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

Fix: Some American And Chinese Units Use GLA Death Scream When Gamma Poisoned #92

Merged
merged 1 commit into from
Aug 29, 2021
Merged

Fix: Some American And Chinese Units Use GLA Death Scream When Gamma Poisoned #92

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: 1 addition & 1 deletion Patch104pZH/Design/Tasks/commy2_tasks.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ https://github.com/commy2/zerohour/issues/109 [IMPROVEMENT] Some Helix
https://github.com/commy2/zerohour/issues/108 [IMPROVEMENT] Chinook and Supply Center Upgrade Icons
https://github.com/commy2/zerohour/issues/107 [IMPROVEMENT] Pilots Have Misleading Upgrade Icons
https://github.com/commy2/zerohour/issues/106 [NOTRELEVANT] Cargo Planes With Countermeasures Are Missing Hit Effects
https://github.com/commy2/zerohour/issues/105 [IMPROVEMENT] Some American And Chinese Units Use GLA Death Scream When Gamma Poisoned
https://github.com/commy2/zerohour/issues/105 [DONE] Some American And Chinese Units Use GLA Death Scream When Gamma Poisoned
https://github.com/commy2/zerohour/issues/104 [IMPROVEMENT] China Command Center Missing Radar Upgrade Icon
https://github.com/commy2/zerohour/issues/103 [IMPROVEMENT] Some Special Power Buttons Disappear From Command Center After Mines Upgrade
https://github.com/commy2/zerohour/issues/102 [IMPROVEMENT] Tank Hunter Missing Patriotism Upgrade Icon
Expand Down
4 changes: 2 additions & 2 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 @@ -3284,7 +3284,7 @@ Object AirF_AmericaInfantryColonelBurton
Behavior = SlowDeathBehavior ModuleTag_Death07
DeathTypes = NONE +POISONED_GAMMA
DestructionDelay = 0
FX = INITIAL FX_DieByToxinGLA
FX = INITIAL FX_DieByToxinUSA ; Patch104p @bugfix commy2 28/08/2021 Use correct faction voice line.
OCL = INITIAL OCL_ToxicInfantryGamma
End
; --- end Death modules ---
Expand Down Expand Up @@ -3794,7 +3794,7 @@ Object AirF_AmericaInfantryRanger
Behavior = SlowDeathBehavior ModuleTag_Death07
DeathTypes = NONE +POISONED_GAMMA
DestructionDelay = 0
FX = INITIAL FX_DieByToxinGLA
FX = INITIAL FX_DieByToxinUSA ; Patch104p @bugfix commy2 28/08/2021 Use correct faction voice line.
OCL = INITIAL OCL_ToxicInfantryGamma
End
; --- end Death modules ---
Expand Down
4 changes: 2 additions & 2 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/InfantryGeneral.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1209,7 +1209,7 @@ Object Infa_ChinaInfantryTankHunter
Behavior = SlowDeathBehavior ModuleTag_Death07
DeathTypes = NONE +POISONED_GAMMA
DestructionDelay = 0
FX = INITIAL FX_DieByToxinGLA
FX = INITIAL FX_DieByToxinChina ; Patch104p @bugfix commy2 28/08/2021 Use correct faction voice line.
OCL = INITIAL OCL_ToxicInfantryGamma
End
; --- end Death modules ---
Expand Down Expand Up @@ -1530,7 +1530,7 @@ Object Infa_ChinaInfantryHacker
Behavior = SlowDeathBehavior ModuleTag_Death07
DeathTypes = NONE +POISONED_GAMMA
DestructionDelay = 0
FX = INITIAL FX_DieByToxinGLA
FX = INITIAL FX_DieByToxinChina ; Patch104p @bugfix commy2 28/08/2021 Use correct faction voice line.
OCL = INITIAL OCL_ToxicInfantryGamma
End
; --- end Death modules ---
Expand Down
10 changes: 5 additions & 5 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/LaserGeneral.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2852,7 +2852,7 @@ Object Lazr_AmericaInfantryColonelBurton
Behavior = SlowDeathBehavior ModuleTag_Death07
DeathTypes = NONE +POISONED_GAMMA
DestructionDelay = 0
FX = INITIAL FX_DieByToxinGLA
FX = INITIAL FX_DieByToxinUSA ; Patch104p @bugfix commy2 28/08/2021 Use correct faction voice line.
OCL = INITIAL OCL_ToxicInfantryGamma
End
; --- end Death modules ---
Expand Down Expand Up @@ -3361,7 +3361,7 @@ Object Lazr_AmericaInfantryRanger
Behavior = SlowDeathBehavior ModuleTag_Death07
DeathTypes = NONE +POISONED_GAMMA
DestructionDelay = 0
FX = INITIAL FX_DieByToxinGLA
FX = INITIAL FX_DieByToxinUSA ; Patch104p @bugfix commy2 28/08/2021 Use correct faction voice line.
OCL = INITIAL OCL_ToxicInfantryGamma
End
; --- end Death modules ---
Expand Down Expand Up @@ -3710,7 +3710,7 @@ Object Lazr_AmericaInfantryMissileDefender
Behavior = SlowDeathBehavior ModuleTag_Death07
DeathTypes = NONE +POISONED_GAMMA
DestructionDelay = 0
FX = INITIAL FX_DieByToxinGLA
FX = INITIAL FX_DieByToxinUSA ; Patch104p @bugfix commy2 28/08/2021 Use correct faction voice line.
OCL = INITIAL OCL_ToxicInfantryGamma
End
; --- end Death modules ---
Expand Down Expand Up @@ -3960,7 +3960,7 @@ Object Lazr_AmericaInfantryPilot
Behavior = SlowDeathBehavior ModuleTag_Death07
DeathTypes = NONE +POISONED_GAMMA
DestructionDelay = 0
FX = INITIAL FX_DieByToxinGLA
FX = INITIAL FX_DieByToxinUSA ; Patch104p @bugfix commy2 28/08/2021 Use correct faction voice line.
OCL = INITIAL OCL_ToxicInfantryGamma
End
; --- end Death modules ---
Expand Down Expand Up @@ -4249,7 +4249,7 @@ Object Lazr_AmericaInfantryPathfinder
Behavior = SlowDeathBehavior ModuleTag_Death07
DeathTypes = NONE +POISONED_GAMMA
DestructionDelay = 0
FX = INITIAL FX_DieByToxinGLA
FX = INITIAL FX_DieByToxinUSA ; Patch104p @bugfix commy2 28/08/2021 Use correct faction voice line.
OCL = INITIAL OCL_ToxicInfantryGamma
End
; --- end Death modules ---
Expand Down
8 changes: 4 additions & 4 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/NukeGeneral.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1786,7 +1786,7 @@ Object Nuke_ChinaInfantryRedguard
Behavior = SlowDeathBehavior ModuleTag_Death07
DeathTypes = NONE +POISONED_GAMMA
DestructionDelay = 0
FX = INITIAL FX_DieByToxinGLA
FX = INITIAL FX_DieByToxinChina ; Patch104p @bugfix commy2 28/08/2021 Use correct faction voice line.
OCL = INITIAL OCL_ToxicInfantryGamma
End
; --- end Death modules ---
Expand Down Expand Up @@ -2225,7 +2225,7 @@ Object Nuke_ChinaInfantryBlackLotus
Behavior = SlowDeathBehavior ModuleTag_Death07
DeathTypes = NONE +POISONED_GAMMA
DestructionDelay = 0
FX = INITIAL FX_DieByToxinGLA
FX = INITIAL FX_DieByToxinFemale ; Patch104p @bugfix commy2 28/08/2021 Use correct voice line.
OCL = INITIAL OCL_ToxicInfantryGamma
End
; --- end Death modules ---
Expand Down Expand Up @@ -2516,7 +2516,7 @@ Object Nuke_ChinaInfantryTankHunter
Behavior = SlowDeathBehavior ModuleTag_Death07
DeathTypes = NONE +POISONED_GAMMA
DestructionDelay = 0
FX = INITIAL FX_DieByToxinGLA
FX = INITIAL FX_DieByToxinChina ; Patch104p @bugfix commy2 28/08/2021 Use correct faction voice line.
OCL = INITIAL OCL_ToxicInfantryGamma
End
; --- end Death modules ---
Expand Down Expand Up @@ -2823,7 +2823,7 @@ Object Nuke_ChinaInfantryHacker
Behavior = SlowDeathBehavior ModuleTag_Death07
DeathTypes = NONE +POISONED_GAMMA
DestructionDelay = 0
FX = INITIAL FX_DieByToxinGLA
FX = INITIAL FX_DieByToxinChina ; Patch104p @bugfix commy2 28/08/2021 Use correct faction voice line.
OCL = INITIAL OCL_ToxicInfantryGamma
End
; --- end Death modules ---
Expand Down
10 changes: 5 additions & 5 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/SuperWeaponGeneral.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3324,7 +3324,7 @@ Object SupW_AmericaInfantryColonelBurton
Behavior = SlowDeathBehavior ModuleTag_Death07
DeathTypes = NONE +POISONED_GAMMA
DestructionDelay = 0
FX = INITIAL FX_DieByToxinGLA
FX = INITIAL FX_DieByToxinUSA ; Patch104p @bugfix commy2 28/08/2021 Use correct faction voice line.
OCL = INITIAL OCL_ToxicInfantryGamma
End
; --- end Death modules ---
Expand Down Expand Up @@ -3833,7 +3833,7 @@ Object SupW_AmericaInfantryRanger
Behavior = SlowDeathBehavior ModuleTag_Death07
DeathTypes = NONE +POISONED_GAMMA
DestructionDelay = 0
FX = INITIAL FX_DieByToxinGLA
FX = INITIAL FX_DieByToxinUSA ; Patch104p @bugfix commy2 28/08/2021 Use correct faction voice line.
OCL = INITIAL OCL_ToxicInfantryGamma
End
; --- end Death modules ---
Expand Down Expand Up @@ -4189,7 +4189,7 @@ Object SupW_AmericaInfantryMissileDefender
Behavior = SlowDeathBehavior ModuleTag_Death07
DeathTypes = NONE +POISONED_GAMMA
DestructionDelay = 0
FX = INITIAL FX_DieByToxinGLA
FX = INITIAL FX_DieByToxinUSA ; Patch104p @bugfix commy2 28/08/2021 Use correct faction voice line.
OCL = INITIAL OCL_ToxicInfantryGamma
End
; --- end Death modules ---
Expand Down Expand Up @@ -4439,7 +4439,7 @@ Object SupW_AmericaInfantryPilot
Behavior = SlowDeathBehavior ModuleTag_Death07
DeathTypes = NONE +POISONED_GAMMA
DestructionDelay = 0
FX = INITIAL FX_DieByToxinGLA
FX = INITIAL FX_DieByToxinUSA ; Patch104p @bugfix commy2 28/08/2021 Use correct faction voice line.
OCL = INITIAL OCL_ToxicInfantryGamma
End
; --- end Death modules ---
Expand Down Expand Up @@ -4728,7 +4728,7 @@ Object SupW_AmericaInfantryPathfinder
Behavior = SlowDeathBehavior ModuleTag_Death07
DeathTypes = NONE +POISONED_GAMMA
DestructionDelay = 0
FX = INITIAL FX_DieByToxinGLA
FX = INITIAL FX_DieByToxinUSA ; Patch104p @bugfix commy2 28/08/2021 Use correct faction voice line.
OCL = INITIAL OCL_ToxicInfantryGamma
End
; --- end Death modules ---
Expand Down
8 changes: 4 additions & 4 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/TankGeneral.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1514,7 +1514,7 @@ Object Tank_ChinaInfantryRedguard
Behavior = SlowDeathBehavior ModuleTag_Death07
DeathTypes = NONE +POISONED_GAMMA
DestructionDelay = 0
FX = INITIAL FX_DieByToxinGLA
FX = INITIAL FX_DieByToxinChina ; Patch104p @bugfix commy2 28/08/2021 Use correct faction voice line.
OCL = INITIAL OCL_ToxicInfantryGamma
End
; --- end Death modules ---
Expand Down Expand Up @@ -1953,7 +1953,7 @@ Object Tank_ChinaInfantryBlackLotus
Behavior = SlowDeathBehavior ModuleTag_Death07
DeathTypes = NONE +POISONED_GAMMA
DestructionDelay = 0
FX = INITIAL FX_DieByToxinGLA
FX = INITIAL FX_DieByToxinFemale ; Patch104p @bugfix commy2 28/08/2021 Use correct voice line.
OCL = INITIAL OCL_ToxicInfantryGamma
End
; --- end Death modules ---
Expand Down Expand Up @@ -2244,7 +2244,7 @@ Object Tank_ChinaInfantryTankHunter
Behavior = SlowDeathBehavior ModuleTag_Death07
DeathTypes = NONE +POISONED_GAMMA
DestructionDelay = 0
FX = INITIAL FX_DieByToxinGLA
FX = INITIAL FX_DieByToxinChina ; Patch104p @bugfix commy2 28/08/2021 Use correct faction voice line.
OCL = INITIAL OCL_ToxicInfantryGamma
End
; --- end Death modules ---
Expand Down Expand Up @@ -2551,7 +2551,7 @@ Object Tank_ChinaInfantryHacker
Behavior = SlowDeathBehavior ModuleTag_Death07
DeathTypes = NONE +POISONED_GAMMA
DestructionDelay = 0
FX = INITIAL FX_DieByToxinGLA
FX = INITIAL FX_DieByToxinChina ; Patch104p @bugfix commy2 28/08/2021 Use correct faction voice line.
OCL = INITIAL OCL_ToxicInfantryGamma
End
; --- end Death modules ---
Expand Down