From eb85fd392751497ee6008610a930662aec6cc109 Mon Sep 17 00:00:00 2001 From: commy2 Date: Sat, 4 Sep 2021 22:28:20 +0200 Subject: [PATCH 1/2] Fix: Tomahawk Launchers Have Battle And Scout Drone Upgrade Icon Reversed --- Patch104pZH/Design/Tasks/commy2_tasks.txt | 2 +- .../Data/INI/Object/AirforceGeneral.ini | 6 ++++-- .../GameFilesEdited/Data/INI/Object/AmericaVehicle.ini | 6 ++++-- .../GameFilesEdited/Data/INI/Object/BossGeneral.ini | 10 ++++++---- .../GameFilesEdited/Data/INI/Object/LaserGeneral.ini | 6 ++++-- .../Data/INI/Object/SuperWeaponGeneral.ini | 6 ++++-- 6 files changed, 23 insertions(+), 13 deletions(-) diff --git a/Patch104pZH/Design/Tasks/commy2_tasks.txt b/Patch104pZH/Design/Tasks/commy2_tasks.txt index 5a38df0f0..628e7466c 100644 --- a/Patch104pZH/Design/Tasks/commy2_tasks.txt +++ b/Patch104pZH/Design/Tasks/commy2_tasks.txt @@ -176,7 +176,7 @@ https://github.com/commy2/zerohour/issues/43 [DONE] Suicide Ab https://github.com/commy2/zerohour/issues/42 [DONE] Worker Has Disabled Suicide Button Before Demolitions Upgrade https://github.com/commy2/zerohour/issues/41 [DONE] Base Defenses Missing Demoliton Upgrade Icon https://github.com/commy2/zerohour/issues/38 [DONE] Detached Floating Object Orbits Avenger Model When Moving -https://github.com/commy2/zerohour/issues/37 [IMPROVEMENT] Tomahawk Launchers Have Reversed Order For Battle And Scout Drone Upgrade +https://github.com/commy2/zerohour/issues/37 [DONE] Tomahawk Launchers Have Reversed Order For Battle And Scout Drone Upgrade https://github.com/commy2/zerohour/issues/36 [NOTRELEVANT] Boss Helix Inconsistencies https://github.com/commy2/zerohour/issues/35 [NOTRELEVANT] Boss Infantry Inconsistencies https://github.com/commy2/zerohour/issues/34 [NOTRELEVANT] Boss Avenger Inconsistencies diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/AirforceGeneral.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/AirforceGeneral.ini index a20cb86d5..91a5b5df4 100644 --- a/Patch104pZH/GameFilesEdited/Data/INI/Object/AirforceGeneral.ini +++ b/Patch104pZH/GameFilesEdited/Data/INI/Object/AirforceGeneral.ini @@ -5395,8 +5395,10 @@ Object AirF_AmericaVehicleTomahawk SelectPortrait = SACTomahawk_L ButtonImage = SACTomahawk - UpgradeCameo1 = Upgrade_AmericaScoutDrone - UpgradeCameo2 = Upgrade_AmericaBattleDrone + ; Patch104p @bugfix commy2 04/09/2021 Fix order of Drone upgrade icons. + + UpgradeCameo1 = Upgrade_AmericaBattleDrone + UpgradeCameo2 = Upgrade_AmericaScoutDrone UpgradeCameo3 = Upgrade_AmericaHellfireDrone UpgradeCameo4 = Upgrade_AmericaAdvancedTraining ;UpgradeCameo5 = XXX diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/AmericaVehicle.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/AmericaVehicle.ini index 5d131c697..c1c9e04d9 100644 --- a/Patch104pZH/GameFilesEdited/Data/INI/Object/AmericaVehicle.ini +++ b/Patch104pZH/GameFilesEdited/Data/INI/Object/AmericaVehicle.ini @@ -288,8 +288,10 @@ Object AmericaVehicleTomahawk SelectPortrait = SACTomahawk_L ButtonImage = SACTomahawk - UpgradeCameo1 = Upgrade_AmericaScoutDrone - UpgradeCameo2 = Upgrade_AmericaBattleDrone + ; Patch104p @bugfix commy2 04/09/2021 Fix order of Drone upgrade icons. + + UpgradeCameo1 = Upgrade_AmericaBattleDrone + UpgradeCameo2 = Upgrade_AmericaScoutDrone UpgradeCameo3 = Upgrade_AmericaHellfireDrone UpgradeCameo4 = Upgrade_AmericaAdvancedTraining ;UpgradeCameo5 = XXX diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/BossGeneral.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/BossGeneral.ini index bc22f3186..bdea7550c 100644 --- a/Patch104pZH/GameFilesEdited/Data/INI/Object/BossGeneral.ini +++ b/Patch104pZH/GameFilesEdited/Data/INI/Object/BossGeneral.ini @@ -19170,10 +19170,12 @@ Object Boss_VehicleTomahawk SelectPortrait = SACTomahawk_L ButtonImage = SACTomahawk - UpgradeCameo1 = Upgrade_AmericaScoutDrone - UpgradeCameo2 = Upgrade_AmericaBattleDrone - UpgradeCameo3 = Upgrade_AmericaAdvancedTraining - UpgradeCameo4 = Upgrade_AmericaHellfireDrone + ; Patch104p @bugfix commy2 04/09/2021 Fix order of Drone upgrade icons and add missing icons. + + UpgradeCameo1 = Upgrade_AmericaBattleDrone + UpgradeCameo2 = Upgrade_AmericaScoutDrone + UpgradeCameo3 = Upgrade_AmericaHellfireDrone + UpgradeCameo4 = Upgrade_AmericaAdvancedTraining ;UpgradeCameo5 = XXX Draw = W3DTankDraw ModuleTag_01 diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/LaserGeneral.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/LaserGeneral.ini index d7928d5b3..f746425d4 100644 --- a/Patch104pZH/GameFilesEdited/Data/INI/Object/LaserGeneral.ini +++ b/Patch104pZH/GameFilesEdited/Data/INI/Object/LaserGeneral.ini @@ -4642,8 +4642,10 @@ Object Lazr_AmericaVehicleTomahawk SelectPortrait = SACTomahawk_L ButtonImage = SACTomahawk - UpgradeCameo1 = Upgrade_AmericaScoutDrone - UpgradeCameo2 = Upgrade_AmericaBattleDrone + ; Patch104p @bugfix commy2 04/09/2021 Fix order of Drone upgrade icons. + + UpgradeCameo1 = Upgrade_AmericaBattleDrone + UpgradeCameo2 = Upgrade_AmericaScoutDrone UpgradeCameo3 = Upgrade_AmericaHellfireDrone UpgradeCameo4 = Upgrade_AmericaAdvancedTraining ;UpgradeCameo5 = XXX diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/SuperWeaponGeneral.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/SuperWeaponGeneral.ini index e72b0a3fe..40aa74f07 100644 --- a/Patch104pZH/GameFilesEdited/Data/INI/Object/SuperWeaponGeneral.ini +++ b/Patch104pZH/GameFilesEdited/Data/INI/Object/SuperWeaponGeneral.ini @@ -5118,8 +5118,10 @@ Object SupW_AmericaVehicleTomahawk SelectPortrait = SACTomahawk_L ButtonImage = SACTomahawk - UpgradeCameo1 = Upgrade_AmericaScoutDrone - UpgradeCameo2 = Upgrade_AmericaBattleDrone + ; Patch104p @bugfix commy2 04/09/2021 Fix order of Drone upgrade icons. + + UpgradeCameo1 = Upgrade_AmericaBattleDrone + UpgradeCameo2 = Upgrade_AmericaScoutDrone UpgradeCameo3 = Upgrade_AmericaHellfireDrone UpgradeCameo4 = Upgrade_AmericaAdvancedTraining ;UpgradeCameo5 = XXX From 584624b35ea3c2eff06c1f9f3b0805917366a6d5 Mon Sep 17 00:00:00 2001 From: commy2 Date: Sat, 4 Sep 2021 22:31:49 +0200 Subject: [PATCH 2/2] Correct A Comment. --- Patch104pZH/GameFilesEdited/Data/INI/Object/BossGeneral.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/BossGeneral.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/BossGeneral.ini index bdea7550c..7f2d270ff 100644 --- a/Patch104pZH/GameFilesEdited/Data/INI/Object/BossGeneral.ini +++ b/Patch104pZH/GameFilesEdited/Data/INI/Object/BossGeneral.ini @@ -19170,7 +19170,7 @@ Object Boss_VehicleTomahawk SelectPortrait = SACTomahawk_L ButtonImage = SACTomahawk - ; Patch104p @bugfix commy2 04/09/2021 Fix order of Drone upgrade icons and add missing icons. + ; Patch104p @bugfix commy2 04/09/2021 Fix order of Drone upgrade icons. UpgradeCameo1 = Upgrade_AmericaBattleDrone UpgradeCameo2 = Upgrade_AmericaScoutDrone