Skip to content

Fix: Worker Has Wrong Death Animation When Carrying Boxes #2120

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Jul 16, 2023
Merged

Fix: Worker Has Wrong Death Animation When Carrying Boxes #2120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f1b1582
Fix: Worker Has Wrong Death Animation When Carrying Boxes
commy2 Jul 16, 2023
ab0cbbf
update documentation
commy2 Jul 16, 2023
742c416
rm obsolete
commy2 Jul 16, 2023
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
5 changes: 3 additions & 2 deletions ...ges/v1.0/1528_worker_death_animation.yaml → ...ges/v1.0/2120_worker_death_animation.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
date: 2023-01-08
date: 2023-07-16

title: Fixes wrong exploded death animation of GLA Worker

Expand All @@ -14,8 +14,9 @@ labels:
- v1.0

links:
- https://github.com/TheSuperHackers/GeneralsGamePatch/pull/1528
- https://github.com/TheSuperHackers/GeneralsGamePatch/pull/2120

authors:
- RedMeow2
- xezon
- commy2
3 changes: 3 additions & 0 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/ChemicalGeneral.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15888,6 +15888,7 @@ Object Chem_GLAInfantryWorker
AnimationMode = ONCE
TransitionKey = TRANS_Dying
End
AliasConditionState = DYING CARRYING

TransitionState = TRANS_Dying TRANS_Flailing
Animation = UIWRKR_SKL.UIWRKR_ADTE1
Expand All @@ -15899,12 +15900,14 @@ Object Chem_GLAInfantryWorker
AnimationMode = LOOP
TransitionKey = TRANS_Flailing
End
AliasConditionState = DYING EXPLODED_FLAILING CARRYING

ConditionState = DYING EXPLODED_BOUNCING
Animation = UIWRKR_SKL.UIWRKR_ADTE3
AnimationMode = ONCE
TransitionKey = None
End
AliasConditionState = DYING EXPLODED_BOUNCING CARRYING

ConditionState = SPECIAL_CHEERING
Animation = UIWRKR_SKL.UIWRKR_CHA
Expand Down
3 changes: 3 additions & 0 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/DemoGeneral.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16702,6 +16702,7 @@ Object Demo_GLAInfantryWorker
AnimationMode = ONCE
TransitionKey = TRANS_Dying
End
AliasConditionState = DYING CARRYING

TransitionState = TRANS_Dying TRANS_Flailing
Animation = UIWRKR_SKL.UIWRKR_ADTE1
Expand All @@ -16713,12 +16714,14 @@ Object Demo_GLAInfantryWorker
AnimationMode = LOOP
TransitionKey = TRANS_Flailing
End
AliasConditionState = DYING EXPLODED_FLAILING CARRYING

ConditionState = DYING EXPLODED_BOUNCING
Animation = UIWRKR_SKL.UIWRKR_ADTE3
AnimationMode = ONCE
TransitionKey = None
End
AliasConditionState = DYING EXPLODED_BOUNCING CARRYING

ConditionState = SPECIAL_CHEERING
Animation = UIWRKR_SKL.UIWRKR_CHA
Expand Down
3 changes: 3 additions & 0 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/GC_Chem_GLAUnits.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1235,6 +1235,7 @@ Object GC_Chem_GLAInfantryWorker
AnimationMode = ONCE
TransitionKey = TRANS_Dying
End
AliasConditionState = DYING CARRYING
TransitionState = TRANS_Dying TRANS_Flailing
Animation = UIWRKR_SKL.UIWRKR_ADTE1
AnimationMode = ONCE
Expand All @@ -1244,11 +1245,13 @@ Object GC_Chem_GLAInfantryWorker
AnimationMode = LOOP
TransitionKey = TRANS_Flailing
End
AliasConditionState = DYING EXPLODED_FLAILING CARRYING
ConditionState = DYING EXPLODED_BOUNCING
Animation = UIWRKR_SKL.UIWRKR_ADTE3
AnimationMode = ONCE
TransitionKey = None
End
AliasConditionState = DYING EXPLODED_BOUNCING CARRYING
ConditionState = SPECIAL_CHEERING
Animation = UIWRKR_SKL.UIWRKR_CHA
AnimationMode = ONCE
Expand Down
3 changes: 3 additions & 0 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/GC_Slth_GLAUnits.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ Object GC_Slth_GLAInfantryWorker
AnimationMode = ONCE
TransitionKey = TRANS_Dying
End
AliasConditionState = DYING CARRYING

