diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties index d18a60372e..33f4e5aea4 100644 --- a/core/assets/bundles/bundle_zh_CN.properties +++ b/core/assets/bundles/bundle_zh_CN.properties @@ -42,7 +42,7 @@ text.sector.unexplored=[accent][[Unexplored] text.mission=任务[LIGHT_GRAY] {0} text.mission.wave=存活了 [accent]{0}[] 波。 text.mission.battle=摧毁敌方基地。 -text.mission.resource=获得 {0} x{1} +text.mission.resource=获得 {0}:\n[accent]{1}/{2}[] text.none= text.close=关闭 text.quit=退出 diff --git a/core/src/io/anuke/mindustry/input/DefaultKeybinds.java b/core/src/io/anuke/mindustry/input/DefaultKeybinds.java index 3595031f94..7dccde8568 100644 --- a/core/src/io/anuke/mindustry/input/DefaultKeybinds.java +++ b/core/src/io/anuke/mindustry/input/DefaultKeybinds.java @@ -20,7 +20,7 @@ public class DefaultKeybinds{ "move_x", new Axis(Input.A, Input.D), "move_y", new Axis(Input.S, Input.W), "select", Input.MOUSE_LEFT, - "deselect", Input.SPACE, + "deselect", Input.MOUSE_RIGHT, "break", Input.MOUSE_RIGHT, "rotate", new Axis(Input.SCROLL), "dash", Input.SHIFT_LEFT, diff --git a/core/src/io/anuke/mindustry/input/DesktopInput.java b/core/src/io/anuke/mindustry/input/DesktopInput.java index 92f03a77d0..be5d1a21d5 100644 --- a/core/src/io/anuke/mindustry/input/DesktopInput.java +++ b/core/src/io/anuke/mindustry/input/DesktopInput.java @@ -147,11 +147,13 @@ public class DesktopInput extends InputHandler{ pollInput(); + //removed for now, will add back if necessary + /* if(recipe != null && !Settings.getBool("desktop-place-help-2", false)){ ui.showInfo("$text.construction.desktop"); Settings.putBool("desktop-place-help-2", true); Settings.save(); - } + }*/ //deselect if not placing if(!isPlacing() && mode == placing){ diff --git a/core/src/io/anuke/mindustry/maps/Sectors.java b/core/src/io/anuke/mindustry/maps/Sectors.java index d8aac4991a..4e0ba5d483 100644 --- a/core/src/io/anuke/mindustry/maps/Sectors.java +++ b/core/src/io/anuke/mindustry/maps/Sectors.java @@ -53,14 +53,14 @@ public class Sectors{ } world.sectors.save(); world.setSector(sector); - sector.currentMission().onBegin(); + if(!sector.complete) sector.currentMission().onBegin(); }else if(SaveIO.breakingVersions.contains(sector.getSave().getBuild())){ ui.showInfo("$text.save.old"); }else try{ sector.getSave().load(); world.setSector(sector); state.set(State.playing); - sector.currentMission().onBegin(); + if(!sector.complete) sector.currentMission().onBegin(); }catch(Exception e){ Log.err(e); sector.getSave().delete(); @@ -270,6 +270,7 @@ public class Sectors{ sector.getSave().delete(); } sector.completedMissions = 0; + sector.complete = false; initSector(sector); for(int x = sector.x; x < sector.width + sector.x; x++){ diff --git a/core/src/io/anuke/mindustry/net/Net.java b/core/src/io/anuke/mindustry/net/Net.java index f4e1fe79c1..a6ff070ded 100644 --- a/core/src/io/anuke/mindustry/net/Net.java +++ b/core/src/io/anuke/mindustry/net/Net.java @@ -244,7 +244,7 @@ public class Net{ } }else if(!((object instanceof Packet) && ((Packet) object).isUnimportant())){ packetQueue.add(object); - Log.info("Queuing packet {0}.", object); + Log.info("Queuing packet {0}", object); }else{ synchronized(packetPoolLock){ Pooling.free(object); diff --git a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java index fee77eda43..52a53a23b9 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java @@ -380,7 +380,7 @@ public class HudFragment extends Fragment{ }); table.setDisabled(() -> !(world.getSector() != null && world.getSector().currentMission().hasMessage())); - table.visible(() -> !((world.getSector() == null && state.mode.disableWaves) || !state.mode.showMission)); + table.visible(() -> !((world.getSector() == null && state.mode.disableWaves) || !state.mode.showMission || (world.getSector() != null && world.getSector().complete))); } private void addPlayButton(Table table){