mirror of
https://github.com/yairm210/Unciv.git
synced 2025-07-21 13:18:56 +07:00
Water units can no longer fortify
This commit is contained in:
@ -64,7 +64,7 @@ class CivilizationInfo {
|
|||||||
toReturn.scienceVictory = scienceVictory.clone()
|
toReturn.scienceVictory = scienceVictory.clone()
|
||||||
toReturn.diplomacy.putAll(diplomacy.values.map { it.clone() }.associateBy { it.otherCivName })
|
toReturn.diplomacy.putAll(diplomacy.values.map { it.clone() }.associateBy { it.otherCivName })
|
||||||
toReturn.cities = cities.map { it.clone() }
|
toReturn.cities = cities.map { it.clone() }
|
||||||
toReturn.exploredTiles.addAll(exploredTiles)
|
toReturn.exploredTiles.addAll(exploredTiles.toList()) // we actually fot a concurrent modification exception here, the toList should solve that
|
||||||
return toReturn
|
return toReturn
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -41,7 +41,7 @@ class UnitActions {
|
|||||||
},true)
|
},true)
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!unit.baseUnit().unitType.isCivilian() && !unit.isEmbarked()
|
if(!unit.baseUnit().unitType.isCivilian() && !unit.isEmbarked() && !unit.baseUnit.unitType.isWaterUnit()
|
||||||
&& !unit.hasUnique("No defensive terrain bonus") && !unit.isFortified()) {
|
&& !unit.hasUnique("No defensive terrain bonus") && !unit.isFortified()) {
|
||||||
actionList += UnitAction("Fortify", { unit.action = "Fortify 0" }, unit.currentMovement != 0f)
|
actionList += UnitAction("Fortify", { unit.action = "Fortify 0" }, unit.currentMovement != 0f)
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user