Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Turret coolant use balancing

Browse Source
This commit is contained in:
Anuken
2019-04-02 11:26:02 -04:00
parent 95eab94c80
commit ebcce194a0
4 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1507,6 +1507,7 @@ public class Blocks implements ContentList{
shootDuration = 220f; shootDuration = 220f;
health = 165 * size * size; health = 165 * size * size;
consumes.add(new ConsumeLiquidFilter(liquid -> liquid.temperature <= 0.5f && liquid.flammability < 0.1f, 0.5f)).update(false);
}}; }};
//endregion //endregion

2
core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
View File

@@ -212,7 +212,7 @@ public class SettingsMenuDialog extends SettingsDialog{
graphics.checkPref("minimap", !mobile); graphics.checkPref("minimap", !mobile);
graphics.checkPref("fps", false); graphics.checkPref("fps", false);
graphics.checkPref("indicators", true); graphics.checkPref("indicators", true);
graphics.checkPref("animatedwater", !mobile); graphics.checkPref("animatedwater", false);
graphics.checkPref("lasers", true); graphics.checkPref("lasers", true);
} }

4
core/src/io/anuke/mindustry/world/blocks/defense/turrets/CooledTurret.java
View File

@@ -17,7 +17,7 @@ import static io.anuke.mindustry.Vars.tilesize;
public class CooledTurret extends Turret{ public class CooledTurret extends Turret{
/**How much reload is lowered by for each unit of liquid of heat capacity.*/ /**How much reload is lowered by for each unit of liquid of heat capacity.*/
protected float coolantMultiplier = 2f; protected float coolantMultiplier = 5f;
protected Effect coolEffect = Fx.fuelburn; protected Effect coolEffect = Fx.fuelburn;
public CooledTurret(String name){ public CooledTurret(String name){
@@ -25,7 +25,7 @@ public class CooledTurret extends Turret{
hasLiquids = true; hasLiquids = true;
liquidCapacity = 20f; liquidCapacity = 20f;
consumes.add(new ConsumeLiquidFilter(liquid -> liquid.temperature <= 0.5f && liquid.flammability < 0.1f, 0.5f)).update(false).optional(true); consumes.add(new ConsumeLiquidFilter(liquid -> liquid.temperature <= 0.5f && liquid.flammability < 0.1f, 0.2f)).update(false).optional(true);
} }
@Override @Override

8
core/src/io/anuke/mindustry/world/blocks/defense/turrets/LaserTurret.java
View File

@@ -12,6 +12,7 @@ import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.consumers.ConsumeLiquidBase; import io.anuke.mindustry.world.consumers.ConsumeLiquidBase;
import io.anuke.mindustry.world.consumers.ConsumeLiquidFilter; import io.anuke.mindustry.world.consumers.ConsumeLiquidFilter;
import io.anuke.mindustry.world.consumers.ConsumeType; import io.anuke.mindustry.world.consumers.ConsumeType;
import io.anuke.mindustry.world.meta.BlockStat;
import static io.anuke.mindustry.Vars.tilesize; import static io.anuke.mindustry.Vars.tilesize;
@@ -26,6 +27,13 @@ public class LaserTurret extends PowerTurret{
consumes.add(new ConsumeLiquidFilter(liquid -> liquid.temperature <= 0.5f && liquid.flammability < 0.1f, 0.01f)).update(false); consumes.add(new ConsumeLiquidFilter(liquid -> liquid.temperature <= 0.5f && liquid.flammability < 0.1f, 0.01f)).update(false);
} }
@Override
public void setStats(){
super.setStats();
stats.remove(BlockStat.boostEffect);
}
@Override @Override
public void update(Tile tile) { public void update(Tile tile) {
super.update(tile); super.update(tile);