mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-13 19:39:04 +07:00
Code Issues Packages Projects Releases Wiki Activity

Nerfed monsoon bomber

Browse Source
This commit is contained in:
Anuken 2018-08-01 13:09:46 -04:00
parent 890d49fdd7
commit c1de67032c
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,7 +93,7 @@ public class Weapons implements ContentList{
bomber = new Weapon("bomber"){{ bomber = new Weapon("bomber"){{
length = 0f; length = 0f;
width = 2f; width = 2f;
reload = 5f; reload = 7f;
roundrobin = true; roundrobin = true;
ejectEffect = Fx.none; ejectEffect = Fx.none;
velocityRnd = 1f; velocityRnd = 1f;

6
core/src/io/anuke/mindustry/content/bullets/WeaponBullets.java
View File

@ -31,7 +31,7 @@ public class WeaponBullets extends BulletList{
} }
}; };
bombExplosive = new BombBulletType(20f, 20f, "shell"){ bombExplosive = new BombBulletType(10f, 20f, "shell"){
{ {
bulletWidth = 9f; bulletWidth = 9f;
bulletHeight = 13f; 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; bulletWidth = 8f;
bulletHeight = 12f; 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; bulletWidth = 8f;
bulletHeight = 12f; bulletHeight = 12f;

2
core/src/io/anuke/mindustry/game/GameMode.java
View File

@ -13,10 +13,12 @@ public enum GameMode{
}}, }},
noWaves{{ noWaves{{
disableWaves = true; disableWaves = true;
hidden = true;
}}; }};
public boolean infiniteResources; public boolean infiniteResources;
public boolean disableWaveTimer; public boolean disableWaveTimer;
public boolean disableWaves; public boolean disableWaves;
public boolean hidden;
public String description(){ public String description(){
return Bundles.get("mode." + name() + ".description"); return Bundles.get("mode." + name() + ".description");

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

@ -14,7 +14,6 @@ import io.anuke.ucore.scene.ui.ImageButton;
import io.anuke.ucore.scene.ui.ScrollPane; import io.anuke.ucore.scene.ui.ScrollPane;
import io.anuke.ucore.scene.ui.TextButton; import io.anuke.ucore.scene.ui.TextButton;
import io.anuke.ucore.scene.ui.layout.Table; 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.Bundles;
import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Mathf;
@ -45,11 +44,10 @@ public class CustomGameDialog extends FloatingDialog{
selmode.add("$text.level.mode").padRight(15f); selmode.add("$text.level.mode").padRight(15f);
for(GameMode mode : GameMode.values()){ for(GameMode mode : GameMode.values()){
TextButton[] b = {null}; if(mode.hidden) continue;
b[0] = Elements.newButton("$mode." + mode.name() + ".name", "toggle", () -> state.mode = mode);
b[0].update(() -> b[0].setChecked(state.mode == mode)); selmode.addButton("$mode." + mode.name() + ".name", "toggle", () -> state.mode = mode)
group.add(b[0]); .update(b -> b.setChecked(state.mode == mode)).group(group).size(130f, 54f);
selmode.add(b[0]).size(130f, 54f);
} }
selmode.addButton("?", this::displayGameModeHelp).size(50f, 54f).padLeft(18f); selmode.addButton("?", this::displayGameModeHelp).size(50f, 54f).padLeft(18f);