[Gear] Funhouse Lens & Garbagemancer's Last Resort initial implementa…

…tions
simulationcraft · Jan 8, 2025 · 20087c4 · 20087c4
1 parent 05288fc
commit 20087c4
Show file tree

Hide file tree

Showing 7 changed files with 343 additions and 188 deletions.
diff --git a/SpellDataDump/allspells_ptr.txt b/SpellDataDump/allspells_ptr.txt
@@ -466305,6 +466305,20 @@ Effects          :
                    Base Value: 0 | Scaled Value: 0 | Trigger Spell: 1214603
 Tooltip          : Critical Strike increased by $1214603w1.
 
+Name             : Funhouse Lens (id=1213434) 
+School           : Physical
+Spell Type       : None
+Duration         : 15 seconds
+Attributes       : Aura Points On Client (268), Scales with Casting Item's Level (354)
+Effects          :
+#1 (id=1195091)  : Apply Aura (6) | Scale% (Stacking) (61)
+                   Base Value: -20 | Scaled Value: -20 | Target: Self (1)
+#2 (id=1195092)  : Apply Aura (6) | Modify Rating (189)
+                   Base Value: 0 | Scaled Value: 0 | Rating: Haste | Target: Self (1)
+#3 (id=1195095)  : Dummy (3)
+                   Base Value: 0 | Scaled Value: 0 | Trigger Spell: 1214603
+Tooltip          : Haste increased by $1214603w2.
+
 Name             : Goo-blin Grenade (id=1213436) 
 School           : Nature
 Spell Type       : Magic
@@ -466899,7 +466913,7 @@ Description      : $@spelldesc386692
 Name             : Funhouse Lens (id=1214603) [Passive] 
 School           : Physical
 Spell Type       : None
-Triggered By     : Funhouse Lens (1213433)
+Triggered By     : Funhouse Lens (1213433), Funhouse Lens (1213434)
 Attributes       : Passive (6), Aura Points On Client (268), Scales with Casting Item's Level (354)
 Effects          :
 #1 (id=1196937)  : Apply Aura (6) | Dummy (4) | Scaling Class: -9
@@ -473515,13 +473529,25 @@ Description      : Fashion nearby garbage into a sphere and launch it into the s
 Name             : Garbagemancer's Last Resort (id=1219296) [Passive] 
 School           : Physical
 Spell Type       : None
+Triggered By     : Garbocalypse (1219299)
 Attributes       : Passive (6), Aura Points On Client (268), Scales with Casting Item's Level (354)
 Effects          :
 #1 (id=1204940)  : Apply Aura (6) | Dummy (4) | Scaling Class: -9
                    Base Value: 0 | Scaled Value: 623474 (coefficient=243.7577) | PvP Coefficient: 0.5 | Target: Self (1)
 #2 (id=1205003)  : Apply Aura (6) | Dummy (4) | Scaling Class: -9
                    Base Value: 10 | Scaled Value: 10 | Target: Self (1)
 
+Name             : Garbocalypse (id=1219299) 
+School           : Physical
+Spell Type       : Ranged
+Range            : 50000 yards
+Attributes       : Always Line of Sight (185), Always AOE Line of Sight (186), Aura Points On Client (268)
+Effects          :
+#1 (id=1204945)  : School Damage (2): physical
+                   Base Value: 0 | Scaled Value: 0 | Radius: 10 yards | Target: At Enemy in Area (16)
+#2 (id=1204946)  : Dummy (3)
+                   Base Value: 0 | Scaled Value: 0 | Trigger Spell: 1219296
+
 Name             : Phoenix Reborn (id=1219304) [Spell Family (3)] 
 Class            : Mage
 School           : Fire

diff --git a/SpellDataDump/nonclass_ptr.txt b/SpellDataDump/nonclass_ptr.txt
@@ -256535,6 +256535,20 @@ Effects          :
                    Base Value: 0 | Scaled Value: 0 | Trigger Spell: 1214603
 Tooltip          : Critical Strike increased by $1214603w1.
 
