Merge branch 'main' into minigunner-squish-fix

TheSuperHackers · Aug 29, 2021 · 9fe575c · 9fe575c
2 parents ad4fa98 + 53cc0da
commit 9fe575c
Show file tree

Hide file tree

Showing 19 changed files with 506 additions and 131 deletions.
diff --git a/Patch104pZH/Design/Tasks/commy2_tasks.txt b/Patch104pZH/Design/Tasks/commy2_tasks.txt
@@ -110,7 +110,7 @@ https://github.com/commy2/zerohour/issues/109 [IMPROVEMENT]           Some Helix
 https://github.com/commy2/zerohour/issues/108 [IMPROVEMENT]           Chinook and Supply Center Upgrade Icons
 https://github.com/commy2/zerohour/issues/107 [IMPROVEMENT]           Pilots Have Misleading Upgrade Icons
 https://github.com/commy2/zerohour/issues/106 [NOTRELEVANT]           Cargo Planes With Countermeasures Are Missing Hit Effects
-https://github.com/commy2/zerohour/issues/105 [IMPROVEMENT]           Some American And Chinese Units Use GLA Death Scream When Gamma Poisoned
+https://github.com/commy2/zerohour/issues/105 [DONE]                  Some American And Chinese Units Use GLA Death Scream When Gamma Poisoned
 https://github.com/commy2/zerohour/issues/104 [IMPROVEMENT]           China Command Center Missing Radar Upgrade Icon
 https://github.com/commy2/zerohour/issues/103 [IMPROVEMENT]           Some Special Power Buttons Disappear From Command Center After Mines Upgrade
 https://github.com/commy2/zerohour/issues/102 [IMPROVEMENT]           Tank Hunter Missing Patriotism Upgrade Icon
@@ -163,9 +163,9 @@ https://github.com/commy2/zerohour/issues/55  [IMPROVEMENT]           Vanilla GL
 https://github.com/commy2/zerohour/issues/54  [IMPROVEMENT]           Vanilla GLA Hijacker And Saboteur Can Ride Toxin Generals Combat Bike
 https://github.com/commy2/zerohour/issues/53  [MAYBE]                 Veteran Quad Cannons Deal Less Damage When Scrapped
 https://github.com/commy2/zerohour/issues/52  [NOTRELEVANT]           Boss Base Defense Inconsistencies
-https://github.com/commy2/zerohour/issues/51  [IMPROVEMENT]           Demo General Worker On Bike Missing Demo Generals Bike Destruction Effect
-https://github.com/commy2/zerohour/issues/50  [IMPROVEMENT]           Demo General Vehicle Destruction Effect Glitches
-https://github.com/commy2/zerohour/issues/49  [IMPROVEMENT]           Demo General Infantry Play Terrorist Sound Effect When Killed
+https://github.com/commy2/zerohour/issues/51  [DONE]                  Demo General Worker On Bike Missing Demo Generals Bike Destruction Effect
+https://github.com/commy2/zerohour/issues/50  [DONE]                  Demo General Vehicle Destruction Effect Glitches
+https://github.com/commy2/zerohour/issues/49  [DONE]                  Demo General Infantry Play Terrorist Sound Effect When Killed
 https://github.com/commy2/zerohour/issues/48  [MAYBE]                 Demo General Scud Launcher With Demolitions Upgrade Deals Full Damage When Destroyed
 https://github.com/commy2/zerohour/issues/47  [IMPROVEMENT]           Demo General Battle Bus Is Deleted Without Dealing Damage When Suicided
 https://github.com/commy2/zerohour/issues/46  [IMPROVEMENT]           Technical Has To Recenter Turret To Suicide
@@ -182,30 +182,30 @@ https://github.com/commy2/zerohour/issues/34  [NOTRELEVANT]           Boss Aveng
 https://github.com/commy2/zerohour/issues/33  [MAYBE]                 Air Force General Avenger Receives 30% More Damage From Jet Missiles
 https://github.com/commy2/zerohour/issues/32  [MAYBE]                 Non-vanilla USA Avengers Benefit From Composite Armor
 https://github.com/commy2/zerohour/issues/31  [IMPROVEMENT]           Some Avengers Can Retaliate
