Skip to content

bugfix: Revert death module consolidation regressions #172

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

Open
Stubbjax wants to merge 2 commits into
base: main
Choose a base branch
from
Open

bugfix: Revert death module consolidation regressions #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e81d7d9
bugfix: Revert death module consolidation for objects without an orig…
Stubbjax Aug 16, 2026
a5aa0b5
bugfix: Revert death module consolidation for objects with a DestroyD…
Stubbjax Aug 18, 2026
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
9 changes: 6 additions & 3 deletions Generals/Data/INI/Object/Campaign/China/Unit/CINE_ChinaVehicleTroopCrawlerEmpty.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,13 @@ Object CINE_ChinaVehicleTroopCrawlerEmpty
HealthRegen%PerSec = 10.0
End

Behavior = InstantDeathBehavior ModuleTag_07
Behavior = FXListDie ModuleTag_07
DeathTypes = NONE +CRUSHED +SPLATTED
FX = FX_CarCrush
OCL = OCL_CrusaderTank_CrushEffect
DeathFX = FX_CarCrush
End
Behavior = CreateObjectDie ModuleTag_08
DeathTypes = NONE +CRUSHED +SPLATTED
CreationList = OCL_CrusaderTank_CrushEffect
End
; Behavior = CreateCrateDie ModuleTag_09
; CrateData = NONE
Expand Down
9 changes: 6 additions & 3 deletions Generals/Data/INI/Object/Campaign/GLA/Unit/CINE_GLAVehicleBombTruck.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,10 +273,13 @@ Object CINE_GLAVehicleBombTruck
DisguiseRevealTransitionTime = 1000
End

Behavior = InstantDeathBehavior ModuleTag_23
Behavior = FXListDie ModuleTag_23
DeathTypes = NONE +CRUSHED +SPLATTED
FX = FX_CarCrush
OCL = OCL_CrusaderTank_CrushEffect
DeathFX = FX_CarCrush
End
Behavior = CreateObjectDie ModuleTag_24
DeathTypes = NONE +CRUSHED +SPLATTED
CreationList = OCL_CrusaderTank_CrushEffect
End
Behavior = CreateCrateDie ModuleTag_25
CrateData = SalvageCrateData
Expand Down
10 changes: 7 additions & 3 deletions Generals/Data/INI/Object/Campaign/GLA/Unit/CINE_GLAVehicleScudLauncher.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,10 +147,14 @@ Object CINE_GLAVehicleScudLauncher
OCL = FINAL OCL_SCUDLauncherDeathEffect
End

Behavior = InstantDeathBehavior ModuleTag_10
Behavior = FXListDie ModuleTag_10
DeathTypes = NONE +CRUSHED +SPLATTED
FX = FX_CarCrush
OCL = OCL_CrusaderTank_CrushEffect
DeathFX = FX_CarCrush
End

Behavior = CreateObjectDie ModuleTag_11
DeathTypes = NONE +CRUSHED +SPLATTED
CreationList = OCL_CrusaderTank_CrushEffect
End

Behavior = FlammableUpdate ModuleTag_21
Expand Down
9 changes: 6 additions & 3 deletions Generals/Data/INI/Object/Faction/China/Unit/ChinaVehicleTroopCrawlerEmpty.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,13 @@ Object ChinaVehicleTroopCrawlerEmpty
HealthRegen%PerSec = 10.0
End

Behavior = InstantDeathBehavior ModuleTag_07
Behavior = FXListDie ModuleTag_07
DeathTypes = NONE +CRUSHED +SPLATTED
FX = FX_CarCrush
OCL = OCL_CrusaderTank_CrushEffect
DeathFX = FX_CarCrush
End
Behavior = CreateObjectDie ModuleTag_08
DeathTypes = NONE +CRUSHED +SPLATTED
CreationList = OCL_CrusaderTank_CrushEffect
End
Behavior = CreateCrateDie ModuleTag_09
CrateData = SalvageCrateData
Expand Down
9 changes: 6 additions & 3 deletions Generals/Data/INI/Object/Faction/Civilian/Building/BaikonurRocketPad.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,12 @@ Object BaikonurRocketPad
DetonationObject = BaikonurRocketDetonation
End

Behavior = InstantDeathBehavior ModuleTag_07
FX = FX_NukeGLA
OCL = OCL_PoisonFieldLarge
Behavior = CreateObjectDie ModuleTag_07
CreationList = OCL_PoisonFieldLarge
End

