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

Heat icon

Browse Source
This commit is contained in:
Anuken
2022-11-01 10:57:41 -04:00
parent 5a44bf6023
commit ff115ee376
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/content/Blocks.java
View File

@@ -1808,7 +1808,7 @@ public class Blocks{
requirements(Category.effect, with(Items.silicon, 150, Items.oxide, 40, Items.thorium, 60)); requirements(Category.effect, with(Items.silicon, 150, Items.oxide, 40, Items.thorium, 60));
outlineColor = Pal.darkOutline; outlineColor = Pal.darkOutline;
range = 180f; range = 200f;
size = 3; size = 3;
buildSpeed = 1.5f; buildSpeed = 1.5f;
@@ -5615,7 +5615,7 @@ public class Blocks{
requirements(Category.units, with(Items.silicon, 100, Items.beryllium, 150, Items.tungsten, 80)); requirements(Category.units, with(Items.silicon, 100, Items.beryllium, 150, Items.tungsten, 80));
regionSuffix = "-dark"; regionSuffix = "-dark";
hasPower = true; hasPower = true;
buildSpeed = 0.5f; buildSpeed = 0.6f;
consumePower(2f); consumePower(2f);
size = 3; size = 3;
//TODO expand this list //TODO expand this list
@@ -5627,7 +5627,7 @@ public class Blocks{
requirements(Category.units, with(Items.silicon, 150, Items.oxide, 150, Items.tungsten, 200, Items.phaseFabric, 40)); requirements(Category.units, with(Items.silicon, 150, Items.oxide, 150, Items.tungsten, 200, Items.phaseFabric, 40));
regionSuffix = "-dark"; regionSuffix = "-dark";
hasPower = true; hasPower = true;
buildSpeed = 0.6f; buildSpeed = 0.75f;
maxBlockSize = 4; maxBlockSize = 4;
minBlockSize = 3; minBlockSize = 3;
size = 5; size = 5;

10
core/src/mindustry/world/meta/StatUnit.java
View File

@@ -1,6 +1,8 @@
package mindustry.world.meta; package mindustry.world.meta;
import arc.*; import arc.*;
import arc.util.*;
import mindustry.gen.*;
import java.util.*; import java.util.*;
@@ -18,7 +20,7 @@ public class StatUnit{
itemsSecond = new StatUnit("itemsSecond"), itemsSecond = new StatUnit("itemsSecond"),
liquidUnits = new StatUnit("liquidUnits"), liquidUnits = new StatUnit("liquidUnits"),
powerUnits = new StatUnit("powerUnits"), powerUnits = new StatUnit("powerUnits"),
heatUnits = new StatUnit("heatUnits"), heatUnits = new StatUnit("heatUnits", "[red]" + Iconc.waves + "[]"),
degrees = new StatUnit("degrees"), degrees = new StatUnit("degrees"),
seconds = new StatUnit("seconds"), seconds = new StatUnit("seconds"),
minutes = new StatUnit("minutes"), minutes = new StatUnit("minutes"),
@@ -33,6 +35,7 @@ public class StatUnit{
public final boolean space; public final boolean space;
public final String name; public final String name;
public @Nullable String icon;
public StatUnit(String name, boolean space){ public StatUnit(String name, boolean space){
this.name = name; this.name = name;
@@ -43,6 +46,11 @@ public class StatUnit{
this(name, true); this(name, true);
} }
public StatUnit(String name, String icon){
this(name, true);
this.icon = icon;
}
public String localized(){ public String localized(){
if(this == none) return ""; if(this == none) return "";
return Core.bundle.get("unit." + name.toLowerCase(Locale.ROOT)); return Core.bundle.get("unit." + name.toLowerCase(Locale.ROOT));

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

@@ -49,7 +49,7 @@ public class StatValues{
public static StatValue number(float value, StatUnit unit, boolean merge){ public static StatValue number(float value, StatUnit unit, boolean merge){
return table -> { return table -> {
String l1 = fixValue(value), l2 = (unit.space ? " " : "") + unit.localized(); String l1 = (unit.icon == null ? "" : unit.icon + " ") + fixValue(value), l2 = (unit.space ? " " : "") + unit.localized();
if(merge){ if(merge){
table.add(l1 + l2); table.add(l1 + l2);