-https://github.com/commy2/zerohour/issues/30  [IMPROVEMENT]           Crushing Marauder With Overlord Creates Indestructible Wreck
+https://github.com/commy2/zerohour/issues/30  [DONE]                  Crushing Marauder With Overlord Creates Indestructible Wreck
 https://github.com/commy2/zerohour/issues/29  [DONE]                  GLA Base Defense Hole Sufficient For Player Survival
 https://github.com/commy2/zerohour/issues/28  [MAYBE]                 Demo General Terrorist Does Not Explode When Crushed, Burned Or Blown Up
 https://github.com/commy2/zerohour/issues/27  [IMPROVEMENT][NPROJECT] Scud Storm Does Not Damage Itself
-https://github.com/commy2/zerohour/issues/26  [IMPROVEMENT]           Saboteur Uses Wrong Art For Sabotage Building-Ability
+https://github.com/commy2/zerohour/issues/26  [DONE]                  Saboteur Uses Wrong Art For Sabotage Building-Ability
 https://github.com/commy2/zerohour/issues/25  [NOTRELEVANT]           Boss Tomahawk Launcher Never Drops Scrap
 https://github.com/commy2/zerohour/issues/24  [IMPROVEMENT]           GLA Buildings Don't Create Scrap
-https://github.com/commy2/zerohour/issues/23  [IMPROVEMENT]           Demo General Jarmen Kell Repeats Voice Line When Planting Timed Demo Charge
+https://github.com/commy2/zerohour/issues/23  [DONE]                  Demo General Jarmen Kell Repeats Voice Line When Planting Timed Demo Charge
 https://github.com/commy2/zerohour/issues/22  [IMPROVEMENT]           Build Scorpion Tank-Button Misspelling
 https://github.com/commy2/zerohour/issues/21  [IMPROVEMENT]           Demo And Tox Rebel Ambush Tooltips Are Wrong
-https://github.com/commy2/zerohour/issues/20  [IMPROVEMENT]           Demo Rocket Buggy Loses Red Missile Detonation Effect After Buggy Ammo Upgrade
-https://github.com/commy2/zerohour/issues/19  [IMPROVEMENT]           Emerging Sneak Attack Uses Tunnel Network Portrait
+https://github.com/commy2/zerohour/issues/20  [DONE]                  Demo Rocket Buggy Loses Red Missile Detonation Effect After Buggy Ammo Upgrade
+https://github.com/commy2/zerohour/issues/19  [DONE]                  Emerging Sneak Attack Uses Tunnel Network Portrait
 https://github.com/commy2/zerohour/issues/18  [MAYBE]                 Toxin General Terrorist Without Anthrax Beta Upgrade Creates No Poison Cloud
 https://github.com/commy2/zerohour/issues/17  [MAYBE]                 Toxin General Terrorist Does Extra Damage Before Anthrax Gamma Upgrade
-https://github.com/commy2/zerohour/issues/16  [IMPROVEMENT]           Toxin Demo Trap Creates Poison Cloud Before It Explodes
-https://github.com/commy2/zerohour/issues/15  [IMPROVEMENT]           Gamma Toxin Streams Create Green Particles When Clearing Buildings
-https://github.com/commy2/zerohour/issues/14  [IMPROVEMENT]           Toxin Shells Lose Projectile Explosion Effect After Anthrax Upgrade
+https://github.com/commy2/zerohour/issues/16  [DONE]                  Toxin Demo Trap Creates Poison Cloud Before It Explodes
+https://github.com/commy2/zerohour/issues/15  [DONE]                  Gamma Toxin Streams Create Green Particles When Clearing Buildings
+https://github.com/commy2/zerohour/issues/14  [DONE]                  Toxin Shells Lose Projectile Explosion Effect After Anthrax Upgrade
 https://github.com/commy2/zerohour/issues/13  [DONE]                  Destroyed Toxin Tractor Always Creates Green Particles
 https://github.com/commy2/zerohour/issues/12  [DONE]                  Destroyed Scud Storm Always Creates Green Poison Cloud
 https://github.com/commy2/zerohour/issues/11  [DONE]                  Scud Storm Always Creates Green Particles When Firing
 https://github.com/commy2/zerohour/issues/10  [IMPROVEMENT]           Quad Cannon-ECM-Bug
 https://github.com/commy2/zerohour/issues/9   [DONE]                  Camo-Netted Palace Not Revealed When Garrisoned Troops Fire
