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

Resolved #1182 - Iroquois unique fixed

Browse Source
This commit is contained in:
Yair Morgenstern 2019-10-10 21:10:21 +03:00
parent 01dd6dfc7d
commit 0d929a7942
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/models/gamebasics/Nation.kt
View File

@ -70,7 +70,7 @@ class Nation : INamed {
if(innerColor==null) innerColorObject = Color.BLACK if(innerColor==null) innerColorObject = Color.BLACK
else innerColorObject = colorFromRGB(innerColor!![0], innerColor!![1], innerColor!![2]) 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 forestsAndJunglesAreRoads = true
} }

11
core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
View File

@ -142,17 +142,16 @@ class UnitActions {
if (unit.hasUnique("Can build improvements on tiles") && !unit.isEmbarked()) { if (unit.hasUnique("Can build improvements on tiles") && !unit.isEmbarked()) {
actionList += UnitAction("Construct improvement", actionList += UnitAction("Construct improvement",
unit.currentMovement >0 unit.currentMovement > 0
&& !tile.isCityCenter() && !tile.isCityCenter()
&& GameBasics.TileImprovements.values.any { tile.canBuildImprovement(it, unit.civInfo) }, && GameBasics.TileImprovements.values.any { tile.canBuildImprovement(it, unit.civInfo) },
currentAction = unit.currentTile.hasImprovementInProgress() currentAction = unit.currentTile.hasImprovementInProgress()
) { worldScreen.game.setScreen(ImprovementPickerScreen(tile) { unitTable.selectedUnit = null }) } ) { worldScreen.game.setScreen(ImprovementPickerScreen(tile) { unitTable.selectedUnit = null }) }
if(Constants.unitActionAutomation == unit.action){ if (Constants.unitActionAutomation == unit.action) {
actionList += UnitAction("Stop automation", true) {unit.action = null} actionList += UnitAction("Stop automation", true) { unit.action = null }
} } else {
else { actionList += UnitAction("Automate", unit.currentMovement > 0)
actionList += UnitAction("Automate", unit.currentMovement >0)
{ {
unit.action = Constants.unitActionAutomation unit.action = Constants.unitActionAutomation
WorkerAutomation(unit).automateWorkerAction() WorkerAutomation(unit).automateWorkerAction()