diff --git a/core/src/com/unciv/ui/tilegroups/TileGroup.kt b/core/src/com/unciv/ui/tilegroups/TileGroup.kt index 9afce63506..7029df8157 100644 --- a/core/src/com/unciv/ui/tilegroups/TileGroup.kt +++ b/core/src/com/unciv/ui/tilegroups/TileGroup.kt @@ -197,7 +197,7 @@ open class TileGroup(var tileInfo: TileInfo) : Group() { private fun updateImprovementImage(viewable: Boolean) { if (tileInfo.improvement != null && tileInfo.improvement != improvementType) { - improvementImage = ImageGetter.getImage("ImprovementIcons/" + tileInfo.improvement!!.replace(' ', '_') + "_(Civ5).png") + improvementImage = ImageGetter.getImprovementIcon(tileInfo.improvement!!) addActor(improvementImage) improvementImage!!.run { setSize(20f, 20f) diff --git a/core/src/com/unciv/ui/utils/ImageGetter.kt b/core/src/com/unciv/ui/utils/ImageGetter.kt index 3033ff9f82..982b62a9cd 100644 --- a/core/src/com/unciv/ui/utils/ImageGetter.kt +++ b/core/src/com/unciv/ui/utils/ImageGetter.kt @@ -45,5 +45,9 @@ object ImageGetter { return getImage("UnitIcons/$unitName.png") } + fun getImprovementIcon(improvementName:String):Image{ + return getImage("ImprovementIcons/" + improvementName.replace(' ', '_') + "_(Civ5).png") + } + fun getBlue() = Color(0x004085bf) } diff --git a/core/src/com/unciv/ui/worldscreen/unit/UnitActionsTable.kt b/core/src/com/unciv/ui/worldscreen/unit/UnitActionsTable.kt index 7b19e98c55..f22fed2130 100644 --- a/core/src/com/unciv/ui/worldscreen/unit/UnitActionsTable.kt +++ b/core/src/com/unciv/ui/worldscreen/unit/UnitActionsTable.kt @@ -25,13 +25,13 @@ class UnitActionsTable(val worldScreen: WorldScreen) : Table(){ "Stop automation" -> return ImageGetter.getImage("OtherIcons/Stop.png") "Found city" -> return ImageGetter.getUnitIcon("Settler") "Discover Technology" -> return ImageGetter.getUnitIcon("Great Scientist") - "Construct Academy" -> return ImageGetter.getImage("ImprovementIcons/Academy_(Civ5).png") + "Construct Academy" -> return ImageGetter.getImprovementIcon("Academy") "Start Golden Age" -> return ImageGetter.getUnitIcon("Great Artist") - "Construct Landmark" -> return ImageGetter.getImage("ImprovementIcons/Landmark_(Civ5).png") + "Construct Landmark" -> return ImageGetter.getImprovementIcon("Landmark") "Hurry Wonder" -> return ImageGetter.getUnitIcon("Great Engineer") - "Construct Manufactory" -> return ImageGetter.getImage("ImprovementIcons/Manufactory_(Civ5).png") + "Construct Manufactory" -> return ImageGetter.getImprovementIcon("Manufactory") "Conduct Trade Mission" -> return ImageGetter.getUnitIcon("Great Merchant") - "Construct Customs House" -> return ImageGetter.getImage("ImprovementIcons/Customs_house_(Civ5).png") + "Construct Customs House" -> return ImageGetter.getImprovementIcon("Customs house") else -> return ImageGetter.getImage("OtherIcons/Star.png") } }