Skip to content

Fix: China Overlord, Emperor command sets #1544

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

Closed
xezon wants to merge 3 commits into from
Closed

Fix: China Overlord, Emperor command sets #1544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
51bfd39
Fix: Moves Overlord upgrade buttons into same position as Helix upgra…
xezon Jan 12, 2023
e0aaab2
Fix: Moves Overlord upgrade icons into same position as Helix, Empero…
xezon Jan 12, 2023
8966f4d
Fix: Keep disabled Overlord attachment upgrade buttons in Command Set
xezon Jan 12, 2023
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
27 changes: 17 additions & 10 deletions Patch104pZH/GameFilesEdited/Data/INI/CommandSet.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,35 +594,41 @@ CommandSet ChinaTankBattlemasterCommandSet
14 = Command_Stop
End

; Patch104p @tweak Moves upgrade buttons into same position as Helix upgrade buttons.
;--------------------------------------------
CommandSet ChinaTankOverlordDefaultCommandSet
1 = Command_UpgradeChinaOverlordBattleBunker
3 = Command_UpgradeChinaOverlordGattlingCannon
5 = Command_UpgradeChinaOverlordPropagandaTower
6 = Command_UpgradeChinaOverlordBattleBunker
8 = Command_UpgradeChinaOverlordPropagandaTower
10 = Command_UpgradeChinaOverlordGattlingCannon
11 = Command_AttackMove
13 = Command_Guard
14 = Command_Stop
End

; Patch104p @tweak Keeps upgrade buttons in all command sets.
; Patch104p @tweak Moves Command_Evacuate from 6 into same position as Outpost, Troopcrawler evacuate.
CommandSet ChinaTankOverlordBattleBunkerCommandSet
1 = Command_TransportExit
2 = Command_TransportExit
3 = Command_TransportExit
4 = Command_TransportExit
5 = Command_TransportExit
6 = Command_Evacuate
6 = Command_UpgradeChinaOverlordBattleBunker
8 = Command_UpgradeChinaOverlordPropagandaTower
9 = Command_Evacuate
10 = Command_UpgradeChinaOverlordGattlingCannon
11 = Command_AttackMove
13 = Command_Guard
14 = Command_Stop
End

CommandSet ChinaTankOverlordGattlingCannonCommandSet
CommandSet ChinaTankOverlordGattlingCannonCommandSet ; Legacy
11 = Command_AttackMove
13 = Command_Guard
14 = Command_Stop
End

CommandSet ChinaTankOverlordPropagandaTowerCommandSet
CommandSet ChinaTankOverlordPropagandaTowerCommandSet ; Legacy
11 = Command_AttackMove
13 = Command_Guard
14 = Command_Stop
Expand Down Expand Up @@ -4730,13 +4736,13 @@ CommandSet Tank_ChinaVehicleBattleMasterCommandSet
14 = Command_Stop
End

CommandSet Tank_ChinaTankOverlordGattlingCannonCommandSet
CommandSet Tank_ChinaTankOverlordGattlingCannonCommandSet ; Legacy
11 = Command_AttackMove
13 = Command_Guard
14 = Command_Stop
End

CommandSet Tank_ChinaTankOverlordPropagandaTowerCommandSet
CommandSet Tank_ChinaTankOverlordPropagandaTowerCommandSet ; Legacy
11 = Command_AttackMove
13 = Command_Guard
14 = Command_Stop
Expand All @@ -4749,9 +4755,10 @@ CommandSet Tank_ChinaInfantryBlackLotusCommandSet
14 = Command_Stop
End

CommandSet Tank_ChinaTankEmperorDefaultCommandSet
; Patch104p @tweak Moves upgrade buttons into same position as Helix upgrade buttons.
CommandSet Tank_ChinaTankEmperorDefaultCommandSet ; Alias Tank_ChinaTankOverlordDefaultCommandSet
;1 = Command_UpgradeChinaOverlordBattleBunker ;Does not get this upgrade.
3 = Tank_Command_UpgradeChinaOverlordGattlingCannon
10 = Tank_Command_UpgradeChinaOverlordGattlingCannon
;5 = Command_UpgradeChinaOverlordPropagandaTower ;Is granted this upgrade innately.
11 = Command_AttackMove
13 = Command_Guard
Expand Down
21 changes: 8 additions & 13 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/ChinaVehicle.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,11 +202,13 @@ Object ChinaTankOverlord
SelectPortrait = SNOverlord_L
ButtonImage = SNOverlord

; Patch104p @tweak Moves upgrade icons into same position as Helix, Emperor upgrade icons.

UpgradeCameo1 = Upgrade_ChinaUraniumShells
UpgradeCameo2 = Upgrade_ChinaNuclearTanks
UpgradeCameo3 = Upgrade_ChinaOverlordBattleBunker
UpgradeCameo4 = Upgrade_ChinaOverlordGattlingCannon
UpgradeCameo5 = Upgrade_ChinaOverlordPropagandaTower
UpgradeCameo3 = Upgrade_ChinaOverlordGattlingCannon
UpgradeCameo4 = Upgrade_ChinaOverlordPropagandaTower
UpgradeCameo5 = Upgrade_ChinaOverlordBattleBunker


