diff --git a/core/src/io/anuke/mindustry/content/Weapons.java b/core/src/io/anuke/mindustry/content/Weapons.java index 5ccc7456fc..1fbdf566ed 100644 --- a/core/src/io/anuke/mindustry/content/Weapons.java +++ b/core/src/io/anuke/mindustry/content/Weapons.java @@ -93,7 +93,7 @@ public class Weapons implements ContentList{ bomber = new Weapon("bomber"){{ length = 0f; width = 2f; - reload = 5f; + reload = 7f; roundrobin = true; ejectEffect = Fx.none; velocityRnd = 1f; diff --git a/core/src/io/anuke/mindustry/content/bullets/WeaponBullets.java b/core/src/io/anuke/mindustry/content/bullets/WeaponBullets.java index 04997b8c68..12ac8b262a 100644 --- a/core/src/io/anuke/mindustry/content/bullets/WeaponBullets.java +++ b/core/src/io/anuke/mindustry/content/bullets/WeaponBullets.java @@ -31,7 +31,7 @@ public class WeaponBullets extends BulletList{ } }; - bombExplosive = new BombBulletType(20f, 20f, "shell"){ + bombExplosive = new BombBulletType(10f, 20f, "shell"){ { bulletWidth = 9f; bulletHeight = 13f; @@ -39,7 +39,7 @@ public class WeaponBullets extends BulletList{ } }; - bombIncendiary = new BombBulletType(15f, 10f, "shell"){ + bombIncendiary = new BombBulletType(7f, 10f, "shell"){ { bulletWidth = 8f; bulletHeight = 12f; @@ -63,7 +63,7 @@ public class WeaponBullets extends BulletList{ } }; - bombOil = new BombBulletType(3f, 3f, "shell"){ + bombOil = new BombBulletType(2f, 3f, "shell"){ { bulletWidth = 8f; bulletHeight = 12f; diff --git a/core/src/io/anuke/mindustry/game/GameMode.java b/core/src/io/anuke/mindustry/game/GameMode.java index 664739094a..ffadb03d8b 100644 --- a/core/src/io/anuke/mindustry/game/GameMode.java +++ b/core/src/io/anuke/mindustry/game/GameMode.java @@ -13,10 +13,12 @@ public enum GameMode{ }}, noWaves{{ disableWaves = true; + hidden = true; }}; public boolean infiniteResources; public boolean disableWaveTimer; public boolean disableWaves; + public boolean hidden; public String description(){ return Bundles.get("mode." + name() + ".description"); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java index 8e887439be..920f2251d8 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java @@ -14,7 +14,6 @@ import io.anuke.ucore.scene.ui.ImageButton; import io.anuke.ucore.scene.ui.ScrollPane; import io.anuke.ucore.scene.ui.TextButton; import io.anuke.ucore.scene.ui.layout.Table; -import io.anuke.ucore.scene.utils.Elements; import io.anuke.ucore.util.Bundles; import io.anuke.ucore.util.Mathf; @@ -45,11 +44,10 @@ public class CustomGameDialog extends FloatingDialog{ selmode.add("$text.level.mode").padRight(15f); for(GameMode mode : GameMode.values()){ - TextButton[] b = {null}; - b[0] = Elements.newButton("$mode." + mode.name() + ".name", "toggle", () -> state.mode = mode); - b[0].update(() -> b[0].setChecked(state.mode == mode)); - group.add(b[0]); - selmode.add(b[0]).size(130f, 54f); + if(mode.hidden) continue; + + selmode.addButton("$mode." + mode.name() + ".name", "toggle", () -> state.mode = mode) + .update(b -> b.setChecked(state.mode == mode)).group(group).size(130f, 54f); } selmode.addButton("?", this::displayGameModeHelp).size(50f, 54f).padLeft(18f);