Behavior = FXListDie ModuleTag_08
DeathFX = FX_NukeGLA
End

Behavior = TransitionDamageFX ModuleTag_09
Expand Down
9 changes: 6 additions & 3 deletions Generals/Data/INI/Object/Faction/Civilian/Building/MonumentTrainBridge.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,12 @@ Object MonumentTrainBridge
ClientUpdate = AnimatedParticleSysBoneClientUpdate ModuleTag_04
End

Behavior = InstantDeathBehavior ModuleTag_05
FX = FX_RailroadBridgeCollapse
OCL = OCL_StructureCollapseFinal
Behavior = FXListDie ModuleTag_05
DeathFX = FX_RailroadBridgeCollapse
End

Behavior = CreateObjectDie ModuleTag_06
CreationList = OCL_StructureCollapseFinal
End

; Behavior = CreateObjectDie ModuleTag_07
Expand Down
8 changes: 5 additions & 3 deletions Generals/Data/INI/Object/Faction/GLA/Building/GLAHole.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,11 @@ Object GLAHole
HoleHealthRegen%PerSecond = 0.5% ; regen this % of HoleMaxHealth per second
End

Behavior = InstantDeathBehavior ModuleTag_13
FX = FX_StructureSmallDeath
OCL = OCL_LargeStructureDebris
Behavior = CreateObjectDie ModuleTag_13
CreationList = OCL_LargeStructureDebris
End
Behavior = FXListDie ModuleTag_14
DeathFX = FX_StructureSmallDeath
End

Geometry = CYLINDER
Expand Down
9 changes: 6 additions & 3 deletions GeneralsZH/Data/INI/Object/Campaign/America/Misc/CINE_Sattelite3.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,12 @@ Object CINE_Sattelite3
DetonationObject = BaikonurRocketDetonation
End

Behavior = InstantDeathBehavior ModuleTag_07
FX = FX_NukeGLA
OCL = OCL_PoisonFieldLarge
Behavior = CreateObjectDie ModuleTag_07
CreationList = OCL_PoisonFieldLarge
End

Behavior = FXListDie ModuleTag_08
DeathFX = FX_NukeGLA
End

Behavior = TransitionDamageFX ModuleTag_09
Expand Down
9 changes: 6 additions & 3 deletions GeneralsZH/Data/INI/Object/Campaign/America/Unit/CINE_Chinook.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,12 @@ Object CINE_Chinook
DetonationObject = BaikonurRocketDetonation
End

Behavior = InstantDeathBehavior ModuleTag_07
FX = FX_NukeGLA
OCL = OCL_PoisonFieldLarge
Behavior = CreateObjectDie ModuleTag_07
CreationList = OCL_PoisonFieldLarge
End

Behavior = FXListDie ModuleTag_08
DeathFX = FX_NukeGLA
End

Behavior = TransitionDamageFX ModuleTag_09
Expand Down
9 changes: 6 additions & 3 deletions GeneralsZH/Data/INI/Object/Campaign/America/Unit/CINE_U06_BBus.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,12 @@ Object CINE_U06_BBus
DetonationObject = BaikonurRocketDetonation
End

Behavior = InstantDeathBehavior ModuleTag_07
FX = FX_NukeGLA
OCL = OCL_PoisonFieldLarge
Behavior = CreateObjectDie ModuleTag_07
CreationList = OCL_PoisonFieldLarge
End

Behavior = FXListDie ModuleTag_08
DeathFX = FX_NukeGLA
End

Behavior = TransitionDamageFX ModuleTag_09
Expand Down
9 changes: 6 additions & 3 deletions GeneralsZH/Data/INI/Object/Campaign/China/Unit/CINE_ChinaVehicleTroopCrawlerEmpty.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,13 @@ Object CINE_ChinaVehicleTroopCrawlerEmpty
HealthRegen%PerSec = 10.0
End

Behavior = InstantDeathBehavior ModuleTag_07
Behavior = FXListDie ModuleTag_07
DeathTypes = NONE +CRUSHED +SPLATTED
FX = FX_CarCrush
OCL = OCL_CrusaderTank_CrushEffect
DeathFX = FX_CarCrush
End
Behavior = CreateObjectDie ModuleTag_08
DeathTypes = NONE +CRUSHED +SPLATTED
CreationList = OCL_CrusaderTank_CrushEffect
End
; Behavior = CreateCrateDie ModuleTag_09
; CrateData = NONE
Expand Down
9 changes: 6 additions & 3 deletions GeneralsZH/Data/INI/Object/Campaign/GLA/Unit/CINE_GLAVehicleBombTruck.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,10 +274,13 @@ Object CINE_GLAVehicleBombTruck
DisguiseRevealTransitionTime = 1000
End

