Fix: Remove debug from main branch, document cheering fixes

Patch104pZH/Design/Changes/v1.0/1030_fix_cheering_animations.yaml

@@ -0,0 +1,46 @@
+---
+date: 2023-08-13
+
+title: Fixes missing and broken cheering animations
+
+changes:
+  - fix: Rangers no longer plays injured transition animation after cheering.
+  - fix: Missile Defender now plays animation when cheering.
+  - fix: Pathfinder now plays animation when cheering.
+  - fix: Colonel Burton no longer plays injured transition animation after cheering.
+  - fix: Colonel Burton no longer freezes when cheering for an extended amount of time.
+  - fix: Pilot now has a smooth transition between standing and cheering.
+  - fix: Redguard now plays animation when cheering while injured.
+  - fix: Redguard now has a smooth transition between standing and cheering.
+  - fix: Minigunner now plays animation when cheering while injured.
+  - fix: Minigunner now has a smooth transition between standing and cheering.
+  - fix: Tank Hunter now plays animation when cheering.
+  - fix: Hacker now plays animation when cheering while injured.
+  - fix: Hacker no longer floats over the ground while cheering and moving at the same time while injured.
+  - fix: Black Lotus no longer plays injured transition animation after cheering.
+  - fix: Black Lotus no longer freezes when cheering for an extended amount of time.
+  - fix: GLA Worker now has a smooth transition between standing and cheering.
+  - fix: Rebel now plays animation when cheering.
+  - fix: RPG-Soldier now has a smooth transition between standing and cheering.
+  - fix: Terrorist now plays animation when cheering while injured.
+  - fix: Hijacker now plays animation when cheering while injured.
+  - fix: Hijacker now has a smooth transition between standing and cheering.
+  - fix: Saboteur now has a smooth transition between standing and cheering.
+  - fix: Jarmen Kell no longer plays injured transition animation after cheering.
+  - fix: Jarmen Kell no longer freezes when cheering for an extended amount of time.
+  - fix: Angry Mob no longer plays "Arm the Mob" transition animation after cheering.
+
+labels:
+  - bug
+  - china
+  - gla
+  - minor
+  - usa
+  - v1.0
+
+links:
+  - https://github.com/TheSuperHackers/GeneralsGamePatch/pull/1030
+  - https://github.com/TheSuperHackers/GeneralsGamePatch/pull/2233
+
+authors:
+  - commy2

Patch104pZH/GameFilesEdited/Data/INI/CommandSet.ini

@@ -921,7 +921,6 @@ CommandSet AmericaBarracksCommandSet
   2 = Command_ConstructAmericaInfantryMissileDefender
   3 = Command_ConstructAmericaInfantryColonelBurton
   4 = Command_ConstructAmericaInfantryPathfinder
-  5 = Command_ConstructAmericaInfantryPilot
   6 = Command_ConstructAmericaInfantryBiohazardTech
   7 = Command_UpgradeAmericaRangerFlashBangGrenade
   8 = Command_UpgradeAmericaRangerCaptureBuilding
@@ -1334,7 +1333,6 @@ CommandSet GLABarracksCommandSet
   6  = Command_ConstructGLAInfantryJarmenKell
   7  = Command_ConstructGLAInfantrySaboteur
   8  = Command_UpgradeGLAInfantryRebelBoobyTrapAttack
-  9  = Command_UpgradeGLAArmTheMob
 ; camo net
   11  = Command_UpgradeGLARebelCaptureBuilding
   13 = Command_SetRallyPoint
@@ -2083,7 +2081,6 @@ CommandSet AirF_AmericaBarracksCommandSet
   2 = AirF_Command_ConstructAmericaInfantryMissileDefender
   3 = AirF_Command_ConstructAmericaInfantryColonelBurton
   4 = AirF_Command_ConstructAmericaInfantryPathfinder
-  5 = Command_ConstructAmericaInfantryPilot
   7 = Command_UpgradeAmericaRangerFlashBangGrenade
   8 = Command_UpgradeAmericaRangerCaptureBuilding
  13 = Command_SetRallyPoint
@@ -2347,7 +2344,6 @@ CommandSet Demo_GLABarracksCommandSet
   4  = Demo_Command_ConstructGLAInfantryAngryMob
   6  = Demo_Command_ConstructGLAInfantryJarmenKell
 ; 8  = Command_UpgradeGLAInfantryRebelBoobyTrapAttack
-  9  = Command_UpgradeGLAArmTheMob
   11 = Command_UpgradeGLARebelCaptureBuilding
   13 = Command_SetRallyPoint
   14 = Command_Sell
