From 8cabae1d46511e35f237efd4a3b6aa6fe74604f9 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 1 Nov 2021 12:27:00 -0400 Subject: [PATCH] Display infinity symbol for "unlimited" unit cap --- core/src/mindustry/entities/Units.java | 6 ++++++ core/src/mindustry/world/blocks/units/UnitFactory.java | 2 +- gradle.properties | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/entities/Units.java b/core/src/mindustry/entities/Units.java index 532c74fbbf..a4b94ae570 100644 --- a/core/src/mindustry/entities/Units.java +++ b/core/src/mindustry/entities/Units.java @@ -81,6 +81,12 @@ public class Units{ 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.*/ public static boolean canInteract(Player player, Building tile){ return player == null || tile == null || tile.interactable(player.team()); diff --git a/core/src/mindustry/world/blocks/units/UnitFactory.java b/core/src/mindustry/world/blocks/units/UnitFactory.java index 882ccec5d6..d0295fc36b 100644 --- a/core/src/mindustry/world/blocks/units/UnitFactory.java +++ b/core/src/mindustry/world/blocks/units/UnitFactory.java @@ -78,7 +78,7 @@ public class UnitFactory extends UnitBlock{ Core.bundle.format("bar.unitcap", Fonts.getUnicodeStr(e.unit().name), e.team.data().countType(e.unit()), - Units.getCap(e.team) + Units.getStringCap(e.team) ), () -> Pal.power, () -> e.unit() == null ? 0f : (float)e.team.data().countType(e.unit()) / Units.getCap(e.team) diff --git a/gradle.properties b/gradle.properties index 10919a574f..e53459d921 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,4 +24,4 @@ android.useAndroidX=true #used for slow jitpack builds; TODO see if this actually works org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 -archash=f1b1c17bf6385b607dad4af3c51ad88646c9e9ca +archash=07d01125a25b789cc081249c469b91b5f65070dc