Fix: Demo General Combat Bike With Demolitions Upgrade Deals No Damag…

…e When Destroyed By Gamma Poison (#104)
TheSuperHackers · Sep 10, 2021 · aff4799 · aff4799
1 parent ebd95cd
commit aff4799
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/Patch104pZH/Design/Tasks/commy2_tasks.txt b/Patch104pZH/Design/Tasks/commy2_tasks.txt
@@ -87,7 +87,7 @@ https://github.com/commy2/zerohour/issues/135 [IMPROVEMENT][NPROJECT] Tunnel And
 https://github.com/commy2/zerohour/issues/134 [IMPROVEMENT][NPROJECT] Air Force Carpet Bomber Tooltip Claims 2:30 Cooldown Instead Of True 4:00
 https://github.com/commy2/zerohour/issues/133 [MAYBE][NPROJECT]       Fire Base Command Button Order Misaligned With Other Buildings
 https://github.com/commy2/zerohour/issues/132 [MAYBE][NPROJECT]       Raptor Guard Air Button Misplaced
-https://github.com/commy2/zerohour/issues/131 [IMPROVEMENT][NPROJECT] Demo General Combat Bike With Demolitions Upgrade Deals No Damage When Destroyed By Gamma Poison
+https://github.com/commy2/zerohour/issues/131 [DONE][NPROJECT]        Demo General Combat Bike With Demolitions Upgrade Deals No Damage When Destroyed By Gamma Poison
 https://github.com/commy2/zerohour/issues/130 [DONE][NPROJECT]        Demo Combat Bike Uses Portrait As Button
 https://github.com/commy2/zerohour/issues/129 [MAYBE][NPROJECT]       Selling Air Force Supply Center Does Refund Less Than Half Of Build Value
 https://github.com/commy2/zerohour/issues/128 [IMPROVEMENT][NPROJECT] Repair And Reinforcement Pads Reward XP When Killed

diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/DemoGeneral.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/DemoGeneral.ini
@@ -17907,6 +17907,9 @@ Object Demo_GLAVehicleCombatBike
 ;    FlingPitchVariance  = 10
 ;  End
 
+  ; Patch104p @bugfix commy2 29/08/2021 Fix poison death not firing expected death weapons.
+  ; This made Bike deal no damage when killed by Anthrax Gamma poison.
+
   ;Terrorist without suicide bomb upgrade
   Behavior = FireWeaponWhenDeadBehavior ModuleTag_Death18
     RequiredStatus  = STATUS_RIDER5
@@ -17923,7 +17926,7 @@ Object Demo_GLAVehicleCombatBike
     StartsActive  = No
     TriggeredBy   = Demo_Upgrade_SuicideBomb
     RequiresAllTriggers = Yes;
-    DeathTypes = ALL -SUICIDED -POISONED -POISONED_BETA -POISONED_GAMMA
+    DeathTypes = ALL -SUICIDED
   End;
 
   ;Non-terrorist with suicide bomb upgrade (no fire)
@@ -17943,7 +17946,7 @@ Object Demo_GLAVehicleCombatBike
     StartsActive   = No
     TriggeredBy    = Demo_Upgrade_SuicideBomb
     RequiresAllTriggers = Yes;
-    DeathTypes     = ALL -SUICIDED -POISONED -POISONED_BETA -POISONED_GAMMA
+    DeathTypes     = ALL -SUICIDED
   End;
 
   ;Terrorist with suicide bomb upgrade (no fire)
@@ -17953,7 +17956,7 @@ Object Demo_GLAVehicleCombatBike
     StartsActive   = No
     TriggeredBy    = Demo_Upgrade_SuicideBomb
     RequiresAllTriggers = Yes;
-    DeathTypes     = NONE +SUICIDED +POISONED +POISONED_BETA
+    DeathTypes     = NONE +SUICIDED
   End;
 
   Behavior = CommandSetUpgrade ModuleTag_23