Got rid of most of the original civ's Promotion icons and replaced with Unciv icons =)

core/src/com/unciv/ui/EmpireOverviewScreen.kt

@@ -114,8 +114,8 @@ class EmpireOverviewScreen : CameraStageBaseScreen(){
 
     private fun createTradeTable(trade: Trade, otherCiv:CivilizationInfo): Table {
         val generalTable = Table(skin)
-        generalTable.add(createOffersTable(currentPlayerCivInfo,trade.ourOffers, trade.theirOffers.size))
-        generalTable.add(createOffersTable(otherCiv, trade.theirOffers, trade.ourOffers.size))
+        generalTable.add(createOffersTable(currentPlayerCivInfo,trade.ourOffers, trade.theirOffers.size)).top()
+        generalTable.add(createOffersTable(otherCiv, trade.theirOffers, trade.ourOffers.size)).top()
         return generalTable
     }
 

core/src/com/unciv/ui/utils/ImageGetter.kt

@@ -116,7 +116,34 @@ object ImageGetter {
         return getStatIcon(construction)
     }
 
-    fun getPromotionIcon(promotionName:String):Image{
+    fun getPromotionIcon(promotionName:String): Actor {
+        var level = 0
+
+        when {
+            promotionName.endsWith(" I") -> level=1
+            promotionName.endsWith(" II") -> level=2
+            promotionName.endsWith(" III") -> level=3
+        }
+
+        val basePromotionName = if(level==0) promotionName
+        else promotionName.substring(0, promotionName.length-level-1)
+
+        if(imageExists("UnitPromotionIcons/$basePromotionName")) {
+            val icon = getImage("UnitPromotionIcons/$basePromotionName")
+            icon.color = colorFromRGB(255,226,0)
+            var circle = icon.surroundWithCircle(30f)
+            circle.circle.color = colorFromRGB(0,12,49)
+//            circle = circle.surroundWithCircle(40f)
+//            circle.circle.color = colorFromRGB(255,226,0)
+            if(level!=0){
+                val starTable = Table().apply { defaults().pad(2f) }
+                for(i in 1..level) starTable.add(getImage("OtherIcons/Star")).size(8f)
+                starTable.centerX(circle)
+                starTable.y=5f
+                circle.addActor(starTable)
+            }
+            return circle
+        }
         return getImage("UnitPromotionIcons/" + promotionName.replace(' ', '_') + "_(Civ5)")
     }
 

core/src/com/unciv/ui/worldscreen/unit/UnitTable.kt

@@ -184,7 +184,7 @@ class UnitTable(val worldScreen: WorldScreen) : Table(){
         if(selectedUnit!=null) {
             unitIconHolder.add(UnitGroup(selectedUnit!!,30f)).pad(5f)
             for(promotion in selectedUnit!!.promotions.promotions)
-                promotionsTable.add(ImageGetter.getPromotionIcon(promotion)).size(20f)
+                promotionsTable.add(ImageGetter.getPromotionIcon(promotion))//.size(20f)
 
         }
 

docs/Credits.md

@@ -440,6 +440,18 @@ Unless otherwise specified, all the following are from [the Noun Project](https:
 * Variation on [crecent moon](https://thenounproject.com/search/?q=crescents&i=1438333) by Estu Suhartono for The Ottomans
 * [Korea](https://thenounproject.com/search/?q=korea&i=1689701) by CJS for Korea
 
+## Promotions
+
+* [Sight](https://thenounproject.com/search/?q=sight&i=2631027) By Jejen Juliansyah Nur Agung for Accuracy
+* [skill bow rain arrow](https://thenounproject.com/search/?q=rain%20of%20arrows&i=2360192) by Maxicons for Barrage
+* [Bomb](https://thenounproject.com/search/?q=bombardment&i=1705276) By Angelo Troiano for Bombardment
+* [Private E2](https://thenounproject.com/yeongrong.kim.5/collection/miltary-rank/?i=833152) By Yeong Rong Kim for Shock
+* [Private First Class](https://thenounproject.com/yeongrong.kim.5/collection/miltary-rank/?i=833161) By Yeong Rong Kim for Drill
+* [Medic](https://thenounproject.com/search/?q=medic&i=48740) By Yohann Berger for Medic
+* [City](https://thenounproject.com/search/?q=city&i=2402817) By iconcheese for Siege
+* [Skull and Crossbones](https://thenounproject.com/search/?q=skull%20and%20cross%20bones&i=15526) By Anton Outkine for Coastal Raider
+* [Spear](https://thenounproject.com/search/?q=spear&i=1754184) By Deemak Daksina for Formation
+
 ## Others 
 
 * [Circle](https://thenounproject.com/term/circle/1841891/) By Aybige