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

Fixed turret cooling

Browse Source
This commit is contained in:
Anuken
2019-09-18 08:49:48 -04:00
parent 5d0cfc3599
commit c6a4bf69ee
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/Vars.java
View File

@@ -122,8 +122,6 @@ public class Vars implements Loadable{
public static FileHandle saveDirectory; public static FileHandle saveDirectory;
/** data subdirectory used for plugins */ /** data subdirectory used for plugins */
public static FileHandle pluginDirectory; public static FileHandle pluginDirectory;
/** old map file extension, for conversion */
public static final String oldMapExtension = "mmap";
/** map file extension */ /** map file extension */
public static final String mapExtension = "msav"; public static final String mapExtension = "msav";
/** save file extension */ /** save file extension */

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

@@ -55,7 +55,7 @@ public class CooledTurret extends Turret{
Liquid liquid = entity.liquids.current(); Liquid liquid = entity.liquids.current();
float used = Math.min(Math.min(entity.liquids.get(liquid), maxUsed * Time.delta()), Math.max(0, ((reload - entity.reload) / coolantMultiplier) / liquid.heatCapacity)) * baseReloadSpeed(tile); float used = Math.min(Math.min(entity.liquids.get(liquid), maxUsed * Time.delta()), Math.max(0, ((reload - entity.reload) / coolantMultiplier) / liquid.heatCapacity)) * baseReloadSpeed(tile);
entity.reload += (used * liquid.heatCapacity) / liquid.heatCapacity; entity.reload += used * liquid.heatCapacity * coolantMultiplier;
entity.liquids.remove(liquid, used); entity.liquids.remove(liquid, used);
if(Mathf.chance(0.06 * used)){ if(Mathf.chance(0.06 * used)){

2
core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java
View File

@@ -100,7 +100,7 @@ public abstract class Turret extends Block{
stats.add(BlockStat.shootRange, range / tilesize, StatUnit.blocks); stats.add(BlockStat.shootRange, range / tilesize, StatUnit.blocks);
stats.add(BlockStat.inaccuracy, (int)inaccuracy, StatUnit.degrees); stats.add(BlockStat.inaccuracy, (int)inaccuracy, StatUnit.degrees);
stats.add(BlockStat.reload, 60f / reload * shots, StatUnit.none); stats.add(BlockStat.reload, 60f / reload, StatUnit.none);
stats.add(BlockStat.shots, shots, StatUnit.none); stats.add(BlockStat.shots, shots, StatUnit.none);
stats.add(BlockStat.targetsAir, targetAir); stats.add(BlockStat.targetsAir, targetAir);
stats.add(BlockStat.targetsGround, targetGround); stats.add(BlockStat.targetsGround, targetGround);

7
core/src/io/anuke/mindustry/world/blocks/production/GenericCrafter.java
View File

@@ -127,6 +127,13 @@ public class GenericCrafter extends Block{
} }
} }
@Override
public boolean outputsItems(){
return outputItem != null;
}
@Override @Override
public boolean canProduce(Tile tile){ public boolean canProduce(Tile tile){
if(outputItem != null && tile.entity.items.get(outputItem.item) >= itemCapacity){ if(outputItem != null && tile.entity.items.get(outputItem.item) >= itemCapacity){