Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ram stance + Mobile command queue support

Browse Source
This commit is contained in:
Anuken
2023-09-21 09:57:57 -04:00
parent 7ce05fde7a
commit a6ec8f4bcc
9 changed files with 54 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/mindustry/ui/Styles.java
View File

@@ -48,6 +48,8 @@ public class Styles{
togglet,
/** Partially transparent square button. */
cleart,
/** Clear, square, orange border, toggleable. */
clearTogglet,
/** Similar to flatToggle, but without a darker border. */
fullTogglet,
/** Toggle-able version of flatBorder. */
@@ -219,6 +221,16 @@ public class Styles{
disabled = buttonDisabled;
disabledFontColor = Color.gray;
}};
clearTogglet = new TextButtonStyle(){{
font = Fonts.def;
fontColor = Color.white;
down = flatDown;
checked = flatDown;
up = black6;
over = flatOver;
disabled = black;
disabledFontColor = Color.gray;
}};
fullTogglet = new TextButtonStyle(){{
font = Fonts.def;
fontColor = Color.white;

9
core/src/mindustry/ui/fragments/PlacementFragment.java
View File

@@ -510,6 +510,7 @@ public class PlacementFragment{
u.table(coms -> {
coms.left();
int scol = 0;
for(var command : commands){
coms.button(Icon.icons.get(command.icon, Icon.cancel), Styles.clearNoneTogglei, () -> {
IntSeq ids = new IntSeq();
@@ -519,7 +520,10 @@ public class PlacementFragment{
Call.setUnitCommand(Vars.player, ids.toArray(), command);
}).checked(i -> currentCommand[0] == command).size(50f).tooltip(command.localized());
if(++scol % 6 == 0) coms.row();
}
}).fillX().padTop(4f).left();
}
@@ -529,9 +533,8 @@ public class PlacementFragment{
u.table(coms -> {
coms.left();
int scol = 0;
for(var stance : stances){
//TODO: patrolling is pointless on mobile since you can't queue commands
if(stance == UnitStance.patrol && mobile) continue;
coms.button(Icon.icons.get(stance.icon, Icon.cancel), Styles.clearNoneTogglei, () -> {
IntSeq ids = new IntSeq();
@@ -541,6 +544,8 @@ public class PlacementFragment{
Call.setUnitStance(Vars.player, ids.toArray(), stance);
}).checked(i -> currentStance[0] == stance).size(50f).tooltip(stance.localized());
if(++scol % 6 == 0) coms.row();
}
}).fillX().padTop(4f).left();
}