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 Cannot Target Stinger Sites #297

Merged
merged 7 commits into from
Jul 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
21 changes: 21 additions & 0 deletions Patch104pZH/Design/Changes/v1.0/297_stinger_flashbang_attack.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
---
date: 2023-07-16

title: Fixes issue where Rangers equipped with Flashbang grenades could not be ordered to target Stinger Sites

changes:
- fix: Attack cursor no longer disappears when attempting to target a Stinger Site with Flashbang Rangers

labels:
- bug
- controversial
- gla
- minor
- usa
- v1.0

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

authors:
- commy2
21 changes: 0 additions & 21 deletions Patch104pZH/Design/Changes/v1.0/636_stinger_flashbang_damage.yaml

This file was deleted.

7 changes: 6 additions & 1 deletion Patch104pZH/GameFilesEdited/Data/INI/Armor.ini
Original file line number Diff line number Diff line change
Expand Up @@ -747,6 +747,11 @@ Armor BaseDefenseArmor ;used for anti-air base defenses. Vulnerable
Armor = SUBDUAL_BUILDING 100%
End

; Patch104p @bugfix commy2 16/07/2023 Fix Flashbang Rangers not being able to target Stinger Sites. (#297)
; Note that damage is not dealt to the structure, because SwallowDamageTypesIfSlavesNotExisting now
; includes the SURRENDER damage type. This only affects targeting. Stinger Troopers were already
; vulnerable to Flashbangs, but the Ranger would only target the Stinger Troopers when idle.

Armor StingerSiteArmor ;used for anti-air base defenses. Vulnerable to steatlh-fighter strikes.
Armor = DEFAULT 100% ; this sets the level for all nonspecified damage types
Armor = SMALL_ARMS 50%
Expand All @@ -756,7 +761,7 @@ Armor StingerSiteArmor ;used for anti-air base defenses. Vulnerable to steatlh
Armor = MICROWAVE 0% ;Patch104p @bugfix commy2 15/08/2022 Fix hit effect on Stinger Site with nearby Microwave tank.
Armor = SNIPER 100% ;***This is required for snipers to be able to attack and kill stinger soldiers! Must be > 0! (Value irrelevant since the soldiers will use their % to modify the damage)
Armor = POISON 100% ; Similarly, this lets the toxin tractor attack to kill the soldiers
Armor = SURRENDER 0% ;And this is for Flashbangs
Armor = SURRENDER 100% ;And this is for Flashbangs
Armor = MELEE 0%
Armor = LASER 0% ;lasers are anti-personel and anti-projectile only (for point defense laser)
Armor = HAZARD_CLEANUP 0% ;Not harmed by cleaning weapons
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6382,10 +6382,10 @@ Object Chem_GLAStingerSite
InitialHealth = 1000.0
;**Careful with these damage types -- because area damage types will already
;**damage slaves.
; 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.
; Patch104p @bugfix commy2 15/08/2022 Fix Stinger Site fail to forward microwave passive emitter damage to Stinger Troopers.
PropagateDamageTypesToSlavesWhenExisting = NONE +SMALL_ARMS +SNIPER +POISON +RADIATION +MICROWAVE
SwallowDamageTypesIfSlavesNotExisting = NONE +SNIPER +POISON; Take no damage if no one to pass this to
PropagateDamageTypesToSlavesWhenExisting = NONE +SMALL_ARMS +SNIPER +POISON +RADIATION +SURRENDER +MICROWAVE
; Patch104p @bugfix commy2 16/07/2023 Fix Flashbang Rangers not being able to target Stinger Sites. (#297)
SwallowDamageTypesIfSlavesNotExisting = NONE +SNIPER +POISON +SURRENDER; 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
6 changes: 3 additions & 3 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/DemoGeneral.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6269,10 +6269,10 @@ Object Demo_GLAStingerSite
InitialHealth = 1000.0
;**Careful with these damage types -- because area damage types will already
;**damage slaves.
; 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.
; Patch104p @bugfix commy2 15/08/2022 Fix Stinger Site fail to forward microwave passive emitter damage to Stinger Troopers.
PropagateDamageTypesToSlavesWhenExisting = NONE +SMALL_ARMS +SNIPER +POISON +RADIATION +MICROWAVE
SwallowDamageTypesIfSlavesNotExisting = NONE +SNIPER +POISON; Take no damage if no one to pass this to
PropagateDamageTypesToSlavesWhenExisting = NONE +SMALL_ARMS +SNIPER +POISON +RADIATION +SURRENDER +MICROWAVE
; Patch104p @bugfix commy2 16/07/2023 Fix Flashbang Rangers not being able to target Stinger Sites. (#297)
SwallowDamageTypesIfSlavesNotExisting = NONE +SNIPER +POISON +SURRENDER; 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
12 changes: 6 additions & 6 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/FactionBuilding.ini
Original file line number Diff line number Diff line change
Expand Up @@ -17412,9 +17412,9 @@ Object GLAStingerSite
InitialHealth = 1000.0
;**Careful with these damage types -- because area damage types will already
;**damage slaves.
; 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
PropagateDamageTypesToSlavesWhenExisting = NONE +SMALL_ARMS +SNIPER +POISON +RADIATION +SURRENDER +MICROWAVE
; Patch104p @bugfix commy2 16/07/2023 Fix Flashbang Rangers not being able to target Stinger Sites. (#297)
SwallowDamageTypesIfSlavesNotExisting = NONE +SNIPER +POISON +SURRENDER; 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 @@ -34592,10 +34592,10 @@ Object GLAStingerSiteNoHole
InitialHealth = 1000.0
;**Careful with these damage types -- because area damage types will already
;**damage slaves.
; 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.
; Patch104p @bugfix commy2 15/08/2022 Fix Stinger Site fail to forward microwave passive emitter damage to Stinger Troopers.
PropagateDamageTypesToSlavesWhenExisting = NONE +SMALL_ARMS +SNIPER +POISON +RADIATION +MICROWAVE
SwallowDamageTypesIfSlavesNotExisting = NONE +SNIPER +POISON; Take no damage if no one to pass this to
PropagateDamageTypesToSlavesWhenExisting = NONE +SMALL_ARMS +SNIPER +POISON +RADIATION +SURRENDER +MICROWAVE
; Patch104p @bugfix commy2 16/07/2023 Fix Flashbang Rangers not being able to target Stinger Sites. (#297)
SwallowDamageTypesIfSlavesNotExisting = NONE +SNIPER +POISON +SURRENDER; 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,10 +957,10 @@ Object GC_Chem_GLAStingerSite
InitialHealth = 1000.0
;**Careful with these damage types -- because area damage types will already
;**damage slaves.
; 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.
; Patch104p @bugfix commy2 15/08/2022 Fix Stinger Site fail to forward microwave passive emitter damage to Stinger Troopers.
PropagateDamageTypesToSlavesWhenExisting = NONE +SMALL_ARMS +SNIPER +POISON +RADIATION +MICROWAVE
SwallowDamageTypesIfSlavesNotExisting = NONE +SNIPER +POISON; Take no damage if no one to pass this to
PropagateDamageTypesToSlavesWhenExisting = NONE +SMALL_ARMS +SNIPER +POISON +RADIATION +SURRENDER +MICROWAVE
; Patch104p @bugfix commy2 16/07/2023 Fix Flashbang Rangers not being able to target Stinger Sites. (#297)
SwallowDamageTypesIfSlavesNotExisting = NONE +SNIPER +POISON +SURRENDER; 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 @@ -2933,10 +2933,10 @@ Object GC_Slth_GLAStingerSite
InitialHealth = 1000.0
;**Careful with these damage types -- because area damage types will already
;**damage slaves.
; 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.
; Patch104p @bugfix commy2 15/08/2022 Fix Stinger Site fail to forward microwave passive emitter damage to Stinger Troopers.
PropagateDamageTypesToSlavesWhenExisting = NONE +SMALL_ARMS +SNIPER +POISON +RADIATION +MICROWAVE
SwallowDamageTypesIfSlavesNotExisting = NONE +SNIPER +POISON; Take no damage if no one to pass this to
PropagateDamageTypesToSlavesWhenExisting = NONE +SMALL_ARMS +SNIPER +POISON +RADIATION +SURRENDER +MICROWAVE
; Patch104p @bugfix commy2 16/07/2023 Fix Flashbang Rangers not being able to target Stinger Sites. (#297)
SwallowDamageTypesIfSlavesNotExisting = NONE +SNIPER +POISON +SURRENDER; 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 @@ -6964,10 +6964,10 @@ Object Slth_GLAStingerSite
InitialHealth = 1000.0
;**Careful with these damage types -- because area damage types will already
;**damage slaves.
; 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.
; Patch104p @bugfix commy2 15/08/2022 Fix Stinger Site fail to forward microwave passive emitter damage to Stinger Troopers.
PropagateDamageTypesToSlavesWhenExisting = NONE +SMALL_ARMS +SNIPER +POISON +RADIATION +MICROWAVE
SwallowDamageTypesIfSlavesNotExisting = NONE +SNIPER +POISON; Take no damage if no one to pass this to
PropagateDamageTypesToSlavesWhenExisting = NONE +SMALL_ARMS +SNIPER +POISON +RADIATION +SURRENDER +MICROWAVE
; Patch104p @bugfix commy2 16/07/2023 Fix Flashbang Rangers not being able to target Stinger Sites. (#297)
SwallowDamageTypesIfSlavesNotExisting = NONE +SNIPER +POISON +SURRENDER; 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