AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-29 15:01:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Automated atomic bombs no longer cause crashes

Browse Source
This commit is contained in:
Yair Morgenstern 2021-07-09 13:51:18 +03:00
parent c327b54b1b
commit d262c1a6ea
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/assets/jsons/Civ V - Vanilla/Units.json
View File

@ -1287,7 +1287,7 @@
"Blast radius [2]"], "Blast radius [2]"],
"attackSound": "nuke" "attackSound": "nuke"
// Plane rather than a missile - can be based in city or Carrier only. // 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", "name": "Rocket Artillery",

2
core/src/com/unciv/logic/automation/UnitAutomation.kt
View File

@ -111,7 +111,7 @@ object UnitAutomation {
if (unit.type == UnitType.Bomber) if (unit.type == UnitType.Bomber)
return SpecificUnitAutomation.automateBomber(unit) return SpecificUnitAutomation.automateBomber(unit)
if (unit.type == UnitType.Missile) if (unit.type == UnitType.Missile || unit.type == UnitType.AtomicBomber)
return SpecificUnitAutomation.automateMissile(unit) return SpecificUnitAutomation.automateMissile(unit)

4
core/src/com/unciv/logic/map/MapUnit.kt
View File

@ -13,7 +13,6 @@ import com.unciv.models.ruleset.Unique
import com.unciv.models.ruleset.tile.TileImprovement import com.unciv.models.ruleset.tile.TileImprovement
import com.unciv.models.ruleset.unit.BaseUnit import com.unciv.models.ruleset.unit.BaseUnit
import com.unciv.models.ruleset.unit.UnitType import com.unciv.models.ruleset.unit.UnitType
import com.unciv.models.translations.getPlaceholderParameters
import java.text.DecimalFormat import java.text.DecimalFormat
import kotlin.math.pow import kotlin.math.pow
import kotlin.random.Random import kotlin.random.Random
@ -675,7 +674,8 @@ class MapUnit {
fun putInTile(tile: TileInfo) { fun putInTile(tile: TileInfo) {
when { 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.isAirUnit() || type.isMissile() -> tile.airUnits.add(this)
type.isCivilian() -> tile.civilianUnit = this type.isCivilian() -> tile.civilianUnit = this
else -> tile.militaryUnit = this else -> tile.militaryUnit = this