diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 7c8c0653fe..a6598bc875 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -341,10 +341,12 @@ keybind.weapon_4.name=weapon_4 keybind.weapon_5.name=weapon_5 keybind.weapon_6.name=weapon_6 mode.text.help.title=Description of modes -mode.text.help.description="{0}" is the normal mode: limited resources and automatic incoming waves.\n"{1}" is a mode with infinite resources and no timer for waves.\n"{2}" is a mode with limited resources and no timer for waves. mode.waves.name=waves +mode.waves.description=the normal mode. limited resources and automatic incoming waves. mode.sandbox.name=sandbox +mode.sandbox.description=infinite resources and no timer for waves. mode.freebuild.name=freebuild +mode.freebuild.description=limited resources and no timer for waves. upgrade.standard.name=standard upgrade.standard.description=The standard mech. upgrade.blaster.name=blaster diff --git a/core/assets/version.properties b/core/assets/version.properties index 978f831df5..2126758c6b 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Thu Mar 15 14:23:19 EDT 2018 +#Fri Mar 16 00:38:49 EDT 2018 version=release -androidBuildCode=412 +androidBuildCode=414 name=Mindustry code=3.4 build=custom build diff --git a/core/src/io/anuke/mindustry/game/GameMode.java b/core/src/io/anuke/mindustry/game/GameMode.java index 4d102a0ac9..8481f1a97f 100644 --- a/core/src/io/anuke/mindustry/game/GameMode.java +++ b/core/src/io/anuke/mindustry/game/GameMode.java @@ -18,6 +18,10 @@ public enum GameMode{ public boolean infiniteResources; public boolean disableWaveTimer; + public String description(){ + return Bundles.get("mode."+name()+".description"); + } + @Override public String toString(){ return Bundles.get("mode."+name()+".name"); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/LevelDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/LevelDialog.java index 0c1d5acb09..612945183e 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/LevelDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/LevelDialog.java @@ -22,7 +22,6 @@ import static io.anuke.mindustry.Vars.*; public class LevelDialog extends FloatingDialog{ private Map selectedMap = world.maps().getMap(0); - private TextureRegion region = new TextureRegion(); private ScrollPane pane; public LevelDialog(){ @@ -56,7 +55,7 @@ public class LevelDialog extends FloatingDialog{ group.add(b[0]); selmode.add(b[0]).size(130f, 54f); } - selmode.addButton("?", () -> displayGameModeHelp()).size(54f, 54f).padLeft(15f); + selmode.addButton("?", this::displayGameModeHelp).size(50f, 54f).padLeft(18f); content().add(selmode); content().row(); @@ -181,17 +180,13 @@ public class LevelDialog extends FloatingDialog{ ScrollPane pane = new ScrollPane(table, "clear"); pane.setFadeScrollBars(false); table.row(); - Label desclabel = new Label( - Bundles.format("mode.text.help.description", - Bundles.get("mode.waves.name"), - Bundles.get("mode.sandbox.name"), - Bundles.get("mode.freebuild.name"))); - desclabel.setWrap(true); - table.add(desclabel).width(600); - table.row(); + for(GameMode mode : GameMode.values()){ + table.labelWrap("[accent]" + mode.toString() + ":[] [lightgray]" + mode.description()).width(600f); + table.row(); + } d.content().add(pane); - d.buttons().addButton("$text.ok", ()-> d.hide()).size(110, 50).pad(10f); + d.buttons().addButton("$text.ok", d::hide).size(110, 50).pad(10f); d.show(); }