Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Remove debug from main branch, document cheering fixes #2233

Merged
merged 3 commits into from
Aug 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 46 additions & 0 deletions Patch104pZH/Design/Changes/v1.0/1030_fix_cheering_animations.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
---
date: 2023-08-13

title: Fixes missing and broken infantry cheering animations

changes:
- fix: USA Rangers no longer plays injured transition animation after cheering.
- fix: USA Missile Defender now plays animation when cheering.
- fix: USA Pathfinder now plays animation when cheering.
- fix: USA Colonel Burton no longer plays injured transition animation after cheering.
- fix: USA Colonel Burton no longer freezes when cheering for an extended amount of time.
- fix: USA Pilot now has a smooth transition between standing and cheering.
- fix: China Redguard now plays animation when cheering while injured.
- fix: China Redguard now has a smooth transition between standing and cheering.
- fix: China Minigunner now plays animation when cheering while injured.
- fix: China Minigunner now has a smooth transition between standing and cheering.
- fix: China Tank Hunter now plays animation when cheering.
- fix: China Hacker now plays animation when cheering while injured.
- fix: China Hacker no longer floats over the ground while cheering and moving at the same time while injured.
- fix: China Black Lotus no longer plays injured transition animation after cheering.
- fix: China 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: GLA Rebel now plays animation when cheering.
- fix: GLA RPG-Soldier now has a smooth transition between standing and cheering.
- fix: GLA Terrorist now plays animation when cheering while injured.
- fix: GLA Hijacker now plays animation when cheering while injured.
- fix: GLA Hijacker now has a smooth transition between standing and cheering.
- fix: GLA Saboteur now has a smooth transition between standing and cheering.
- fix: GLA Jarmen Kell no longer plays injured transition animation after cheering.
- fix: GLA Jarmen Kell no longer freezes when cheering for an extended amount of time.
- fix: GLA 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
8 changes: 0 additions & 8 deletions Patch104pZH/GameFilesEdited/Data/INI/CommandSet.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/ChinaInfantry.ini
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@ Object ChinaInfantryBlackLotus
ShroudClearingRange = 400
Prerequisites
Object = ChinaBarracks
;Object = ChinaPropagandaCenter
Object = ChinaPropagandaCenter
End
BuildCost = 1500
BuildTime = 20.0 ;in seconds
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/DemoGeneral.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/GLAInfantry.ini
Original file line number Diff line number Diff line change
Expand Up @@ -614,7 +614,7 @@ Object GLAInfantryJarmenKell
ShroudClearingRange = 400
Prerequisites
Object = GLABarracks
;Object = GLAPalace
Object = GLAPalace
End
BuildCost = 1500
BuildTime = 20.0 ;in seconds
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -3490,8 +3490,8 @@ Object GLAInfantryHijacker
ShroudClearingRange = 200
Prerequisites
Object = GLABarracks
;Object = GLAPalace
;Science = SCIENCE_Hijacker
Object = GLAPalace
Science = SCIENCE_Hijacker
End

BuildCost = 400
Expand Down Expand Up @@ -4166,7 +4166,7 @@ Object GLAInfantrySaboteur
VisionRange = 150
ShroudClearingRange = 300
Prerequisites
;Object = GLAArmsDealer
Object = GLAArmsDealer
End
BuildCost = 800
BuildTime = 15.0 ;in seconds
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/LaserGeneral.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/NukeGeneral.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/TankGeneral.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down