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.

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

Change: Infantry lasered by the USA Paladin Tank will burn #2071

Merged
merged 1 commit into from
Jul 9, 2023
Merged

Change: Infantry lasered by the USA Paladin Tank will burn #2071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions Patch104pZH/Design/Changes/v1.0/2067_laser_weapons_infantry_burn.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ title: Enables Laser weapons to burn killed infantry units
changes:
- tweak: The USA Laser Turret now burns infantry on kill. It does not change gameplay.
- tweak: The USA Laser Crusader now burns infantry on kill. The burned death now triggers the suicide explosion of the GLA Terrorist.
- tweak: The Point Defense Laser of the USA Paladin now burns infantry on kill. It does not change gameplay.

labels:
- controversial
Expand All @@ -16,6 +17,7 @@ labels:

links:
- https://github.com/TheSuperHackers/GeneralsGamePatch/pull/2067
- https://github.com/TheSuperHackers/GeneralsGamePatch/pull/2071

authors:
- xezon
1 change: 1 addition & 0 deletions Patch104pZH/Design/Changes/v1.0/2071_laser_weapons_infantry_burn.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2067_laser_weapons_infantry_burn.yaml
25 changes: 15 additions & 10 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/AirforceGeneral.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3209,7 +3209,7 @@ Object AirF_AmericaInfantryColonelBurton

