From 4491ae18590d19e7f97c5720498b91820ca85a63 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Fri, 7 Dec 2018 12:01:31 +0200 Subject: [PATCH] Movable tiles shown again for Civilian units --- .../com/unciv/logic/city/CityExpansionManager.kt | 15 ++++++++++++--- .../src/com/unciv/ui/worldscreen/TileMapHolder.kt | 9 +++------ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/core/src/com/unciv/logic/city/CityExpansionManager.kt b/core/src/com/unciv/logic/city/CityExpansionManager.kt index 51d3cd4f3e..9a720059b6 100644 --- a/core/src/com/unciv/logic/city/CityExpansionManager.kt +++ b/core/src/com/unciv/logic/city/CityExpansionManager.kt @@ -25,7 +25,10 @@ class CityExpansionManager { fun getCultureToNextTile(): Int { val numTilesClaimed = cityInfo.tiles.size - 7 var cultureToNextTile = 6 * Math.pow(numTilesClaimed + 1.4813, 1.3) - if (cityInfo.civInfo.getBuildingUniques().contains("Cost of acquiring new tiles reduced by 25%")) cultureToNextTile *= 0.75 //Speciality of Angkor Wat + if (cityInfo.civInfo.getBuildingUniques().contains("Cost of acquiring new tiles reduced by 25%")) + cultureToNextTile *= 0.75 //Speciality of Angkor Wat + if(cityInfo.getBuildingUniques().contains("Culture and Gold costs of acquiring new tiles reduced by 25% in this city")) + cultureToNextTile *= 0.75 // Specialty of Krepost if (cityInfo.civInfo.policies.isAdopted("Tradition")) cultureToNextTile *= 0.75 return Math.round(cultureToNextTile).toInt() } @@ -42,10 +45,16 @@ class CityExpansionManager { val baseCost = 50 val numTilesClaimed= cityInfo.tiles.size - 7 val distanceFromCenter = tileInfo.arialDistanceTo(cityInfo.getCenterTile()) - var cost = baseCost * (distanceFromCenter-1) + numTilesClaimed*5 + var cost = baseCost * (distanceFromCenter-1) + numTilesClaimed*5.0 + + if (cityInfo.civInfo.getBuildingUniques().contains("Cost of acquiring new tiles reduced by 25%")) + cost *= 0.75 //Speciality of Angkor Wat + if(cityInfo.getBuildingUniques().contains("Culture and Gold costs of acquiring new tiles reduced by 25% in this city")) + cost *= 0.75 // Specialty of Krepost + if(cityInfo.civInfo.getNation().unique=="All land military units have +1 sight, 50% discount when purchasing tiles") cost /= 2 - return cost + return cost.toInt() } diff --git a/core/src/com/unciv/ui/worldscreen/TileMapHolder.kt b/core/src/com/unciv/ui/worldscreen/TileMapHolder.kt index 0de5c4e64c..3d7b0453b3 100644 --- a/core/src/com/unciv/ui/worldscreen/TileMapHolder.kt +++ b/core/src/com/unciv/ui/worldscreen/TileMapHolder.kt @@ -220,16 +220,13 @@ class TileMapHolder(internal val worldScreen: WorldScreen, internal val tileMap: val unitType = unit.type val attackableTiles: List = when { - unitType.isCivilian() -> unit.getDistanceToTiles().keys.toList() + unitType.isCivilian() -> listOf() else -> UnitAutomation().getAttackableEnemies(unit, unit.getDistanceToTiles()).map { it.tileToAttack } .filter { (UnCivGame.Current.viewEntireMapForDebug || playerViewableTilePositions.contains(it.position)) } } for (attackableTile in attackableTiles) { - if (unit.type.isCivilian()) tileGroups[attackableTile]!!.hideCircle() - else { - tileGroups[attackableTile]!!.showCircle(colorFromRGB(237, 41, 57)) - tileGroups[attackableTile]!!.showCrosshair() - } + tileGroups[attackableTile]!!.showCircle(colorFromRGB(237, 41, 57)) + tileGroups[attackableTile]!!.showCrosshair() } // Fadeout less relevant images if a military unit is selected