+Name             : Funhouse Lens (id=1213434) 
+School           : Physical
+Spell Type       : None
+Duration         : 15 seconds
+Attributes       : Aura Points On Client (268), Scales with Casting Item's Level (354)
+Effects          :
+#1 (id=1195091)  : Apply Aura (6) | Scale% (Stacking) (61)
+                   Base Value: -20 | Scaled Value: -20 | Target: Self (1)
+#2 (id=1195092)  : Apply Aura (6) | Modify Rating (189)
+                   Base Value: 0 | Scaled Value: 0 | Rating: Haste | Target: Self (1)
+#3 (id=1195095)  : Dummy (3)
+                   Base Value: 0 | Scaled Value: 0 | Trigger Spell: 1214603
+Tooltip          : Haste increased by $1214603w2.
+
 Name             : Goo-blin Grenade (id=1213436) 
 School           : Nature
 Spell Type       : Magic
@@ -257021,7 +257035,7 @@ Description      : $@spelldesc386692
 Name             : Funhouse Lens (id=1214603) [Passive] 
 School           : Physical
 Spell Type       : None
-Triggered By     : Funhouse Lens (1213433)
+Triggered By     : Funhouse Lens (1213433), Funhouse Lens (1213434)
 Attributes       : Passive (6), Aura Points On Client (268), Scales with Casting Item's Level (354)
 Effects          :
 #1 (id=1196937)  : Apply Aura (6) | Dummy (4) | Scaling Class: -9
@@ -259717,13 +259731,25 @@ Description      : Fashion nearby garbage into a sphere and launch it into the s
 Name             : Garbagemancer's Last Resort (id=1219296) [Passive] 
 School           : Physical
 Spell Type       : None
+Triggered By     : Garbocalypse (1219299)
 Attributes       : Passive (6), Aura Points On Client (268), Scales with Casting Item's Level (354)
 Effects          :
 #1 (id=1204940)  : Apply Aura (6) | Dummy (4) | Scaling Class: -9
                    Base Value: 0 | Scaled Value: 623474 (coefficient=243.7577) | PvP Coefficient: 0.5 | Target: Self (1)
 #2 (id=1205003)  : Apply Aura (6) | Dummy (4) | Scaling Class: -9
                    Base Value: 10 | Scaled Value: 10 | Target: Self (1)
 
+Name             : Garbocalypse (id=1219299) 
+School           : Physical
+Spell Type       : Ranged
+Range            : 50000 yards
+Attributes       : Always Line of Sight (185), Always AOE Line of Sight (186), Aura Points On Client (268)
+Effects          :
+#1 (id=1204945)  : School Damage (2): physical
+                   Base Value: 0 | Scaled Value: 0 | Radius: 10 yards | Target: At Enemy in Area (16)
+#2 (id=1204946)  : Dummy (3)
+                   Base Value: 0 | Scaled Value: 0 | Trigger Spell: 1219296
+
 Name             : Garbagemancer's Last Resort (id=1219314) 
 School           : Physical
 Spell Type       : None

diff --git a/dbc_extract3/dbc/generator.py b/dbc_extract3/dbc/generator.py
@@ -1528,6 +1528,8 @@ class SpellDataGenerator(DataGenerator):
          1214823, 1214826, # The Jastor Diamond
          1218471, 1218442, 1218463, 1218469, # Machine Gob's Iron Grin
          1214787, 1214806, 1214807, 1214808, 1214810, # Mechano-core Amplifier 
+         1219299, # Garbagemancer's Last Resort
+         1213433, 1213434, # Funhouse Lens
         ),
 
         # Warrior:

diff --git a/engine/dbc/generated/client_data_version_ptr.inc b/engine/dbc/generated/client_data_version_ptr.inc
@@ -10,6 +10,6 @@
 
 #define PTR_CLIENT_DATA_HOTFIX_DATE "2025-01-08"
 #define PTR_CLIENT_DATA_HOTFIX_BUILD (58221)
-#define PTR_CLIENT_DATA_HOTFIX_HASH "62e4334cf2873abe91a61ad1e11bb380436fb6a47d2a71afe390f0624d1993d1"
+#define PTR_CLIENT_DATA_HOTFIX_HASH "38e14bc5f3cad322eaaa3c5230346d103e7ab37069d6020aa2040730d1ea0cd7"
 
 #endif /* PTR_CLIENT_DATA_VERSION_INC*/