@@ -3023,7 +3019,6 @@ CommandSet Slth_GLABarracksCommandSet
   5  = Slth_Command_ConstructGLAInfantryHijacker
   6  = Slth_Command_ConstructGLAInfantryJarmenKell
   7  = Slth_Command_ConstructGLAInfantrySaboteur
-  9  = Command_UpgradeGLAArmTheMob
   11 = Command_UpgradeGLARebelCaptureBuilding
   12 = Command_UpgradeGLACamoNetting
   13 = Command_SetRallyPoint
@@ -3305,7 +3300,6 @@ CommandSet Chem_GLABarracksCommandSet
   3  = Chem_Command_ConstructGLAInfantryTerrorist
   4  = Chem_Command_ConstructGLAInfantryAngryMob
   6  = Chem_Command_ConstructGLAInfantryJarmenKell
-  9  = Command_UpgradeGLAArmTheMob
   11 = Command_UpgradeGLARebelCaptureBuilding
   13 = Command_SetRallyPoint
   14 = Command_Sell
@@ -3958,7 +3952,6 @@ CommandSet SupW_AmericaBarracksCommandSet
   2 = SupW_Command_ConstructAmericaInfantryMissileDefender
   3 = SupW_Command_ConstructAmericaInfantryColonelBurton
   4 = SupW_Command_ConstructAmericaInfantryPathfinder
-  5 = Command_ConstructAmericaInfantryPilot
   7 = Command_UpgradeAmericaRangerFlashBangGrenade
   8 = Command_UpgradeAmericaRangerCaptureBuilding
  13 = Command_SetRallyPoint
@@ -4937,7 +4930,6 @@ CommandSet Lazr_AmericaBarracksCommandSet
   2 = Lazr_Command_ConstructAmericaInfantryMissileDefender
   3 = Lazr_Command_ConstructAmericaInfantryColonelBurton
   4 = Lazr_Command_ConstructAmericaInfantryPathfinder
-  5 = Command_ConstructAmericaInfantryPilot
   7 = Command_UpgradeAmericaRangerFlashBangGrenade
   8 = Command_UpgradeAmericaRangerCaptureBuilding
  13 = Command_SetRallyPoint

Patch104pZH/GameFilesEdited/Data/INI/Object/AirforceGeneral.ini

@@ -3077,7 +3077,7 @@ Object AirF_AmericaInfantryColonelBurton
   ShroudClearingRange = 400 ; Patch104p @tweak from 500 to match with other Hero units
   Prerequisites
     Object = AirF_AmericaBarracks
-    ;Object = AirF_AmericaStrategyCenter
+    Object = AirF_AmericaStrategyCenter
   End
   BuildCost = 1500
   BuildTime = 20.0          ;in seconds
@@ -4603,7 +4603,7 @@ Object AirF_AmericaInfantryPathfinder
   ShroudClearingRange = 400
   Prerequisites
     Object = AirF_AmericaBarracks
-    ;Science = SCIENCE_Pathfinder
+    Science = SCIENCE_Pathfinder
   End
   BuildCost = 600
   BuildTime = 10.0          ;in seconds

Patch104pZH/GameFilesEdited/Data/INI/Object/AmericaInfantry.ini

@@ -301,7 +301,7 @@ Object AmericaInfantryColonelBurton
   ShroudClearingRange = 400 ; Patch104p @tweak from 500 to match with other Hero units
   Prerequisites
     Object = AmericaBarracks
-    ;Object = AmericaStrategyCenter
+    Object = AmericaStrategyCenter
   End
   BuildCost = 1500
   BuildTime = 20.0          ;in seconds
@@ -1840,7 +1840,7 @@ Object AmericaInfantryPathfinder
   ShroudClearingRange = 400
   Prerequisites
     Object = AmericaBarracks
-    ;Science = SCIENCE_Pathfinder
+    Science = SCIENCE_Pathfinder
   End
   BuildCost = 600
   BuildTime = 10.0          ;in seconds

Patch104pZH/GameFilesEdited/Data/INI/Object/ChemicalGeneral.ini

@@ -13098,7 +13098,7 @@ Object Chem_GLAInfantryJarmenKell
   ShroudClearingRange = 400
   Prerequisites
     Object = Chem_GLABarracks
-    ;Object = Chem_GLAPalace
+    Object = Chem_GLAPalace
   End
   BuildCost = 1500
   BuildTime = 20.0          ;in seconds
@@ -14162,7 +14162,7 @@ Object Chem_GLAInfantryAngryMobNexus
 
   Prerequisites
     Object = Chem_GLABarracks
