Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed cyanogen color / Fixed liquid display negative values

Browse Source
This commit is contained in:
Anuken
2021-11-25 12:31:53 -05:00
parent 1bcd48aadc
commit 9b291a366a
5 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/content/Liquids.java
View File

@@ -78,9 +78,9 @@ public class Liquids implements ContentList{
flammability = 1f; flammability = 1f;
}}; }};
cyanogen = new Liquid("cyanogen", Color.valueOf("6fd5d5")){{ cyanogen = new Liquid("cyanogen", Color.valueOf("89e8b6")){{
gas = true; gas = true;
barColor = Color.valueOf("6fd5d5"); barColor = color;
flammability = 2f; flammability = 2f;
}}; }};

1
core/src/mindustry/world/blocks/defense/turrets/ContinuousTurret.java
View File

@@ -18,6 +18,7 @@ public class ContinuousTurret extends Turret{
coolantMultiplier = 1f; coolantMultiplier = 1f;
envEnabled |= Env.space; envEnabled |= Env.space;
acceptCoolant = false; acceptCoolant = false;
displayAmmoMultiplier = false;
} }
@Override @Override

1
core/src/mindustry/world/blocks/defense/turrets/Turret.java
View File

@@ -69,6 +69,7 @@ public class Turret extends ReloadTurret{
public boolean targetGround = true; public boolean targetGround = true;
public boolean targetHealing = false; public boolean targetHealing = false;
public boolean playerControllable = true; public boolean playerControllable = true;
public boolean displayAmmoMultiplier = true;
//charging //charging
public float chargeTime = -1f; public float chargeTime = -1f;

2
core/src/mindustry/world/consumers/ConsumeLiquids.java
View File

@@ -65,7 +65,7 @@ public class ConsumeLiquids extends Consume{
@Override @Override
public void display(Stats stats){ public void display(Stats stats){
//TODO display is wrong //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){ protected float use(float amount, Building build){

2
core/src/mindustry/world/meta/StatValues.java
View File

@@ -309,7 +309,7 @@ public class StatValues{
sep(bt, Core.bundle.format("bullet.splashdamage", (int)type.splashDamage, Strings.fixed(type.splashDamageRadius / tilesize, 1))); 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)); sep(bt, Core.bundle.format("bullet.multiplier", (int)type.ammoMultiplier));
} }