From 0d929a7942b480083ee989bd7640518ff2a773d0 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Thu, 10 Oct 2019 21:10:21 +0300 Subject: [PATCH] Resolved #1182 - Iroquois unique fixed --- core/src/com/unciv/models/gamebasics/Nation.kt | 2 +- core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/core/src/com/unciv/models/gamebasics/Nation.kt b/core/src/com/unciv/models/gamebasics/Nation.kt index b3b3ce30..9d348f3a 100644 --- a/core/src/com/unciv/models/gamebasics/Nation.kt +++ b/core/src/com/unciv/models/gamebasics/Nation.kt @@ -70,7 +70,7 @@ class Nation : INamed { if(innerColor==null) innerColorObject = Color.BLACK else innerColorObject = colorFromRGB(innerColor!![0], innerColor!![1], innerColor!![2]) - if(unique == "All units move through Forest and Jungle tiles in friendly territory as if it is Road. These tiles can be used to establish City Connections upon researching the Wheel.") + if(unique == "All units move through Forest and Jungle Tiles in friendly territory as if they have roads. These tiles can be used to establish City Connections upon researching the Wheel.") forestsAndJunglesAreRoads = true } diff --git a/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt b/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt index 743c1ac7..4ad8684d 100644 --- a/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt +++ b/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt @@ -142,17 +142,16 @@ class UnitActions { if (unit.hasUnique("Can build improvements on tiles") && !unit.isEmbarked()) { actionList += UnitAction("Construct improvement", - unit.currentMovement >0 + unit.currentMovement > 0 && !tile.isCityCenter() && GameBasics.TileImprovements.values.any { tile.canBuildImprovement(it, unit.civInfo) }, currentAction = unit.currentTile.hasImprovementInProgress() ) { worldScreen.game.setScreen(ImprovementPickerScreen(tile) { unitTable.selectedUnit = null }) } - if(Constants.unitActionAutomation == unit.action){ - actionList += UnitAction("Stop automation", true) {unit.action = null} - } - else { - actionList += UnitAction("Automate", unit.currentMovement >0) + if (Constants.unitActionAutomation == unit.action) { + actionList += UnitAction("Stop automation", true) { unit.action = null } + } else { + actionList += UnitAction("Automate", unit.currentMovement > 0) { unit.action = Constants.unitActionAutomation WorkerAutomation(unit).automateWorkerAction()