Skip to content

Adding activity for Iron Banner Rift #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
michaelaird wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Adding activity for Iron Banner Rift #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/data/activities.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@
85: 'Dares of Eternity',
86: 'Offensive',
87: '????', # not here?? https://bungie-net.github.io/#/components/schemas/Destiny.Definitions.DestinyActivityDefinition
90: 'Iron Banner Rift',
}

PVP_ACTIVITIES = [84, 81, 80, 74, 73, 72, 71, 68, 65, 62, 61, 60, 59, 50, 48, 43, 45, 44, 41, 42, 37, 38, 31, 25, 15]
PVP_ACTIVITIES = [84, 81, 80, 74, 73, 72, 71, 68, 65, 62, 61, 60, 59, 50, 48, 43, 45, 44, 41, 42, 37, 38, 31, 25, 15, 90]
GAMBIT_ACTIVITIES = [75, 63]
2 changes: 1 addition & 1 deletion app/reports/ActivityCountReport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def generateData(self, data):
for entry in datapoint["entries"]:
if entry["player"]["destinyUserInfo"]["membershipId"] != str(self.membershipId): continue
typus = "PvE"
if datapoint["activityDetails"]["mode"] in [84, 81, 80, 74, 73, 72, 71, 68, 65, 62, 61,32, 60, 59, 32, 50, 48, 43, 45, 44, 41, 42, 37, 38, 31, 25, 15]:
if datapoint["activityDetails"]["mode"] in [84, 81, 80, 74, 73, 72, 71, 68, 65, 62, 61,32, 60, 59, 32, 50, 48, 43, 45, 44, 41, 42, 37, 38, 31, 25, 15, 90]:
typus = "PvP"
elif datapoint["activityDetails"]["mode"] in [75, 63]:
typus = "Gambit"
Expand Down
2 changes: 1 addition & 1 deletion app/reports/ActivityLocationTimeReport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def generateData(self, data):
start_date = datetime.fromtimestamp(timestamp + starts)

typus = "PvE"
if datapoint["activityDetails"]["mode"] in [84, 81, 80, 74, 73, 72, 71, 68, 65, 62, 61, 60, 59, 50, 48, 43, 45, 44, 41, 42, 37, 38, 31, 25, 15]:
if datapoint["activityDetails"]["mode"] in [84, 81, 80, 74, 73, 72, 71, 68, 65, 62, 61, 60, 59, 50, 48, 43, 45, 44, 41, 42, 37, 38, 31, 25, 15, 90]:
typus = "PvP"
elif datapoint["activityDetails"]["mode"] in [75, 63]:
typus = "Gambit"
Expand Down
2 changes: 1 addition & 1 deletion app/reports/ActivityLocationWeaponReport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def generateData(self, data):
for wp in entry["extended"]["weapons"]:

typus = "PvE"
if datapoint["activityDetails"]["mode"] in [84, 81, 80, 74, 73, 72, 71, 68, 65, 62, 61, 60, 59, 50, 48, 32, 43, 45, 44, 41, 42, 37, 38, 31, 25, 15]:
if datapoint["activityDetails"]["mode"] in [84, 81, 80, 74, 73, 72, 71, 68, 65, 62, 61, 60, 59, 50, 48, 32, 43, 45, 44, 41, 42, 37, 38, 31, 25, 15, 90]:
typus = "PvP"
elif datapoint["activityDetails"]["mode"] in [75, 63]:
typus = "Gambit"
Expand Down
2 changes: 1 addition & 1 deletion app/reports/ActivityWinrateReport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def generateData(self, data):
timestamp = dateutil.parser.parse(datapoint["period"]).timestamp()
for entry in datapoint["entries"]:
if entry["player"]["destinyUserInfo"]["membershipId"] != str(self.membershipId): continue
if datapoint["activityDetails"]["mode"] in [84, 81, 80, 74, 73, 72, 71, 68, 65, 62, 61, 60, 59, 50, 48, 43, 45, 44, 41, 42, 37, 38, 31, 25, 15]:
if datapoint["activityDetails"]["mode"] in [84, 81, 80, 74, 73, 72, 71, 68, 65, 62, 61, 60, 59, 50, 48, 43, 45, 44, 41, 42, 37, 38, 31, 25, 15, 90]:
typus = "PvP"
elif datapoint["activityDetails"]["mode"] in [75, 63]:
typus = "Gambit"
Expand Down
2 changes: 1 addition & 1 deletion app/reports/KDReport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def generateRawDataframe(self, data):
"deaths": deaths,
"assists": assists,
})
df["is_pvp"] = df["mode"].astype("int32").isin([84, 81, 80, 74, 73, 72, 71, 68, 65, 62, 61, 60, 59, 50, 48, 43, 45, 44, 41, 42, 37, 38, 31, 25, 15]) * 1
df["is_pvp"] = df["mode"].astype("int32").isin([84, 81, 80, 74, 73, 72, 71, 68, 65, 62, 61, 60, 59, 50, 48, 43, 45, 44, 41, 42, 37, 38, 31, 25, 15, 90]) * 1

return df

Expand Down
2 changes: 1 addition & 1 deletion app/reports/KillsDeathsAssistsReport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ def generateRawDataframe(self, data):
"assists": assists,
})

df["is_pvp"] = df["mode"].astype("int32").isin([84, 81, 80, 74, 73, 72, 71, 68, 65, 62, 61, 60, 59, 50, 48, 43, 45, 44, 41, 42, 37, 38, 31, 25, 15]) * 1
df["is_pvp"] = df["mode"].astype("int32").isin([84, 81, 80, 74, 73, 72, 71, 68, 65, 62, 61, 60, 59, 50, 48, 43, 45, 44, 41, 42, 37, 38, 31, 25, 15, 90]) * 1
df['Date'] = pd.to_datetime(df['start']) - pd.to_timedelta(7, unit='d')
return df

Expand Down