mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-09 10:18:40 +07:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Anuken 2020-09-23 22:15:14 -04:00
parent 75ebaab3a3
commit 0288cb34fb
6 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
annotations/src/main/resources/classids.properties
View File

@ -26,4 +26,4 @@ pulsar=19
quad=23 quad=23
risso=20 risso=20
spiroct=21 spiroct=21
vela=25 vela=25

1
core/src/mindustry/content/Blocks.java
View File

@ -1750,7 +1750,6 @@ public class Blocks implements ContentList{
new UnitPlan(UnitTypes.risso, 60f * 45f, with(Items.silicon, 20, Items.metaglass, 35)), new UnitPlan(UnitTypes.risso, 60f * 45f, with(Items.silicon, 20, Items.metaglass, 35)),
}; };
size = 3; size = 3;
requiresWater = true;
consumes.power(1.2f); consumes.power(1.2f);
}}; }};

10
core/src/mindustry/content/Bullets.java
View File

@ -42,7 +42,7 @@ public class Bullets implements ContentList{
@Override @Override
public void load(){ public void load(){
artilleryDense = new ArtilleryBulletType(3f, 12, "shell"){{ artilleryDense = new ArtilleryBulletType(3f, 20, "shell"){{
hitEffect = Fx.flakExplosion; hitEffect = Fx.flakExplosion;
knockback = 0.8f; knockback = 0.8f;
lifetime = 80f; lifetime = 80f;
@ -63,7 +63,7 @@ public class Bullets implements ContentList{
collidesAir = false; collidesAir = false;
}}; }};
artilleryPlastic = new ArtilleryBulletType(3.4f, 12, "shell"){{ artilleryPlastic = new ArtilleryBulletType(3.4f, 20, "shell"){{
hitEffect = Fx.plasticExplosion; hitEffect = Fx.plasticExplosion;
knockback = 1f; knockback = 1f;
lifetime = 80f; lifetime = 80f;
@ -77,7 +77,7 @@ public class Bullets implements ContentList{
frontColor = Pal.plastaniumFront; frontColor = Pal.plastaniumFront;
}}; }};
artilleryHoming = new ArtilleryBulletType(3f, 12, "shell"){{ artilleryHoming = new ArtilleryBulletType(3f, 20, "shell"){{
hitEffect = Fx.flakExplosion; hitEffect = Fx.flakExplosion;
knockback = 0.8f; knockback = 0.8f;
lifetime = 80f; lifetime = 80f;
@ -91,7 +91,7 @@ public class Bullets implements ContentList{
homingRange = 50f; homingRange = 50f;
}}; }};
artilleryIncendiary = new ArtilleryBulletType(3f, 12, "shell"){{ artilleryIncendiary = new ArtilleryBulletType(3f, 20, "shell"){{
hitEffect = Fx.blastExplosion; hitEffect = Fx.blastExplosion;
knockback = 0.8f; knockback = 0.8f;
lifetime = 80f; lifetime = 80f;
@ -105,7 +105,7 @@ public class Bullets implements ContentList{
trailEffect = Fx.incendTrail; trailEffect = Fx.incendTrail;
}}; }};
artilleryExplosive = new ArtilleryBulletType(2f, 12, "shell"){{ artilleryExplosive = new ArtilleryBulletType(2f, 20, "shell"){{
hitEffect = Fx.blastExplosion; hitEffect = Fx.blastExplosion;
knockback = 0.8f; knockback = 0.8f;
lifetime = 80f; lifetime = 80f;

2
core/src/mindustry/game/Rules.java
View File

@ -39,7 +39,7 @@ public class Rules{
/** Whether reactors can explode and damage other blocks. */ /** Whether reactors can explode and damage other blocks. */
public boolean reactorExplosions = true; public boolean reactorExplosions = true;
/** Whether schematics are allowed */ /** Whether schematics are allowed */
public boolean schematicAllowed = true; public boolean schematicsAllowed = true;
/** Whether friendly explosions can occur and set fire/damage other blocks. */ /** Whether friendly explosions can occur and set fire/damage other blocks. */
public boolean damageExplosions = true; public boolean damageExplosions = true;
/** Whether fire is enabled. */ /** Whether fire is enabled. */

2
core/src/mindustry/ui/dialogs/CustomRulesDialog.java
View File

@ -140,7 +140,7 @@ public class CustomRulesDialog extends BaseDialog{
title("@rules.title.resourcesbuilding"); title("@rules.title.resourcesbuilding");
check("@rules.infiniteresources", b -> rules.infiniteResources = b, () -> rules.infiniteResources); check("@rules.infiniteresources", b -> rules.infiniteResources = b, () -> rules.infiniteResources);
check("@rules.reactorexplosions", b -> rules.reactorExplosions = b, () -> rules.reactorExplosions); 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.buildcostmultiplier", false, f -> rules.buildCostMultiplier = f, () -> rules.buildCostMultiplier, () -> !rules.infiniteResources);
number("@rules.buildspeedmultiplier", f -> rules.buildSpeedMultiplier = f, () -> rules.buildSpeedMultiplier); number("@rules.buildspeedmultiplier", f -> rules.buildSpeedMultiplier = f, () -> rules.buildSpeedMultiplier);
number("@rules.deconstructrefundmultiplier", false, f -> rules.deconstructRefundMultiplier = f, () -> rules.deconstructRefundMultiplier, () -> !rules.infiniteResources); number("@rules.deconstructrefundmultiplier", false, f -> rules.deconstructRefundMultiplier = f, () -> rules.deconstructRefundMultiplier, () -> !rules.infiniteResources);

4
core/src/mindustry/ui/dialogs/SchematicsDialog.java
View File

@ -64,7 +64,7 @@ public class SchematicsDialog extends BaseDialog{
t.update(() -> { t.update(() -> {
if(Core.input.keyTap(Binding.chat) && Core.scene.getKeyboardFocus() == searchField && firstSchematic != null){ 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"); ui.showInfo("@schematic.disabled");
}else{ }else{
control.input.useSchematic(firstSchematic); control.input.useSchematic(firstSchematic);
@ -150,7 +150,7 @@ public class SchematicsDialog extends BaseDialog{
if(state.isMenu()){ if(state.isMenu()){
showInfo(s); showInfo(s);
}else{ }else{
if(!Vars.state.rules.schematicAllowed){ if(!Vars.state.rules.schematicsAllowed){
ui.showInfo("@schematic.disabled"); ui.showInfo("@schematic.disabled");
}else{ }else{
control.input.useSchematic(s); control.input.useSchematic(s);