From ac47d22ea1413867b19d01401f10e075dc5fd548 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 23 Jun 2022 17:10:44 -0400 Subject: [PATCH] Map resize dialog shift options --- core/assets/maps/lake.msav | Bin 8199 -> 8592 bytes core/src/mindustry/core/World.java | 4 +-- core/src/mindustry/editor/MapEditor.java | 9 ++++--- .../src/mindustry/editor/MapEditorDialog.java | 6 ++--- .../src/mindustry/editor/MapResizeDialog.java | 25 +++++++++++++++--- 5 files changed, 32 insertions(+), 12 deletions(-) diff --git a/core/assets/maps/lake.msav b/core/assets/maps/lake.msav index da7acda1fa2c9b6bf082513488b79f19b8f56bb2..ab97d14a8d5a3c8205277d73cd3a13579c177b0a 100644 GIT binary patch literal 8592 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 { - if(!(editor.width() == x && editor.height() == y)){ + resizeDialog = new MapResizeDialog((width, height, shiftX, shiftY) -> { + if(!(editor.width() == width && editor.height() == height && shiftX == 0 && shiftY == 0)){ ui.loadAnd(() -> { - editor.resize(x, y); + editor.resize(width, height, shiftX, shiftY); }); } }); diff --git a/core/src/mindustry/editor/MapResizeDialog.java b/core/src/mindustry/editor/MapResizeDialog.java index f9cbfc8da8..f5ea504b33 100644 --- a/core/src/mindustry/editor/MapResizeDialog.java +++ b/core/src/mindustry/editor/MapResizeDialog.java @@ -1,19 +1,19 @@ package mindustry.editor; -import arc.func.*; import arc.math.*; import arc.scene.ui.TextField.*; import arc.scene.ui.layout.*; import arc.util.*; import mindustry.ui.dialogs.*; + import static mindustry.Vars.*; public class MapResizeDialog extends BaseDialog{ public static int minSize = 50, maxSize = 600, increment = 50; - int width, height; + int width, height, shiftX, shiftY; - public MapResizeDialog(Intc2 cons){ + public MapResizeDialog(ResizeListener cons){ super("@editor.resizemap"); closeOnBack(); @@ -35,6 +35,19 @@ public class MapResizeDialog extends BaseDialog{ table.row(); } + + for(boolean x : Mathf.booleans){ + table.add(x ? "@editor.shiftx" : "@editor.shifty").padRight(8f); + table.defaults().height(60f).padTop(8); + + table.field((x ? shiftX : shiftY) + "", value -> { + int val = Integer.parseInt(value); + if(x) shiftX = val; else shiftY = val; + }).valid(Strings::canParseInt).maxTextLength(3); + + table.row(); + } + cont.row(); cont.add(table); @@ -43,8 +56,12 @@ public class MapResizeDialog extends BaseDialog{ buttons.defaults().size(200f, 50f); buttons.button("@cancel", this::hide); buttons.button("@ok", () -> { - cons.get(width, height); + cons.get(width, height, shiftX, shiftY); hide(); }); } + + public interface ResizeListener{ + void get(int width, int height, int shiftX, int shiftY); + } }