Behavior = InstantDeathBehavior ModuleTag_23
Behavior = FXListDie ModuleTag_23
DeathTypes = NONE +CRUSHED +SPLATTED
FX = FX_CarCrush
OCL = OCL_CrusaderTank_CrushEffect
DeathFX = FX_CarCrush
End
Behavior = CreateObjectDie ModuleTag_24
DeathTypes = NONE +CRUSHED +SPLATTED
CreationList = OCL_CrusaderTank_CrushEffect
End
Behavior = CreateCrateDie ModuleTag_25
CrateData = SalvageCrateData
Expand Down
10 changes: 7 additions & 3 deletions GeneralsZH/Data/INI/Object/Campaign/GLA/Unit/CINE_GLAVehicleScudLauncher.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,10 +147,14 @@ Object CINE_GLAVehicleScudLauncher
OCL = FINAL OCL_SCUDLauncherDeathEffect
End

Behavior = InstantDeathBehavior ModuleTag_10
Behavior = FXListDie ModuleTag_10
DeathTypes = NONE +CRUSHED +SPLATTED
FX = FX_CarCrush
OCL = OCL_CrusaderTank_CrushEffect
DeathFX = FX_CarCrush
End

Behavior = CreateObjectDie ModuleTag_11
DeathTypes = NONE +CRUSHED +SPLATTED
CreationList = OCL_CrusaderTank_CrushEffect
End

Behavior = FlammableUpdate ModuleTag_21
Expand Down
9 changes: 6 additions & 3 deletions GeneralsZH/Data/INI/Object/Campaign/GLA/Unit/CINE_akStature.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,12 @@ Object CINE_akStature
DetonationObject = BaikonurRocketDetonation
End

Behavior = InstantDeathBehavior ModuleTag_07
FX = FX_NukeGLA
OCL = OCL_PoisonFieldLarge
Behavior = CreateObjectDie ModuleTag_07
CreationList = OCL_PoisonFieldLarge
End

Behavior = FXListDie ModuleTag_08
DeathFX = FX_NukeGLA
End

Behavior = TransitionDamageFX ModuleTag_09
Expand Down
9 changes: 6 additions & 3 deletions GeneralsZH/Data/INI/Object/Campaign/Misc/CINE_B301.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,12 @@ Object CINE_B301
DetonationObject = BaikonurRocketDetonation
End

Behavior = InstantDeathBehavior ModuleTag_07
FX = FX_NukeGLA
OCL = OCL_PoisonFieldLarge
Behavior = CreateObjectDie ModuleTag_07
CreationList = OCL_PoisonFieldLarge
End

Behavior = FXListDie ModuleTag_08
DeathFX = FX_NukeGLA
End

Behavior = TransitionDamageFX ModuleTag_09
Expand Down
9 changes: 6 additions & 3 deletions GeneralsZH/Data/INI/Object/Campaign/Misc/CINE_B302.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,12 @@ Object CINE_B302
DetonationObject = BaikonurRocketDetonation
End

Behavior = InstantDeathBehavior ModuleTag_07
FX = FX_NukeGLA
OCL = OCL_PoisonFieldLarge
Behavior = CreateObjectDie ModuleTag_07
CreationList = OCL_PoisonFieldLarge
End

Behavior = FXListDie ModuleTag_08
DeathFX = FX_NukeGLA
End

Behavior = TransitionDamageFX ModuleTag_09
Expand Down
9 changes: 6 additions & 3 deletions GeneralsZH/Data/INI/Object/Campaign/Misc/CINE_B303.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,12 @@ Object CINE_B303
DetonationObject = BaikonurRocketDetonation
End

Behavior = InstantDeathBehavior ModuleTag_07
FX = FX_NukeGLA
OCL = OCL_PoisonFieldLarge
Behavior = CreateObjectDie ModuleTag_07
CreationList = OCL_PoisonFieldLarge
End

Behavior = FXListDie ModuleTag_08
DeathFX = FX_NukeGLA
End

Behavior = TransitionDamageFX ModuleTag_09
Expand Down
9 changes: 6 additions & 3 deletions GeneralsZH/Data/INI/Object/Campaign/Misc/CINE_Biak.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,12 @@ Object CINE_Biak
DetonationObject = BaikonurRocketDetonation
End

