From b68c4d3edcfc0836da866b8295596120717efe11 Mon Sep 17 00:00:00 2001
From: yairm210 <yairm210@hotmail.com>
Date: Tue, 5 Nov 2024 15:51:06 +0200
Subject: [PATCH] Revert "perf(memory): Save unit icon location on baseunit"

This reverts commit ba37be8641459509e2f28b1209ee4d89f8472d02.
---
 core/src/com/unciv/models/ruleset/unit/BaseUnit.kt | 3 ---
 core/src/com/unciv/ui/images/ImageGetter.kt        | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt b/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt
index 17542d8dd5..130125d850 100644
--- a/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt
+++ b/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt
@@ -63,9 +63,6 @@ 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
index 908cdb0070..f5f877fe13 100644
--- 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(unit.unitIconLocation))
-            getImage(unit.unitIconLocation).apply { this.color = color }
+        if (imageExists("UnitIcons/${unit.name}"))
+            getImage("UnitIcons/${unit.name}").apply { this.color = color }
         else getImage("UnitTypeIcons/${unit.type}").apply { this.color = color }
 
     fun getConstructionPortrait(construction: String, size: Float): Group {