Fix: Toxin General Terrorist Does Extra Damage Before Anthrax Gamma U…

…pgrade
commy2 · Feb 21, 2021 · 2da86a6 · 2da86a6
1 parent 7fa0610
commit 2da86a6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/Data/INI/Object/ChemicalGeneral.ini b/Data/INI/Object/ChemicalGeneral.ini
@@ -12680,7 +12680,6 @@ Object Chem_GLAInfantryTerrorist
     FlingForceVariance  = 3
     FlingPitch          = 60
     FlingPitchVariance  = 10
-    OCL                 = INITIAL Chem_PoisonFieldGammaLarge
   End
 
   Behavior = FireWeaponWhenDeadBehavior ModuleTag_Death04
@@ -12703,12 +12702,14 @@ Object Chem_GLAInfantryTerrorist
     TriggeredBy   = Upgrade_GLAAnthraxBeta
     RequiresAllTriggers = Yes ;TriggeredBy is an AND, not an OR like it normally is
     ConflictsWith = Chem_Upgrade_GLAAnthraxGamma
+    DeathTypes = NONE +SUICIDED +CRUSHED +SPLATTED +LASERED +BURNED +EXPLODED
   End
 
   Behavior = FireWeaponWhenDeadBehavior ModuleTag_93
     DeathWeapon   = Chem_SuicideWeapon
     StartsActive  = No                      ; turned on by upgrade
     ConflictsWith = Upgrade_GLAAnthraxBeta Chem_Upgrade_GLAAnthraxGamma
+    DeathTypes = NONE +SUICIDED +CRUSHED +SPLATTED +LASERED +BURNED +EXPLODED
   End
 
 ; Units that can gain experience can't have GrantUpgradeCreate or they crash savegames.
@@ -16355,13 +16356,15 @@ Object Chem_GLAVehicleCombatBike
     TriggeredBy   = Upgrade_GLAAnthraxBeta
     RequiresAllTriggers = Yes ;TriggeredBy is an AND, not an OR like it normally is
     ConflictsWith = Chem_Upgrade_GLAAnthraxGamma
+    DeathTypes = NONE +SUICIDED +CRUSHED +SPLATTED +LASERED +BURNED +EXPLODED
   End
 
   Behavior = FireWeaponWhenDeadBehavior ModuleTag_93
     RequiredStatus  = STATUS_RIDER5
     DeathWeapon   = Chem_SuicideWeapon
     StartsActive  = No                      ; turned on by upgrade
     ConflictsWith = Upgrade_GLAAnthraxBeta Chem_Upgrade_GLAAnthraxGamma
+    DeathTypes = NONE +SUICIDED +CRUSHED +SPLATTED +LASERED +BURNED +EXPLODED
   End
 
 ; Units that can gain experience can't have GrantUpgradeCreate or they crash savegames.

diff --git a/Data/INI/Weapon.ini b/Data/INI/Weapon.ini
@@ -7895,7 +7895,7 @@ Weapon Chem_SuicideWeaponGamma ; No extra damage, just lays down a damage field
   DeathType = EXPLODED
   WeaponSpeed = 99999.0
   ProjectileObject = NONE
-;  FireFX = WeaponFX_NapalmMissileDetonation
+  FireFX = Chem_WeaponFX_ToxinShellWeaponGamma
   FireOCL = OCL_PoisonFieldGammaSmall
   RadiusDamageAffects = ALLIES ENEMIES NEUTRALS
   DelayBetweenShots = 0                   ; time between shots, msec
@@ -7908,7 +7908,7 @@ End
 
 ;------------------------------------------------------------------------------
 Weapon Chem_SuicideWeapon ; No extra damage, just lays down a damage field
-  PrimaryDamage = 200.0
+  PrimaryDamage = 0.0
   PrimaryDamageRadius = 10.0
   AttackRange = 100.0
   DamageType = EXPLOSION
@@ -7928,14 +7928,14 @@ End
 
 ;------------------------------------------------------------------------------
 Weapon Chem_SuicideWeaponBeta ; No extra damage, just lays down a damage field
-  PrimaryDamage = 200.0
+  PrimaryDamage = 0.0
   PrimaryDamageRadius = 10.0
   AttackRange = 100.0
   DamageType = EXPLOSION
   DeathType = EXPLODED
   WeaponSpeed = 99999.0
   ProjectileObject = NONE
-;  FireFX = WeaponFX_NapalmMissileDetonation
+  FireFX = WeaponFX_ToxinShellWeaponUpgraded
   FireOCL = OCL_PoisonFieldUpgradedSmall
   RadiusDamageAffects = ALLIES ENEMIES NEUTRALS
   DelayBetweenShots = 0                   ; time between shots, msec