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: Flashbangs Can Damage Stinger Troopers #636

Merged
merged 2 commits into from
Jan 3, 2022
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
2 changes: 1 addition & 1 deletion Patch104pZH/Design/Tasks/commy2_tasks.txt
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ https://github.com/commy2/zerohour/issues/117 [DONE][NPROJEC!] Some Rebel
https://github.com/commy2/zerohour/issues/116 [DONE][NPROJECT] Tactical Nuke Mig Upgrade Not Buildable While Low On Power
https://github.com/commy2/zerohour/issues/115 [DONE][NPROJEC!] Early And Nuke Carpet Bomber Unavailable While Controlling Mixed Sub Faction Command Centers
https://github.com/commy2/zerohour/issues/114 [DONE][NPROJEC!] Hitting Battle Bus In Hull Mode Causes Screen Shake
https://github.com/commy2/zerohour/issues/113 [MAYBE][NPROJECT] Flashbangs Cannot Target Stinger Sites
https://github.com/commy2/zerohour/issues/113 [DONE][NPROJECT] Flashbangs Cannot Target Stinger Sites
https://github.com/commy2/zerohour/issues/112 [DONE][NPROJEC!] Stealth Fake Arms Dealer Missing Camo Netting Upgrade Icon
https://github.com/commy2/zerohour/issues/111 [DONE][NPROJEC!] Stealth General Saboteur Uses Rebel Death Scream
https://github.com/commy2/zerohour/issues/110 [DONE][NPROJEC!] Anthrax Beta And Gamma Upgrade Icons Missing From Many Objects
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6081,8 +6081,9 @@ Object Chem_GLAStingerSite
InitialHealth = 1000.0
;**Careful with these damage types -- because area damage types will already
;**damage slaves.
PropagateDamageTypesToSlavesWhenExisting = NONE +SMALL_ARMS +SNIPER +POISON +RADIATION +SURRENDER
SwallowDamageTypesIfSlavesNotExisting = NONE +SNIPER +POISON +SURRENDER; Take no damage if no one to pass this to
; Patch104p @bugfix commy2 01/01/2022 Fix Stinger Troopers receive damage from Flashbangs despite the Stinger Site not being selectable as target by Flashbang-Rangers.
PropagateDamageTypesToSlavesWhenExisting = NONE +SMALL_ARMS +SNIPER +POISON +RADIATION
SwallowDamageTypesIfSlavesNotExisting = NONE +SNIPER +POISON; Take no damage if no one to pass this to

; Subdual damage "Subdues" you (reaction defined by BodyModule) when it passes your max health.
; The cap limits how extra-subdued you can be, and the other numbers detemine how fast it drains away on its own.
Expand Down
5 changes: 3 additions & 2 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/DemoGeneral.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5971,8 +5971,9 @@ Object Demo_GLAStingerSite
InitialHealth = 1000.0
;**Careful with these damage types -- because area damage types will already
;**damage slaves.
PropagateDamageTypesToSlavesWhenExisting = NONE +SMALL_ARMS +SNIPER +POISON +RADIATION +SURRENDER
SwallowDamageTypesIfSlavesNotExisting = NONE +SNIPER +POISON +SURRENDER; Take no damage if no one to pass this to
; Patch104p @bugfix commy2 01/01/2022 Fix Stinger Troopers receive damage from Flashbangs despite the Stinger Site not being selectable as target by Flashbang-Rangers.
PropagateDamageTypesToSlavesWhenExisting = NONE +SMALL_ARMS +SNIPER +POISON +RADIATION
SwallowDamageTypesIfSlavesNotExisting = NONE +SNIPER +POISON; Take no damage if no one to pass this to

; Subdual damage "Subdues" you (reaction defined by BodyModule) when it passes your max health.
; The cap limits how extra-subdued you can be, and the other numbers detemine how fast it drains away on its own.
Expand Down
10 changes: 6 additions & 4 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/FactionBuilding.ini
Original file line number Diff line number Diff line change
Expand Up @@ -17158,8 +17158,9 @@ Object GLAStingerSite
InitialHealth = 1000.0
;**Careful with these damage types -- because area damage types will already
;**damage slaves.
PropagateDamageTypesToSlavesWhenExisting = NONE +SMALL_ARMS +SNIPER +POISON +RADIATION +SURRENDER +MICROWAVE
SwallowDamageTypesIfSlavesNotExisting = NONE +SNIPER +POISON +SURRENDER; Take no damage if no one to pass this to
; Patch104p @bugfix commy2 01/01/2022 Fix Stinger Troopers receive damage from Flashbangs despite the Stinger Site not being selectable as target by Flashbang-Rangers.
PropagateDamageTypesToSlavesWhenExisting = NONE +SMALL_ARMS +SNIPER +POISON +RADIATION +MICROWAVE
SwallowDamageTypesIfSlavesNotExisting = NONE +SNIPER +POISON; Take no damage if no one to pass this to

