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: Cash Bounty Granted By Command Center Scaffold, Method 2 #595

Merged
merged 2 commits into from
Dec 24, 2021
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
15 changes: 4 additions & 11 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/BossGeneral.ini
Original file line number Diff line number Diff line change
Expand Up @@ -1354,17 +1354,10 @@ Object Boss_CommandCenter
ReferenceObject = GLASneakAttackTunnelNetwork ;So we know what the final product is for script placement calculations
End

Behavior = CashBountyPower ModuleTag_96
SpecialPowerTemplate = SpecialAbilityCashBounty1
Bounty = 5%
End
Behavior = CashBountyPower ModuleTag_97
SpecialPowerTemplate = SpecialAbilityCashBounty2
Bounty = 10%
End
Behavior = CashBountyPower ModuleTag_98
SpecialPowerTemplate = SpecialAbilityCashBounty3
Bounty = 20%
; Patch104p @bugfix commy2 24/10/2021 Fix Command Center scaffold unlocks Cash Bounty.

Behavior = FireWeaponUpdate ModuleTag_15
Weapon = CashBountyDummyWeapon
End

Behavior = FlammableUpdate ModuleTag_23
Expand Down
14 changes: 3 additions & 11 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/ChemicalGeneral.ini
Original file line number Diff line number Diff line change
Expand Up @@ -991,18 +991,10 @@ Object Chem_GLACommandCenter
CreateLocation = CREATE_AT_LOCATION
End

; Patch104p @bugfix commy2 24/10/2021 Fix Command Center scaffold unlocks Cash Bounty.

Behavior = CashBountyPower ModuleTag_15
SpecialPowerTemplate = SpecialAbilityCashBounty1
Bounty = 5%
End
Behavior = CashBountyPower ModuleTag_16
SpecialPowerTemplate = SpecialAbilityCashBounty2
Bounty = 10%
End
Behavior = CashBountyPower ModuleTag_17
SpecialPowerTemplate = SpecialAbilityCashBounty3
Bounty = 20%
Behavior = FireWeaponUpdate ModuleTag_15
Weapon = CashBountyDummyWeapon
End

Behavior = FlammableUpdate ModuleTag_19
Expand Down
14 changes: 3 additions & 11 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/DemoGeneral.ini
Original file line number Diff line number Diff line change
Expand Up @@ -1127,18 +1127,10 @@ Object Demo_GLACommandCenter
CreateLocation = CREATE_AT_LOCATION
End

; Patch104p @bugfix commy2 24/10/2021 Fix Command Center scaffold unlocks Cash Bounty.

Behavior = CashBountyPower ModuleTag_15
SpecialPowerTemplate = SpecialAbilityCashBounty1
Bounty = 5%
End
Behavior = CashBountyPower ModuleTag_16
SpecialPowerTemplate = SpecialAbilityCashBounty2
Bounty = 10%
End
Behavior = CashBountyPower ModuleTag_17
SpecialPowerTemplate = SpecialAbilityCashBounty3
Bounty = 20%
Behavior = FireWeaponUpdate ModuleTag_15
Weapon = CashBountyDummyWeapon
End

Behavior = FlammableUpdate ModuleTag_19
Expand Down
14 changes: 3 additions & 11 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/FactionBuilding.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2169,18 +2169,10 @@ Object GLACommandCenter
CreateLocation = CREATE_AT_LOCATION
End

; Patch104p @bugfix commy2 24/10/2021 Fix Command Center scaffold unlocks Cash Bounty.

Behavior = CashBountyPower ModuleTag_15
SpecialPowerTemplate = SpecialAbilityCashBounty1
Bounty = 5%
End
Behavior = CashBountyPower ModuleTag_16
SpecialPowerTemplate = SpecialAbilityCashBounty2
Bounty = 10%
End
Behavior = CashBountyPower ModuleTag_17
SpecialPowerTemplate = SpecialAbilityCashBounty3
Bounty = 20%
Behavior = FireWeaponUpdate ModuleTag_15
Weapon = CashBountyDummyWeapon
End

Behavior = FlammableUpdate ModuleTag_19
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1899,17 +1899,10 @@ Object GC_Chem_GLACommandCenter
CreateLocation = CREATE_AT_LOCATION
End

Behavior = CashBountyPower ModuleTag_15
SpecialPowerTemplate = SpecialAbilityCashBounty1
Bounty = 5%
End
Behavior = CashBountyPower ModuleTag_16
SpecialPowerTemplate = SpecialAbilityCashBounty2
Bounty = 10%
End
Behavior = CashBountyPower ModuleTag_17
SpecialPowerTemplate = SpecialAbilityCashBounty3
Bounty = 20%
; Patch104p @bugfix commy2 24/10/2021 Fix Command Center scaffold unlocks Cash Bounty.

