Merge branch 'yairm210:master' into flash-on-new-chat-message

android/assets/Flags.atlas

@@ -195,126 +195,126 @@ FlagIcons/Malay
   index: -1
 FlagIcons/Maltese
   rotate: false
-  xy: 1908, 4
+  xy: 1092, 4
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 FlagIcons/Norwegian
   rotate: false
-  xy: 1092, 4
+  xy: 1228, 140
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 FlagIcons/Persian_(Pinglish-DIN)
   rotate: false
-  xy: 1228, 140
+  xy: 1364, 276
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 FlagIcons/Persian_(Pinglish-UN)
   rotate: false
-  xy: 1228, 140
+  xy: 1364, 276
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 FlagIcons/Polish
   rotate: false
-  xy: 1364, 276
+  xy: 1228, 4
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 FlagIcons/Portuguese
   rotate: false
-  xy: 1228, 4
+  xy: 1364, 140
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 FlagIcons/Romanian
   rotate: false
-  xy: 1364, 140
+  xy: 1500, 276
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 FlagIcons/Russian
   rotate: false
-  xy: 1500, 276
+  xy: 1364, 4
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 FlagIcons/Rusyn
   rotate: false
-  xy: 1364, 4
+  xy: 1500, 140
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 FlagIcons/Simplified_Chinese
   rotate: false
-  xy: 1500, 140
+  xy: 1636, 276
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 FlagIcons/Spanish
   rotate: false
-  xy: 1636, 276
+  xy: 1500, 4
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 FlagIcons/Swedish
   rotate: false
-  xy: 1500, 4
+  xy: 1636, 140
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 FlagIcons/Thai
   rotate: false
-  xy: 1636, 140
+  xy: 1772, 276
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 FlagIcons/Traditional_Chinese
   rotate: false
-  xy: 1772, 276
+  xy: 1636, 4
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 FlagIcons/Turkish
   rotate: false
-  xy: 1636, 4
+  xy: 1772, 140
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 FlagIcons/Ukrainian
   rotate: false
-  xy: 1772, 140
+  xy: 1908, 276
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 FlagIcons/Vietnamese
   rotate: false
-  xy: 1908, 276
+  xy: 1772, 4
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 FlagIcons/Zulu
   rotate: false
-  xy: 1772, 4
+  xy: 1908, 140
   size: 128, 128
   orig: 128, 128
   offset: 0, 0

build.gradle.kts

