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.

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

Fix: Tomahawk Launchers Have Battle And Scout Drone Upgrade Icon Reversed #205

Merged
merged 2 commits into from
Sep 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion Patch104pZH/Design/Tasks/commy2_tasks.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 6 additions & 4 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/BossGeneral.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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.

UpgradeCameo1 = Upgrade_AmericaBattleDrone
UpgradeCameo2 = Upgrade_AmericaScoutDrone
UpgradeCameo3 = Upgrade_AmericaHellfireDrone
UpgradeCameo4 = Upgrade_AmericaAdvancedTraining
;UpgradeCameo5 = XXX

Draw = W3DTankDraw ModuleTag_01
Expand Down
6 changes: 4 additions & 2 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/LaserGeneral.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down