Merge pull request #3188 from sk7725/patch-26

Field for LiquidTurrets that do not care about the fires around it
This commit is contained in:
Anuken 2020-10-30 09:17:40 -04:00 committed by GitHub
commit 7cac70010e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -19,6 +19,7 @@ public class LiquidTurret extends Turret{
public ObjectMap<Liquid, BulletType> ammoTypes = new ObjectMap<>();
public @Load("@-liquid") TextureRegion liquidRegion;
public @Load("@-top") TextureRegion topRegion;
public boolean extinguish = true;
public LiquidTurret(String name){
super(name);
@ -86,7 +87,7 @@ public class LiquidTurret extends Turret{
@Override
protected void findTarget(){
if(liquids.current().canExtinguish()){
if(extinguish && liquids.current().canExtinguish()){
int tr = (int)(range / tilesize);
for(int x = -tr; x <= tr; x++){
for(int y = -tr; y <= tr; y++){