Merge pull request #623 from DestinyItemManager/tfs-patch

The Final Shape: fixes and manifest update
DestinyItemManager · Jun 4, 2024 · 5b61d04 · 5b61d04
2 parents ce80c3d + e675552
commit 5b61d04
Show file tree

Hide file tree

Showing 50 changed files with 3,884 additions and 2,026 deletions.
diff --git a/SEASONS.md b/SEASONS.md
@@ -1,29 +1,30 @@
 ## Seasons
 
-| Season | Start Date | End Date  | DLC Name        | Season of   |
-| :----: | ---------- | --------- | --------------- | ----------- |
-|   1    | 06SEP2017  | 04DEC2017 | Red War         |             |
-|   2    | 05DEC2017  | 07MAY2018 | Curse of Osiris |             |
-|   3    | 08MAY2018  | 03SEP2018 | Warmind         | Resurgence  |
-|   4    | 04SEP2018  | 26NOV2018 | Forsaken        | the Outlaw  |
-|   5    | 27NOV2018  | 04MAR2019 | Black Armory    | the Forge   |
-|   6    | 05MAR2019  | 03JUN2019 | Joker's Wild    | the Drifter |
-|   7    | 04JUN2019  | 30SEP2019 | Penumbra        | Opulence    |
-|   8    | 01OCT2019  | 09DEC2019 | Shadowkeep      | the Undying |
-|   9    | 10DEC2019  | 09MAR2020 |                 | Dawn        |
-|   10   | 10MAR2020  | 08JUN2020 |                 | the Worthy  |
-|   11   | 09JUN2020  | 09NOV2020 |                 | the Arrival |
-|   12   | 10NOV2020  | 08FEB2021 | Beyond Light    | the Hunt    |
-|   13   | 09FEB2021  | 10MAY2021 |                 | the Chosen  |
-|   14   | 11MAY2021  | 23AUG2021 |                 | the Splicer |
-|   15   | 24AUG2021  | 21FEB2022 |                 | the Lost    |
-|   16   | 22FEB2022  | 23MAY2022 | Witch Queen     | the Risen   |
-|   17   | 24MAY2022  | 22AUG2022 |                 | the Haunted |
-|   18   | 23AUG2022  | 05DEC2022 |                 | Plunder     |
-|   19   | 06DEC2022  | 27FEB2023 |                 | the Seraph  |
-|   20   | 28FEB2023  | 22MAY2023 | Lightfall       | Defiance    |
-|   21   | 23MAY2023  | 21AUG2023 |                 | the Deep    |
-|   22   | 22AUG2023  | 27NOV2023 |                 | the Witch   |
-|   23   | 28NOV2023  | 03JUN2024 |                 | the Wish    |
+| Season | Start Date | End Date  | DLC Name        | Season of       |
+| :----: | ---------- | --------- | --------------- | --------------- |
+|   1    | 06SEP2017  | 04DEC2017 | Red War         |                 |
+|   2    | 05DEC2017  | 07MAY2018 | Curse of Osiris |                 |
+|   3    | 08MAY2018  | 03SEP2018 | Warmind         | Resurgence      |
+|   4    | 04SEP2018  | 26NOV2018 | Forsaken        | the Outlaw      |
+|   5    | 27NOV2018  | 04MAR2019 | Black Armory    | the Forge       |
+|   6    | 05MAR2019  | 03JUN2019 | Joker's Wild    | the Drifter     |
+|   7    | 04JUN2019  | 30SEP2019 | Penumbra        | Opulence        |
+|   8    | 01OCT2019  | 09DEC2019 | Shadowkeep      | the Undying     |
+|   9    | 10DEC2019  | 09MAR2020 |                 | Dawn            |
+|   10   | 10MAR2020  | 08JUN2020 |                 | the Worthy      |
+|   11   | 09JUN2020  | 09NOV2020 |                 | the Arrival     |
+|   12   | 10NOV2020  | 08FEB2021 | Beyond Light    | the Hunt        |
+|   13   | 09FEB2021  | 10MAY2021 |                 | the Chosen      |
+|   14   | 11MAY2021  | 23AUG2021 |                 | the Splicer     |
+|   15   | 24AUG2021  | 21FEB2022 |                 | the Lost        |
+|   16   | 22FEB2022  | 23MAY2022 | Witch Queen     | the Risen       |
+|   17   | 24MAY2022  | 22AUG2022 |                 | the Haunted     |
+|   18   | 23AUG2022  | 05DEC2022 |                 | Plunder         |
+|   19   | 06DEC2022  | 27FEB2023 |                 | the Seraph      |
+|   20   | 28FEB2023  | 22MAY2023 | Lightfall       | Defiance        |
+|   21   | 23MAY2023  | 21AUG2023 |                 | the Deep        |
+|   22   | 22AUG2023  | 27NOV2023 |                 | the Witch       |
+|   23   | 28NOV2023  | 03JUN2024 |                 | the Wish        |
+|   24   | 04JUN2024  | 07OCT2024 | The Final Shape | Episode: Echoes |
 
 - \*denotes best guess dates