TransitionState = TRANS_Dying TRANS_Flailing
Animation = UIWRKR_SKL.UIWRKR_ADTE1
Expand All @@ -187,12 +188,14 @@ Object GC_Slth_GLAInfantryWorker
AnimationMode = LOOP
TransitionKey = TRANS_Flailing
End
AliasConditionState = DYING EXPLODED_FLAILING CARRYING

ConditionState = DYING EXPLODED_BOUNCING
Animation = UIWRKR_SKL.UIWRKR_ADTE3
AnimationMode = ONCE
TransitionKey = None
End
AliasConditionState = DYING EXPLODED_BOUNCING CARRYING

ConditionState = SPECIAL_CHEERING
Animation = UIWRKR_SKL.UIWRKR_CHA
Expand Down
6 changes: 6 additions & 0 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/GLACINEUnit.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6044,6 +6044,7 @@ Object CINE_GLAInfantryWorker
AnimationMode = ONCE
TransitionKey = TRANS_Dying
End
AliasConditionState = DYING CARRYING

TransitionState = TRANS_Dying TRANS_Flailing
Animation = UIWRKR_SKL.UIWRKR_ADTE1
Expand All @@ -6055,12 +6056,14 @@ Object CINE_GLAInfantryWorker
AnimationMode = LOOP
TransitionKey = TRANS_Flailing
End
AliasConditionState = DYING EXPLODED_FLAILING CARRYING

ConditionState = DYING EXPLODED_BOUNCING
Animation = UIWRKR_SKL.UIWRKR_ADTE3
AnimationMode = ONCE
TransitionKey = None
End
AliasConditionState = DYING EXPLODED_BOUNCING CARRYING

ConditionState = SPECIAL_CHEERING
Animation = UIWRKR_SKL.UIWRKR_CHA
Expand Down Expand Up @@ -8024,6 +8027,7 @@ Object CINE_CheeringWorker
AnimationMode = ONCE
TransitionKey = TRANS_Dying
End
AliasConditionState = DYING CARRYING

TransitionState = TRANS_Dying TRANS_Flailing
Animation = UIWRKR_SKL.UIWRKR_ADTE1
Expand All @@ -8035,12 +8039,14 @@ Object CINE_CheeringWorker
AnimationMode = LOOP
TransitionKey = TRANS_Flailing
End
AliasConditionState = DYING EXPLODED_FLAILING CARRYING

ConditionState = DYING EXPLODED_BOUNCING
Animation = UIWRKR_SKL.UIWRKR_ADTE3
AnimationMode = ONCE
TransitionKey = None
End
AliasConditionState = DYING EXPLODED_BOUNCING CARRYING

ConditionState = SPECIAL_CHEERING
Animation = UIWRKR_SKL.UIWRKR_CHA
Expand Down
3 changes: 3 additions & 0 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/GLAInfantry.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3700,6 +3700,7 @@ Object GLAInfantryWorker
AnimationMode = ONCE
TransitionKey = TRANS_Dying
End
AliasConditionState = DYING CARRYING

TransitionState = TRANS_Dying TRANS_Flailing
Animation = UIWRKR_SKL.UIWRKR_ADTE1
Expand All @@ -3711,12 +3712,14 @@ Object GLAInfantryWorker
AnimationMode = LOOP
TransitionKey = TRANS_Flailing
End
AliasConditionState = DYING EXPLODED_FLAILING CARRYING

ConditionState = DYING EXPLODED_BOUNCING
Animation = UIWRKR_SKL.UIWRKR_ADTE3
AnimationMode = ONCE
TransitionKey = None
End
AliasConditionState = DYING EXPLODED_BOUNCING CARRYING

ConditionState = SPECIAL_CHEERING
Animation = UIWRKR_SKL.UIWRKR_CHA
Expand Down
3 changes: 3 additions & 0 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/StealthGeneral.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17102,6 +17102,7 @@ Object Slth_GLAInfantryWorker
AnimationMode = ONCE
TransitionKey = TRANS_Dying
End
AliasConditionState = DYING CARRYING

TransitionState = TRANS_Dying TRANS_Flailing
Animation = UIWRKR_SKL.UIWRKR_ADTE1
Expand All @@ -17113,12 +17114,14 @@ Object Slth_GLAInfantryWorker
AnimationMode = LOOP
TransitionKey = TRANS_Flailing
End
AliasConditionState = DYING EXPLODED_FLAILING CARRYING

ConditionState = DYING EXPLODED_BOUNCING
Animation = UIWRKR_SKL.UIWRKR_ADTE3
AnimationMode = ONCE
TransitionKey = None
End
AliasConditionState = DYING EXPLODED_BOUNCING CARRYING

ConditionState = SPECIAL_CHEERING
Animation = UIWRKR_SKL.UIWRKR_CHA
Expand Down