diff --git a/android/assets/jsons/Civ V - Vanilla/Units.json b/android/assets/jsons/Civ V - Vanilla/Units.json index e35a313f8f..5a52b24d2d 100644 --- a/android/assets/jsons/Civ V - Vanilla/Units.json +++ b/android/assets/jsons/Civ V - Vanilla/Units.json @@ -1287,7 +1287,7 @@ "Blast radius [2]"], "attackSound": "nuke" // Plane rather than a missile - can be based in city or Carrier only. - // Can be intercepted, be must die for it not to take effect. + // Can be intercepted, but must die for it not to take effect. }, { "name": "Rocket Artillery", diff --git a/core/src/com/unciv/logic/automation/UnitAutomation.kt b/core/src/com/unciv/logic/automation/UnitAutomation.kt index e24fbc3a7c..8418d5c884 100644 --- a/core/src/com/unciv/logic/automation/UnitAutomation.kt +++ b/core/src/com/unciv/logic/automation/UnitAutomation.kt @@ -111,7 +111,7 @@ object UnitAutomation { if (unit.type == UnitType.Bomber) return SpecificUnitAutomation.automateBomber(unit) - if (unit.type == UnitType.Missile) + if (unit.type == UnitType.Missile || unit.type == UnitType.AtomicBomber) return SpecificUnitAutomation.automateMissile(unit) diff --git a/core/src/com/unciv/logic/map/MapUnit.kt b/core/src/com/unciv/logic/map/MapUnit.kt index 13b2a26ac8..c4bf74ae35 100644 --- a/core/src/com/unciv/logic/map/MapUnit.kt +++ b/core/src/com/unciv/logic/map/MapUnit.kt @@ -13,7 +13,6 @@ import com.unciv.models.ruleset.Unique import com.unciv.models.ruleset.tile.TileImprovement import com.unciv.models.ruleset.unit.BaseUnit import com.unciv.models.ruleset.unit.UnitType -import com.unciv.models.translations.getPlaceholderParameters import java.text.DecimalFormat import kotlin.math.pow import kotlin.random.Random @@ -675,7 +674,8 @@ class MapUnit { fun putInTile(tile: TileInfo) { when { - !movement.canMoveTo(tile) -> throw Exception("I can't go there!") + !movement.canMoveTo(tile) -> + throw Exception("I can't go there!") type.isAirUnit() || type.isMissile() -> tile.airUnits.add(this) type.isCivilian() -> tile.civilianUnit = this else -> tile.militaryUnit = this