-https://github.com/commy2/zerohour/issues/8   [IMPROVEMENT][NPROJECT] Supply Truck Has Extremely Low Mass
-https://github.com/commy2/zerohour/issues/7   [DONE] Mini-Gunner Has Broken Squish Detection
+https://github.com/commy2/zerohour/issues/8   [DONE]                  Supply Truck Has Extremely Low Mass
+https://github.com/commy2/zerohour/issues/7   [DONE]                  Mini-Gunner Has Broken Squish Detection
 https://github.com/commy2/zerohour/issues/6   [IMPROVEMENT]           Mini-Gunner Has Broken Sound And Fire Animation When Aiming At Airborne Targets
 https://github.com/commy2/zerohour/issues/5   [DONE]                  Heroic Pathfinders And Jarmen Kell Don't Use Red Tracers
 https://github.com/commy2/zerohour/issues/4   [IMPROVEMENT]           Vet 3 Jarmen Kell Has Tracer For Sniper Attack But Not For Normal Attack

diff --git a/Patch104pZH/GameFilesEdited/Data/INI/CommandButton.ini b/Patch104pZH/GameFilesEdited/Data/INI/CommandButton.ini
@@ -1926,7 +1926,7 @@ CommandButton Command_SabotageBuilding
   Options                 = OK_FOR_MULTI_SELECT CONTEXTMODE_COMMAND NEED_TARGET_ENEMY_OBJECT ;Kris: Contextmode command options require code support!
   Upgrade                 = None
   TextLabel               = CONTROLBAR:SabotageBuilding
-  ButtonImage             = SUSaboteur
+  ButtonImage             = SUEnterbldg   ; Patch104p @bugfix commy2 28/08/2021 Use intended artwork for ability instead of unit portrait.
   CursorName              = EnterAggressive
   InvalidCursorName       = GenericInvalid
   ButtonBorderType        = ACTION ; Identifier for the User as to what kind of button this is

diff --git a/Patch104pZH/GameFilesEdited/Data/INI/FXList.ini b/Patch104pZH/GameFilesEdited/Data/INI/FXList.ini
@@ -3,13 +3,28 @@
 ;//////////////////////////////////////////////////////////////////////////////
 
 ; ----------------------------------------------
-
 FXList WeaponFX_ToxinShellWeapon
   ParticleSystem
     Name = ToxicShellExplosion
   End
 End
 
+; Patch104p @bugfix commy2 28/08/2021 Effects used for Toxin Shell with Anthrax upgrades.
+
+; ----------------------------------------------
+FXList WeaponFX_ToxinShellWeaponUpgraded
+  ParticleSystem
+    Name = ToxicShellExplosionAnthrax
+  End
+End
+
+; ----------------------------------------------
+FXList Chem_WeaponFX_ToxinShellWeaponGamma
+  ParticleSystem
+    Name = Chem_ToxicShellExplosionGamma
+  End
+End
+
 ; ----------------------------------------------
 FXList FX_CarOverlappedByCrusher
   Sound
@@ -5615,6 +5630,25 @@ FXList FX_ToxinUpgradedBuildingClear
 
 End
 
