wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Every unit enabled by a tech gets its own line now

Browse source
This commit is contained in:
Yair Morgenstern 2018-11-19 20:07:29 +02:00
parent 3e02417838
commit 9d27e22952
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/com/unciv/logic/automation/UnitAutomation.kt
View file

@ -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)

6
core/src/com/unciv/models/gamebasics/tech/Technology.kt
View file

@ -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()