; Subdual damage "Subdues" you (reaction defined by BodyModule) when it passes your max health.
; The cap limits how extra-subdued you can be, and the other numbers detemine how fast it drains away on its own.
Expand Down Expand Up @@ -33429,8 +33430,9 @@ Object GLAStingerSiteNoHole
InitialHealth = 1000.0
;**Careful with these damage types -- because area damage types will already
;**damage slaves.
PropagateDamageTypesToSlavesWhenExisting = NONE +SMALL_ARMS +SNIPER +POISON +RADIATION +SURRENDER
SwallowDamageTypesIfSlavesNotExisting = NONE +SNIPER +POISON +SURRENDER; Take no damage if no one to pass this to
; Patch104p @bugfix commy2 01/01/2022 Fix Stinger Troopers receive damage from Flashbangs despite the Stinger Site not being selectable as target by Flashbang-Rangers.
PropagateDamageTypesToSlavesWhenExisting = NONE +SMALL_ARMS +SNIPER +POISON +RADIATION
SwallowDamageTypesIfSlavesNotExisting = NONE +SNIPER +POISON; Take no damage if no one to pass this to

; Subdual damage "Subdues" you (reaction defined by BodyModule) when it passes your max health.
; The cap limits how extra-subdued you can be, and the other numbers detemine how fast it drains away on its own.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -957,8 +957,9 @@ Object GC_Chem_GLAStingerSite
InitialHealth = 1000.0
;**Careful with these damage types -- because area damage types will already
;**damage slaves.
PropagateDamageTypesToSlavesWhenExisting = NONE +SMALL_ARMS +SNIPER +POISON +RADIATION +SURRENDER
SwallowDamageTypesIfSlavesNotExisting = NONE +SNIPER +POISON +SURRENDER; Take no damage if no one to pass this to
; Patch104p @bugfix commy2 01/01/2022 Fix Stinger Troopers receive damage from Flashbangs despite the Stinger Site not being selectable as target by Flashbang-Rangers.
PropagateDamageTypesToSlavesWhenExisting = NONE +SMALL_ARMS +SNIPER +POISON +RADIATION
SwallowDamageTypesIfSlavesNotExisting = NONE +SNIPER +POISON; Take no damage if no one to pass this to

; Subdual damage "Subdues" you (reaction defined by BodyModule) when it passes your max health.
; The cap limits how extra-subdued you can be, and the other numbers detemine how fast it drains away on its own.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2709,8 +2709,9 @@ Object GC_Slth_GLAStingerSite
InitialHealth = 1000.0
;**Careful with these damage types -- because area damage types will already
;**damage slaves.
PropagateDamageTypesToSlavesWhenExisting = NONE +SMALL_ARMS +SNIPER +POISON +RADIATION +SURRENDER
SwallowDamageTypesIfSlavesNotExisting = NONE +SNIPER +POISON +SURRENDER; Take no damage if no one to pass this to
; Patch104p @bugfix commy2 01/01/2022 Fix Stinger Troopers receive damage from Flashbangs despite the Stinger Site not being selectable as target by Flashbang-Rangers.
PropagateDamageTypesToSlavesWhenExisting = NONE +SMALL_ARMS +SNIPER +POISON +RADIATION
SwallowDamageTypesIfSlavesNotExisting = NONE +SNIPER +POISON; Take no damage if no one to pass this to

; Subdual damage "Subdues" you (reaction defined by BodyModule) when it passes your max health.
; The cap limits how extra-subdued you can be, and the other numbers detemine how fast it drains away on its own.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6654,8 +6654,9 @@ Object Slth_GLAStingerSite
InitialHealth = 1000.0
;**Careful with these damage types -- because area damage types will already
;**damage slaves.
PropagateDamageTypesToSlavesWhenExisting = NONE +SMALL_ARMS +SNIPER +POISON +RADIATION +SURRENDER
SwallowDamageTypesIfSlavesNotExisting = NONE +SNIPER +POISON +SURRENDER; Take no damage if no one to pass this to
; Patch104p @bugfix commy2 01/01/2022 Fix Stinger Troopers receive damage from Flashbangs despite the Stinger Site not being selectable as target by Flashbang-Rangers.
PropagateDamageTypesToSlavesWhenExisting = NONE +SMALL_ARMS +SNIPER +POISON +RADIATION
SwallowDamageTypesIfSlavesNotExisting = NONE +SNIPER +POISON; Take no damage if no one to pass this to

; Subdual damage "Subdues" you (reaction defined by BodyModule) when it passes your max health.
; The cap limits how extra-subdued you can be, and the other numbers detemine how fast it drains away on its own.
Expand Down