From 0288cb34fb51695a279ac0633c31d97e4aeb52c2 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 23 Sep 2020 22:15:14 -0400 Subject: [PATCH] Cleanup --- annotations/src/main/resources/classids.properties | 2 +- core/src/mindustry/content/Blocks.java | 1 - core/src/mindustry/content/Bullets.java | 10 +++++----- core/src/mindustry/game/Rules.java | 2 +- core/src/mindustry/ui/dialogs/CustomRulesDialog.java | 2 +- core/src/mindustry/ui/dialogs/SchematicsDialog.java | 4 ++-- 6 files changed, 10 insertions(+), 11 deletions(-) diff --git a/annotations/src/main/resources/classids.properties b/annotations/src/main/resources/classids.properties index 974e2d7e70..86ca440e1c 100644 --- a/annotations/src/main/resources/classids.properties +++ b/annotations/src/main/resources/classids.properties @@ -26,4 +26,4 @@ pulsar=19 quad=23 risso=20 spiroct=21 -vela=25 +vela=25 \ No newline at end of file diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 05f65b5afc..7a7ac22ea0 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1750,7 +1750,6 @@ public class Blocks implements ContentList{ new UnitPlan(UnitTypes.risso, 60f * 45f, with(Items.silicon, 20, Items.metaglass, 35)), }; size = 3; - requiresWater = true; consumes.power(1.2f); }}; diff --git a/core/src/mindustry/content/Bullets.java b/core/src/mindustry/content/Bullets.java index 9e454576a7..bf3a575433 100644 --- a/core/src/mindustry/content/Bullets.java +++ b/core/src/mindustry/content/Bullets.java @@ -42,7 +42,7 @@ public class Bullets implements ContentList{ @Override public void load(){ - artilleryDense = new ArtilleryBulletType(3f, 12, "shell"){{ + artilleryDense = new ArtilleryBulletType(3f, 20, "shell"){{ hitEffect = Fx.flakExplosion; knockback = 0.8f; lifetime = 80f; @@ -63,7 +63,7 @@ public class Bullets implements ContentList{ collidesAir = false; }}; - artilleryPlastic = new ArtilleryBulletType(3.4f, 12, "shell"){{ + artilleryPlastic = new ArtilleryBulletType(3.4f, 20, "shell"){{ hitEffect = Fx.plasticExplosion; knockback = 1f; lifetime = 80f; @@ -77,7 +77,7 @@ public class Bullets implements ContentList{ frontColor = Pal.plastaniumFront; }}; - artilleryHoming = new ArtilleryBulletType(3f, 12, "shell"){{ + artilleryHoming = new ArtilleryBulletType(3f, 20, "shell"){{ hitEffect = Fx.flakExplosion; knockback = 0.8f; lifetime = 80f; @@ -91,7 +91,7 @@ public class Bullets implements ContentList{ homingRange = 50f; }}; - artilleryIncendiary = new ArtilleryBulletType(3f, 12, "shell"){{ + artilleryIncendiary = new ArtilleryBulletType(3f, 20, "shell"){{ hitEffect = Fx.blastExplosion; knockback = 0.8f; lifetime = 80f; @@ -105,7 +105,7 @@ public class Bullets implements ContentList{ trailEffect = Fx.incendTrail; }}; - artilleryExplosive = new ArtilleryBulletType(2f, 12, "shell"){{ + artilleryExplosive = new ArtilleryBulletType(2f, 20, "shell"){{ hitEffect = Fx.blastExplosion; knockback = 0.8f; lifetime = 80f; diff --git a/core/src/mindustry/game/Rules.java b/core/src/mindustry/game/Rules.java index 0b56b2e3ca..e0937c9b2b 100644 --- a/core/src/mindustry/game/Rules.java +++ b/core/src/mindustry/game/Rules.java @@ -39,7 +39,7 @@ public class Rules{ /** Whether reactors can explode and damage other blocks. */ public boolean reactorExplosions = true; /** Whether schematics are allowed */ - public boolean schematicAllowed = true; + public boolean schematicsAllowed = true; /** Whether friendly explosions can occur and set fire/damage other blocks. */ public boolean damageExplosions = true; /** Whether fire is enabled. */ diff --git a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java index 176e7cc49e..68f61f1df2 100644 --- a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java +++ b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java @@ -140,7 +140,7 @@ public class CustomRulesDialog extends BaseDialog{ title("@rules.title.resourcesbuilding"); check("@rules.infiniteresources", b -> rules.infiniteResources = b, () -> rules.infiniteResources); check("@rules.reactorexplosions", b -> rules.reactorExplosions = b, () -> rules.reactorExplosions); - check("@rules.schematic", b-> rules.schematicAllowed = b, () -> rules.schematicAllowed); + check("@rules.schematic", b-> rules.schematicsAllowed = b, () -> rules.schematicsAllowed); number("@rules.buildcostmultiplier", false, f -> rules.buildCostMultiplier = f, () -> rules.buildCostMultiplier, () -> !rules.infiniteResources); number("@rules.buildspeedmultiplier", f -> rules.buildSpeedMultiplier = f, () -> rules.buildSpeedMultiplier); number("@rules.deconstructrefundmultiplier", false, f -> rules.deconstructRefundMultiplier = f, () -> rules.deconstructRefundMultiplier, () -> !rules.infiniteResources); diff --git a/core/src/mindustry/ui/dialogs/SchematicsDialog.java b/core/src/mindustry/ui/dialogs/SchematicsDialog.java index 3501ae1873..7a2afbbd1e 100644 --- a/core/src/mindustry/ui/dialogs/SchematicsDialog.java +++ b/core/src/mindustry/ui/dialogs/SchematicsDialog.java @@ -64,7 +64,7 @@ public class SchematicsDialog extends BaseDialog{ t.update(() -> { if(Core.input.keyTap(Binding.chat) && Core.scene.getKeyboardFocus() == searchField && firstSchematic != null){ - if(!Vars.state.rules.schematicAllowed){ + if(!Vars.state.rules.schematicsAllowed){ ui.showInfo("@schematic.disabled"); }else{ control.input.useSchematic(firstSchematic); @@ -150,7 +150,7 @@ public class SchematicsDialog extends BaseDialog{ if(state.isMenu()){ showInfo(s); }else{ - if(!Vars.state.rules.schematicAllowed){ + if(!Vars.state.rules.schematicsAllowed){ ui.showInfo("@schematic.disabled"); }else{ control.input.useSchematic(s);