Behavior = FireWeaponUpdate ModuleTag_15
Weapon = CashBountyDummyWeapon
End

Behavior = FlammableUpdate ModuleTag_19
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -693,18 +693,10 @@ Object GC_Slth_GLACommandCenter
CreateLocation = CREATE_AT_LOCATION
End

; Patch104p @bugfix commy2 24/10/2021 Fix Command Center scaffold unlocks Cash Bounty.

Behavior = CashBountyPower ModuleTag_15
SpecialPowerTemplate = SpecialAbilityCashBounty1
Bounty = 5%
End
Behavior = CashBountyPower ModuleTag_16
SpecialPowerTemplate = SpecialAbilityCashBounty2
Bounty = 10%
End
Behavior = CashBountyPower ModuleTag_17
SpecialPowerTemplate = SpecialAbilityCashBounty3
Bounty = 20%
Behavior = FireWeaponUpdate ModuleTag_15
Weapon = CashBountyDummyWeapon
End

Behavior = FlammableUpdate ModuleTag_19
Expand Down
14 changes: 3 additions & 11 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/StealthGeneral.ini
Original file line number Diff line number Diff line change
Expand Up @@ -993,18 +993,10 @@ Object Slth_GLACommandCenter
CreateLocation = CREATE_AT_LOCATION
End

; Patch104p @bugfix commy2 24/10/2021 Fix Command Center scaffold unlocks Cash Bounty.

Behavior = CashBountyPower ModuleTag_15
SpecialPowerTemplate = SpecialAbilityCashBounty1
Bounty = 5%
End
Behavior = CashBountyPower ModuleTag_16
SpecialPowerTemplate = SpecialAbilityCashBounty2
Bounty = 10%
End
Behavior = CashBountyPower ModuleTag_17
SpecialPowerTemplate = SpecialAbilityCashBounty3
Bounty = 20%
Behavior = FireWeaponUpdate ModuleTag_15
Weapon = CashBountyDummyWeapon
End

Behavior = FlammableUpdate ModuleTag_19
Expand Down
34 changes: 34 additions & 0 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/System.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2878,3 +2878,37 @@ Object DummyWeaponProjectile
GeometryMajorRadius = 2.0

End

; Patch104p @bugfix commy2 24/10/2021 Logic that grants player Cash Bounty.

;------------------------------------------------------------------------------
Object CashBountyDummy

; ***DESIGN parameters ***
EditorSorting = SYSTEM
KindOf = NO_COLLIDE IMMOBILE UNATTACKABLE INERT

; *** ENGINEERING Parameters ***
Body = HighlanderBody ModuleTag_01
MaxHealth = 1.0
InitialHealth = 1.0
End

Behavior = LifetimeUpdate ModuleTag_02
MinLifetime = 250 ; min lifetime in msec
MaxLifetime = 250 ; max lifetime in msec
End

Behavior = CashBountyPower ModuleTag_15
SpecialPowerTemplate = SpecialAbilityCashBounty1
Bounty = 5%
End
Behavior = CashBountyPower ModuleTag_16
SpecialPowerTemplate = SpecialAbilityCashBounty2
Bounty = 10%
End
Behavior = CashBountyPower ModuleTag_17
SpecialPowerTemplate = SpecialAbilityCashBounty3
Bounty = 20%
End
End
7 changes: 7 additions & 0 deletions Patch104pZH/GameFilesEdited/Data/INI/ObjectCreationList.ini
Original file line number Diff line number Diff line change
Expand Up @@ -9155,3 +9155,10 @@ ObjectCreationList Demo_OCL_BattleBusDeathWeaponDummySuicide
Disposition = LIKE_EXISTING
End
End

; -----------------------------------------------------------------------------
ObjectCreationList OCL_CashBountyDummy
CreateObject
ObjectNames = CashBountyDummy
End
End
8 changes: 8 additions & 0 deletions Patch104pZH/GameFilesEdited/Data/INI/Weapon.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8637,3 +8637,11 @@ Weapon Demo_ScudStormDeathWeapon
AntiGround = Yes
DamageDealtAtSelfPosition = Yes
End

; Patch104p @bugfix commy2 24/10/2021 Spawns temporary object with cash bounty logic over and over.

;------------------------------------------------------------------------------
Weapon CashBountyDummyWeapon
DelayBetweenShots = 250 ; time between shots, msec
commy2 marked this conversation as resolved.
Show resolved Hide resolved
FireOCL = OCL_CashBountyDummy
End