diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 643656803b..bec750319b 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -63,6 +63,7 @@ text.sector.unexplored=[accent][[Unexplored] text.missions=Missions:[LIGHT_GRAY] {0} text.mission=Mission:[LIGHT_GRAY] {0} +text.mission.main=Main Mission:[LIGHT_GRAY] {0} text.mission.info=Mission Info text.mission.complete=Mission complete! text.mission.complete.body=Sector {0},{1} has been conquered. diff --git a/core/src/io/anuke/mindustry/input/DesktopInput.java b/core/src/io/anuke/mindustry/input/DesktopInput.java index be5d1a21d5..f714fe3fa2 100644 --- a/core/src/io/anuke/mindustry/input/DesktopInput.java +++ b/core/src/io/anuke/mindustry/input/DesktopInput.java @@ -57,6 +57,8 @@ public class DesktopInput extends InputHandler{ region.getRegionWidth() * selectScale, region.getRegionHeight() * selectScale, block.rotate ? rotation * 90 : 0); } }else{ + Draw.color(Palette.removeBack); + Lines.square(x * tilesize + block.offset(), y * tilesize + block.offset() - 1, block.size * tilesize / 2f); Draw.color(Palette.remove); Lines.square(x * tilesize + block.offset(), y * tilesize + block.offset(), block.size * tilesize / 2f); } @@ -107,6 +109,8 @@ public class DesktopInput extends InputHandler{ } } + Draw.color(Palette.removeBack); + Lines.rect(result.x, result.y - 1, result.x2 - result.x, result.y2 - result.y); Draw.color(Palette.remove); Lines.rect(result.x, result.y, result.x2 - result.x, result.y2 - result.y); }else if(isPlacing()){ diff --git a/core/src/io/anuke/mindustry/input/MobileInput.java b/core/src/io/anuke/mindustry/input/MobileInput.java index e95d76cdec..9b6b7e278d 100644 --- a/core/src/io/anuke/mindustry/input/MobileInput.java +++ b/core/src/io/anuke/mindustry/input/MobileInput.java @@ -368,7 +368,9 @@ public class MobileInput extends InputHandler implements GestureListener{ region.getRegionWidth() * lineScale, region.getRegionHeight() * lineScale, recipe.result.rotate ? result.rotation * 90 : 0); } }else{ - Draw.color(Palette.breakInvalid); + Draw.color(Palette.removeBack); + Lines.square(x * tilesize + recipe.result.offset(), y * tilesize + recipe.result.offset() - 1, recipe.result.size * tilesize / 2f); + Draw.color(Palette.remove); Lines.square(x * tilesize + recipe.result.offset(), y * tilesize + recipe.result.offset(), recipe.result.size * tilesize / 2f); } } @@ -391,6 +393,8 @@ public class MobileInput extends InputHandler implements GestureListener{ } } + Draw.color(Palette.removeBack); + Lines.rect(result.x, result.y - 1, result.x2 - result.x, result.y2 - result.y); Draw.color(Palette.remove); Lines.rect(result.x, result.y, result.x2 - result.x, result.y2 - result.y); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java index b320b76a16..a1de283c9a 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java @@ -42,7 +42,7 @@ public class SectorsDialog extends FloatingDialog{ + (selected.saveID == -1 ? " " + Bundles.get("text.sector.unexplored") : (selected.hasSave() ? " [accent]/[white] " + Bundles.format("text.sector.time", selected.getSave().getPlayTime()) : "")))); content().row(); - content().label(() -> Bundles.format("text.mission", selected == null || selected.completedMissions >= selected.missions.size + content().label(() -> Bundles.format("text.mission.main", selected == null || selected.completedMissions >= selected.missions.size ? Bundles.get("text.none") : selected.getDominantMission().menuDisplayString())); content().row(); content().add(new SectorView()).grow();