mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-26 07:39:44 +07:00
Code Issues Packages Projects Releases Wiki Activity

Unique units do not need to replace existing units

Browse Source
This commit is contained in:
Yair Morgenstern
2020-04-17 17:15:21 +03:00
parent 30fc110d67
commit c764324e81
4 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/logic/automation/SpecificUnitAutomation.kt
View File

@ -61,7 +61,7 @@ object SpecificUnitAutomation {
// try to build a citadel // try to build a citadel
if (WorkerAutomation(unit).evaluateFortPlacement(unit.currentTile, unit.civInfo)) if (WorkerAutomation(unit).evaluateFortPlacement(unit.currentTile, unit.civInfo))
UnitActions.getGreatPersonBuildImprovementAction(unit)?.action?.invoke() UnitActions.getBuildImprovementAction(unit)?.action?.invoke()
//if no unit to follow, take refuge in city or build citadel there. //if no unit to follow, take refuge in city or build citadel there.
val reachableTest : (TileInfo) -> Boolean = {it.civilianUnit == null && val reachableTest : (TileInfo) -> Boolean = {it.civilianUnit == null &&
@ -189,7 +189,7 @@ object SpecificUnitAutomation {
unit.movement.headTowards(chosenTile) unit.movement.headTowards(chosenTile)
if (unit.currentTile == chosenTile) if (unit.currentTile == chosenTile)
UnitActions.getGreatPersonBuildImprovementAction(unit)?.action?.invoke() UnitActions.getBuildImprovementAction(unit)?.action?.invoke()
return return
} }
} }

9
core/src/com/unciv/models/ruleset/Nation.kt
View File

@ -123,9 +123,9 @@ class Nation : INamed {
private fun addUniqueUnitsText(textList: ArrayList<String>, ruleset: Ruleset) { private fun addUniqueUnitsText(textList: ArrayList<String>, ruleset: Ruleset) {
for (unit in ruleset.units.values for (unit in ruleset.units.values
.filter { it.uniqueTo == name }) { .filter { it.uniqueTo == name }) {
if(unit.replaces != null) {
val originalUnit = ruleset.units[unit.replaces!!]!! val originalUnit = ruleset.units[unit.replaces!!]!!
textList += unit.name.tr() + " - " + "Replaces [${originalUnit.name}]".tr()
textList += unit.name.tr() + " - "+"Replaces [${originalUnit.name}]".tr()
if (unit.cost != originalUnit.cost) if (unit.cost != originalUnit.cost)
textList += " {Cost} " + "[${unit.cost}] vs [${originalUnit.cost}]".tr() textList += " {Cost} " + "[${unit.cost}] vs [${originalUnit.cost}]".tr()
if (unit.strength != originalUnit.strength) if (unit.strength != originalUnit.strength)
@ -144,6 +144,11 @@ class Nation : INamed {
textList += " " + "Lost ability".tr() + "(vs " + originalUnit.name.tr() + "): " + Translations.translateBonusOrPenalty(unique) textList += " " + "Lost ability".tr() + "(vs " + originalUnit.name.tr() + "): " + Translations.translateBonusOrPenalty(unique)
for (promotion in unit.promotions.filter { it !in originalUnit.promotions }) for (promotion in unit.promotions.filter { it !in originalUnit.promotions })
textList += " " + promotion.tr() + " (" + Translations.translateBonusOrPenalty(ruleset.unitPromotions[promotion]!!.effect) + ")" textList += " " + promotion.tr() + " (" + Translations.translateBonusOrPenalty(ruleset.unitPromotions[promotion]!!.effect) + ")"
}
else {
textList += unit.name.tr()
textList += " " + unit.getDescription(true).split("\n").joinToString("\n ")
}
textList += "" textList += ""
} }

3
core/src/com/unciv/ui/newgamescreen/PlayerPickerTable.kt
View File

@ -153,7 +153,8 @@ class PlayerPickerTable(val newGameScreen: NewGameScreen, val newGameParameters:
nationListTable.add(randomPlayerTable).pad(10f).width(nationsPopupWidth).row() nationListTable.add(randomPlayerTable).pad(10f).width(nationsPopupWidth).row()
for (nation in newGameScreen.ruleset.nations.values.filter { !it.isCityState() && it.name != "Barbarians" }) { for (nation in newGameScreen.ruleset.nations.values
.filter { !it.isCityState() && it.name != "Barbarians" }) {
if (player.chosenCiv != nation.name && newGameParameters.players.any { it.chosenCiv == nation.name }) if (player.chosenCiv != nation.name && newGameParameters.players.any { it.chosenCiv == nation.name })
continue continue

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

@ -346,11 +346,11 @@ object UnitActions {
}.takeIf { canConductTradeMission }) }.takeIf { canConductTradeMission })
} }
val buildImprovementAction = getGreatPersonBuildImprovementAction(unit) val buildImprovementAction = getBuildImprovementAction(unit)
if (buildImprovementAction != null) actionList += buildImprovementAction if (buildImprovementAction != null) actionList += buildImprovementAction
} }
fun getGreatPersonBuildImprovementAction(unit: MapUnit): UnitAction? { fun getBuildImprovementAction(unit: MapUnit): UnitAction? {
val tile = unit.currentTile val tile = unit.currentTile
for (unique in unit.getUniques().filter { it.startsWith("Can build improvement: ") }) { for (unique in unit.getUniques().filter { it.startsWith("Can build improvement: ") }) {
val improvementName = unique.replace("Can build improvement: ", "") val improvementName = unique.replace("Can build improvement: ", "")