From 9b291a366a0ad80a48d77e06041899d4b3e6c7bf Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 25 Nov 2021 12:31:53 -0500 Subject: [PATCH] Fixed cyanogen color / Fixed liquid display negative values --- core/src/mindustry/content/Liquids.java | 4 ++-- .../world/blocks/defense/turrets/ContinuousTurret.java | 1 + core/src/mindustry/world/blocks/defense/turrets/Turret.java | 1 + core/src/mindustry/world/consumers/ConsumeLiquids.java | 2 +- core/src/mindustry/world/meta/StatValues.java | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/core/src/mindustry/content/Liquids.java b/core/src/mindustry/content/Liquids.java index d95e4aceb5..e928ced123 100644 --- a/core/src/mindustry/content/Liquids.java +++ b/core/src/mindustry/content/Liquids.java @@ -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; }}; diff --git a/core/src/mindustry/world/blocks/defense/turrets/ContinuousTurret.java b/core/src/mindustry/world/blocks/defense/turrets/ContinuousTurret.java index e9d8208ef8..2109961335 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/ContinuousTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/ContinuousTurret.java @@ -18,6 +18,7 @@ public class ContinuousTurret extends Turret{ coolantMultiplier = 1f; envEnabled |= Env.space; acceptCoolant = false; + displayAmmoMultiplier = false; } @Override diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java index 182df47fc8..a80fa06722 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java @@ -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; diff --git a/core/src/mindustry/world/consumers/ConsumeLiquids.java b/core/src/mindustry/world/consumers/ConsumeLiquids.java index a38e4dc725..74448ef64e 100644 --- a/core/src/mindustry/world/consumers/ConsumeLiquids.java +++ b/core/src/mindustry/world/consumers/ConsumeLiquids.java @@ -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){ diff --git a/core/src/mindustry/world/meta/StatValues.java b/core/src/mindustry/world/meta/StatValues.java index b148c6a16e..39b99a1c6f 100644 --- a/core/src/mindustry/world/meta/StatValues.java +++ b/core/src/mindustry/world/meta/StatValues.java @@ -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)); }