mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-20 09:17:47 +07:00
Code Issues Packages Projects Releases Wiki Activity

Removed some by-name references in construction automation

Browse Source
This commit is contained in:
Yair Morgenstern 2021-06-03 22:44:13 +03:00
parent e22c53ca96
commit c5d81569f7
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/com/unciv/logic/automation/ConstructionAutomation.kt
View File

@ -259,7 +259,7 @@ class ConstructionAutomation(val cityConstructions: CityConstructions){
private fun addScienceBuildingChoice() { private fun addScienceBuildingChoice() {
if (allTechsAreResearched) return if (allTechsAreResearched) return
val scienceBuilding = buildableNotWonders.asSequence() val scienceBuilding = buildableNotWonders.asSequence()
.filter { it.isStatRelated(Stat.Science) || it.name == "Library" } // only stat related in unique .filter { it.isStatRelated(Stat.Science) }
.minByOrNull { it.cost } .minByOrNull { it.cost }
if (scienceBuilding != null) { if (scienceBuilding != null) {
var modifier = 1.1f var modifier = 1.1f
@ -282,10 +282,7 @@ class ConstructionAutomation(val cityConstructions: CityConstructions){
val hasWaterResource = cityInfo.tilesInRange val hasWaterResource = cityInfo.tilesInRange
.any { it.isWater && it.resource!=null && it.position in cityInfo.tiles } .any { it.isWater && it.resource!=null && it.position in cityInfo.tiles }
val productionBuilding = buildableNotWonders.asSequence() val productionBuilding = buildableNotWonders.asSequence()
.filter { it.isStatRelated(Stat.Production) .filter { it.isStatRelated(Stat.Production) }
|| (hasWaterResource && (it.uniques.contains("+1 production and gold from all sea resources worked by the city")
|| it.uniques.contains("+1 production from all sea resources worked by the city")) )
}
.minByOrNull { it.cost } .minByOrNull { it.cost }
if (productionBuilding != null) { if (productionBuilding != null) {
addChoice(relativeCostEffectiveness, productionBuilding.name, 1.5f) addChoice(relativeCostEffectiveness, productionBuilding.name, 1.5f)
@ -294,7 +291,7 @@ class ConstructionAutomation(val cityConstructions: CityConstructions){
private fun addFoodBuildingChoice() { private fun addFoodBuildingChoice() {
val foodBuilding = buildableNotWonders.asSequence().filter { it.isStatRelated(Stat.Food) val foodBuilding = buildableNotWonders.asSequence().filter { it.isStatRelated(Stat.Food)
|| it.getBaseBuilding(civInfo.gameInfo.ruleSet).name == "Aqueduct" || it.getBaseBuilding(civInfo.gameInfo.ruleSet).name == "Medical Lab"} // only stat related in unique || it.uniqueObjects.any { it.placeholderText=="[]% of food is carried over after population increases" }}
.minByOrNull { it.cost } .minByOrNull { it.cost }
if (foodBuilding != null) { if (foodBuilding != null) {
var modifier = 1f var modifier = 1f

1
core/src/com/unciv/models/ruleset/Building.kt
View File

@ -458,6 +458,7 @@ class Building : NamedStats(), IConstruction {
if (get(stat) > 0) return true if (get(stat) > 0) return true
if (getStatPercentageBonuses(null).get(stat) > 0) return true if (getStatPercentageBonuses(null).get(stat) > 0) return true
if (resourceBonusStats != null && resourceBonusStats!!.get(stat) > 0) return true if (resourceBonusStats != null && resourceBonusStats!!.get(stat) > 0) return true
if (uniqueObjects.any { it.placeholderText == "[] Per [] Population in this city" && it.stats.get(stat) > 0 }) return true
return false return false
} }