Change: Improve China Overlord upgrade command button and cameo icon placements

Author: xezon

Patch104pZH/GameFilesEdited/Data/INI/CommandButton.ini

@@ -1259,6 +1259,21 @@ CommandButton Command_UpgradeChinaOverlordGattlingCannon
   UnitSpecificSound       = OverlordTankVoiceModeGattling
 End
 
+;patch104p-optional-begin
+; Patch104p @tweak xezon 01/05/2023 Adds a new button variant for the Gattling Cannon upgrade that works for both Overlord and Emperor.
+;   This allows the button to be used in Overlord and Emperor group selections.
+CommandButton Multi_Command_UpgradeChinaOverlordGattlingCannon
+  Command       = OBJECT_UPGRADE
+  Upgrade       = Upgrade_ChinaOverlordGattlingCannon
+  Options       = OK_FOR_MULTI_SELECT NOT_QUEUEABLE
+  TextLabel     = CONTROLBAR:UpgradeChinaOverlordGattlingCannon
+  ButtonImage   = SSOLGattling
+  ButtonBorderType        = UPGRADE ; Identifier for the User as to what kind of button this is
+  DescriptLabel           = CONTROLBAR:TooltipUpgradeChinaTankGattlingCannon
+  UnitSpecificSound       = OverlordTankVoiceModeGattling
+End
+;patch104p-optional-end
+
 CommandButton Command_UpgradeChinaOverlordPropagandaTower
   Command       = OBJECT_UPGRADE
   Upgrade       = Upgrade_ChinaOverlordPropagandaTower

Patch104pZH/GameFilesEdited/Data/INI/CommandSet.ini

@@ -674,23 +674,38 @@ CommandSet ChinaTankBattlemasterCommandSet
 End
 
 ;--------------------------------------------
+; Patch104p @tweak tweak 01/05/2023 Optionally repositions and reorders the attachment upgrades to match the position and order of the Helix ones.
 CommandSet ChinaTankOverlordDefaultCommandSet
+;patch104p-core-begin
   1  = Command_UpgradeChinaOverlordBattleBunker
   3  = Command_UpgradeChinaOverlordGattlingCannon
   5  = Command_UpgradeChinaOverlordPropagandaTower
+;patch104p-core-end
+;patch104p-optional-begin
+  6  = Command_UpgradeChinaOverlordBattleBunker
+  8  = Command_UpgradeChinaOverlordPropagandaTower
+  10 = Multi_Command_UpgradeChinaOverlordGattlingCannon
+;patch104p-optional-end
   11 = Command_AttackMove
   13 = Command_Guard
   14 = Command_Stop
 End
 
 ; Patch104p @tweak from Command_Evacuate to Command_EmptyCrawler, so that all vehicles use same evacuate command button.
 ; Patch104p @tweak xezon 30/04/2023 Moves Command_EmptyCrawler from 6 to 9, so that it can be evacuated together with other ground vehicles.
+; Patch104p @tweak tweak 01/05/2023 Optionally adds the attachment upgrades to keep them usable in group selections always.
+; Patch104p @tweak tweak 01/05/2023 Optionally uses the multi button variant for the Gattling Cannon upgrade so that the Overlord and Emperor can use this button in a group selection.
 CommandSet ChinaTankOverlordBattleBunkerCommandSet
   1 = Command_TransportExit
   2 = Command_TransportExit
   3 = Command_TransportExit
   4 = Command_TransportExit
   5 = Command_TransportExit
+;patch104p-optional-begin
+  6  = Command_UpgradeChinaOverlordBattleBunker
+  8  = Command_UpgradeChinaOverlordPropagandaTower
+  10 = Multi_Command_UpgradeChinaOverlordGattlingCannon
+;patch104p-optional-end
   9 = Command_EmptyCrawler
   11 = Command_AttackMove
   13 = Command_Guard
@@ -5202,8 +5217,15 @@ CommandSet Tank_ChinaInfantryBlackLotusCommandSet
   14 = Command_Stop
 End
 
+; Patch104p @tweak tweak 01/05/2023 Optionally repositions the attachment upgrade to match the position of the Overlord and Helix one.
+; Patch104p @tweak tweak 01/05/2023 Optionally uses the multi button variant for the Gattling Cannon upgrade so that the Overlord and Emperor can use this button in a group selection.
 CommandSet Tank_ChinaTankEmperorDefaultCommandSet