-    ;Object = Chem_GLAPalace
+    Object = Chem_GLAPalace
   End
 
   ExperienceValue    = 5 5 5 5 ;Experience point value at each level

Patch104pZH/GameFilesEdited/Data/INI/Object/ChinaInfantry.ini

@@ -684,7 +684,7 @@ Object ChinaInfantryBlackLotus
   ShroudClearingRange = 400
   Prerequisites
     Object = ChinaBarracks
-    ;Object = ChinaPropagandaCenter
+    Object = ChinaPropagandaCenter
   End
   BuildCost             = 1500
   BuildTime             = 20.0          ;in seconds
@@ -1364,7 +1364,7 @@ Object ChinaInfantryHacker
   ShroudClearingRange = 300
   Prerequisites
     Object = ChinaBarracks
-    ;Object = ChinaPropagandaCenter
+    Object = ChinaPropagandaCenter
   End
   BuildCost = 625
   BuildTime = 15.0 ; Patch104p @balance from 20.0 to equalize build time of 4 Hackers with build time of same value Black Market (01:00)

Patch104pZH/GameFilesEdited/Data/INI/Object/DemoGeneral.ini

@@ -13478,7 +13478,7 @@ Object Demo_GLAInfantryJarmenKell
   ShroudClearingRange = 400
   Prerequisites
     Object = Demo_GLABarracks
-    ;Object = Demo_GLAPalace
+    Object = Demo_GLAPalace
   End
   BuildCost = 1500
   BuildTime = 20.0          ;in seconds
@@ -14654,7 +14654,7 @@ Object Demo_GLAInfantryAngryMobNexus
 
   Prerequisites
     Object = Demo_GLABarracks
-    ;Object = Demo_GLAPalace
+    Object = Demo_GLAPalace
   End
 
   ExperienceValue    = 5 5 5 5 ;Experience point value at each level

Patch104pZH/GameFilesEdited/Data/INI/Object/GLAInfantry.ini

@@ -614,7 +614,7 @@ Object GLAInfantryJarmenKell
   ShroudClearingRange = 400
   Prerequisites
     Object = GLABarracks
-    ;Object = GLAPalace
+    Object = GLAPalace
   End
   BuildCost = 1500
   BuildTime = 20.0          ;in seconds
@@ -1605,7 +1605,7 @@ Object GLAInfantryAngryMobNexus
 
   Prerequisites
     Object = GLABarracks
-    ;Object = GLAPalace
+    Object = GLAPalace
   End
 
   ExperienceValue    = 5 5 5 5 ;Experience point value at each level
@@ -3490,8 +3490,8 @@ Object GLAInfantryHijacker
   ShroudClearingRange = 200
   Prerequisites
     Object = GLABarracks
-    ;Object = GLAPalace
-    ;Science = SCIENCE_Hijacker
+    Object = GLAPalace
+    Science = SCIENCE_Hijacker
   End
 
   BuildCost = 400
@@ -4166,7 +4166,7 @@ Object GLAInfantrySaboteur
   VisionRange         = 150
   ShroudClearingRange = 300
   Prerequisites
-    ;Object = GLAArmsDealer
+    Object = GLAArmsDealer
   End
   BuildCost = 800
   BuildTime = 15.0          ;in seconds

Patch104pZH/GameFilesEdited/Data/INI/Object/InfantryGeneral.ini

@@ -695,7 +695,7 @@ Object Infa_ChinaInfantryBlackLotus
   ShroudClearingRange = 400
   Prerequisites
     Object = Infa_ChinaBarracks
-    ;Object = Infa_ChinaPropagandaCenter
+    Object = Infa_ChinaPropagandaCenter
   End
   BuildCost             = 1500
   BuildTime             = 20.0          ;in seconds
@@ -1392,7 +1392,7 @@ Object Infa_ChinaInfantryHacker
   ShroudClearingRange = 300
   Prerequisites
     Object = Infa_ChinaBarracks
-    ;Object = Infa_ChinaPropagandaCenter
+    Object = Infa_ChinaPropagandaCenter
   End
   BuildCost = 625
   BuildTime = 15.0 ; Patch104p @balance from 20.0 to equalize build time of 4 Hackers with build time of same value Black Market (01:00)

Patch104pZH/GameFilesEdited/Data/INI/Object/LaserGeneral.ini

@@ -2624,7 +2624,7 @@ Object Lazr_AmericaInfantryColonelBurton
   ShroudClearingRange = 400 ; Patch104p @tweak from 500 to match with other Hero units
   Prerequisites
     Object = Lazr_AmericaBarracks
