diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 9264ed9e83..2416e80ecb 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -253,6 +253,7 @@ launch = < LAUNCH > launch.title = Launch Successful launch.next = [LIGHT_GRAY]next opportunity at wave {0} launch.unable = [scarlet]Unable to LAUNCH.[] Enemies. +launch.confirm = This will launch all resources in your core.\nYou will not be able to return to this base. zone.unlocked = [LIGHT_GRAY]{0} unlocked. connectfail = [crimson]Failed to connect to server:\n\n[accent]{0} diff --git a/core/src/io/anuke/mindustry/core/UI.java b/core/src/io/anuke/mindustry/core/UI.java index f3a8d4c506..9f4bb58306 100644 --- a/core/src/io/anuke/mindustry/core/UI.java +++ b/core/src/io/anuke/mindustry/core/UI.java @@ -277,7 +277,7 @@ public class UI implements ApplicationListener{ public void showConfirm(String title, String text, Runnable confirmed){ FloatingDialog dialog = new FloatingDialog(title); - dialog.cont.add(text).width(400f).wrap().pad(4f).get().setAlignment(Align.center, Align.center); + dialog.cont.add(text).width(500f).wrap().pad(4f).get().setAlignment(Align.center, Align.center); dialog.buttons.defaults().size(200f, 54f).pad(2f); dialog.setFillParent(false); dialog.buttons.addButton("$cancel", dialog::hide); diff --git a/core/src/io/anuke/mindustry/editor/MapInfoDialog.java b/core/src/io/anuke/mindustry/editor/MapInfoDialog.java index 73b6ce6220..f1e81e7ab0 100644 --- a/core/src/io/anuke/mindustry/editor/MapInfoDialog.java +++ b/core/src/io/anuke/mindustry/editor/MapInfoDialog.java @@ -60,13 +60,6 @@ public class MapInfoDialog extends FloatingDialog{ }).size(400, 55f).get(); author.setMessageText("$unknown"); - cont.row(); - - cont.add().padRight(8).left(); - cont.addCheck("$editor.oregen", enabled -> { - tags.put("oregen", enabled ? "1" : "0"); - }).update(c -> c.setChecked(!tags.get("oregen", "0").equals("0"))).left(); - name.change(); description.change(); author.change(); diff --git a/core/src/io/anuke/mindustry/maps/MapMeta.java b/core/src/io/anuke/mindustry/maps/MapMeta.java index 74228aa5b4..36f815b63f 100644 --- a/core/src/io/anuke/mindustry/maps/MapMeta.java +++ b/core/src/io/anuke/mindustry/maps/MapMeta.java @@ -35,10 +35,6 @@ public class MapMeta{ return tags.containsKey(name) && !tags.get(name).trim().isEmpty() ? tags.get(name): Core.bundle.get("unknown"); } - public boolean hasOreGen(){ - return !tags.get("oregen", "0").equals("0"); - } - @Override public String toString(){ return "MapMeta{" + diff --git a/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java index 55a1ecb84d..62cc23e37a 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java @@ -140,8 +140,6 @@ public class MapsDialog extends FloatingDialog{ t.add(map.meta.description()).growX().wrap().padTop(2); t.row(); t.add("$editor.oregen.info").padRight(10).color(Color.GRAY); - t.row(); - t.add(map.meta.hasOreGen() ? "$on" : "$off").padTop(2); }).height(mapsize).width(mapsize); table.row(); diff --git a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java index 7f9caf9b8a..ff449fb759 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java @@ -219,7 +219,7 @@ public class HudFragment extends Fragment{ parent.fill(t -> { t.top().visible(() -> !state.is(State.menu)); - TextButton button = Elements.newButton("$launch", Call::launchZone); + TextButton button = Elements.newButton("$launch", () -> ui.showConfirm("$launch", "$launch.confirm", Call::launchZone)); button.getStyle().disabledFontColor = Color.WHITE; button.visible(() ->