Merge pull request #42 from alanblack166/main

Updated 3 factions with building scaffold fixes
TheSuperHackers · Aug 25, 2021 · 986ea22 · 986ea22
2 parents 23c1c3f + c13287f
commit 986ea22
Show file tree

Hide file tree

Showing 3 changed files with 395 additions and 19 deletions.
diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/AirforceGeneral.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/AirforceGeneral.ini
@@ -8499,7 +8499,14 @@ Object AirF_AmericaCommandCenter
   BuildCost             = 2000
   BuildTime             = 45.0           ; in seconds
   EnergyProduction      = 0   ;Command Center should be free
-  CommandSet            = AirF_AmericaCommandCenterCommandSet
+
+  ; @bugfix - hanfield
+  ; Changed CommandSet to EmptyCommandSet to make in-progress buildings not have a commandset.
+  ; This prevents building units from scaffolds.
+  ; 25/08/2021
+
+  CommandSet          = EmptyCommandSet
+
   VisionRange           = 300.0           ; Shroud clearing distance
   ShroudClearingRange   = 300
   ArmorSet
@@ -8699,6 +8706,20 @@ Object AirF_AmericaCommandCenter
     TriggeredBy = Upgrade_AmericaMOAB
   End
 
+  ; @bugfix - hanfield
+  ; These modules will grant the building its intended commandset once construction is complete.
+  ; 25/08/2021
+
+  Behavior = GrantUpgradeCreate ModuleTag_ScaffoldBuildFix1
+    UpgradeToGrant = Upgrade_DummyUpgrade
+    ExemptStatus = UNDER_CONSTRUCTION
+  End
+
+  Behavior = CommandSetUpgrade ModuleTag_ScaffoldBuildFix2
+    TriggeredBy = Upgrade_DummyUpgrade
+    CommandSet = AirF_AmericaCommandCenterCommandSet
+  End
+
   Geometry            = BOX
   GeometryMajorRadius = 60.0
   GeometryMinorRadius = 70.0
@@ -11843,7 +11864,14 @@ Object AirF_AmericaStrategyCenter
   Prerequisites
     Object = AirF_AmericaWarFactory AirF_AmericaAirfield
   End
-  CommandSet          = AirF_AmericaStrategyCenterCommandSet
+
+  ; @bugfix - hanfield
+  ; Changed CommandSet to EmptyCommandSet to make in-progress buildings not have a commandset.
+  ; This prevents building units from scaffolds.
+  ; 25/08/2021
+
+  CommandSet          = EmptyCommandSet
+
   BuildCost           = 2500
   BuildTime           = 60.0           ; in seconds
   EnergyProduction    = -2
@@ -12022,6 +12050,19 @@ Object AirF_AmericaStrategyCenter
     CreateLocation       = CREATE_AT_EDGE_NEAR_SOURCE
   End 
 
+  ; @bugfix - hanfield
+  ; These modules will grant the building its intended commandset once construction is complete.
+  ; 25/08/2021
+
+  Behavior = GrantUpgradeCreate ModuleTag_ScaffoldBuildFix1
+    UpgradeToGrant = Upgrade_DummyUpgrade
+    ExemptStatus = UNDER_CONSTRUCTION
+  End
+
+  Behavior = CommandSetUpgrade ModuleTag_ScaffoldBuildFix2
+    TriggeredBy = Upgrade_DummyUpgrade
+    CommandSet = AirF_AmericaStrategyCenterCommandSet
+  End
 
   Geometry            = BOX
   GeometryMajorRadius = 62.0
@@ -13139,7 +13180,14 @@ Object AirF_AmericaAirfield
   BuildCost           = 800
   BuildTime           = 30.0           ; in seconds
   EnergyProduction    = -1
-  CommandSet          = AirF_AmericaAirfieldCommandSet
+
+  ; @bugfix - hanfield
+  ; Changed CommandSet to EmptyCommandSet to make in-progress buildings not have a commandset.
+  ; This prevents building units from scaffolds.
+  ; 25/08/2021
+
+  CommandSet          = EmptyCommandSet
+
   VisionRange         = 200.0           ; Shroud clearing distance
   ShroudClearingRange = 200
   ArmorSet
@@ -13220,6 +13268,20 @@ Object AirF_AmericaAirfield
     ReallyDamagedParticleSystem3 = Bone:None RandomBone:No PSys:StructureTransitionMediumShockwave
   End
 
+  ; @bugfix - hanfield
+  ; These modules will grant the building its intended commandset once construction is complete.
+  ; 25/08/2021
+
+  Behavior = GrantUpgradeCreate ModuleTag_ScaffoldBuildFix1
+    UpgradeToGrant = Upgrade_DummyUpgrade
+    ExemptStatus = UNDER_CONSTRUCTION
+  End
+
+  Behavior = CommandSetUpgrade ModuleTag_ScaffoldBuildFix2
+    TriggeredBy = Upgrade_DummyUpgrade
+    CommandSet = AirF_AmericaAirfieldCommandSet
+  End
+
   Geometry            = BOX
   GeometryMajorRadius = 112.0
   GeometryMinorRadius = 74.0