@@ -37,7 +37,7 @@ plugins {
     kotlin("multiplatform") version kotlinVersion
     kotlin("plugin.serialization") version kotlinVersion
     id("io.gitlab.arturbosch.detekt") version "1.23.8"
-    id("io.github.yairm210.purity-plugin") version "1.2.3" apply false
+    id("io.github.yairm210.purity-plugin") version "1.3.0" apply false
 }
 
 allprojects {

core/src/com/unciv/logic/civilization/diplomacy/DeclareWar.kt

@@ -49,23 +49,21 @@ object DeclareWar {
                 UniqueTriggerActivation.triggerUnique(unique, civInfo)
         }
 
-        for (unique in civInfo.getTriggeredUniques(UniqueType.TriggerUponDeclaringWarFiltered)) {
+        for (unique in civInfo.getTriggeredUniques(UniqueType.TriggerUponDeclaringWarFiltered)
-            if (otherCiv.matchesFilter(unique.params[0]))
+                { otherCiv.matchesFilter(it.params[0])} )
-                UniqueTriggerActivation.triggerUnique(unique, civInfo)
+            UniqueTriggerActivation.triggerUnique(unique, civInfo)
-        }
 
-        for (unique in otherCiv.getTriggeredUniques(UniqueType.TriggerUponBeingDeclaredWarUpon)) {
+        for (unique in otherCiv.getTriggeredUniques(UniqueType.TriggerUponBeingDeclaredWarUpon)
-            if (civInfo.matchesFilter(unique.params[0]))
+                { civInfo.matchesFilter(it.params[0])} ) 
-                UniqueTriggerActivation.triggerUnique(unique, otherCiv)
+            UniqueTriggerActivation.triggerUnique(unique, otherCiv)
-        }
 
-        for (unique in civInfo.getTriggeredUniques(UniqueType.TriggerUponEnteringWar))
+        for (unique in civInfo.getTriggeredUniques(UniqueType.TriggerUponEnteringWar)
-            if (otherCiv.matchesFilter(unique.params[0]))
+                {otherCiv.matchesFilter(it.params[0])})
-                UniqueTriggerActivation.triggerUnique(unique, civInfo)
+            UniqueTriggerActivation.triggerUnique(unique, civInfo)
 
-        for (unique in otherCiv.getTriggeredUniques(UniqueType.TriggerUponEnteringWar))
+        for (unique in otherCiv.getTriggeredUniques(UniqueType.TriggerUponEnteringWar)
-            if (civInfo.matchesFilter(unique.params[0]))
+                {civInfo.matchesFilter(it.params[0])})
-                UniqueTriggerActivation.triggerUnique(unique, otherCiv)
+            UniqueTriggerActivation.triggerUnique(unique, otherCiv)
     }
 
     private fun handleCityStateDirectAttack(diplomacyManager: DiplomacyManager) {

core/src/com/unciv/logic/civilization/managers/ImprovementFunctions.kt

@@ -51,12 +51,13 @@ object ImprovementFunctions {
                 yield(ImprovementBuildingProblem.MissingResources)
             
             if (tile != null) {
-                if (tile.getOwner() != civInfo && !improvement.hasUnique(UniqueType.CanBuildOutsideBorders, gameContext)) {
+                if (tile.getOwner() != civInfo
-                    if (!improvement.hasUnique(UniqueType.CanBuildJustOutsideBorders, gameContext))
+                    && !improvement.hasUnique(UniqueType.CanBuildOutsideBorders, gameContext)
-                        yield(ImprovementBuildingProblem.OutsideBorders)
+                    && (!improvement.hasUnique(UniqueType.CanBuildJustOutsideBorders, gameContext)
-                    else if (tile.neighbors.none { it.getOwner() == civInfo })
+                            || tile.neighbors.none { it.getOwner() == civInfo })
-                        yield(ImprovementBuildingProblem.NotJustOutsideBorders)
+                ) 
-                }
+                    yield(ImprovementBuildingProblem.OutsideBorders)
+                
                 val knownFeatureRemovals = tile.ruleset.nonRoadTileRemovals
                     .filter { rulesetImprovement ->
                         rulesetImprovement.techRequired == null || civInfo.tech.isResearched(rulesetImprovement.techRequired!!)

core/src/com/unciv/ui/components/ISortableGridContentProvider.kt

@@ -81,8 +81,7 @@ interface ISortableGridContentProvider<IT, ACT> {
         items.sumOf { getEntryValue(it) }.toCenteredLabel()
 
     companion object {
-        @JvmStatic
+        val collator by lazy {UncivGame.Current.settings.getCollatorFromLocale()}
-        val collator = UncivGame.Current.settings.getCollatorFromLocale()
 
         @JvmStatic
         fun getCircledIcon(path: String, iconSize: Float, circleColor: Color = Color.LIGHT_GRAY) =

core/src/com/unciv/ui/screens/worldscreen/unit/actions/UnitActionsFromUniques.kt

@@ -6,7 +6,9 @@ import com.unciv.UncivGame
 import com.unciv.logic.civilization.Civilization
 import com.unciv.logic.civilization.PlayerType
 import com.unciv.logic.civilization.diplomacy.DiplomacyFlags
+import com.unciv.logic.civilization.managers.ImprovementFunctions
 import com.unciv.logic.map.mapunit.MapUnit
+import com.unciv.logic.map.tile.ImprovementBuildingProblem
 import com.unciv.logic.map.tile.RoadStatus
 import com.unciv.logic.map.tile.Tile
 import com.unciv.models.Counter
@@ -512,6 +514,9 @@ object UnitActionsFromUniques {
         val couldConstruct = unit.hasMovement()
             && !tile.isCityCenter() && tile.improvementInProgress != Constants.repair
             && !tile.isEnemyTerritory(unit.civ)
+                // Are there any other improvement building problems that should block repair?
+            && ImprovementFunctions.getImprovementBuildingProblems(unit.currentTile.getImprovementToRepair()!!, GameContext(civInfo = unit.civ, unit = unit, tile = tile))
+                .none { it == ImprovementBuildingProblem.OutsideBorders }
 
         val turnsToBuild = getRepairTurns(unit)