Implemented #1129 / Bugfixes

This commit is contained in:
Anuken
2020-03-24 12:02:26 -04:00
14 changed files with 72 additions and 16 deletions

View File

@@ -37,7 +37,7 @@ public class LiquidTurret extends Turret{
consumes.add(new ConsumeLiquidFilter(i -> ammoTypes.containsKey(i), 1f){
@Override
public boolean valid(Tilec entity){
return !((TurretEntity)entity).ammo.isEmpty();
return entity.liquids().total() > 0.001f;
}
@Override

View File

@@ -254,7 +254,6 @@ public abstract class Turret extends Block{
if(alternate){
float i = (shotCounter % shots) - shots/2f + (((shots+1)%2) / 2f);
Log.info(i);
tr.trns(rotation - 90, spread * i + Mathf.range(xRand), size * tilesize / 2);
bullet(type, rotation + Mathf.range(inaccuracy));