@@ -13955,7 +14017,14 @@ Object AirF_AmericaSupplyCenter
   RefundValue      = 400 ; With nothing (or zero) listed, we sell for half price. 
   BuildTime        = 10.0           ; in seconds
   EnergyProduction = -1
-  CommandSet       = AirF_AmericaSupplyCenterCommandSet
+
+  ; @bugfix - hanfield
+  ; Changed CommandSet to EmptyCommandSet to make in-progress buildings not have a commandset.
+  ; This prevents building units from scaffolds.
+  ; 25/08/2021
+
+  CommandSet          = EmptyCommandSet
+
   VisionRange      = 200.0           ; Shroud clearing distance
   ShroudClearingRange = 200
   ArmorSet
@@ -14041,7 +14110,21 @@ Object AirF_AmericaSupplyCenter
     ReallyDamagedParticleSystem2 = Bone:None RandomBone:No PSys:StructureTransitionSmallExplosion
     ReallyDamagedParticleSystem3 = Bone:None RandomBone:No PSys:StructureTransitionSmallShockwave
   End
-
+
+  ; @bugfix - hanfield
+  ; These modules will grant the building its intended commandset once construction is complete.
+  ; 25/08/2021
+
+  Behavior = GrantUpgradeCreate ModuleTag_ScaffoldBuildFix1
+    UpgradeToGrant = Upgrade_DummyUpgrade
+    ExemptStatus = UNDER_CONSTRUCTION
+  End
+
+  Behavior = CommandSetUpgrade ModuleTag_ScaffoldBuildFix2
+    TriggeredBy = Upgrade_DummyUpgrade
+    CommandSet = AirF_AmericaSupplyCenterCommandSet
+  End
+
   Geometry            = BOX
   GeometryMajorRadius = 44.0
   GeometryMinorRadius = 45.0
@@ -15177,7 +15260,14 @@ Object AirF_AmericaBarracks
   BuildCost           = 600
   BuildTime           = 10.0           ; in seconds
   EnergyProduction    = 0
-  CommandSet          = AirF_AmericaBarracksCommandSet
+
+  ; @bugfix - hanfield
+  ; Changed CommandSet to EmptyCommandSet to make in-progress buildings not have a commandset.
+  ; This prevents building units from scaffolds.
+  ; 25/08/2021
+
+  CommandSet          = EmptyCommandSet
+
   VisionRange         = 200.0           ; Shroud clearing distance
   ShroudClearingRange = 200
   ArmorSet
@@ -15260,6 +15350,20 @@ Object AirF_AmericaBarracks
     ReallyDamagedParticleSystem3 = Bone:None RandomBone:No PSys:StructureTransitionMediumShockwave
   End
 
+  ; @bugfix - hanfield
+  ; These modules will grant the building its intended commandset once construction is complete.
+  ; 25/08/2021
+
+  Behavior = GrantUpgradeCreate ModuleTag_ScaffoldBuildFix1
+    UpgradeToGrant = Upgrade_DummyUpgrade
+    ExemptStatus = UNDER_CONSTRUCTION
+  End
+
+  Behavior = CommandSetUpgrade ModuleTag_ScaffoldBuildFix2
+    TriggeredBy = Upgrade_DummyUpgrade
+    CommandSet = AirF_AmericaBarracksCommandSet
+  End
+
   Geometry             = BOX
   GeometryMajorRadius  = 55.0
   GeometryMinorRadius  = 45.0
@@ -16159,7 +16263,14 @@ Object AirF_AmericaWarFactory
   BuildTime        = 15.0           ; in seconds
 
   EnergyProduction = -1
-  CommandSet       = AirF_AmericaWarFactoryCommandSet
+
+  ; @bugfix - hanfield
+  ; Changed CommandSet to EmptyCommandSet to make in-progress buildings not have a commandset.
+  ; This prevents building units from scaffolds.
+  ; 25/08/2021
+
+  CommandSet          = EmptyCommandSet
+
   VisionRange     = 200.0           ; Shroud clearing distance
   ShroudClearingRange = 200
   ArmorSet
@@ -16249,6 +16360,20 @@ Object AirF_AmericaWarFactory
     ;nothing
   End
 
+  ; @bugfix - hanfield
+  ; These modules will grant the building its intended commandset once construction is complete.
+  ; 25/08/2021
+
+  Behavior = GrantUpgradeCreate ModuleTag_ScaffoldBuildFix1
+    UpgradeToGrant = Upgrade_DummyUpgrade
+    ExemptStatus = UNDER_CONSTRUCTION
+  End
+
+  Behavior = CommandSetUpgrade ModuleTag_ScaffoldBuildFix2
+    TriggeredBy = Upgrade_DummyUpgrade
+    CommandSet = AirF_AmericaWarFactoryCommandSet
+  End
+
   Geometry            = BOX
   GeometryMajorRadius = 53.0
   GeometryMinorRadius = 60.0