diff --git a/data/exotic-synergies.ts b/data/exotic-synergies.ts
@@ -16,7 +16,7 @@ export const synergies = {
       PlugCategoryHashes.WarlockArcMelee,
     ]),
     verbs: /blind(s)?\b|jolt(s)?/,
-    misc: /arc (bolt|ability|soul)|ionic traces/,
+    misc: /arc (bolt|ability|soul|super)|ionic traces/,
     keywords: {
       exclude: /sentinel shield/,
     },
@@ -31,7 +31,7 @@ export const synergies = {
       PlugCategoryHashes.WarlockSolarMelee,
     ]),
     verbs: /scorch(es)?/,
-    misc: /sunspot|solar abilities|sol invictus|kni(v|f)e(s)?|helion/,
+    misc: /sunspot|solar (abilities|super)|sol invictus|kni(v|f)e(s)?|helion/,
     keywords: {
       excludes: /solar final blows/,
     },
@@ -45,8 +45,8 @@ export const synergies = {
       PlugCategoryHashes.HunterVoidMelee,
       PlugCategoryHashes.WarlockVoidMelee,
     ]),
-    verbs: /suppress(es)?/,
-    misc: /void subclass|smoke bomb|void-damage|devour|invisible|blink|void soul(s)?/,
+    verbs: /suppress(es)?|weaken(s)?/,
+    misc: /void super|smoke bomb|void-damage|devour|invisible|blink|void soul(s)?/,
     keywords: {},
   },
   stasis: {
@@ -59,7 +59,7 @@ export const synergies = {
       PlugCategoryHashes.WarlockStasisMelee,
     ]),
     verbs: /slows/,
-    misc: /stasis subclass|frost armor/,
+    misc: /stasis super|frost armor/,
     keywords: {},
   },
   strand: {
@@ -72,7 +72,7 @@ export const synergies = {
       PlugCategoryHashes.WarlockStrandMelee,
     ]),
     verbs: /sever(s)?\b|!(while you're midair )suspend(s)?|unravel(s)?/,
-    misc: /strand subclass|woven mail/,
+    misc: /strand super|woven mail/,
     keywords: {},
   },
 } as Record<

