Fixed cyanogen color / Fixed liquid display negative values
This commit is contained in:
@@ -78,9 +78,9 @@ public class Liquids implements ContentList{
|
||||
flammability = 1f;
|
||||
}};
|
||||
|
||||
cyanogen = new Liquid("cyanogen", Color.valueOf("6fd5d5")){{
|
||||
cyanogen = new Liquid("cyanogen", Color.valueOf("89e8b6")){{
|
||||
gas = true;
|
||||
barColor = Color.valueOf("6fd5d5");
|
||||
barColor = color;
|
||||
flammability = 2f;
|
||||
}};
|
||||
|
||||
|
||||
@@ -18,6 +18,7 @@ public class ContinuousTurret extends Turret{
|
||||
coolantMultiplier = 1f;
|
||||
envEnabled |= Env.space;
|
||||
acceptCoolant = false;
|
||||
displayAmmoMultiplier = false;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -69,6 +69,7 @@ public class Turret extends ReloadTurret{
|
||||
public boolean targetGround = true;
|
||||
public boolean targetHealing = false;
|
||||
public boolean playerControllable = true;
|
||||
public boolean displayAmmoMultiplier = true;
|
||||
|
||||
//charging
|
||||
public float chargeTime = -1f;
|
||||
|
||||
@@ -65,7 +65,7 @@ public class ConsumeLiquids extends Consume{
|
||||
@Override
|
||||
public void display(Stats stats){
|
||||
//TODO display is wrong
|
||||
stats.add(booster ? Stat.booster : Stat.input, StatValues.liquids(stats.timePeriod, stats.timePeriod >= 0, liquids));
|
||||
stats.add(booster ? Stat.booster : Stat.input, StatValues.liquids(1f, true, liquids));
|
||||
}
|
||||
|
||||
protected float use(float amount, Building build){
|
||||
|
||||
@@ -309,7 +309,7 @@ public class StatValues{
|
||||
sep(bt, Core.bundle.format("bullet.splashdamage", (int)type.splashDamage, Strings.fixed(type.splashDamageRadius / tilesize, 1)));
|
||||
}
|
||||
|
||||
if(!compact && !Mathf.equal(type.ammoMultiplier, 1f) && type.displayAmmoMultiplier){
|
||||
if(!compact && !Mathf.equal(type.ammoMultiplier, 1f) && type.displayAmmoMultiplier && (!(t instanceof Turret turret) || turret.displayAmmoMultiplier)){
|
||||
sep(bt, Core.bundle.format("bullet.multiplier", (int)type.ammoMultiplier));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user