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

Clean Up Dummy Upgrade Code #831

Merged
merged 6 commits into from
Aug 6, 2022
Merged

Clean Up Dummy Upgrade Code #831

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
90b3305
Make Dummy Upgrade Global
commy2 Aug 5, 2022
5b9381a
Clean Up Dummy Upgrade Code
commy2 Aug 5, 2022
110406e
remove a forgotten
commy2 Aug 6, 2022
a5253f7
add patch name to change comment
commy2 Aug 6, 2022
fd4aa4a
add patch name to change comment 1/2
commy2 Aug 6, 2022
95e7652
Merge branch 'main' into cleanup-dummy-upgrade
commy2 Aug 6, 2022
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: 0 additions & 2 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 @@ -9833,7 +9833,6 @@ Object AirF_AmericaPowerPlant

Behavior = GrantUpgradeCreate ModuleTag_MicrowaveTankFix01
UpgradeToGrant = Upgrade_DummyUpgrade
ExemptStatus = UNDER_CONSTRUCTION
End

Behavior = ArmorUpgrade ModuleTag_MicrowaveTankFix02
Expand Down Expand Up @@ -14663,7 +14662,6 @@ Object AirF_AmericaSupplyDropZone

Behavior = GrantUpgradeCreate ModuleTag_MicrowaveTankFix01
UpgradeToGrant = Upgrade_DummyUpgrade
ExemptStatus = UNDER_CONSTRUCTION
End

Behavior = ArmorUpgrade ModuleTag_MicrowaveTankFix02
Expand Down
7 changes: 2 additions & 5 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/FactionBuilding.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5115,7 +5115,6 @@ Object AmericaPowerPlant

Behavior = GrantUpgradeCreate ModuleTag_MicrowaveTankFix01
UpgradeToGrant = Upgrade_DummyUpgrade
ExemptStatus = UNDER_CONSTRUCTION
End

Behavior = ArmorUpgrade ModuleTag_MicrowaveTankFix02
Expand Down Expand Up @@ -19017,7 +19016,6 @@ Object ChinaPowerPlant

Behavior = GrantUpgradeCreate ModuleTag_MicrowaveTankFix01
UpgradeToGrant = Upgrade_DummyUpgrade
ExemptStatus = UNDER_CONSTRUCTION
End

Behavior = ArmorUpgrade ModuleTag_MicrowaveTankFix02
Expand Down Expand Up @@ -20415,12 +20413,11 @@ Object AmericaSupplyDropZone
; 22/08/2021

Behavior = GrantUpgradeCreate ModuleTag_MicrowaveTankFix01
UpgradeToGrant = Upgrade_ChinaOverlordGattlingCannon
ExemptStatus = UNDER_CONSTRUCTION
UpgradeToGrant = Upgrade_DummyUpgrade
End
commy2 marked this conversation as resolved.
Show resolved Hide resolved

Behavior = ArmorUpgrade ModuleTag_MicrowaveTankFix02
TriggeredBy = Upgrade_ChinaOverlordGattlingCannon
TriggeredBy = Upgrade_DummyUpgrade
End

Geometry = BOX
Expand Down
1 change: 0 additions & 1 deletion Patch104pZH/GameFilesEdited/Data/INI/Object/InfantryGeneral.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8461,7 +8461,6 @@ Object Infa_ChinaPowerPlant

Behavior = GrantUpgradeCreate ModuleTag_MicrowaveTankFix01
UpgradeToGrant = Upgrade_DummyUpgrade
ExemptStatus = UNDER_CONSTRUCTION
End

Behavior = ArmorUpgrade ModuleTag_MicrowaveTankFix02
Expand Down
2 changes: 0 additions & 2 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/LaserGeneral.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9533,7 +9533,6 @@ Object Lazr_AmericaPowerPlant

Behavior = GrantUpgradeCreate ModuleTag_MicrowaveTankFix01
UpgradeToGrant = Upgrade_DummyUpgrade
ExemptStatus = UNDER_CONSTRUCTION
End

Behavior = ArmorUpgrade ModuleTag_MicrowaveTankFix02
Expand Down Expand Up @@ -14348,7 +14347,6 @@ Object Lazr_AmericaSupplyDropZone

Behavior = GrantUpgradeCreate ModuleTag_MicrowaveTankFix01
UpgradeToGrant = Upgrade_DummyUpgrade
ExemptStatus = UNDER_CONSTRUCTION
End

Behavior = ArmorUpgrade ModuleTag_MicrowaveTankFix02
Expand Down
1 change: 0 additions & 1 deletion Patch104pZH/GameFilesEdited/Data/INI/Object/NukeGeneral.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10231,7 +10231,6 @@ Object Nuke_ChinaPowerPlant

Behavior = GrantUpgradeCreate ModuleTag_MicrowaveTankFix01
UpgradeToGrant = Upgrade_DummyUpgrade
ExemptStatus = UNDER_CONSTRUCTION
End

Behavior = ArmorUpgrade ModuleTag_MicrowaveTankFix02
Expand Down
2 changes: 0 additions & 2 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/SuperWeaponGeneral.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13776,7 +13776,6 @@ Object SupW_AmericaSupplyDropZone

Behavior = GrantUpgradeCreate ModuleTag_MicrowaveTankFix01
UpgradeToGrant = Upgrade_DummyUpgrade
ExemptStatus = UNDER_CONSTRUCTION
End

Behavior = ArmorUpgrade ModuleTag_MicrowaveTankFix02
Expand Down Expand Up @@ -17505,7 +17504,6 @@ Object SupW_AmericaPowerPlant

Behavior = GrantUpgradeCreate ModuleTag_MicrowaveTankFix01
UpgradeToGrant = Upgrade_DummyUpgrade
ExemptStatus = UNDER_CONSTRUCTION
End

Behavior = ArmorUpgrade ModuleTag_MicrowaveTankFix02
Expand Down
1 change: 0 additions & 1 deletion Patch104pZH/GameFilesEdited/Data/INI/Object/TankGeneral.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8136,7 +8136,6 @@ Object Tank_ChinaPowerPlant

Behavior = GrantUpgradeCreate ModuleTag_MicrowaveTankFix01
UpgradeToGrant = Upgrade_DummyUpgrade
ExemptStatus = UNDER_CONSTRUCTION
End

Behavior = ArmorUpgrade ModuleTag_MicrowaveTankFix02
Expand Down
2 changes: 1 addition & 1 deletion Patch104pZH/GameFilesEdited/Data/INI/Upgrade.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,9 +811,9 @@ End
; Added a new dummy object-class upgrade for use in places where a local upgrade is required.
; 23/08/2021

; @bugfix commy2 06/08/2022 Upgrade is now global.
;----------------------------
Upgrade Upgrade_DummyUpgrade
Type = OBJECT
BuildTime = 0.0
BuildCost = 0
End