mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-23 22:28:08 +07:00
Code Issues Packages Projects Releases Wiki Activity

Other tweaks

Browse Source
This commit is contained in:
Anuken
2020-04-10 19:17:40 -04:00
parent 758ace353e
commit 7dca6b2a30
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java
View File

@ -59,9 +59,21 @@ public class LaserTurret extends PowerTurret{
if(bulletLife <= 0f){ if(bulletLife <= 0f){
bullet = null; bullet = null;
} }
}else if(reload > 0){
Liquid liquid = liquids().current();
float maxUsed = consumes.<ConsumeLiquidBase>get(ConsumeType.liquid).amount;
float used = (tile.isEnemyCheat() ? maxUsed * Time.delta() : Math.min(liquids.get(liquid), maxUsed * Time.delta())) * liquid.heatCapacity * coolantMultiplier;
reload -= used;
liquids.remove(liquid, used);
if(Mathf.chance(0.06 * used)){
coolEffect.at(x + Mathf.range(size * tilesize / 2f), y + Mathf.range(size * tilesize / 2f));
} }
} }
}
@Override @Override
protected void updateShooting(){ protected void updateShooting(){
if(bulletLife > 0 && bullet != null){ if(bulletLife > 0 && bullet != null){
@ -74,17 +86,6 @@ public class LaserTurret extends PowerTurret{
shoot(type); shoot(type);
reload = reloadTime; reload = reloadTime;
}else{
Liquid liquid = liquids().current();
float maxUsed = consumes.<ConsumeLiquidBase>get(ConsumeType.liquid).amount;
float used = (tile.isEnemyCheat() ? maxUsed * Time.delta() : Math.min(liquids.get(liquid), maxUsed * Time.delta())) * liquid.heatCapacity * coolantMultiplier;
reload -= used;
liquids.remove(liquid, used);
if(Mathf.chance(0.06 * used)){
coolEffect.at(x + Mathf.range(size * tilesize / 2f), y + Mathf.range(size * tilesize / 2f));
}
} }
} }