+; Patch104p @bugfix commy2 28/08/2021 Effects used when Gamma toxin stream clears garrisoned building.
+
+;------------------------------------------------------------------------------
+; FX played when a building gets cleared by the Gamma Toxin Truck
+;------------------------------------------------------------------------------
+
+FXList Chem_FX_ToxinGammaBuildingClear
+
+  ParticleSystem
+    Name           = Chem_ToxinGammaBuildingClearSpray
+    OrientToObject = yes
+  End
+
+;  Sound
+;    Name           = RaptorDie
+;  End
+
+End
+
 ;------------------------------------------------------------------------------
 ; FX played when a building gets cleared by the Dragon Tank
 ;------------------------------------------------------------------------------
@@ -5684,6 +5718,34 @@ FXList FX_ToxinStreamUpgradedGarrisonBuildingHit
 
 End
 
+; Patch104p @bugfix commy2 28/08/2021 Effects used when Gamma toxin stream hits garrisoned building.
+
+; -----------------------------------------------------------------------------------
+; FX played when a Gamma Toxin Stream hits a garrisoned building and does Urban Combat Bldg clearing
+; -----------------------------------------------------------------------------------
+
+FXList Chem_FX_ToxinStreamGammaGarrisonBuildingHit
+
+  LightPulse
+    Color = R:255 G:255 B:255
+    Radius = 100
+    RadiusAsPercentOfObjectSize = 150%
+    IncreaseTime = 0
+    DecreaseTime = 2000
+  End
+
+  Sound
+    Name = TankDie
+  End
+
+  FXListAtBonePos
+    FX = Chem_FX_ToxinGammaBuildingClear
+    BoneName = FIREPOINT
+    OrientToBone = Yes
+  End
+
+End
+
 ; -----------------------------------------------------------------------------------
 ; FX played when a Flame Stream hits a garrisoned building and does Urban Combat Bldg clearing
 ; -----------------------------------------------------------------------------------

diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/AirforceGeneral.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/AirforceGeneral.ini
@@ -3284,7 +3284,7 @@ Object AirF_AmericaInfantryColonelBurton
   Behavior = SlowDeathBehavior ModuleTag_Death07
     DeathTypes          = NONE +POISONED_GAMMA
     DestructionDelay    = 0
-    FX                  = INITIAL FX_DieByToxinGLA
+    FX                  = INITIAL FX_DieByToxinUSA  ; Patch104p @bugfix commy2 28/08/2021 Use correct faction voice line.
     OCL                 = INITIAL OCL_ToxicInfantryGamma
   End
 ; --- end Death modules ---
@@ -3794,7 +3794,7 @@ Object AirF_AmericaInfantryRanger
   Behavior = SlowDeathBehavior ModuleTag_Death07
     DeathTypes          = NONE +POISONED_GAMMA
     DestructionDelay    = 0
-    FX                  = INITIAL FX_DieByToxinGLA
+    FX                  = INITIAL FX_DieByToxinUSA  ; Patch104p @bugfix commy2 28/08/2021 Use correct faction voice line.
     OCL                 = INITIAL OCL_ToxicInfantryGamma
   End
 ; --- end Death modules ---

diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/ChemicalGeneral.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/ChemicalGeneral.ini
@@ -5444,23 +5444,26 @@ Object Chem_GLADemoTrap
     DetonateWhenKilled        = Yes
   End
 
+  ; Patch104p @bugfix commy2 28/08/2021 Fix Toxin Demo Trap exploding before the warning delay unlike other Demo Traps.
+
   Behavior = SlowDeathBehavior ModuleTag_05
-    ExemptStatus = UNDER_CONSTRUCTION
+    ExemptStatus = UNDER_CONSTRUCTION STATUS_RIDER1
     DestructionDelay = 1000
     FX = INITIAL FX_GLADemoTrapWarning
-;   Weapon = FINAL Chem_DemoTrapDetonationWeaponBeta
+    Weapon = FINAL Chem_DemoTrapDetonationWeaponBeta
   End
 
