diff --git a/app/data/activities.py b/app/data/activities.py index ecaa816..45388fc 100644 --- a/app/data/activities.py +++ b/app/data/activities.py @@ -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] diff --git a/app/reports/ActivityCountReport.py b/app/reports/ActivityCountReport.py index b293d41..01071f8 100644 --- a/app/reports/ActivityCountReport.py +++ b/app/reports/ActivityCountReport.py @@ -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" diff --git a/app/reports/ActivityLocationTimeReport.py b/app/reports/ActivityLocationTimeReport.py index bc79f03..4f54123 100644 --- a/app/reports/ActivityLocationTimeReport.py +++ b/app/reports/ActivityLocationTimeReport.py @@ -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" diff --git a/app/reports/ActivityLocationWeaponReport.py b/app/reports/ActivityLocationWeaponReport.py index 4bc5db1..792f198 100644 --- a/app/reports/ActivityLocationWeaponReport.py +++ b/app/reports/ActivityLocationWeaponReport.py @@ -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" diff --git a/app/reports/ActivityWinrateReport.py b/app/reports/ActivityWinrateReport.py index 77b45fb..d26eaa1 100644 --- a/app/reports/ActivityWinrateReport.py +++ b/app/reports/ActivityWinrateReport.py @@ -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" diff --git a/app/reports/KDReport.py b/app/reports/KDReport.py index dc6106a..0ee45ca 100644 --- a/app/reports/KDReport.py +++ b/app/reports/KDReport.py @@ -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 diff --git a/app/reports/KillsDeathsAssistsReport.py b/app/reports/KillsDeathsAssistsReport.py index 699c3ef..9fb226a 100644 --- a/app/reports/KillsDeathsAssistsReport.py +++ b/app/reports/KillsDeathsAssistsReport.py @@ -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