AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-27 05:46:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Harden automateImprovementPlacer and detect Mod problems with these (#5010)

Browse Source
This commit is contained in:
SomeTroglodyte 2021-08-28 21:26:00 +02:00 committed by GitHub
parent 8779ca7147
commit ef7fc36c80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,6 +9,7 @@ import com.unciv.logic.map.MapUnit
import com.unciv.logic.map.TileInfo import com.unciv.logic.map.TileInfo
import com.unciv.models.ruleset.tile.ResourceType import com.unciv.models.ruleset.tile.ResourceType
import com.unciv.models.ruleset.tile.TileResource import com.unciv.models.ruleset.tile.TileResource
import com.unciv.models.stats.Stat
import com.unciv.models.stats.Stats import com.unciv.models.stats.Stats
import com.unciv.ui.worldscreen.unit.UnitActions import com.unciv.ui.worldscreen.unit.UnitActions
@ -217,8 +218,9 @@ object SpecificUnitAutomation {
fun automateImprovementPlacer(unit: MapUnit) { fun automateImprovementPlacer(unit: MapUnit) {
val improvementName = unit.getMatchingUniques("Can construct []").first().params[0] val improvementName = unit.getMatchingUniques("Can construct []").first().params[0]
val improvement = unit.civInfo.gameInfo.ruleSet.tileImprovements[improvementName]!! val improvement = unit.civInfo.gameInfo.ruleSet.tileImprovements[improvementName]
val relatedStat = improvement.maxByOrNull { it.value }!!.key ?: return
val relatedStat = improvement.maxByOrNull { it.value }?.key ?: Stat.Culture
val citiesByStatBoost = unit.civInfo.cities.sortedByDescending { val citiesByStatBoost = unit.civInfo.cities.sortedByDescending {
val stats = Stats() val stats = Stats()

14
core/src/com/unciv/models/ruleset/Ruleset.kt
View File

@ -299,7 +299,7 @@ class Ruleset {
val lines = ArrayList<String>() val lines = ArrayList<String>()
var warningCount = 0 var warningCount = 0
// Checks for all mods // Checks for all mods - only those that can succeed without loading a base ruleset
for (unit in units.values) { for (unit in units.values) {
if (unit.upgradesTo == unit.name) if (unit.upgradesTo == unit.name)
lines += "${unit.name} upgrades to itself!" lines += "${unit.name} upgrades to itself!"
@ -327,9 +327,10 @@ class Ruleset {
} }
} }
// Quit here when no base ruleset is loaded - references cannot be checked
if (!modOptions.isBaseRuleset) return CheckModLinksResult(warningCount, lines) if (!modOptions.isBaseRuleset) return CheckModLinksResult(warningCount, lines)
val baseRuleset = RulesetCache.getBaseRuleset() val baseRuleset = RulesetCache.getBaseRuleset() // for UnitTypes fallback
for (unit in units.values) { for (unit in units.values) {
if (unit.requiredTech != null && !technologies.containsKey(unit.requiredTech!!)) if (unit.requiredTech != null && !technologies.containsKey(unit.requiredTech!!))
@ -348,6 +349,15 @@ class Ruleset {
lines += "${unit.name} contains promotion $promotion which does not exist!" lines += "${unit.name} contains promotion $promotion which does not exist!"
if (!unitTypes.containsKey(unit.unitType) && !baseRuleset.unitTypes.containsKey(unit.unitType)) if (!unitTypes.containsKey(unit.unitType) && !baseRuleset.unitTypes.containsKey(unit.unitType))
lines += "${unit.name} is of type ${unit.unitType}, which does not exist!" lines += "${unit.name} is of type ${unit.unitType}, which does not exist!"
for (unique in unit.getMatchingUniques("Can construct []")) {
val improvementName = unique.params[0]
if (improvementName !in tileImprovements)
lines += "${unit.name} can place improvement $improvementName which does not exist!"
else if (tileImprovements[improvementName]!!.firstOrNull() == null && !unit.hasUnique("Bonus for units in 2 tile radius 15%")) {
lines += "${unit.name} can place improvement $improvementName which has no stats, preventing unit automation!"
warningCount++
}
}
} }
for (building in buildings.values) { for (building in buildings.values) {