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

Display infinity symbol for "unlimited" unit cap

Browse Source
This commit is contained in:
Anuken
2021-11-01 12:27:00 -04:00
parent 779bab0344
commit 8cabae1d46
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/entities/Units.java
View File

@@ -81,6 +81,12 @@ public class Units{
return Math.max(0, state.rules.unitCapVariable ? state.rules.unitCap + team.data().unitCap : state.rules.unitCap); return Math.max(0, state.rules.unitCapVariable ? state.rules.unitCap + team.data().unitCap : state.rules.unitCap);
} }
/** @return unit cap as a string, substituting the infinity symbol instead of MAX_VALUE */
public static String getStringCap(Team team){
int cap = getCap(team);
return cap >= Integer.MAX_VALUE - 1 ? "∞" : cap + "";
}
/** @return whether this player can interact with a specific tile. if either of these are null, returns true.*/ /** @return whether this player can interact with a specific tile. if either of these are null, returns true.*/
public static boolean canInteract(Player player, Building tile){ public static boolean canInteract(Player player, Building tile){
return player == null || tile == null || tile.interactable(player.team()); return player == null || tile == null || tile.interactable(player.team());

2
core/src/mindustry/world/blocks/units/UnitFactory.java
View File

@@ -78,7 +78,7 @@ public class UnitFactory extends UnitBlock{
Core.bundle.format("bar.unitcap", Core.bundle.format("bar.unitcap",
Fonts.getUnicodeStr(e.unit().name), Fonts.getUnicodeStr(e.unit().name),
e.team.data().countType(e.unit()), e.team.data().countType(e.unit()),
Units.getCap(e.team) Units.getStringCap(e.team)
), ),
() -> Pal.power, () -> Pal.power,
() -> e.unit() == null ? 0f : (float)e.team.data().countType(e.unit()) / Units.getCap(e.team) () -> e.unit() == null ? 0f : (float)e.team.data().countType(e.unit()) / Units.getCap(e.team)

2
gradle.properties
View File

@@ -24,4 +24,4 @@ android.useAndroidX=true
#used for slow jitpack builds; TODO see if this actually works #used for slow jitpack builds; TODO see if this actually works
org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.socketTimeout=100000
org.gradle.internal.http.connectionTimeout=100000 org.gradle.internal.http.connectionTimeout=100000
archash=f1b1c17bf6385b607dad4af3c51ad88646c9e9ca archash=07d01125a25b789cc081249c469b91b5f65070dc