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: Prevent radar dish animation reset on damage transition of GLA Radar Van, China Overlord, Listening Outpost #2365

Merged
merged 3 commits into from
Sep 16, 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
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
date: 2023-09-16

title: Fixes animation reset on damage transition of vehicles

changes:
- fix: The radar dish rotation of the GLA Radar Van no longer resets on a damage transition.
- fix: The radar dish rotation of the China Overlord no longer resets on a damage transition.
- fix: The radar dish rotation of the China Listening Outpost no longer resets on a damage transition.

labels:
- bug
- china
- gla
- minor
- v1.0

links:
- https://github.com/TheSuperHackers/GeneralsGamePatch/pull/2365

authors:
- xezon
3 changes: 3 additions & 0 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/BossGeneral.ini
Original file line number Diff line number Diff line change
Expand Up @@ -21131,10 +21131,12 @@ Object Boss_TankOverlord

Draw = W3DOverlordTankDraw ModuleTag_01
; Patch104p @bugfix xezon 09/02/2023 Hide all muzzle flash meshes explicitly because otherwise they can show on death.
; Patch104p @bugfix xezon 16/09/2023 Maintain frame across states for the radar dish. (#2365)
DefaultConditionState
Model = NVOvrlrd
Animation = NVOvrlrd.NVOvrlrd
AnimationMode = LOOP
Flags = MAINTAIN_FRAME_ACROSS_STATES
Turret = Turret01
HideSubObject = MuzzleFX01 MuzzleFX02
WeaponFireFXBone = PRIMARY Muzzle
Expand All @@ -21146,6 +21148,7 @@ Object Boss_TankOverlord
Model = NVOvrlrd_d
Animation = NVOvrlrd_d.NVOvrlrd_d
AnimationMode = LOOP
Flags = MAINTAIN_FRAME_ACROSS_STATES
Turret = Turret01
WeaponFireFXBone = PRIMARY Muzzle
WeaponRecoilBone = PRIMARY Barrel
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20548,22 +20548,26 @@ Object Chem_GLAVehicleRadarVan
Draw = W3DTruckDraw ModuleTag_01
OkToChangeModelColor = Yes

; Patch104p @bugfix xezon 16/09/2023 Maintain frame across states for the radar dish. (#2365)
DefaultConditionState
Model = UVRadarVan
Animation = UVRadarVan.UVRadarVan
AnimationMode = LOOP
Flags = MAINTAIN_FRAME_ACROSS_STATES
End

ConditionState = REALLYDAMAGED
Model = UVRadarVan_D
Animation = UVRadarVan_D.UVRadarVan_D
AnimationMode = LOOP
Flags = MAINTAIN_FRAME_ACROSS_STATES
End

ConditionState = RUBBLE
Model = UVRadarVan_D
Animation = UVRadarVan_D.UVRadarVan_D
AnimationMode = LOOP
Flags = MAINTAIN_FRAME_ACROSS_STATES
End

TrackMarks = EXTireTrack.tga
Expand Down
3 changes: 3 additions & 0 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/ChinaCINEUnit.ini
Original file line number Diff line number Diff line change
Expand Up @@ -1306,10 +1306,12 @@ Object CINE_ChinaTankOverlord

Draw = W3DOverlordTankDraw ModuleTag_01
; Patch104p @bugfix xezon 09/02/2023 Hide all muzzle flash meshes explicitly because otherwise they can show on death.
; Patch104p @bugfix xezon 16/09/2023 Maintain frame across states for the radar dish. (#2365)
DefaultConditionState
Model = NVOvrlrd
Animation = NVOvrlrd.NVOvrlrd
AnimationMode = LOOP
Flags = MAINTAIN_FRAME_ACROSS_STATES
Turret = Turret01
HideSubObject = MuzzleFX01 MuzzleFX02
WeaponFireFXBone = PRIMARY Muzzle
Expand All @@ -1321,6 +1323,7 @@ Object CINE_ChinaTankOverlord
Model = NVOvrlrd_d
Animation = NVOvrlrd_d.NVOvrlrd_d
AnimationMode = LOOP
Flags = MAINTAIN_FRAME_ACROSS_STATES
Turret = Turret01
WeaponFireFXBone = PRIMARY Muzzle
WeaponRecoilBone = PRIMARY Barrel
Expand Down
8 changes: 8 additions & 0 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/ChinaVehicle.ini
Original file line number Diff line number Diff line change
Expand Up @@ -238,10 +238,12 @@ Object ChinaTankOverlord

Draw = W3DOverlordTankDraw ModuleTag_01
; Patch104p @bugfix xezon 09/02/2023 Hide all muzzle flash meshes explicitly because otherwise they can show on death.
; Patch104p @bugfix xezon 16/09/2023 Maintain frame across states for the radar dish. (#2365)
DefaultConditionState
Model = NVOvrlrd
Animation = NVOvrlrd.NVOvrlrd
AnimationMode = LOOP
Flags = MAINTAIN_FRAME_ACROSS_STATES
Turret = Turret01
HideSubObject = MuzzleFX01 MuzzleFX02
WeaponFireFXBone = PRIMARY Muzzle
Expand All @@ -253,6 +255,7 @@ Object ChinaTankOverlord
Model = NVOvrlrd_d
Animation = NVOvrlrd_d.NVOvrlrd_d
AnimationMode = LOOP
Flags = MAINTAIN_FRAME_ACROSS_STATES
Turret = Turret01
WeaponFireFXBone = PRIMARY Muzzle
WeaponRecoilBone = PRIMARY Barrel
Expand Down Expand Up @@ -2849,29 +2852,34 @@ Object ChinaVehicleListeningOutpost
Draw = W3DModelDraw ModuleTag_33
OkToChangeModelColor = Yes

; Patch104p @bugfix xezon 16/09/2023 Maintain frame across states for the radar dish and legs. (#2365)
ConditionState = NONE
Model = NVLOUTPOST_B
Animation = NVLOUTPOST_B.NVLOUTPOST_B
AnimationMode = LOOP
Flags = MAINTAIN_FRAME_ACROSS_STATES
TransitionKey = Trans_Deployed
End
ConditionState = REALLYDAMAGED
Model = NVLOUTPOST_BD
Animation = NVLOUTPOST_BD.NVLOUTPOST_BD
AnimationMode = LOOP
Flags = MAINTAIN_FRAME_ACROSS_STATES
TransitionKey = Trans_Deployed_ReallyDamaged
End

ConditionState = MOVING
Model = NVLOUTPOST_A
Animation = NVLOUTPOST_A.NVLOUTPOST_A
AnimationMode = LOOP
Flags = MAINTAIN_FRAME_ACROSS_STATES
TransitionKey = Trans_Moving
End
ConditionState = REALLYDAMAGED MOVING
Model = NVLOUTPOST_AD
Animation = NVLOUTPOST_AD.NVLOUTPOST_AD
AnimationMode = LOOP
Flags = MAINTAIN_FRAME_ACROSS_STATES
TransitionKey = Trans_Moving_ReallyDamaged
End

Expand Down
4 changes: 4 additions & 0 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/DemoGeneral.ini
Original file line number Diff line number Diff line change
Expand Up @@ -22045,22 +22045,26 @@ Object Demo_GLAVehicleRadarVan
Draw = W3DTruckDraw ModuleTag_01
OkToChangeModelColor = Yes

; Patch104p @bugfix xezon 16/09/2023 Maintain frame across states for the radar dish. (#2365)
DefaultConditionState
Model = UVRadarVan
Animation = UVRadarVan.UVRadarVan
AnimationMode = LOOP
Flags = MAINTAIN_FRAME_ACROSS_STATES
End

ConditionState = REALLYDAMAGED
Model = UVRadarVan_D
Animation = UVRadarVan_D.UVRadarVan_D
AnimationMode = LOOP
Flags = MAINTAIN_FRAME_ACROSS_STATES
End

ConditionState = RUBBLE
Model = UVRadarVan_D
Animation = UVRadarVan_D.UVRadarVan_D
AnimationMode = LOOP
Flags = MAINTAIN_FRAME_ACROSS_STATES
End

TrackMarks = EXTireTrack.tga
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2405,22 +2405,26 @@ Object GC_Chem_GLAVehicleRadarVan
Draw = W3DTruckDraw ModuleTag_01
OkToChangeModelColor = Yes

; Patch104p @bugfix xezon 16/09/2023 Maintain frame across states for the radar dish. (#2365)
DefaultConditionState
Model = UVRadarVan
Animation = UVRadarVan.UVRadarVan
AnimationMode = LOOP
Flags = MAINTAIN_FRAME_ACROSS_STATES
End

ConditionState = REALLYDAMAGED
Model = UVRadarVan_D
Animation = UVRadarVan_D.UVRadarVan_D
AnimationMode = LOOP
Flags = MAINTAIN_FRAME_ACROSS_STATES
End

ConditionState = RUBBLE
Model = UVRadarVan_D
Animation = UVRadarVan_D.UVRadarVan_D
AnimationMode = LOOP
Flags = MAINTAIN_FRAME_ACROSS_STATES
End

TrackMarks = EXTireTrack.tga
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2840,22 +2840,26 @@ Object GC_Slth_GLAVehicleRadarVan
Draw = W3DTruckDraw ModuleTag_01
OkToChangeModelColor = Yes

; Patch104p @bugfix xezon 16/09/2023 Maintain frame across states for the radar dish. (#2365)
DefaultConditionState
Model = UVRadarVan
Animation = UVRadarVan.UVRadarVan
AnimationMode = LOOP
Flags = MAINTAIN_FRAME_ACROSS_STATES
End

ConditionState = REALLYDAMAGED
Model = UVRadarVan_D
Animation = UVRadarVan_D.UVRadarVan_D
AnimationMode = LOOP
Flags = MAINTAIN_FRAME_ACROSS_STATES
End

ConditionState = RUBBLE
Model = UVRadarVan_D
Animation = UVRadarVan_D.UVRadarVan_D
AnimationMode = LOOP
Flags = MAINTAIN_FRAME_ACROSS_STATES
End

TrackMarks = EXTireTrack.tga
Expand Down
4 changes: 4 additions & 0 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/GLAVehicle.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6266,22 +6266,26 @@ Object GLAVehicleRadarVan
Draw = W3DTruckDraw ModuleTag_01
OkToChangeModelColor = Yes

; Patch104p @bugfix xezon 16/09/2023 Maintain frame across states for the radar dish. (#2365)
DefaultConditionState
Model = UVRadarVan
Animation = UVRadarVan.UVRadarVan
AnimationMode = LOOP
Flags = MAINTAIN_FRAME_ACROSS_STATES
End

ConditionState = REALLYDAMAGED
Model = UVRadarVan_D
Animation = UVRadarVan_D.UVRadarVan_D
AnimationMode = LOOP
Flags = MAINTAIN_FRAME_ACROSS_STATES
End

ConditionState = RUBBLE
Model = UVRadarVan_D
Animation = UVRadarVan_D.UVRadarVan_D
AnimationMode = LOOP
Flags = MAINTAIN_FRAME_ACROSS_STATES
End

TrackMarks = EXTireTrack.tga
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16337,29 +16337,34 @@ Object Infa_ChinaVehicleListeningOutpost
Draw = W3DModelDraw ModuleTag_33
OkToChangeModelColor = Yes

; Patch104p @bugfix xezon 16/09/2023 Maintain frame across states for the radar dish and legs. (#2365)
ConditionState = NONE
Model = NVLOUTPOST_B
Animation = NVLOUTPOST_B.NVLOUTPOST_B
AnimationMode = LOOP
Flags = MAINTAIN_FRAME_ACROSS_STATES
TransitionKey = Trans_Deployed
End
ConditionState = REALLYDAMAGED
Model = NVLOUTPOST_BD
Animation = NVLOUTPOST_BD.NVLOUTPOST_BD
AnimationMode = LOOP
Flags = MAINTAIN_FRAME_ACROSS_STATES
TransitionKey = Trans_Deployed_ReallyDamaged
End

ConditionState = MOVING
Model = NVLOUTPOST_A
Animation = NVLOUTPOST_A.NVLOUTPOST_A
AnimationMode = LOOP
Flags = MAINTAIN_FRAME_ACROSS_STATES
TransitionKey = Trans_Moving
End
ConditionState = REALLYDAMAGED MOVING
Model = NVLOUTPOST_AD
Animation = NVLOUTPOST_AD.NVLOUTPOST_AD
AnimationMode = LOOP
Flags = MAINTAIN_FRAME_ACROSS_STATES
TransitionKey = Trans_Moving_ReallyDamaged
End

Expand Down
8 changes: 8 additions & 0 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/NukeGeneral.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4959,29 +4959,34 @@ Object Nuke_ChinaVehicleListeningOutpost
Draw = W3DModelDraw ModuleTag_33
OkToChangeModelColor = Yes

; Patch104p @bugfix xezon 16/09/2023 Maintain frame across states for the radar dish and legs. (#2365)
ConditionState = NONE
Model = NVLOUTPOST_B
Animation = NVLOUTPOST_B.NVLOUTPOST_B
AnimationMode = LOOP
Flags = MAINTAIN_FRAME_ACROSS_STATES
TransitionKey = Trans_Deployed
End
ConditionState = REALLYDAMAGED
Model = NVLOUTPOST_BD
Animation = NVLOUTPOST_BD.NVLOUTPOST_BD
AnimationMode = LOOP
Flags = MAINTAIN_FRAME_ACROSS_STATES
TransitionKey = Trans_Deployed_ReallyDamaged
End

ConditionState = MOVING
Model = NVLOUTPOST_A
Animation = NVLOUTPOST_A.NVLOUTPOST_A
AnimationMode = LOOP
Flags = MAINTAIN_FRAME_ACROSS_STATES
TransitionKey = Trans_Moving
End
ConditionState = REALLYDAMAGED MOVING
Model = NVLOUTPOST_AD
Animation = NVLOUTPOST_AD.NVLOUTPOST_AD
AnimationMode = LOOP
Flags = MAINTAIN_FRAME_ACROSS_STATES
TransitionKey = Trans_Moving_ReallyDamaged
End

Expand Down Expand Up @@ -17387,10 +17392,12 @@ Object Nuke_ChinaTankOverlord

Draw = W3DOverlordTankDraw ModuleTag_01
; Patch104p @bugfix xezon 09/02/2023 Hide all muzzle flash meshes explicitly because otherwise they can show on death.
; Patch104p @bugfix xezon 16/09/2023 Maintain frame across states for the radar dish. (#2365)
DefaultConditionState
Model = NVOvrlrd
Animation = NVOvrlrd.NVOvrlrd
AnimationMode = LOOP
Flags = MAINTAIN_FRAME_ACROSS_STATES
Turret = Turret01
HideSubObject = MuzzleFX01 MuzzleFX02
WeaponFireFXBone = PRIMARY Muzzle
Expand All @@ -17402,6 +17409,7 @@ Object Nuke_ChinaTankOverlord
Model = NVOvrlrd_d
Animation = NVOvrlrd_d.NVOvrlrd_d
AnimationMode = LOOP
Flags = MAINTAIN_FRAME_ACROSS_STATES
Turret = Turret01
WeaponFireFXBone = PRIMARY Muzzle
WeaponRecoilBone = PRIMARY Barrel
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22140,22 +22140,26 @@ Object Slth_GLAVehicleRadarVan
Draw = W3DTruckDraw ModuleTag_01
OkToChangeModelColor = Yes

; Patch104p @bugfix xezon 16/09/2023 Maintain frame across states for the radar dish. (#2365)
DefaultConditionState
Model = UVRadarVan
Animation = UVRadarVan.UVRadarVan
AnimationMode = LOOP
Flags = MAINTAIN_FRAME_ACROSS_STATES
End

ConditionState = REALLYDAMAGED
Model = UVRadarVan_D
Animation = UVRadarVan_D.UVRadarVan_D
AnimationMode = LOOP
Flags = MAINTAIN_FRAME_ACROSS_STATES
End

ConditionState = RUBBLE
Model = UVRadarVan_D
Animation = UVRadarVan_D.UVRadarVan_D
AnimationMode = LOOP
Flags = MAINTAIN_FRAME_ACROSS_STATES
End

TrackMarks = EXTireTrack.tga
Expand Down
Loading