Draw = W3DOverlordTankDraw ModuleTag_01
Expand Down Expand Up @@ -368,16 +370,9 @@ Object ChinaTankOverlord
Behavior = ProductionUpdate ModuleTag_10
MaxQueueEntries = 1; So you can't build multiple upgrades in the same frame
End
Behavior = CommandSetUpgrade ModuleTag_11
CommandSet = ChinaTankOverlordGattlingCannonCommandSet
TriggeredBy = Upgrade_ChinaOverlordGattlingCannon
ConflictsWith = Upgrade_ChinaOverlordPropagandaTower Upgrade_ChinaOverlordBattleBunker
End
Behavior = CommandSetUpgrade ModuleTag_12
CommandSet = ChinaTankOverlordPropagandaTowerCommandSet
TriggeredBy = Upgrade_ChinaOverlordPropagandaTower
ConflictsWith = Upgrade_ChinaOverlordGattlingCannon Upgrade_ChinaOverlordBattleBunker
End

; Patch104p @tweak Removes Gattling And Propaganda CommandSetUpgrade behaviours to keep disabled upgrade buttons.

Behavior = CommandSetUpgrade ModuleTag_13
CommandSet = ChinaTankOverlordBattleBunkerCommandSet
TriggeredBy = Upgrade_ChinaOverlordBattleBunker
Expand Down
21 changes: 8 additions & 13 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/NukeGeneral.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17122,11 +17122,13 @@ Object Nuke_ChinaTankOverlord
SelectPortrait = SNOverlord_L
ButtonImage = SNOverlord

; Patch104p @tweak Moves upgrade icons into same position as Helix, Emperor upgrade icons.

UpgradeCameo1 = Upgrade_ChinaWGUraniumShells
UpgradeCameo2 = Upgrade_ChinaFusionReactors
UpgradeCameo3 = Upgrade_ChinaOverlordBattleBunker
UpgradeCameo4 = Upgrade_ChinaOverlordGattlingCannon
UpgradeCameo5 = Upgrade_ChinaOverlordPropagandaTower
UpgradeCameo3 = Upgrade_ChinaOverlordGattlingCannon
UpgradeCameo4 = Upgrade_ChinaOverlordPropagandaTower
UpgradeCameo5 = Upgrade_ChinaOverlordBattleBunker


Draw = W3DOverlordTankDraw ModuleTag_01
Expand Down Expand Up @@ -17284,16 +17286,9 @@ Object Nuke_ChinaTankOverlord
Behavior = ProductionUpdate ModuleTag_10
MaxQueueEntries = 1; So you can't build multiple upgrades in the same frame
End
Behavior = CommandSetUpgrade ModuleTag_11
CommandSet = ChinaTankOverlordGattlingCannonCommandSet
TriggeredBy = Upgrade_ChinaOverlordGattlingCannon
ConflictsWith = Upgrade_ChinaOverlordPropagandaTower Upgrade_ChinaOverlordBattleBunker
End
Behavior = CommandSetUpgrade ModuleTag_12
CommandSet = ChinaTankOverlordPropagandaTowerCommandSet
TriggeredBy = Upgrade_ChinaOverlordPropagandaTower
ConflictsWith = Upgrade_ChinaOverlordGattlingCannon Upgrade_ChinaOverlordBattleBunker
End

; Patch104p @tweak Removes Gattling And Propaganda CommandSetUpgrade behaviours to keep disabled upgrade buttons.

Behavior = CommandSetUpgrade ModuleTag_13
CommandSet = ChinaTankOverlordBattleBunkerCommandSet
TriggeredBy = Upgrade_ChinaOverlordBattleBunker
Expand Down
10 changes: 4 additions & 6 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/TankGeneral.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2902,7 +2902,7 @@ End


;------------------------------------------------------------------------------
Object Tank_ChinaTankEmperor
Object Tank_ChinaTankEmperor ; Alias Tank_ChinaTankOverlord

; *** ART Parameters ***
SelectPortrait = SNEmpTank_L
Expand Down Expand Up @@ -3095,11 +3095,9 @@ Object Tank_ChinaTankEmperor
; MaxQueueEntries = 1; So you can't build multiple upgrades in the same frame
MaxQueueEntries = 2; Propaganda model is hacked to not show up.
End
Behavior = CommandSetUpgrade ModuleTag_11
CommandSet = Tank_ChinaTankOverlordGattlingCannonCommandSet
TriggeredBy = Upgrade_ChinaOverlordGattlingCannon
ConflictsWith = Upgrade_ChinaOverlordPropagandaTower Upgrade_ChinaOverlordBattleBunker
End

; Patch104p @tweak Removes Gattling CommandSetUpgrade behaviour to keep disabled upgrade button.

;Behavior = CommandSetUpgrade ModuleTag_12
; CommandSet = Tank_ChinaTankOverlordPropagandaTowerCommandSet
;TriggeredBy = Upgrade_ChinaOverlordPropagandaTower
Expand Down