diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/BossGeneral.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/BossGeneral.ini
index 27580e0e8..73fc07bc9 100644
--- a/Patch104pZH/GameFilesEdited/Data/INI/Object/BossGeneral.ini
+++ b/Patch104pZH/GameFilesEdited/Data/INI/Object/BossGeneral.ini
@@ -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
diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/ChemicalGeneral.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/ChemicalGeneral.ini
index dfdf476dc..9cc18afc9 100644
--- a/Patch104pZH/GameFilesEdited/Data/INI/Object/ChemicalGeneral.ini
+++ b/Patch104pZH/GameFilesEdited/Data/INI/Object/ChemicalGeneral.ini
@@ -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
diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/DemoGeneral.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/DemoGeneral.ini
index d6303367e..b81043f53 100644
--- a/Patch104pZH/GameFilesEdited/Data/INI/Object/DemoGeneral.ini
+++ b/Patch104pZH/GameFilesEdited/Data/INI/Object/DemoGeneral.ini
@@ -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
diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/FactionBuilding.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/FactionBuilding.ini
index 29ba4a1cd..75d1cf435 100644
--- a/Patch104pZH/GameFilesEdited/Data/INI/Object/FactionBuilding.ini
+++ b/Patch104pZH/GameFilesEdited/Data/INI/Object/FactionBuilding.ini
@@ -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
diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/GC_Chem_GLABuildings.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/GC_Chem_GLABuildings.ini
index e69674ace..60fa6b1d8 100644
--- a/Patch104pZH/GameFilesEdited/Data/INI/Object/GC_Chem_GLABuildings.ini
+++ b/Patch104pZH/GameFilesEdited/Data/INI/Object/GC_Chem_GLABuildings.ini
@@ -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
diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/GC_Slth_GLABuildings.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/GC_Slth_GLABuildings.ini
index b2f5e022a..2051595be 100644
--- a/Patch104pZH/GameFilesEdited/Data/INI/Object/GC_Slth_GLABuildings.ini
+++ b/Patch104pZH/GameFilesEdited/Data/INI/Object/GC_Slth_GLABuildings.ini
@@ -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
diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/StealthGeneral.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/StealthGeneral.ini
index 257d70e7a..2cfc8ff5c 100644
--- a/Patch104pZH/GameFilesEdited/Data/INI/Object/StealthGeneral.ini
+++ b/Patch104pZH/GameFilesEdited/Data/INI/Object/StealthGeneral.ini
@@ -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
diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/System.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/System.ini
index a98ac0731..416b009ab 100644
--- a/Patch104pZH/GameFilesEdited/Data/INI/Object/System.ini
+++ b/Patch104pZH/GameFilesEdited/Data/INI/Object/System.ini
@@ -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
diff --git a/Patch104pZH/GameFilesEdited/Data/INI/ObjectCreationList.ini b/Patch104pZH/GameFilesEdited/Data/INI/ObjectCreationList.ini
index ca1e46f06..42a7ce352 100644
--- a/Patch104pZH/GameFilesEdited/Data/INI/ObjectCreationList.ini
+++ b/Patch104pZH/GameFilesEdited/Data/INI/ObjectCreationList.ini
@@ -9155,3 +9155,10 @@ ObjectCreationList Demo_OCL_BattleBusDeathWeaponDummySuicide
     Disposition = LIKE_EXISTING
   End
 End
+
+; -----------------------------------------------------------------------------
+ObjectCreationList OCL_CashBountyDummy
+  CreateObject
+    ObjectNames = CashBountyDummy
+  End
+End
diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Weapon.ini b/Patch104pZH/GameFilesEdited/Data/INI/Weapon.ini
index 2576e6863..a373acf95 100644
--- a/Patch104pZH/GameFilesEdited/Data/INI/Weapon.ini
+++ b/Patch104pZH/GameFilesEdited/Data/INI/Weapon.ini
@@ -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
+  FireOCL = OCL_CashBountyDummy
+End