diff --git a/core/src/io/anuke/mindustry/UI.java b/core/src/io/anuke/mindustry/UI.java index c645a20dd0..57fcb6e1e4 100644 --- a/core/src/io/anuke/mindustry/UI.java +++ b/core/src/io/anuke/mindustry/UI.java @@ -77,7 +77,7 @@ public class UI extends SceneModule{ Draw.tscl(1.5f); - Draw.text("[DARK_GRAY]-( Mindustry )-", w/2, h-16); + Draw.text("[#111111]-( Mindustry )-", w/2, h-16); Draw.text("[#f1de60]-( Mindustry )-", w/2, h-10); Draw.tscl(0.5f); @@ -141,41 +141,20 @@ public class UI extends SceneModule{ keys = new KeybindDialog(); - about = new Dialog("About"); - about.getContentTable().add("Made by [ROYAL]Anuken[] for the" + "\nGDL Metal Monstrosity jam.\n" - + "\nSources used:" - + "\n- [YELLOW]bfxr.com[] for sound effects" - + "\n- [RED]freemusicarchive.org[] for music" - + "\n- Music made by [GREEN]RoccoW[]" - ); - about.addCloseButton(); + about = new TextDialog("About", aboutText); - tutorial = new Dialog("Tutorial", "dialog"){ - @Override - public void hide(){ - super.hide(); - playing = true; - paused = false; - } - }; + tutorial = new TextDialog("Tutorial", tutorialText) + .setDialog(); + + tutorial.hidden(()->{ + playing = true; + paused = false; + }); - tutorial.addCloseButton(); tutorial.getButtonTable().addButton("OK", ()->{ tutorial.hide(); }); - tutorial.content().add( - "[GREEN]Default Controls:[WHITE]\n[YELLOW][[WASD][] to move, [YELLOW][[R][] to rotate blocks." - + "\nHold [YELLOW][[R-MOUSE][] to destroy blocks, click [YELLOW][[L-MOUSE][] to place them." - + "\n[YELLOW][[L-MOUSE][] to shoot." - + "\n\n[GOLD]Every 20 seconds, a new wave will appear." - + "\nBuild turrets to defend the core." - + "\nIf the core is destroyed, you lose the game." - + "\n[LIME]To collect building resources, \nmove them into the core with conveyors." - + "\n[LIME]Place [ORANGE]drills[] on the right material,\nthey will automatically mine material\nand dump it to nearby conveyors or turrets." - + "\n\n[SCARLET]To produce steel, feed coal and iron into a smelter." - ); - tutorial.content().pad(8); tutorial.content().row(); diff --git a/core/src/io/anuke/mindustry/Vars.java b/core/src/io/anuke/mindustry/Vars.java index 8536cf324b..03c0f0b5b3 100644 --- a/core/src/io/anuke/mindustry/Vars.java +++ b/core/src/io/anuke/mindustry/Vars.java @@ -52,4 +52,30 @@ public class Vars{ public static boolean playing = false; public static boolean paused = false; public static boolean showedTutorial = false; + + public static String[] aboutText = { + "Made by [ROYAL]Anuken[] for the" + "\nGDL Metal Monstrosity jam.", + "", + "Sources used:", + "- [YELLOW]bfxr.com[] for sound effects", + "- [RED]freemusicarchive.org[] for music", + "- Music made by [GREEN]RoccoW[]", + }; + + public static String[] tutorialText = { + "[GREEN]Default Controls:", + "[WHITE][YELLOW][[WASD][] to move, [YELLOW][[R][] to rotate blocks.", + "Hold [YELLOW][[R-MOUSE][] to destroy blocks, click [YELLOW][[L-MOUSE][] to place them.", + "[YELLOW][[L-MOUSE][] to shoot.", + "", + "[GOLD]Every 20 seconds, a new wave will appear.", + "Build turrets to defend the core.", + "If the core is destroyed, you lose the game.", + "", + "[LIME]To collect building resources, move them into the core with conveyors.", + "[LIME]Place [ORANGE]drills[] on the right material,they will automatically mine material", + "and dump it to nearby conveyors or turrets.", + "", + "[SCARLET]To produce steel, feed coal and iron into a smelter." + }; }