diff --git a/data/generated-enums.ts b/data/generated-enums.ts
@@ -41,6 +41,7 @@ export const enum PlugCategoryHashes {
   EnhancementsArms = 640682011,
   EnhancementsArtifact = 284811516,
   EnhancementsArtifice = 3773173029,
+  EnhancementsArtificeExotic = 1934732343,
   EnhancementsChest = 383756333,
   EnhancementsClass = 1955304674,
   EnhancementsExoticAeonCult = 913734466,
@@ -119,6 +120,14 @@ export const enum PlugCategoryHashes {
   HunterArcMelee = 2434874031,
   HunterArcMovement = 2101241798,
   HunterArcSupers = 4145425829,
+  HunterPrismAspects = 1164816619,
+  HunterPrismClassAbilities = 3324969927,
+  HunterPrismGrenades = 2789335173,
+  HunterPrismMelee = 511532732,
+  HunterPrismMovement = 1681184239,
+  HunterPrismPrismGrenade = 418351300,
+  HunterPrismSupers = 180411040,
+  HunterPrismTranscendence = 2415732645,
   HunterSharedAspects = 3032847657,
   HunterSolarAspects = 3052104375,
   HunterSolarClassAbilities = 3538316507,
@@ -152,11 +161,15 @@ export const enum PlugCategoryHashes {
   PlugsMasterworksArmorDefault = 2457930460,
   PlugsMasterworksWeaponsDefault = 782502718,
   RandomPerk = 1135709122,
+  SchismBoonsDestinationModsEfficiency = 3424523197,
+  SchismBoonsDestinationModsInfo = 3096991326,
+  SchismBoonsDestinationModsPlaystyle = 484496731,
   Scopes = 2619833294,
   Shader = 2973005342,
   SharedArcFragments = 2430016289,
   SharedArcGrenades = 404070091,
   SharedFragments = 1920373979,
+  SharedPrismFragments = 2696330562,
   SharedSolarFragments = 3119191718,
   SharedSolarGrenades = 3369359206,
   SharedStasisGrenades = 900498880,
@@ -175,6 +188,14 @@ export const enum PlugCategoryHashes {
   TitanArcMelee = 1458470025,
   TitanArcMovement = 2415307576,
   TitanArcSupers = 1861253111,
+  TitanPrismAspects = 912150793,
+  TitanPrismClassAbilities = 3820930681,
+  TitanPrismGrenades = 3205146347,
+  TitanPrismMelee = 1422809918,
+  TitanPrismMovement = 3777887553,
+  TitanPrismPrismGrenade = 2370651390,
+  TitanPrismSupers = 902963970,
+  TitanPrismTranscendence = 742077731,
   TitanSharedAspects = 4032445539,
   TitanSolarAspects = 1970675705,
   TitanSolarClassAbilities = 1197336009,
@@ -771,22 +792,51 @@ export const enum PlugCategoryHashes {
   V710NewTraceRifle0Skins = 2775050468,
   V710PursuitScoutRifle0Skins = 657820579,
   V720NewFusionRifle0Masterwork = 1306261452,
+  V720NewFusionRifle0Skins = 129564502,
   V720NewGrenadeLauncher0Masterwork = 3535138282,
   V720NewGrenadeLauncher0Skins = 1250777624,
   V720PursuitHandcannon0Skins = 3351746883,
   V720RepackageAutoRifle0Masterwork = 282796296,
   V720RepackageAutoRifle0Skins = 3113397682,
   V730NewBow0Skins = 3480541086,
   V730NewSidearm0Masterwork = 4103783549,
+  V730NewSidearm0Skins = 3206497209,
   V730PursuitSword0Skins = 4166989435,
   V730RepackageRocketLauncher0Masterwork = 3867121356,
   V730RepackageRocketLauncher0Skins = 3831742870,
-  VehiclesModSpeed = 821963863,
+  V800HunterNewChest0Skins = 171540076,
+  V800HunterNewClass0Skins = 1319487721,
+  V800HunterNewLegs0Skins = 2260466760,
+  V800NewSniperRifle0Masterwork = 1615215818,
+  V800NewSniperRifle0Skins = 889298944,
+  V800NewSword0Masterwork = 1231552077,
+  V800NewSword0Skins = 1819523641,
+  V800NewTraceRifle0Masterwork = 2837543682,
+  V800NewTraceRifle0Skins = 2673070336,
+  V800PursuitSubmachinegun0Skins = 4042778950,
+  V800RepackageAutoRifle0Masterwork = 1144321079,
+  V800RepackageAutoRifle0Skins = 1166372799,
+  V800RepackagePulseRifle0Masterwork = 606228473,
+  V800RepackagePulseRifle0Skins = 794172773,
+  V800TitanNewArms0Skins = 4013059526,
+  V800TitanNewChest0Skins = 2397546760,
+  V800TitanNewClass0Skins = 3720175165,
+  V800WarlockNewChest0Skins = 4082523555,
+  V800WarlockNewClass0Skins = 1166112530,
+  V800WarlockNewHead0Skins = 755248998,
   WarlockArcAspects = 2111409167,
   WarlockArcClassAbilities = 1308084083,
   WarlockArcMelee = 1387605624,
   WarlockArcMovement = 1943502171,
   WarlockArcSupers = 2285394316,
+  WarlockPrismAspects = 769886388,
+  WarlockPrismClassAbilities = 3339135424,
+  WarlockPrismGrenades = 3287837048,
+  WarlockPrismMelee = 204703343,
+  WarlockPrismMovement = 2883193222,
+  WarlockPrismPrismGrenade = 1341484747,
+  WarlockPrismSupers = 1684765285,
+  WarlockPrismTranscendence = 1121283194,
   WarlockSharedAspects = 3908861120,
   WarlockSolarAspects = 81856188,
   WarlockSolarClassAbilities = 1662395848,
@@ -1006,16 +1056,19 @@ export const enum SocketCategoryHashes {
   ArmorPerks_LargePerk = 3154740035,
   ArmorPerks_Reusable = 2518356196,
   ArmorTier = 760375309,
+  Aspects_Abilities = 2047681910,
   Aspects_Abilities_Ikora = 2140934067,
   Aspects_Abilities_Neomuna = 764703411,
   Aspects_Abilities_Stranger = 3400923910,
   ClanPerks_Unlockable_ClanBanner = 3898156960,
   ClanPerks_Unlockable_UNUSED = 1683579090,
   ClanStaves = 3954618873,
+  DestinationMods = 2787222118,
   EmblemBonuses = 513547461,
   EmblemCustomization = 279738248,
   Emotes = 1093090108,
   ForgeMaterials = 3970188346,
+  Fragments_Abilities = 271461480,
   Fragments_Abilities_Ikora = 1313488945,
   Fragments_Abilities_Neomuna = 193371309,
   Fragments_Abilities_Stranger = 2819965312,
@@ -1025,6 +1078,7 @@ export const enum SocketCategoryHashes {
   GhostShellMods = 3379164649,
   GhostShellPerks = 3301318876,
   GhostTier = 446880883,
+  Information = 2217462106,
   Ingredients = 663582928,
   IntrinsicTraits = 3956125808,
   NightfallModifiers = 2622243744,
@@ -1034,6 +1088,7 @@ export const enum SocketCategoryHashes {
   RuneBonus = 879083882,
   RuneCompatibility = 2316895247,
   Super = 457473665,
+  Transcendence = 1905270138,
   VehicleMods_Consumable_Ship = 4265082475,
   VehicleMods_Consumable_Vehicle = 4243480345,
   VehiclePerks = 2278110604,
@@ -1072,6 +1127,7 @@ export const enum BucketHashes {
   PowerWeapons = 953998645,
   Quests = 1345459588,
   SeasonalArtifact = 1506418338,
+  SeasonalEquipment = 4178487412,
   Shaders = 18606351,
   Ships = 284967655,
   Silver = 2689798310,
@@ -1114,6 +1170,8 @@ export const enum TraitHashes {
   Blind = 500183315,
   Career = 4263853822,
   Cure = 3263723277,
+  DarknessBuffs = 1891050213,
+  DarknessDebuffs = 1514833946,
   Devour = 3078132110,
   Exotics = 370766376,
   FactionCrucible = 2951764300,
@@ -1131,6 +1189,7 @@ export const enum TraitHashes {
   FoundryTexMechanica = 1821231131,
   FoundryVeist = 963390771,
   Freeze = 2968599152,
+  FrostArmor = 106947924,
   Ignition = 3268862716,
   InventoryFilteringBounty = 201433599,
   InventoryFilteringQuest = 1861210184,
@@ -1163,16 +1222,17 @@ export const enum TraitHashes {
   ItemQuestAnnualV500 = 2774395792,
   ItemQuestAnnualV600 = 929402123,
   ItemQuestAnnualV700 = 2976021378,
+  ItemQuestAnnualV800 = 3011401061,
   ItemQuestCampaign = 2973844452,
   ItemQuestEvent = 1056186694,
   ItemQuestOnramp = 170945933,
-  ItemQuestSeasonalSeason22 = 3904180895,
-  ItemQuestSeasonalSeason23 = 3904180894,
+  ItemQuestSeasonalSeason24 = 3904180889,
   ItemShader = 2652561225,
   ItemShip = 3607584152,
   ItemSpawnfx = 856705125,
   ItemSubclassDark = 3224025418,
   ItemSubclassLight = 482679394,
+  ItemSubclassPrism = 3820193993,
   ItemVehicle = 3977049418,
   ItemWeapon = 567594262,
   ItemWeaponAutoRifle = 2729780558,
@@ -1193,7 +1253,8 @@ export const enum TraitHashes {
   ItemWeaponSword = 1531673855,
   ItemWeaponTraceRifle = 446244952,
   Jolted = 3221118171,
-  Lightfall = 2878306895,
+  LightBuffs = 2713325501,
+  LightDebuffs = 3023190802,
   MambaRoleCollector = 3791840693,
   MambaRoleDefender = 2712954769,
   MambaRoleInvader = 3090596947,
@@ -1215,8 +1276,10 @@ export const enum TraitHashes {
   Suppression = 2578642829,
   Suspend = 2679722414,
   Tangle = 1577394840,
+  TheFinalShape = 2878306895,
   ThePast = 2387836362,
   Threadling = 2724747993,
+  Transcendence = 345967499,
   Unravel = 945613349,
   VoidBreach = 3328352616,
   Volatile = 4105407564,

diff --git a/data/seasons/all-watermarks.json b/data/seasons/all-watermarks.json
@@ -1,4 +1,5 @@
 [
+  "/common/destiny2_content/icons/0337ec21962f67c7c493fedb447c4a9b.png",
   "/common/destiny2_content/icons/04de56db6d59127239ed51e82d16c06c.png",
   "/common/destiny2_content/icons/0ec87dd7ef282db27e1fc337e9545cd0.png",
   "/common/destiny2_content/icons/1448dde4efdb57b07f5473f87c4fccd7.png",
@@ -46,6 +47,7 @@
   "/common/destiny2_content/icons/dd71a9a48c4303fd8546433d63e46cc7.png",
   "/common/destiny2_content/icons/e197b731c11556b17664b90a87dd0c11.png",
   "/common/destiny2_content/icons/e27a4f39c1bb8c6f89613648afaa3e9f.png",
+  "/common/destiny2_content/icons/e3ea0bd2e889b605614276876667759c.png",
   "/common/destiny2_content/icons/e4a1a5aaeb9f65cc5276fd4d86499c70.png",
   "/common/destiny2_content/icons/e775dcb3d47e3d54e0e24fbdb64b5763.png",
   "/common/destiny2_content/icons/e8fe681196baf74917fa3e6f125349b0.png",