diff --git a/build.gradle b/build.gradle index 84075e0fbf..348104fbeb 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ allprojects{ appName = 'Mindustry' gdxVersion = '1.9.10' roboVMVersion = '2.3.8-SNAPSHOT' - steamworksVersion = 'ffa83e14c90be0c1977fc75b167bb8d6f3f94057' + steamworksVersion = '1e1bd5c7c042f8eb0c23a6daaa373d562f82539a' arcHash = null debugged = { diff --git a/core/src/io/anuke/mindustry/input/DesktopInput.java b/core/src/io/anuke/mindustry/input/DesktopInput.java index 40425933a5..017733a840 100644 --- a/core/src/io/anuke/mindustry/input/DesktopInput.java +++ b/core/src/io/anuke/mindustry/input/DesktopInput.java @@ -254,7 +254,7 @@ public class DesktopInput extends InputHandler{ table.row(); table.left().margin(0f).defaults().size(48f).left(); - table.addImageButton(Icon.wikiSmall, Styles.clearPartiali, () -> { + table.addImageButton(Icon.pasteSmall, Styles.clearPartiali, () -> { ui.schematics.show(); }); } diff --git a/core/src/io/anuke/mindustry/input/MobileInput.java b/core/src/io/anuke/mindustry/input/MobileInput.java index 0e3f471761..9c97b8287f 100644 --- a/core/src/io/anuke/mindustry/input/MobileInput.java +++ b/core/src/io/anuke/mindustry/input/MobileInput.java @@ -205,7 +205,7 @@ public class MobileInput extends InputHandler implements GestureListener{ boolean arrow = block != null && block.rotate; i.getImage().setRotationOrigin(!arrow ? 0 : rotation * 90, Align.center); - i.getStyle().imageUp = arrow ? Icon.arrowSmall : Icon.wikiSmall; + i.getStyle().imageUp = arrow ? Icon.arrowSmall : Icon.pasteSmall; i.setChecked(!arrow && schematicMode); }); diff --git a/core/src/io/anuke/mindustry/input/Placement.java b/core/src/io/anuke/mindustry/input/Placement.java index 13052d9a03..14d1b8b230 100644 --- a/core/src/io/anuke/mindustry/input/Placement.java +++ b/core/src/io/anuke/mindustry/input/Placement.java @@ -58,7 +58,7 @@ public class Placement{ private static float tileHeuristic(Tile tile, Tile other){ Block block = control.input.block; - if(!other.block().alwaysReplace && !(block != null && block.canReplace(other.block()))){ + if((!other.block().alwaysReplace && !(block != null && block.canReplace(other.block()))) || other.floor().isDeep()){ return 20; }else{ if(parents.containsKey(tile.pos())){ diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SchematicsDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SchematicsDialog.java index 8ca77f843d..fe24b31bdc 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/SchematicsDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/SchematicsDialog.java @@ -11,12 +11,12 @@ import io.anuke.arc.scene.ui.ImageButton.*; import io.anuke.arc.scene.ui.TextButton.*; import io.anuke.arc.scene.ui.layout.*; import io.anuke.arc.util.*; +import io.anuke.mindustry.core.GameState.*; import io.anuke.mindustry.game.*; import io.anuke.mindustry.gen.*; import io.anuke.mindustry.graphics.*; import io.anuke.mindustry.type.*; import io.anuke.mindustry.ui.*; -import io.anuke.mindustry.ui.Cicon; import static io.anuke.mindustry.Vars.*; @@ -118,8 +118,12 @@ public class SchematicsDialog extends FloatingDialog{ })).size(200f); }, () -> { if(sel[0].childrenPressed()) return; - control.input.useSchematic(s); - hide(); + if(state.is(State.menu)){ + showInfo(s); + }else{ + control.input.useSchematic(s); + hide(); + } }).pad(4).style(Styles.cleari).get(); sel[0].getStyle().up = Tex.pane; diff --git a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java index ffa8b6e2db..462d7f3ece 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java @@ -68,7 +68,7 @@ public class HudFragment extends Fragment{ select.addImageButton(Icon.menuLargeSmall, style, ui.paused::show); flip = select.addImageButton(Icon.arrowUpSmall, style, this::toggleMenus).get(); - select.addImageButton(Icon.wikiSmall, style, () -> { + select.addImageButton(Icon.pasteSmall, style, () -> { ui.schematics.show(); }); diff --git a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java index 4fb14f855d..966d78cc5b 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java @@ -164,6 +164,7 @@ public class MenuFragment extends Fragment{ ), new Buttoni("$editor", Icon.editorSmall, ui.maps::show), steam ? new Buttoni("$workshop", Icon.saveSmall, platform::openWorkshop) : null, new Buttoni(Core.bundle.get("mods") + "\n" + Core.bundle.get("mods.alpha"), Icon.wikiSmall, ui.mods::show), + new Buttoni("$schematics", Icon.pasteSmall, ui.schematics::show), new Buttoni("$settings", Icon.toolsSmall, ui.settings::show), new Buttoni("$about.button", Icon.infoSmall, ui.about::show), new Buttoni("$quit", Icon.exitSmall, Core.app::exit)