-    ;Object = Lazr_AmericaStrategyCenter
+    Object = Lazr_AmericaStrategyCenter
   End
   BuildCost = 1500
   BuildTime = 20.0          ;in seconds
@@ -4137,7 +4137,7 @@ Object Lazr_AmericaInfantryPathfinder
   ShroudClearingRange = 400
   Prerequisites
     Object = Lazr_AmericaBarracks
-    ;Science = SCIENCE_Pathfinder
+    Science = SCIENCE_Pathfinder
   End
   BuildCost = 600
   BuildTime = 10.0          ;in seconds

Patch104pZH/GameFilesEdited/Data/INI/Object/NukeGeneral.ini

@@ -2076,7 +2076,7 @@ Object Nuke_ChinaInfantryBlackLotus
   ShroudClearingRange = 400
   Prerequisites
     Object = Nuke_ChinaBarracks
-    ;Object = Nuke_ChinaPropagandaCenter
+    Object = Nuke_ChinaPropagandaCenter
   End
   BuildCost             = 1600
   BuildTime             = 20.0          ;in seconds
@@ -2754,7 +2754,7 @@ Object Nuke_ChinaInfantryHacker
   ShroudClearingRange = 300
   Prerequisites
     Object = Nuke_ChinaBarracks
-    ;Object = Nuke_ChinaPropagandaCenter
+    Object = Nuke_ChinaPropagandaCenter
   End
   BuildCost = 625
   BuildTime = 15.0 ; Patch104p @balance from 20.0 to equalize build time of 4 Hackers with build time of same value Black Market (01:00)

Patch104pZH/GameFilesEdited/Data/INI/Object/StealthGeneral.ini

@@ -14156,7 +14156,7 @@ Object Slth_GLAInfantryJarmenKell
   ShroudClearingRange = 400
   Prerequisites
     Object = Slth_GLABarracks
-    ;Object = Slth_GLAPalace
+    Object = Slth_GLAPalace
   End
   BuildCost = 1500
   BuildTime = 20.0          ;in seconds
@@ -15149,7 +15149,7 @@ Object Slth_GLAInfantryAngryMobNexus
 
   Prerequisites
     Object = Slth_GLABarracks
-    ;Object = Slth_GLAPalace
+    Object = Slth_GLAPalace
   End
 
   ExperienceValue    = 5 5 5 5 ;Experience point value at each level
@@ -17653,7 +17653,7 @@ Object Slth_GLAInfantrySaboteur
   VisionRange         = 150
   ShroudClearingRange = 300
   Prerequisites
-    ;Object = Slth_GLAArmsDealer
+    Object = Slth_GLAArmsDealer
   End
   BuildCost = 800
   BuildTime = 15.0          ;in seconds

Patch104pZH/GameFilesEdited/Data/INI/Object/SuperWeaponGeneral.ini

@@ -3103,7 +3103,7 @@ Object SupW_AmericaInfantryColonelBurton
   ShroudClearingRange = 400 ; Patch104p @tweak from 500 to match with other Hero units
   Prerequisites
     Object = SupW_AmericaBarracks
-    ;Object = SupW_AmericaStrategyCenter
+    Object = SupW_AmericaStrategyCenter
   End
   BuildCost = 1200
   BuildTime = 20.0          ;in seconds
@@ -4623,7 +4623,7 @@ Object SupW_AmericaInfantryPathfinder
   ShroudClearingRange = 400
   Prerequisites
     Object = SupW_AmericaBarracks
-    ;Science = SCIENCE_Pathfinder
+    Science = SCIENCE_Pathfinder
   End
   BuildCost = 600
   BuildTime = 10.0          ;in seconds

Patch104pZH/GameFilesEdited/Data/INI/Object/TankGeneral.ini

@@ -1809,7 +1809,7 @@ Object Tank_ChinaInfantryBlackLotus
   ShroudClearingRange = 400
   Prerequisites
     Object = Tank_ChinaBarracks
-    ;Object = Tank_ChinaPropagandaCenter
+    Object = Tank_ChinaPropagandaCenter
   End
   BuildCost             = 1875
   BuildTime             = 20.0          ;in seconds
@@ -2487,7 +2487,7 @@ Object Tank_ChinaInfantryHacker
   ShroudClearingRange = 300
   Prerequisites
     Object = Tank_ChinaBarracks
-    ;Object = Tank_ChinaPropagandaCenter
+    Object = Tank_ChinaPropagandaCenter
   End
   BuildCost = 625 ; Patch104p @balance from 780 to streamline price with all other faction Hackers
   BuildTime = 15.0 ; Patch104p @balance from 20.0 to equalize build time of 4 Hackers with build time of same value Black Market (01:00)