+;patch104p-core-begin
   3  = Tank_Command_UpgradeChinaOverlordGattlingCannon
+;patch104p-core-end
+;patch104p-optional-begin
+  10 = Multi_Command_UpgradeChinaOverlordGattlingCannon
+;patch104p-optional-end
   11 = Command_AttackMove
   13 = Command_Guard
   14 = Command_Stop

Patch104pZH/GameFilesEdited/Data/INI/Object/ChinaVehicle.ini

@@ -227,11 +227,13 @@ Object ChinaTankOverlord
   SelectPortrait         = SNOverlord_L
   ButtonImage            = SNOverlord
 
+  ; Patch104p @tweak xezon 30/04/2023 Moves attachment upgrade icons into same order as new optional upgrade buttons and Helix 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

Patch104pZH/GameFilesEdited/Data/INI/Object/NukeGeneral.ini

@@ -17142,12 +17142,14 @@ Object Nuke_ChinaTankOverlord
 
   ; Patch104p @refactor xezon 08/04/2023 Comments the incorrect and unused Nuke upgrades.
   ; Patch104p @bugfix xezon 08/04/2023 Adds missing IsotopeStability icon.
+  ; Patch104p @tweak xezon 30/04/2023 Moves attachment upgrade icons into same order as new optional upgrade buttons and Helix icons.
+
   ;UpgradeCameo1 = Nuke_Upgrade_ChinaWGUraniumShells
   ;UpgradeCameo2 = Nuke_Upgrade_ChinaFusionReactors
   UpgradeCameo2 = Upgrade_ChinaIsotopeStability
-  UpgradeCameo3 = Upgrade_ChinaOverlordBattleBunker
-  UpgradeCameo4 = Upgrade_ChinaOverlordGattlingCannon
-  UpgradeCameo5 = Upgrade_ChinaOverlordPropagandaTower
+  UpgradeCameo3 = Upgrade_ChinaOverlordGattlingCannon
+  UpgradeCameo4 = Upgrade_ChinaOverlordPropagandaTower
+  UpgradeCameo5 = Upgrade_ChinaOverlordBattleBunker
 
 
   Draw = W3DOverlordTankDraw ModuleTag_01

Patch104pZH/GameFilesEdited/Data/generals.str

@@ -24887,6 +24887,22 @@ RU: "Построить пулемётную пушку на этом Влады
 AR: "ﻰﻠﻋ شﺎﺷﺮﻟا ﻊﻓﺪﻤﻟا ءﺎﻨﺑ\nﺔﻣﺪﻘﺘﻤﻟا Overlord ﺔﺑﺎﺑد"
 END
 
+// Patch104p @feature xezon 01/05/2023 Adds Overlord and Emperor neutral tooltip text. Allows to use the same text for both tank upgrades.
+
+CONTROLBAR:TooltipUpgradeChinaTankGattlingCannon
+US: "Build a Gattling Cannon on this tank"
+DE: "Bringt an diesem Panzer ein Gatling-Geschütz an."
+FR: "Ajoute une Mitrailleuse Gattling sur ce char."
+ES: "Construye un Cañón Gattling en este tanque."
+IT: "Costruisce un Cannone gatling su questo carro armato."
+KO: "탱크 뒤쪽에 개틀링 캐논을 장착합니다."
+ZH: "在這輛坦克上建造一門加特林大砲。"
+BP: "Equipa este tanque com um Canhão Gattling."
+PL: "Wyposaża ten czołg w działko Gattling."
+RU: "Построить пулемётную пушку на этом танке"
+AR: "ﻰﻠﻋ شﺎﺷﺮﻟا ﻊﻓﺪﻤﻟا ءﺎﻨﺑ\nﺔﻣﺪﻘﺘﻤﻟا Overlord ﺔﺑﺎﺑد"
+END
+
 CONTROLBAR:TooltipUpgradeChinaOverlordPropagandaTower
 US: "Build a Propaganda Tower on this Overlord"
 DE: "Bringt an diesem Overlord einen Propagandaturm an."

Patch104pZH/ModBundleItems.json

@@ -355,6 +355,7 @@
                     {
                         "parent": "GameFilesEdited",
                         "sourceList": [
+                            "Data/INI/CommandButton.ini",
                             "Data/INI/CommandSet.ini"
                         ],
                         "params": {