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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2022-06-09 13:16:39 -04:00
parent 1b5e49bd3c b199379e1d
commit 4c5850ae96
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/mindustry/editor/MapView.java
View File

@@ -256,6 +256,13 @@ public class MapView extends Element implements GestureListener{
image.setBounds(centerx - sclwidth / 2, centery - sclheight / 2, sclwidth, sclheight);
image.draw();
Lines.stroke(2f);
Draw.color(Pal.bulletYellowBack);
Lines.line(centerx - sclwidth/2f, centery - sclheight/4f, centerx + sclwidth/2f, centery - sclheight/4f);
Lines.line(centerx - sclwidth/4f, centery - sclheight/2f, centerx - sclwidth/4f, centery + sclheight/2f);
Lines.line(centerx - sclwidth/2f, centery + sclheight/4f, centerx + sclwidth/2f, centery + sclheight/4f);
Lines.line(centerx + sclwidth/4f, centery - sclheight/2f, centerx + sclwidth/4f, centery + sclheight/2f);
Lines.stroke(3f);
Draw.color(Pal.accent);
Lines.line(centerx - sclwidth/2f, centery, centerx + sclwidth/2f, centery);

24
core/src/mindustry/ui/dialogs/MapPlayDialog.java
View File

@@ -52,22 +52,22 @@ public class MapPlayDialog extends BaseDialog{
rules = map.applyRules(selectedGamemode);
Table selmode = new Table();
selmode.add("@level.mode").colspan(4);
selmode.add("@level.mode").colspan(2);
selmode.row();
int i = 0;
Table modes = new Table();
selmode.table(Tex.button, modes -> {
int i = 0;
for(Gamemode mode : Gamemode.all){
if(mode.hidden) continue;
for(Gamemode mode : Gamemode.values()){
if(mode.hidden) continue;
modes.button(mode.toString(), Styles.flatToggleMenut, () -> {
selectedGamemode = mode;
rules = map.applyRules(mode);
}).update(b -> b.setChecked(selectedGamemode == mode)).size(140f, 54f).disabled(!mode.valid(map));
if(i++ % 2 == 1) modes.row();
}
});
modes.button(mode.toString(), Styles.togglet, () -> {
selectedGamemode = mode;
rules = map.applyRules(mode);
}).update(b -> b.setChecked(selectedGamemode == mode)).size(140f, 54f).disabled(!mode.valid(map));
if(i++ % 2 == 1) modes.row();
}
selmode.add(modes);
selmode.button("?", this::displayGameModeHelp).width(50f).fillY().padLeft(18f);
cont.add(selmode);