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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 WwE^>Q2Z7x6b2rz$-S&^ZoBY9wOSZuP literal 8199 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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); + } }