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

Block break visual cleanup

Browse Source
This commit is contained in:
Anuken
2018-10-17 22:10:56 -04:00
parent 36903eb749
commit 6ecdef02ab
4 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/assets/bundles/bundle.properties
View File

@@ -63,6 +63,7 @@ text.sector.unexplored=[accent][[Unexplored]
text.missions=Missions:[LIGHT_GRAY] {0} text.missions=Missions:[LIGHT_GRAY] {0}
text.mission=Mission:[LIGHT_GRAY] {0} text.mission=Mission:[LIGHT_GRAY] {0}
text.mission.main=Main Mission:[LIGHT_GRAY] {0}
text.mission.info=Mission Info text.mission.info=Mission Info
text.mission.complete=Mission complete! text.mission.complete=Mission complete!
text.mission.complete.body=Sector {0},{1} has been conquered. text.mission.complete.body=Sector {0},{1} has been conquered.

4
core/src/io/anuke/mindustry/input/DesktopInput.java
View File

@@ -57,6 +57,8 @@ public class DesktopInput extends InputHandler{
region.getRegionWidth() * selectScale, region.getRegionHeight() * selectScale, block.rotate ? rotation * 90 : 0); region.getRegionWidth() * selectScale, region.getRegionHeight() * selectScale, block.rotate ? rotation * 90 : 0);
} }
}else{ }else{
Draw.color(Palette.removeBack);
Lines.square(x * tilesize + block.offset(), y * tilesize + block.offset() - 1, block.size * tilesize / 2f);
Draw.color(Palette.remove); Draw.color(Palette.remove);
Lines.square(x * tilesize + block.offset(), y * tilesize + block.offset(), block.size * tilesize / 2f); 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); Draw.color(Palette.remove);
Lines.rect(result.x, result.y, result.x2 - result.x, result.y2 - result.y); Lines.rect(result.x, result.y, result.x2 - result.x, result.y2 - result.y);
}else if(isPlacing()){ }else if(isPlacing()){

6
core/src/io/anuke/mindustry/input/MobileInput.java
View File

@@ -368,7 +368,9 @@ public class MobileInput extends InputHandler implements GestureListener{
region.getRegionWidth() * lineScale, region.getRegionHeight() * lineScale, recipe.result.rotate ? result.rotation * 90 : 0); region.getRegionWidth() * lineScale, region.getRegionHeight() * lineScale, recipe.result.rotate ? result.rotation * 90 : 0);
} }
}else{ }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); 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); Draw.color(Palette.remove);
Lines.rect(result.x, result.y, result.x2 - result.x, result.y2 - result.y); Lines.rect(result.x, result.y, result.x2 - result.x, result.y2 - result.y);

2
core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java
View File

@@ -42,7 +42,7 @@ public class SectorsDialog extends FloatingDialog{
+ (selected.saveID == -1 ? " " + Bundles.get("text.sector.unexplored") : + (selected.saveID == -1 ? " " + Bundles.get("text.sector.unexplored") :
(selected.hasSave() ? " [accent]/[white] " + Bundles.format("text.sector.time", selected.getSave().getPlayTime()) : "")))); (selected.hasSave() ? " [accent]/[white] " + Bundles.format("text.sector.time", selected.getSave().getPlayTime()) : ""))));
content().row(); 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())); ? Bundles.get("text.none") : selected.getDominantMission().menuDisplayString()));
content().row(); content().row();
content().add(new SectorView()).grow(); content().add(new SectorView()).grow();