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

Fixed mod compatibility autochanges

Browse Source 
Tested by forcing a new Deciv game to load with a much older mod version
This commit is contained in:
Yair Morgenstern 2023-09-21 14:37:21 +03:00
parent ebfdbb8c4a
commit 92b71102e1
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/logic/BackwardCompatibility.kt
View File

@ -39,7 +39,7 @@ object BackwardCompatibility {
private fun GameInfo.removeUnitsAndPromotions() { private fun GameInfo.removeUnitsAndPromotions() {
for (tile in tileMap.values) { for (tile in tileMap.values) {
for (unit in tile.getUnits()) { for (unit in tile.getUnits().toList()) {
if (!ruleset.units.containsKey(unit.name)) tile.removeUnit(unit) if (!ruleset.units.containsKey(unit.name)) tile.removeUnit(unit)
for (promotion in unit.promotions.promotions.toList()) for (promotion in unit.promotions.promotions.toList())

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

@ -564,8 +564,8 @@ object UnitAutomation {
// Our main attack target is the closest city, but we're fine with deviating from that a bit // Our main attack target is the closest city, but we're fine with deviating from that a bit
var enemyCitiesByPriority = closestEnemyCity.civ.cities var enemyCitiesByPriority = closestEnemyCity.civ.cities
.associateWith { it.getCenterTile().aerialDistanceTo(closestEnemyCity.getCenterTile()) } .associateWith { it.getCenterTile().aerialDistanceTo(closestEnemyCity.getCenterTile()) }
.filterNot { it.value > 10 } // anything 10 tiles away from the target is irrelevant .asSequence().filterNot { it.value > 10 } // anything 10 tiles away from the target is irrelevant
.asSequence().sortedBy { it.value }.map { it.key } // sort the list by closeness to target - least is best! .sortedBy { it.value }.map { it.key } // sort the list by closeness to target - least is best!
if (unit.baseUnit.isRanged()) // ranged units don't harm capturable cities, waste of a turn if (unit.baseUnit.isRanged()) // ranged units don't harm capturable cities, waste of a turn
enemyCitiesByPriority = enemyCitiesByPriority.filterNot { it.health == 1 } enemyCitiesByPriority = enemyCitiesByPriority.filterNot { it.health == 1 }

2
core/src/com/unciv/logic/map/tile/Tile.kt
View File

@ -883,7 +883,7 @@ open class Tile : IsPartOfGameInfoSerialization {
if (resource != null && resource !in ruleset.tileResources) if (resource != null && resource !in ruleset.tileResources)
resource = null resource = null
if (improvement != null && improvement !in ruleset.tileImprovements) if (improvement != null && improvement !in ruleset.tileImprovements)
removeImprovement() improvement = null
} }
/** If the unit isn't in the ruleset we can't even know what type of unit this is! So check each place /** If the unit isn't in the ruleset we can't even know what type of unit this is! So check each place

2
core/src/com/unciv/ui/images/ImageGetter.kt
View File

@ -62,6 +62,8 @@ object ImageGetter {
atlases["game"] = atlas atlases["game"] = atlas
} }
/** Required every time the ruleset changes, in order to load mod-specific images */ /** Required every time the ruleset changes, in order to load mod-specific images */
fun setNewRuleset(ruleset: Ruleset) { fun setNewRuleset(ruleset: Ruleset) {
ImageGetter.ruleset = ruleset ImageGetter.ruleset = ruleset