Got rid of useless WaterMissileCarrier promotion

Transportation refactor

core/src/com/unciv/logic/automation/SpecificUnitAutomation.kt

@@ -255,8 +255,7 @@ class SpecificUnitAutomation {
         val tilesInRange = unit.currentTile.getTilesInDistance(unit.getRange()*2)
 
         val immediatelyReachableCities = tilesInRange
-                .filter { unit.movement.canMoveTo(it) && ((it.isCityCenter() && it.getOwner() == unit.civInfo) ||
+                .filter { unit.movement.canMoveTo(it) }
-                        (it.getUnits().any { mapUnit -> mapUnit.type.isMissileCarrierUnit() && mapUnit.civInfo == unit.civInfo }))}
 
         for (city in immediatelyReachableCities) {
             if (city.getTilesInDistance(unit.getRange())
@@ -272,9 +271,8 @@ class SpecificUnitAutomation {
     }
 
     private fun tryRelocateToCitiesWithEnemyNearBy(unit: MapUnit): Boolean {
-        val immediatelyReachableCitiesAndCarriers = unit.currentTile.getTilesInDistance(unit.getRange()*2)
+        val immediatelyReachableCitiesAndCarriers = unit.currentTile
-                .filter {  unit.movement.canMoveTo(it) && ((it.isCityCenter() && it.getOwner() == unit.civInfo) ||
+                .getTilesInDistance(unit.getRange()*2).filter {  unit.movement.canMoveTo(it) }
-                        (it.getUnits().any { mapUnit -> mapUnit.type.isAircraftCarrierUnit() && mapUnit.civInfo == unit.civInfo })) }
 
         for (city in immediatelyReachableCitiesAndCarriers) {
             if (city.getTilesInDistance(unit.getRange())

core/src/com/unciv/logic/map/MapUnit.kt

@@ -118,7 +118,7 @@ class MapUnit {
         return movement
     }
 
-    // This SHOULD NOT be a hashset, because if it is, thenn promotions with the same text (e.g. barrage I, barrage II)
+    // This SHOULD NOT be a hashset, because if it is, then promotions with the same text (e.g. barrage I, barrage II)
     //  will not get counted twice!
     @Transient var tempUniques= ArrayList<String>()
 
@@ -471,10 +471,8 @@ class MapUnit {
         civInfo.removeUnit(this)
         civInfo.updateViewableTiles()
         // all transported units should be destroyed as well
-        if (type.isAircraftCarrierUnit() || type.isMissileCarrierUnit()) {
+        currentTile.getUnits().filter { it.isTransported && isTransportTypeOf(it) }
-            currentTile.getUnits().filter { it.type.isAirUnit() && it.isTransported }
+                .forEach { unit -> unit.destroy() }
-                    .forEach { unit -> unit.destroy() }
-        }
     }
 
     fun removeFromTile(){
@@ -530,23 +528,21 @@ class MapUnit {
 
     fun disband() {
         // evacuation of transported units before disbanding, if possible
-        if (type.isAircraftCarrierUnit() || type.isMissileCarrierUnit()) {
+        for (unit in currentTile.getUnits().filter { it.isTransported && isTransportTypeOf(it) }) {
-            for(unit in currentTile.getUnits().filter { it.type.isAirUnit() && it.isTransported }) {
+            // we disbanded a carrier in a city, it can still stay in the city
-                // we disbanded a carrier in a city, it can still stay in the city
+            if (currentTile.isCityCenter() && unit.movement.canMoveTo(currentTile)) continue
-                if (currentTile.isCityCenter() && unit.movement.canMoveTo(currentTile)) continue
+            // if no "fuel" to escape, should be disbanded as well
-                // if no "fuel" to escape, should be disbanded as well
+            if (unit.currentMovement < 0.1)
-                if (unit.currentMovement < 0.1)
+                unit.disband()
-                    unit.disband()
+            // let's find closest city or another carrier where it can be evacuated
-                // let's find closest city or another carrier where it can be evacuated
+            val tileCanMoveTo = unit.currentTile.getTilesInDistance(unit.getRange() * 2).filterNot { it == currentTile }.firstOrNull { unit.movement.canMoveTo(it) }
-                val tileCanMoveTo = unit.currentTile.getTilesInDistance(unit.getRange()*2).
-                        filterNot { it == currentTile }.firstOrNull{unit.movement.canMoveTo(it)}
 
-                if (tileCanMoveTo!=null)
+            if (tileCanMoveTo != null)
-                    unit.movement.moveToTile(tileCanMoveTo)
+                unit.movement.moveToTile(tileCanMoveTo)
-                else
+            else
-                    unit.disband()
+                unit.disband()
-            }
         }
+
         destroy()
         if (currentTile.getOwner() == civInfo)
             civInfo.gold += baseUnit.getDisbandGold()
@@ -632,18 +628,24 @@ class MapUnit {
         return percent
     }
 
-    fun canTransport(mapUnit: MapUnit): Boolean {
+    fun isTransportTypeOf(mapUnit: MapUnit): Boolean {
-        if(type!=UnitType.WaterAircraftCarrier && type!=UnitType.WaterMissileCarrier)
+        val isAircraftCarrier = getUniques().contains("Can carry 2 aircraft")
+        val isMissileCarrier = getUniques().contains("Can carry 2 missiles")
+        if(!isMissileCarrier && !isAircraftCarrier)
             return false
         if(!mapUnit.type.isAirUnit()) return false
-        if(type==UnitType.WaterMissileCarrier && mapUnit.type!=UnitType.Missile)
+        if(isMissileCarrier && mapUnit.type!=UnitType.Missile)
             return false
-        if(type==UnitType.WaterAircraftCarrier && mapUnit.type==UnitType.Missile)
+        if(isAircraftCarrier && mapUnit.type==UnitType.Missile)
             return false
+        return true
+    }
+
+    fun canTransport(mapUnit: MapUnit): Boolean {
+        if(!isTransportTypeOf(mapUnit)) return false
         if(owner!=mapUnit.owner) return false
 
-        var unitCapacity = 0
+        var unitCapacity = 2
-        if (getUniques().contains("Can carry 2 aircraft")) unitCapacity=2
         unitCapacity += getUniques().count { it == "Can carry 1 extra air unit" }
 
         if(currentTile.airUnits.filter { it.isTransported }.size>=unitCapacity) return false

core/src/com/unciv/models/ruleset/unit/UnitType.kt

@@ -15,7 +15,6 @@ enum class UnitType{
     WaterRanged,
     WaterSubmarine,
     WaterAircraftCarrier,
-    WaterMissileCarrier,
 
     Fighter,
     Bomber,
@@ -55,16 +54,9 @@ enum class UnitType{
                 || this == WaterMelee
                 || this == WaterCivilian
                 || this == WaterAircraftCarrier
-                || this == WaterMissileCarrier
 
     fun isAirUnit() =
                 this == Bomber
                 || this == Fighter
                 || this == Missile
-
-    fun isMissile() = this == Missile
-
-    fun isAircraftCarrierUnit() = this == WaterAircraftCarrier
-
-    fun isMissileCarrierUnit() = this == WaterMissileCarrier
 }

core/src/com/unciv/ui/tilegroups/TileGroupIcons.kt

@@ -65,8 +65,7 @@ class TileGroupIcons(val tileGroup: TileGroup){
             newImage.y += yFromCenter
 
             // Display number of carried air units
-            if ((unit.type.isAircraftCarrierUnit() || unit.type.isMissileCarrierUnit())
+            if (unit.getTile().airUnits.any { unit.canTransport(it) } && !unit.getTile().isCityCenter()) {
-                    && !unit.getTile().airUnits.isEmpty() && !unit.getTile().isCityCenter()) {
                 val holder = Table()
                 val secondarycolor = unit.civInfo.nation.getInnerColor()
                 val airUnitTable = Table().apply { defaults().pad(5f) }

core/src/com/unciv/ui/worldscreen/WorldMapHolder.kt

@@ -128,9 +128,7 @@ class WorldMapHolder(internal val worldScreen: WorldScreen, internal val tileMap
         var unitList = ArrayList<MapUnit>()
         if (tileInfo.isCityCenter() && tileInfo.getOwner()==worldScreen.viewingCiv) {
             unitList.addAll(tileInfo.getCity()!!.getCenterTile().getUnits())
-        } else if (tileInfo.militaryUnit!=null &&
+        } else if (tileInfo.airUnits.isNotEmpty() && tileInfo.airUnits.first().civInfo==worldScreen.viewingCiv) {
-                (tileInfo.militaryUnit!!.type.isAircraftCarrierUnit() || tileInfo.militaryUnit!!.type.isMissileCarrierUnit()) &&
-                 tileInfo.militaryUnit!!.civInfo==worldScreen.viewingCiv && tileInfo.airUnits.isNotEmpty()) {
             unitList.addAll(tileInfo.getUnits())
         }
 

core/src/com/unciv/ui/worldscreen/bottombar/BattleTable.kt

@@ -48,7 +48,7 @@ class BattleTable(val worldScreen: WorldScreen): Table() {
         val attacker = tryGetAttacker()
         if(attacker==null){ hide(); return }
 
-        if (attacker.getUnitType().isMissile()) {
+        if (attacker.getUnitType()==UnitType.Missile) {
             val selectedTile = worldScreen.mapHolder.selectedTile
             if (selectedTile == null) { hide(); return } // no selected tile
             simulateNuke(attacker as MapUnitCombatant, selectedTile)