Discord rich presence tweaks, wave balancing

This commit is contained in:
Anuken
2018-01-08 22:57:07 -05:00
parent 2662c0a8fd
commit 5cac11b3fe
7 changed files with 53 additions and 22 deletions

View File

@@ -4,7 +4,6 @@ import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.I18NBundle;
import com.badlogic.gdx.utils.OrderedMap;
import io.anuke.mindustry.core.*;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.io.PlatformFunction;
@@ -21,8 +20,6 @@ public class Mindustry extends ModuleCore {
public static boolean hasDiscord = true;
public static Array<String> args = new Array<>();
public static PlatformFunction platforms = new PlatformFunction(){};
public static OrderedMap<String, Integer> idMap = new OrderedMap<>();
public static boolean externalBundle = false;
@Override

View File

@@ -197,5 +197,20 @@ public class UI extends SceneModule{
});
dialog.show();
}
public void showConfirmListen(String title, String text, Consumer<Boolean> listener){
FloatingDialog dialog = new FloatingDialog(title);
dialog.content().add(text).pad(4f);
dialog.buttons().defaults().size(200f, 54f).pad(2f);
dialog.buttons().addButton("$text.cancel", () -> {
dialog.hide();
listener.accept(true);
});
dialog.buttons().addButton("$text.ok", () -> {
dialog.hide();
listener.accept(true);
});
dialog.show();
}
}

View File

@@ -16,13 +16,13 @@ public class WaveCreator{
scaling = 1;
after = 3;
spacing = 5;
amount = 4;
amount = 3;
tierscaleback = 0;
}},
new EnemySpawn(EnemyTypes.blast){{
after = 4;
amount = 3;
amount = 2;
spacing = 5;
scaling = 2;
tierscaleback = 0;
@@ -65,7 +65,7 @@ public class WaveCreator{
new EnemySpawn(EnemyTypes.flamer){{
after = 12;
amount = 3;
amount = 2;
spacing = 5;
scaling = 3;
}},