From 9d27e2295217719d67f2ac1e4cc3067dff04162b Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Mon, 19 Nov 2018 20:07:29 +0200 Subject: [PATCH] Every unit enabled by a tech gets its own line now --- core/src/com/unciv/logic/automation/UnitAutomation.kt | 2 +- core/src/com/unciv/models/gamebasics/tech/Technology.kt | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/core/src/com/unciv/logic/automation/UnitAutomation.kt b/core/src/com/unciv/logic/automation/UnitAutomation.kt index ddff9f8eb3..5f24ade385 100644 --- a/core/src/com/unciv/logic/automation/UnitAutomation.kt +++ b/core/src/com/unciv/logic/automation/UnitAutomation.kt @@ -157,7 +157,7 @@ class UnitAutomation{ .filter { unit.canMoveTo(it) || it==unit.getTile() } if(unit.type.isLandUnit()) tilesToAttackFrom = tilesToAttackFrom.filter { it.getBaseTerrain().type==TerrainType.Land } - + for(reachableTile in tilesToAttackFrom){ // tiles we'll still have energy after we reach there val tilesInAttackRange = if (unit.hasUnique("Indirect fire")) reachableTile.getTilesInDistance(rangeOfAttack) else reachableTile.getViewableTiles(rangeOfAttack) diff --git a/core/src/com/unciv/models/gamebasics/tech/Technology.kt b/core/src/com/unciv/models/gamebasics/tech/Technology.kt index cffa145c4a..65abdde711 100644 --- a/core/src/com/unciv/models/gamebasics/tech/Technology.kt +++ b/core/src/com/unciv/models/gamebasics/tech/Technology.kt @@ -21,7 +21,11 @@ class Technology : ICivilopedia { var enabledUnits = GameBasics.Units.values.filter { it.requiredTech==name && (it.uniqueTo==null || it.uniqueTo==UnCivGame.Current.gameInfo.getPlayerCivilization().civName) } val replacedUnits = enabledUnits.map { it.replaces }.filterNotNull() enabledUnits = enabledUnits.filter { it.name !in replacedUnits} - if(enabledUnits.isNotEmpty()) SB.appendln("{Units enabled}: "+enabledUnits.map { it.name.tr() + " ("+it.getShortDescription()+")" }.joinToString()) + if(enabledUnits.isNotEmpty()){ + SB.appendln("{Units enabled}: ") + for(unit in enabledUnits) + SB.appendln(" * "+unit.name.tr() + " ("+unit.getShortDescription()+")") + } var enabledBuildings = GameBasics.Buildings.values.filter { it.requiredTech==name && (it.uniqueTo==null || it.uniqueTo==UnCivGame.Current.gameInfo.getPlayerCivilization().civName) } val replacedBuildings = enabledBuildings.map { it.replaces }.filterNotNull()