-  Behavior = FireWeaponWhenDeadBehavior ModuleTag_Chem01
-    DeathWeapon   = Chem_DemoTrapDetonationWeaponBeta
-    StartsActive  = Yes
-    ConflictsWith = Chem_Upgrade_GLAAnthraxGamma
+  Behavior = SlowDeathBehavior ModuleTag_05Anthrax
+    ExemptStatus = UNDER_CONSTRUCTION
+    RequiredStatus = STATUS_RIDER1
+    DestructionDelay = 1000
+    FX = INITIAL FX_GLADemoTrapWarning
+    Weapon = FINAL Chem_DemoTrapDetonationWeaponGamma
   End
 
-  Behavior = FireWeaponWhenDeadBehavior ModuleTag_Chem02
-    DeathWeapon   = Chem_DemoTrapDetonationWeaponGamma
-    StartsActive  = No                      ; turned on by upgrade
-    TriggeredBy   = Chem_Upgrade_GLAAnthraxGamma
+  Behavior = StatusBitsUpgrade ModuleTag_05Upgrade
+    TriggeredBy = Chem_Upgrade_GLAAnthraxGamma
+    StatusToSet = STATUS_RIDER1
   End
 
   Behavior = FlammableUpdate ModuleTag_07
@@ -11514,10 +11517,12 @@ End
 
 Object Chem_GLASneakAttackTunnelNetworkStart
 
+  ; Patch104p @bugfix commy2 28/08/2021 Fix portrait used by emerging Sneak Attack.
+
   ; *** ART Parameters ***
 
-  SelectPortrait         = SUTunnel_L
-  ButtonImage            = SUTunnel
+  SelectPortrait         = SUSneakAttack_L
+  ButtonImage            = SUSneakAttack
   Draw = W3DModelDraw ModuleTag_01
     OkToChangeModelColor = Yes
 
@@ -19199,6 +19204,16 @@ Object Chem_GLATankMarauder
     DeathFX = FX_CarCrush
   End
 
+  ; Patch104p @bugfix commy2 28/08/2021 Fix lingering wreck when crushed by Overlord.
+
+  Behavior = CreateObjectDie ModuleTag_10
+    DeathTypes = NONE +CRUSHED +SPLATTED
+    CreationList = OCL_CrusaderTank_CrushEffect
+  End
+  Behavior = DestroyDie ModuleTag_11
+    DeathTypes = NONE +CRUSHED +SPLATTED
+  End
+
   Behavior = FlammableUpdate ModuleTag_21
     AflameDuration = 5000         ; If I catch fire, I'll burn for this long...
     AflameDamageAmount = 3       ; taking this much damage...
@@ -21356,7 +21371,7 @@ Object Chem_ToxinStreamProjectile
     GarrisonHitKillRequiredKindOf   = INFANTRY
     GarrisonHitKillForbiddenKindOf  = NONE
     GarrisonHitKillCount            = 2
-    GarrisonHitKillFX               = FX_ToxinStreamGarrisonBuildingHit
+    GarrisonHitKillFX               = Chem_FX_ToxinStreamGammaGarrisonBuildingHit   ; Patch104p @bugfix commy2 28/08/2021 Fix Gamma Anthrax effect to use pink instead of green color.
   End
 
   Locomotor = SET_NORMAL ToxinTruckStreamLocomotor

diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/ChinaVehicle.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/ChinaVehicle.ini
@@ -2055,8 +2055,10 @@ Object ChinaVehicleSupplyTruck
     SuppliesDepletedVoice = SupplyTruckVoiceSuppliesDepleted
   End
   Locomotor = SET_NORMAL SupplyTruckLocomotor
+
+  ; Patch104p @bugfix hanfield 28/08/2021 Increased Supply Truck mass from 5 to 50.
   Behavior = PhysicsBehavior ModuleTag_04
-    Mass = 5.0
+    Mass = 50.0
   End
 
   ExperienceValue    = 50 50 50 50 ;Experience point value at each level