Skip to content

Fix: Inconsistent Evacuate Button Placement #165

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

Merged
merged 2 commits into from
Sep 3, 2021
Merged

Fix: Inconsistent Evacuate Button Placement #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
729996e
Fix: Inconsistent Evacuate Button Placement
commy2 Sep 3, 2021
5fb25d4
manual merge
commy2 Sep 3, 2021
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ https://github.com/commy2/zerohour/issues/70 [NOTRELEVANT] Boss Sentr
https://github.com/commy2/zerohour/issues/69 [IMPROVEMENT] Damaged And Non-Vanilla USA Sentry Drones Missing Their Move Start Sounds
https://github.com/commy2/zerohour/issues/68 [IMPROVEMENT] Spy Drone Seleced By Q-Shortcut
https://github.com/commy2/zerohour/issues/67 [DONE] Super Weapon And Laser General Vehicle Drone Upgrade Incompatibility
https://github.com/commy2/zerohour/issues/66 [IMPROVEMENT] Evacuate Buttons Are Not Aligned
https://github.com/commy2/zerohour/issues/66 [DONE] Evacuate Buttons Are Not Aligned
https://github.com/commy2/zerohour/issues/65 [IMPROVEMENT] Laser General Humvee Has Duplicated Infantry Enter And Exit Sound Effect
https://github.com/commy2/zerohour/issues/64 [MAYBE] Battle Drone Gains Double The Intended Bonus From Drone Armor
https://github.com/commy2/zerohour/issues/63 [MAYBE] Paladins And Microwaves Gain Slightly Less Than Intended From Composite Armor
Expand Down
33 changes: 18 additions & 15 deletions Patch104pZH/GameFilesEdited/Data/INI/CommandSet.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
;+--+--+--+--+--+--+--+
;
;------------------------------------------------------------------------------

; Patch104p @bugfix commy2 03/09/2021 Align evacuate buttons on same slot.

; Many things just want these three buttons.
CommandSet GenericCommandSet
11 = Command_AttackMove
Expand Down Expand Up @@ -365,8 +368,8 @@ CommandSet GLAVehicleBattleBusCommandSet
6 = Command_TransportExit
7 = Command_TransportExit
8 = Command_TransportExit
9 = Command_Evacuate
11 = Command_AttackMove
10 = Command_Evacuate
13 = Command_Guard
14 = Command_Stop
End
Expand All @@ -384,8 +387,8 @@ CommandSet GLAVehicleTechnicalCommandSet
3 = Command_TransportExit
4 = Command_TransportExit
5 = Command_TransportExit
9 = Command_Evacuate
11 = Command_AttackMove
10 = Command_Evacuate
13 = Command_Guard
14 = Command_Stop
End
Expand Down Expand Up @@ -444,14 +447,15 @@ CommandSet ChinaTroopCrawlerCommandSet
8 = Command_TransportExit
9 = Command_EmptyCrawler
11 = Command_AttackMove
;13 = Command_Guard
14 = Command_Stop
End

CommandSet ChinaListeningOutpostCommandSet
1 = Command_TransportExit
2 = Command_TransportExit
9 = Command_EmptyCrawler
11 = Command_AttackMove
12 = Command_EmptyCrawler
13 = Command_Guard
14 = Command_Stop
End
Expand Down Expand Up @@ -536,7 +540,7 @@ CommandSet AmericaVehicleAmbulanceCommandSet
5 = Command_TransportExit
6 = Command_TransportExit
7 = Command_TransportExit
8 = Command_Evacuate
9 = Command_Evacuate
10 = Command_AmbulanceCleanupArea
11 = Command_AttackMove
13 = Command_Guard
Expand Down Expand Up @@ -2158,7 +2162,7 @@ CommandSet Demo_GLAVehicleBattleBusCommandSet
6 = Command_TransportExit
7 = Command_TransportExit
8 = Command_TransportExit
10 = Command_Evacuate
9 = Command_Evacuate
11 = Command_AttackMove
13 = Command_Guard
14 = Command_Stop
Expand Down Expand Up @@ -2202,8 +2206,8 @@ CommandSet Demo_GLAVehicleTechnicalCommandSet
3 = Command_TransportExit
4 = Command_TransportExit
5 = Command_TransportExit
9 = Command_Evacuate
11 = Command_AttackMove
10 = Command_Evacuate
13 = Command_Guard
14 = Command_Stop
End
Expand Down Expand Up @@ -2231,8 +2235,8 @@ CommandSet Demo_GLAVehicleTechnicalCommandSetUpgrade
3 = Command_TransportExit
4 = Command_TransportExit
5 = Command_TransportExit
9 = Command_Evacuate
11 = Command_AttackMove
10 = Command_Evacuate
12 = Demo_Command_TertiarySuicide
13 = Command_Guard
14 = Command_Stop
Expand Down Expand Up @@ -2462,7 +2466,7 @@ CommandSet Demo_GLAVehicleBattleBusCommandSetUpgrade
6 = Command_TransportExit
7 = Command_TransportExit
8 = Command_TransportExit
10 = Command_Evacuate
9 = Command_Evacuate
11 = Command_AttackMove
12 = Demo_Command_TertiarySuicide
13 = Command_Guard
Expand Down Expand Up @@ -2738,7 +2742,7 @@ CommandSet Slth_GLAVehicleBattleBusCommandSet
6 = Command_TransportExit
7 = Command_TransportExit
8 = Command_TransportExit
10 = Command_Evacuate
9 = Command_Evacuate
11 = Command_AttackMove
13 = Command_Guard
14 = Command_Stop
Expand Down Expand Up @@ -3313,8 +3317,8 @@ End
CommandSet Nuke_ChinaListeningOutpostCommandSet
1 = Command_TransportExit
2 = Command_TransportExit
9 = Command_EmptyCrawler
11 = Command_AttackMove
12 = Command_EmptyCrawler
13 = Command_Guard
14 = Command_Stop
End
Expand Down Expand Up @@ -3626,7 +3630,7 @@ CommandSet SupW_AmericaVehicleAmbulanceCommandSet
5 = Command_TransportExit
6 = Command_TransportExit
7 = Command_TransportExit
8 = Command_Evacuate
9 = Command_Evacuate
10 = Command_AmbulanceCleanupArea
11 = Command_AttackMove
13 = Command_Guard
Expand Down Expand Up @@ -4034,6 +4038,7 @@ CommandSet Infa_ChinaTroopCrawlerCommandSet
8 = Command_TransportExit
9 = Command_EmptyCrawler
11 = Command_AttackMove
;13 = Command_Guard
14 = Command_Stop
End

Expand All @@ -4046,10 +4051,8 @@ CommandSet Infa_ChinaListeningOutpostCommandSet
6 = Command_TransportExit
7 = Command_TransportExit
8 = Command_TransportExit
; 9 = Command_TransportExit
;10 = Command_TransportExit
9 = Command_EmptyCrawler
11 = Command_AttackMove
12 = Command_EmptyCrawler
13 = Command_Guard
14 = Command_Stop
End
Expand Down Expand Up @@ -4407,7 +4410,7 @@ CommandSet Lazr_AmericaVehicleAmbulanceCommandSet
5 = Command_TransportExit
6 = Command_TransportExit
7 = Command_TransportExit
8 = Command_Evacuate
9 = Command_Evacuate
10 = Command_AmbulanceCleanupArea
11 = Command_AttackMove
13 = Command_Guard
Expand Down