Behavior = InstantDeathBehavior ModuleTag_07
FX = FX_NukeGLA
OCL = OCL_PoisonFieldLarge
Behavior = CreateObjectDie ModuleTag_07
CreationList = OCL_PoisonFieldLarge
End

Behavior = FXListDie ModuleTag_08
DeathFX = FX_NukeGLA
End

Behavior = TransitionDamageFX ModuleTag_09
Expand Down
9 changes: 6 additions & 3 deletions GeneralsZH/Data/INI/Object/Campaign/Misc/CINE_Biak01.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,12 @@ Object CINE_Biak01
DetonationObject = BaikonurRocketDetonation
End

Behavior = InstantDeathBehavior ModuleTag_07
FX = FX_NukeGLA
OCL = OCL_PoisonFieldLarge
Behavior = CreateObjectDie ModuleTag_07
CreationList = OCL_PoisonFieldLarge
End

Behavior = FXListDie ModuleTag_08
DeathFX = FX_NukeGLA
End

Behavior = TransitionDamageFX ModuleTag_09
Expand Down
9 changes: 6 additions & 3 deletions GeneralsZH/Data/INI/Object/Campaign/Misc/CINE_Biak02.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,12 @@ Object CINE_Biak02
DetonationObject = BaikonurRocketDetonation
End

Behavior = InstantDeathBehavior ModuleTag_07
FX = FX_NukeGLA
OCL = OCL_PoisonFieldLarge
Behavior = CreateObjectDie ModuleTag_07
CreationList = OCL_PoisonFieldLarge
End

Behavior = FXListDie ModuleTag_08
DeathFX = FX_NukeGLA
End

Behavior = TransitionDamageFX ModuleTag_09
Expand Down
9 changes: 6 additions & 3 deletions GeneralsZH/Data/INI/Object/Campaign/Misc/CINE_Biak03.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,12 @@ Object CINE_Biak03
DetonationObject = BaikonurRocketDetonation
End

Behavior = InstantDeathBehavior ModuleTag_07
FX = FX_NukeGLA
OCL = OCL_PoisonFieldLarge
Behavior = CreateObjectDie ModuleTag_07
CreationList = OCL_PoisonFieldLarge
End

Behavior = FXListDie ModuleTag_08
DeathFX = FX_NukeGLA
End

Behavior = TransitionDamageFX ModuleTag_09
Expand Down
9 changes: 6 additions & 3 deletions GeneralsZH/Data/INI/Object/Campaign/Misc/CINE_CPlane.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,12 @@ Object CINE_CPlane
DetonationObject = BaikonurRocketDetonation
End

Behavior = InstantDeathBehavior ModuleTag_07
FX = FX_NukeGLA
OCL = OCL_PoisonFieldLarge
Behavior = CreateObjectDie ModuleTag_07
CreationList = OCL_PoisonFieldLarge
End

Behavior = FXListDie ModuleTag_08
DeathFX = FX_NukeGLA
End

Behavior = TransitionDamageFX ModuleTag_09
Expand Down
9 changes: 6 additions & 3 deletions GeneralsZH/Data/INI/Object/Campaign/Misc/CINE_CPlane02.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,12 @@ Object CINE_CPlane02
DetonationObject = BaikonurRocketDetonation
End

Behavior = InstantDeathBehavior ModuleTag_07
FX = FX_NukeGLA
OCL = OCL_PoisonFieldLarge
Behavior = CreateObjectDie ModuleTag_07
CreationList = OCL_PoisonFieldLarge
End

Behavior = FXListDie ModuleTag_08
DeathFX = FX_NukeGLA
End

Behavior = TransitionDamageFX ModuleTag_09
Expand Down
9 changes: 6 additions & 3 deletions GeneralsZH/Data/INI/Object/Campaign/Misc/CINE_CShadow.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,12 @@ Object CINE_CShadow
DetonationObject = BaikonurRocketDetonation
End

Behavior = InstantDeathBehavior ModuleTag_07
FX = FX_NukeGLA
OCL = OCL_PoisonFieldLarge
Behavior = CreateObjectDie ModuleTag_07
CreationList = OCL_PoisonFieldLarge
End

Behavior = FXListDie ModuleTag_08
DeathFX = FX_NukeGLA
End

Behavior = TransitionDamageFX ModuleTag_09
Expand Down
Loading