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: Demo General Combat Bike With Demolitions Upgrade Deals No Damage When Destroyed By Gamma Poison #104

Merged
merged 4 commits into from
Sep 10, 2021
Merged

Fix: Demo General Combat Bike With Demolitions Upgrade Deals No Damage When Destroyed By Gamma Poison #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cdbead4
Fix: Demo General Combat Bike With Demolitions Upgrade Deals No Damag…
commy2 Aug 28, 2021
706327b
Fix Typo In Comment
commy2 Sep 4, 2021
71612cf
Merge branch 'main' into fix-demo-bike-gamma-poison-death
commy2 Sep 7, 2021
4e5359e
Merge branch 'main' into fix-demo-bike-gamma-poison-death
commy2 Sep 10, 2021
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 @@ -87,7 +87,7 @@ https://github.com/commy2/zerohour/issues/135 [IMPROVEMENT][NPROJECT] Tunnel And
https://github.com/commy2/zerohour/issues/134 [IMPROVEMENT][NPROJECT] Air Force Carpet Bomber Tooltip Claims 2:30 Cooldown Instead Of True 4:00
https://github.com/commy2/zerohour/issues/133 [MAYBE][NPROJECT] Fire Base Command Button Order Misaligned With Other Buildings
https://github.com/commy2/zerohour/issues/132 [MAYBE][NPROJECT] Raptor Guard Air Button Misplaced
https://github.com/commy2/zerohour/issues/131 [IMPROVEMENT][NPROJECT] Demo General Combat Bike With Demolitions Upgrade Deals No Damage When Destroyed By Gamma Poison
https://github.com/commy2/zerohour/issues/131 [DONE][NPROJECT] Demo General Combat Bike With Demolitions Upgrade Deals No Damage When Destroyed By Gamma Poison
https://github.com/commy2/zerohour/issues/130 [DONE][NPROJECT] Demo Combat Bike Uses Portrait As Button
https://github.com/commy2/zerohour/issues/129 [MAYBE][NPROJECT] Selling Air Force Supply Center Does Refund Less Than Half Of Build Value
https://github.com/commy2/zerohour/issues/128 [IMPROVEMENT][NPROJECT] Repair And Reinforcement Pads Reward XP When Killed
Expand Down
9 changes: 6 additions & 3 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/DemoGeneral.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17907,6 +17907,9 @@ Object Demo_GLAVehicleCombatBike
; FlingPitchVariance = 10
; End

; Patch104p @bugfix commy2 29/08/2021 Fix poison death not firing expected death weapons.
; This made Bike deal no damage when killed by Anthrax Gamma poison.

;Terrorist without suicide bomb upgrade
Behavior = FireWeaponWhenDeadBehavior ModuleTag_Death18
RequiredStatus = STATUS_RIDER5
Expand All @@ -17923,7 +17926,7 @@ Object Demo_GLAVehicleCombatBike
StartsActive = No
TriggeredBy = Demo_Upgrade_SuicideBomb
RequiresAllTriggers = Yes;
DeathTypes = ALL -SUICIDED -POISONED -POISONED_BETA -POISONED_GAMMA
DeathTypes = ALL -SUICIDED
End;

;Non-terrorist with suicide bomb upgrade (no fire)
Expand All @@ -17943,7 +17946,7 @@ Object Demo_GLAVehicleCombatBike
StartsActive = No
TriggeredBy = Demo_Upgrade_SuicideBomb
RequiresAllTriggers = Yes;
DeathTypes = ALL -SUICIDED -POISONED -POISONED_BETA -POISONED_GAMMA
DeathTypes = ALL -SUICIDED
End;

;Terrorist with suicide bomb upgrade (no fire)
Expand All @@ -17953,7 +17956,7 @@ Object Demo_GLAVehicleCombatBike
StartsActive = No
TriggeredBy = Demo_Upgrade_SuicideBomb
RequiresAllTriggers = Yes;
DeathTypes = NONE +SUICIDED +POISONED +POISONED_BETA
DeathTypes = NONE +SUICIDED
End;

Behavior = CommandSetUpgrade ModuleTag_23
Expand Down