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

Revert all Scaffold CommandSet Upgrade changes #282

Merged
merged 14 commits into from
Sep 11, 2021
Merged

Revert all Scaffold CommandSet Upgrade changes #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e233f63
Revert #65
xezon Sep 10, 2021
5d7e7bd
Revert #63
xezon Sep 10, 2021
98d1c3b
Revert #50
xezon Sep 10, 2021
b1d60e2
Revert #47
xezon Sep 10, 2021
2a346c8
Revert #44
xezon Sep 10, 2021
319a87f
Revert #42
xezon Sep 10, 2021
ba3bb75
Revert #32
xezon Sep 10, 2021
1657606
Revert #14
xezon Sep 10, 2021
d9ced40
Revert #11
xezon Sep 10, 2021
cadcbf9
Fix: Demo General Combat Bike With Demolitions Upgrade Deals No Damag…
commy2 Sep 10, 2021
82d1943
Fix: Dummy Weapons Cause Notifications And Hit Effects (#279)
commy2 Sep 10, 2021
371e65c
Merge branch 'main' into revert-scaffold-fix3
xezon Sep 10, 2021
1102c47
Merge branch 'main' into revert-scaffold-fix3
xezon Sep 10, 2021
7f79fbe
Merge branch 'revert-scaffold-fix3' of github.com:xezon/GeneralsGameP…
xezon 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
145 changes: 7 additions & 138 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/AirforceGeneral.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8511,14 +8511,7 @@ Object AirF_AmericaCommandCenter
BuildCost = 2000
BuildTime = 45.0 ; in seconds
EnergyProduction = 0 ;Command Center should be free

; @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

CommandSet = AirF_AmericaCommandCenterCommandSet
VisionRange = 300.0 ; Shroud clearing distance
ShroudClearingRange = 300
ArmorSet
Expand Down Expand Up @@ -8718,21 +8711,6 @@ 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 Upgrade_GlobalDummyUpgrade
RequiresAllTriggers = Yes
CommandSet = AirF_AmericaCommandCenterCommandSet
End

Geometry = BOX
GeometryMajorRadius = 60.0
GeometryMinorRadius = 70.0
Expand Down Expand Up @@ -11877,14 +11855,7 @@ Object AirF_AmericaStrategyCenter
Prerequisites
Object = AirF_AmericaWarFactory AirF_AmericaAirfield
End

; @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

CommandSet = AirF_AmericaStrategyCenterCommandSet
BuildCost = 2500
BuildTime = 60.0 ; in seconds
EnergyProduction = -2
Expand Down Expand Up @@ -12063,20 +12034,6 @@ 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 Upgrade_GlobalDummyUpgrade
RequiresAllTriggers = Yes
CommandSet = AirF_AmericaStrategyCenterCommandSet
End

Geometry = BOX
GeometryMajorRadius = 62.0
Expand Down Expand Up @@ -13194,14 +13151,7 @@ Object AirF_AmericaAirfield
BuildCost = 800
BuildTime = 30.0 ; in seconds
EnergyProduction = -1

; @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

CommandSet = AirF_AmericaAirfieldCommandSet
VisionRange = 200.0 ; Shroud clearing distance
ShroudClearingRange = 200
ArmorSet
Expand Down Expand Up @@ -13282,21 +13232,6 @@ 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 Upgrade_GlobalDummyUpgrade
RequiresAllTriggers = Yes
CommandSet = AirF_AmericaAirfieldCommandSet
End

Geometry = BOX
GeometryMajorRadius = 112.0
GeometryMinorRadius = 74.0
Expand Down Expand Up @@ -14032,14 +13967,7 @@ Object AirF_AmericaSupplyCenter
RefundValue = 400 ; With nothing (or zero) listed, we sell for half price.
BuildTime = 10.0 ; in seconds
EnergyProduction = -1

; @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

CommandSet = AirF_AmericaSupplyCenterCommandSet
VisionRange = 200.0 ; Shroud clearing distance
ShroudClearingRange = 200
ArmorSet
Expand Down Expand Up @@ -14125,22 +14053,7 @@ 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 Upgrade_GlobalDummyUpgrade
RequiresAllTriggers = Yes
CommandSet = AirF_AmericaSupplyCenterCommandSet
End


Geometry = BOX
GeometryMajorRadius = 44.0
GeometryMinorRadius = 45.0
Expand Down Expand Up @@ -15276,14 +15189,7 @@ Object AirF_AmericaBarracks
BuildCost = 600
BuildTime = 10.0 ; in seconds
EnergyProduction = 0

; @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

CommandSet = AirF_AmericaBarracksCommandSet
VisionRange = 200.0 ; Shroud clearing distance
ShroudClearingRange = 200
ArmorSet
Expand Down Expand Up @@ -15366,21 +15272,6 @@ 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 Upgrade_GlobalDummyUpgrade
RequiresAllTriggers = Yes
CommandSet = AirF_AmericaBarracksCommandSet
End

Geometry = BOX
GeometryMajorRadius = 55.0
GeometryMinorRadius = 45.0
Expand Down Expand Up @@ -16280,14 +16171,7 @@ Object AirF_AmericaWarFactory
BuildTime = 15.0 ; in seconds

EnergyProduction = -1

; @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

CommandSet = AirF_AmericaWarFactoryCommandSet
VisionRange = 200.0 ; Shroud clearing distance
ShroudClearingRange = 200
ArmorSet
Expand Down Expand Up @@ -16377,21 +16261,6 @@ 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 Upgrade_GlobalDummyUpgrade
RequiresAllTriggers = Yes
CommandSet = AirF_AmericaWarFactoryCommandSet
End

Geometry = BOX
GeometryMajorRadius = 53.0
GeometryMinorRadius = 60.0
Expand Down
Loading