Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minified gamemode table

Browse Source
This commit is contained in:
Anuken
2018-10-14 10:41:17 -04:00
parent f670d522bf
commit c7f5b7fca1
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -27,7 +27,7 @@ allprojects {
appName = 'Mindustry' appName = 'Mindustry'
gdxVersion = '1.9.8' gdxVersion = '1.9.8'
roboVMVersion = '2.3.0' roboVMVersion = '2.3.0'
uCoreVersion = 'abd096135c0c3da6f42b781851118b8725b1c676' uCoreVersion = '88f8200deb8b64fceecfcfd7a90a6daadabf0f1a'
getVersionString = { getVersionString = {
String buildVersion = getBuildVersion() String buildVersion = getBuildVersion()

2
core/src/io/anuke/mindustry/content/blocks/StorageBlocks.java
View File

@@ -17,13 +17,11 @@ public class StorageBlocks extends BlockList implements ContentList{
vault = new Vault("vault"){{ vault = new Vault("vault"){{
size = 3; size = 3;
health = 600;
itemCapacity = 2000; itemCapacity = 2000;
}}; }};
container = new Vault("container"){{ container = new Vault("container"){{
size = 2; size = 2;
health = 600;
itemCapacity = 500; itemCapacity = 500;
}}; }};

14
core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java
View File

@@ -42,14 +42,20 @@ public class CustomGameDialog extends FloatingDialog{
Table selmode = new Table(); Table selmode = new Table();
ButtonGroup<TextButton> group = new ButtonGroup<>(); ButtonGroup<TextButton> group = new ButtonGroup<>();
selmode.add("$text.level.mode").padRight(15f); selmode.add("$text.level.mode").padRight(15f);
int i = 0;
Table modes = new Table();
modes.marginBottom(5);
for(GameMode mode : GameMode.values()){ for(GameMode mode : GameMode.values()){
if(mode.hidden) continue; if(mode.hidden) continue;
selmode.addButton("$mode." + mode.name() + ".name", "toggle", () -> state.mode = mode) modes.addButton("$mode." + mode.name() + ".name", "toggle", () -> state.mode = mode)
.update(b -> b.setChecked(state.mode == mode)).group(group).size(130f, 54f); .update(b -> b.setChecked(state.mode == mode)).group(group).size(125f, 54f).padBottom(-5);
if(i++ % 2 == 1) modes.row();
} }
selmode.addButton("?", this::displayGameModeHelp).size(50f, 54f).padLeft(18f); selmode.add(modes);
selmode.addButton("?", this::displayGameModeHelp).width(50f).fillY().padLeft(18f);
content().add(selmode); content().add(selmode);
content().row(); content().row();
@@ -83,7 +89,7 @@ public class CustomGameDialog extends FloatingDialog{
float images = 146f; float images = 146f;
int i = 0; i = 0;
for(Map map : world.maps.all()){ for(Map map : world.maps.all()){
if(i % maxwidth == 0){ if(i % maxwidth == 0){