perf(memory): Save unit icon location on baseunit

yairm210 · Nov 5, 2024 · ba37be8 · ba37be8
1 parent 9ccce38
commit ba37be8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt b/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt
@@ -63,6 +63,9 @@ class BaseUnit : RulesetObject(), INonPerpetualConstruction {
 
     @Transient
     var cachedForceEvaluation: Int = -1
+
+    @delegate:Transient // memory perf optimization to not create the string per unit
+    val unitIconLocation by lazy { "UnitIcons/$name.png" }
 
     @Transient
     val costFunctions = BaseUnitCost(this)

diff --git a/core/src/com/unciv/ui/images/ImageGetter.kt b/core/src/com/unciv/ui/images/ImageGetter.kt
@@ -251,8 +251,8 @@ object ImageGetter {
     fun getRandomNationPortrait(size: Float): Portrait = PortraitNation(Constants.random, size)
 
     fun getUnitIcon(unit: BaseUnit, color: Color = Color.BLACK): Image =
-        if (imageExists("UnitIcons/${unit.name}"))
-            getImage("UnitIcons/${unit.name}").apply { this.color = color }
+        if (imageExists(unit.unitIconLocation))
+            getImage(unit.unitIconLocation).apply { this.color = color }
         else getImage("UnitTypeIcons/${unit.type}").apply { this.color = color }
 
     fun getConstructionPortrait(construction: String, size: Float): Group {