; --- begin Death modules ---
Behavior = SlowDeathBehavior ModuleTag_Death01
DeathTypes = ALL -CRUSHED -SPLATTED -EXPLODED -BURNED -POISONED -POISONED_BETA -POISONED_GAMMA
DeathTypes = ALL -CRUSHED -SPLATTED -EXPLODED -BURNED -LASERED -POISONED -POISONED_BETA -POISONED_GAMMA
SinkDelay = 3000
SinkRate = 0.5 ; in Dist/Sec
DestructionDelay = 8000
Expand All @@ -3233,8 +3233,9 @@ Object AirF_AmericaInfantryColonelBurton
FlingPitch = 60
FlingPitchVariance = 10
End
; Patch104p @tweak xezon 08/07/2023 Adds LASERED burn. (#2071)
Behavior = SlowDeathBehavior ModuleTag_Death04
DeathTypes = NONE +BURNED
DeathTypes = NONE +BURNED +LASERED
DestructionDelay = 0
FX = INITIAL FX_DieByFireUSA
OCL = INITIAL OCL_FlamingInfantry
Expand Down Expand Up @@ -3717,7 +3718,7 @@ Object AirF_AmericaInfantryRanger

; --- begin Death modules ---
Behavior = SlowDeathBehavior ModuleTag_Death01
DeathTypes = ALL -CRUSHED -SPLATTED -EXPLODED -BURNED -POISONED -POISONED_BETA -POISONED_GAMMA
DeathTypes = ALL -CRUSHED -SPLATTED -EXPLODED -BURNED -LASERED -POISONED -POISONED_BETA -POISONED_GAMMA
SinkDelay = 3000
SinkRate = 0.5 ; in Dist/Sec
DestructionDelay = 8000
Expand All @@ -3741,8 +3742,9 @@ Object AirF_AmericaInfantryRanger
FlingPitch = 60
FlingPitchVariance = 10
End
; Patch104p @tweak xezon 08/07/2023 Adds LASERED burn. (#2071)
Behavior = SlowDeathBehavior ModuleTag_Death04
DeathTypes = NONE +BURNED
DeathTypes = NONE +BURNED +LASERED
DestructionDelay = 0
FX = INITIAL FX_DieByFireUSA
OCL = INITIAL OCL_FlamingInfantry
Expand Down Expand Up @@ -4086,7 +4088,7 @@ Object AirF_AmericaInfantryMissileDefender

; --- begin Death modules ---
Behavior = SlowDeathBehavior ModuleTag_Death01
DeathTypes = ALL -CRUSHED -SPLATTED -EXPLODED -BURNED -POISONED -POISONED_BETA -POISONED_GAMMA
DeathTypes = ALL -CRUSHED -SPLATTED -EXPLODED -BURNED -LASERED -POISONED -POISONED_BETA -POISONED_GAMMA
SinkDelay = 3000
SinkRate = 0.5 ; in Dist/Sec
DestructionDelay = 8000
Expand All @@ -4110,8 +4112,9 @@ Object AirF_AmericaInfantryMissileDefender
FlingPitch = 60
FlingPitchVariance = 10
End
; Patch104p @tweak xezon 08/07/2023 Adds LASERED burn. (#2071)
Behavior = SlowDeathBehavior ModuleTag_Death04
DeathTypes = NONE +BURNED
DeathTypes = NONE +BURNED +LASERED
DestructionDelay = 0
FX = INITIAL FX_DieByFireUSA
OCL = INITIAL OCL_FlamingInfantry
Expand Down Expand Up @@ -4344,7 +4347,7 @@ Object AirF_AmericaInfantryPilot

; --- begin Death modules ---
Behavior = SlowDeathBehavior ModuleTag_Death01
DeathTypes = ALL -CRUSHED -SPLATTED -EXPLODED -BURNED -POISONED -POISONED_BETA -POISONED_GAMMA
DeathTypes = ALL -CRUSHED -SPLATTED -EXPLODED -BURNED -LASERED -POISONED -POISONED_BETA -POISONED_GAMMA
SinkDelay = 3000
SinkRate = 0.5 ; in Dist/Sec
DestructionDelay = 8000
Expand All @@ -4368,8 +4371,9 @@ Object AirF_AmericaInfantryPilot
FlingPitch = 60
FlingPitchVariance = 10
End
; Patch104p @tweak xezon 08/07/2023 Adds LASERED burn. (#2071)
Behavior = SlowDeathBehavior ModuleTag_Death04
DeathTypes = NONE +BURNED
DeathTypes = NONE +BURNED +LASERED
DestructionDelay = 0
FX = INITIAL FX_DieByFireUSA
OCL = INITIAL OCL_FlamingInfantry
Expand Down Expand Up @@ -4636,7 +4640,7 @@ Object AirF_AmericaInfantryPathfinder

; --- begin Death modules ---
Behavior = SlowDeathBehavior ModuleTag_Death01
DeathTypes = ALL -CRUSHED -SPLATTED -EXPLODED -BURNED -POISONED -POISONED_BETA -POISONED_GAMMA
DeathTypes = ALL -CRUSHED -SPLATTED -EXPLODED -BURNED -LASERED -POISONED -POISONED_BETA -POISONED_GAMMA
SinkDelay = 3000
SinkRate = 0.5 ; in Dist/Sec
DestructionDelay = 8000
Expand All @@ -4660,8 +4664,9 @@ Object AirF_AmericaInfantryPathfinder
FlingPitch = 60
FlingPitchVariance = 10
End
; Patch104p @tweak xezon 08/07/2023 Adds LASERED burn. (#2071)
Behavior = SlowDeathBehavior ModuleTag_Death04
DeathTypes = NONE +BURNED
DeathTypes = NONE +BURNED +LASERED
DestructionDelay = 0
FX = INITIAL FX_DieByFireUSA
OCL = INITIAL OCL_FlamingInfantry
Expand Down
25 changes: 15 additions & 10 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/AmericaInfantry.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ Object AmericaInfantryColonelBurton

; --- begin Death modules ---
Behavior = SlowDeathBehavior ModuleTag_Death01
DeathTypes = ALL -CRUSHED -SPLATTED -EXPLODED -BURNED -POISONED -POISONED_BETA -POISONED_GAMMA
DeathTypes = ALL -CRUSHED -SPLATTED -EXPLODED -BURNED -LASERED -POISONED -POISONED_BETA -POISONED_GAMMA
SinkDelay = 3000
SinkRate = 0.5 ; in Dist/Sec
DestructionDelay = 8000
Expand All @@ -474,8 +474,9 @@ Object AmericaInfantryColonelBurton
FlingPitch = 60
FlingPitchVariance = 10
End
; Patch104p @tweak xezon 08/07/2023 Adds LASERED burn. (#2071)
Behavior = SlowDeathBehavior ModuleTag_Death04
DeathTypes = NONE +BURNED
DeathTypes = NONE +BURNED +LASERED
DestructionDelay = 0
FX = INITIAL FX_DieByFireUSA
OCL = INITIAL OCL_FlamingInfantry
Expand Down Expand Up @@ -959,7 +960,7 @@ Object AmericaInfantryRanger

; --- begin Death modules ---
Behavior = SlowDeathBehavior ModuleTag_Death01
DeathTypes = ALL -CRUSHED -SPLATTED -EXPLODED -BURNED -POISONED -POISONED_BETA -POISONED_GAMMA
DeathTypes = ALL -CRUSHED -SPLATTED -EXPLODED -BURNED -LASERED -POISONED -POISONED_BETA -POISONED_GAMMA
SinkDelay = 3000
SinkRate = 0.5 ; in Dist/Sec
DestructionDelay = 8000
Expand All @@ -983,8 +984,9 @@ Object AmericaInfantryRanger
FlingPitch = 60
FlingPitchVariance = 10
End
; Patch104p @tweak xezon 08/07/2023 Adds LASERED burn. (#2071)
Behavior = SlowDeathBehavior ModuleTag_Death04
DeathTypes = NONE +BURNED
DeathTypes = NONE +BURNED +LASERED
DestructionDelay = 0
FX = INITIAL FX_DieByFireUSA
OCL = INITIAL OCL_FlamingInfantry
Expand Down Expand Up @@ -1328,7 +1330,7 @@ Object AmericaInfantryMissileDefender

; --- begin Death modules ---
Behavior = SlowDeathBehavior ModuleTag_Death01
DeathTypes = ALL -CRUSHED -SPLATTED -EXPLODED -BURNED -POISONED -POISONED_BETA -POISONED_GAMMA
DeathTypes = ALL -CRUSHED -SPLATTED -EXPLODED -BURNED -LASERED -POISONED -POISONED_BETA -POISONED_GAMMA
SinkDelay = 3000
SinkRate = 0.5 ; in Dist/Sec
DestructionDelay = 8000
Expand All @@ -1352,8 +1354,9 @@ Object AmericaInfantryMissileDefender
FlingPitch = 60
FlingPitchVariance = 10
End
; Patch104p @tweak xezon 08/07/2023 Adds LASERED burn. (#2071)
Behavior = SlowDeathBehavior ModuleTag_Death04
DeathTypes = NONE +BURNED
DeathTypes = NONE +BURNED +LASERED
DestructionDelay = 0
FX = INITIAL FX_DieByFireUSA
OCL = INITIAL OCL_FlamingInfantry
Expand Down Expand Up @@ -1583,7 +1586,7 @@ Object AmericaInfantryPilot

; --- begin Death modules ---
Behavior = SlowDeathBehavior ModuleTag_Death01
DeathTypes = ALL -CRUSHED -SPLATTED -EXPLODED -BURNED -POISONED -POISONED_BETA -POISONED_GAMMA
DeathTypes = ALL -CRUSHED -SPLATTED -EXPLODED -BURNED -LASERED -POISONED -POISONED_BETA -POISONED_GAMMA
SinkDelay = 3000
SinkRate = 0.5 ; in Dist/Sec
DestructionDelay = 8000
Expand All @@ -1607,8 +1610,9 @@ Object AmericaInfantryPilot
FlingPitch = 60
FlingPitchVariance = 10
End
; Patch104p @tweak xezon 08/07/2023 Adds LASERED burn. (#2071)
Behavior = SlowDeathBehavior ModuleTag_Death04
DeathTypes = NONE +BURNED
DeathTypes = NONE +BURNED +LASERED
DestructionDelay = 0
FX = INITIAL FX_DieByFireUSA
OCL = INITIAL OCL_FlamingInfantry
Expand Down Expand Up @@ -1872,7 +1876,7 @@ Object AmericaInfantryPathfinder

; --- begin Death modules ---
Behavior = SlowDeathBehavior ModuleTag_Death01
DeathTypes = ALL -CRUSHED -SPLATTED -EXPLODED -BURNED -POISONED -POISONED_BETA -POISONED_GAMMA
DeathTypes = ALL -CRUSHED -SPLATTED -EXPLODED -BURNED -LASERED -POISONED -POISONED_BETA -POISONED_GAMMA
SinkDelay = 3000
SinkRate = 0.5 ; in Dist/Sec
DestructionDelay = 8000
Expand All @@ -1896,8 +1900,9 @@ Object AmericaInfantryPathfinder
FlingPitch = 60
FlingPitchVariance = 10
End
; Patch104p @tweak xezon 08/07/2023 Adds LASERED burn. (#2071)
Behavior = SlowDeathBehavior ModuleTag_Death04
DeathTypes = NONE +BURNED
DeathTypes = NONE +BURNED +LASERED
DestructionDelay = 0
FX = INITIAL FX_DieByFireUSA
OCL = INITIAL OCL_FlamingInfantry
Expand Down
15 changes: 9 additions & 6 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/AmericaMiscUnit.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,7 @@ Object AmericaInfantryBiohazardTech

; --- begin Death modules ---
Behavior = SlowDeathBehavior ModuleTag_Death01
DeathTypes = ALL -CRUSHED -SPLATTED -EXPLODED -BURNED -POISONED -POISONED_BETA -POISONED_GAMMA
DeathTypes = ALL -CRUSHED -SPLATTED -EXPLODED -BURNED -LASERED -POISONED -POISONED_BETA -POISONED_GAMMA
SinkDelay = 3000
SinkRate = 0.5 ; in Dist/Sec
DestructionDelay = 8000
Expand All @@ -575,8 +575,9 @@ Object AmericaInfantryBiohazardTech
FlingPitch = 60
FlingPitchVariance = 10
End
; Patch104p @tweak xezon 08/07/2023 Adds LASERED burn. (#2071)
Behavior = SlowDeathBehavior ModuleTag_Death04
DeathTypes = NONE +BURNED
DeathTypes = NONE +BURNED +LASERED
DestructionDelay = 0
FX = INITIAL FX_RebelDie
OCL = INITIAL OCL_FlamingInfantry
Expand Down Expand Up @@ -795,7 +796,7 @@ Object AmericaInfantryOfficer

; --- begin Death modules ---
Behavior = SlowDeathBehavior ModuleTag_Death01
DeathTypes = ALL -CRUSHED -SPLATTED -EXPLODED -BURNED -POISONED -POISONED_BETA -POISONED_GAMMA
DeathTypes = ALL -CRUSHED -SPLATTED -EXPLODED -BURNED -LASERED -POISONED -POISONED_BETA -POISONED_GAMMA
SinkDelay = 3000
SinkRate = 0.5 ; in Dist/Sec
DestructionDelay = 8000
Expand All @@ -819,8 +820,9 @@ Object AmericaInfantryOfficer
FlingPitch = 60
FlingPitchVariance = 10
End
; Patch104p @tweak xezon 08/07/2023 Adds LASERED burn. (#2071)
Behavior = SlowDeathBehavior ModuleTag_Death04
DeathTypes = NONE +BURNED
DeathTypes = NONE +BURNED +LASERED
DestructionDelay = 0
FX = INITIAL FX_DieByFireUSA
OCL = INITIAL OCL_FlamingInfantry
Expand Down Expand Up @@ -2127,7 +2129,7 @@ Object AmericaInfantryCIAOfficer

; --- begin Death modules ---
Behavior = SlowDeathBehavior ModuleTag_Death01
DeathTypes = ALL -CRUSHED -SPLATTED -EXPLODED -BURNED -POISONED -POISONED_BETA -POISONED_GAMMA
DeathTypes = ALL -CRUSHED -SPLATTED -EXPLODED -BURNED -LASERED -POISONED -POISONED_BETA -POISONED_GAMMA
SinkDelay = 3000
SinkRate = 0.5 ; in Dist/Sec
DestructionDelay = 8000
Expand All @@ -2151,8 +2153,9 @@ Object AmericaInfantryCIAOfficer
FlingPitch = 60
FlingPitchVariance = 10
End
; Patch104p @tweak xezon 08/07/2023 Adds LASERED burn. (#2071)
Behavior = SlowDeathBehavior ModuleTag_Death04
DeathTypes = NONE +BURNED
DeathTypes = NONE +BURNED +LASERED
DestructionDelay = 0
FX = INITIAL FX_DieByFireUSA
OCL = INITIAL OCL_FlamingInfantry
Expand Down
Loading