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

Resolved #9058 - Mods that remove 'repair' improvement no longer cause crashes down the line

Browse Source
This commit is contained in:
Yair Morgenstern
2023-03-29 10:17:20 +03:00
parent 6000232eac
commit d3305e680a
3 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,10 +1,12 @@
package com.unciv.logic package com.unciv.logic
import com.unciv.Constants
import com.unciv.logic.city.CityConstructions import com.unciv.logic.city.CityConstructions
import com.unciv.logic.city.PerpetualConstruction import com.unciv.logic.city.PerpetualConstruction
import com.unciv.logic.civilization.diplomacy.DiplomacyFlags import com.unciv.logic.civilization.diplomacy.DiplomacyFlags
import com.unciv.logic.civilization.diplomacy.DiplomacyManager import com.unciv.logic.civilization.diplomacy.DiplomacyManager
import com.unciv.logic.civilization.managers.TechManager import com.unciv.logic.civilization.managers.TechManager
import com.unciv.logic.map.tile.RoadStatus
import com.unciv.models.ruleset.ModOptions import com.unciv.models.ruleset.ModOptions
import com.unciv.models.ruleset.Ruleset import com.unciv.models.ruleset.Ruleset
@ -35,6 +37,20 @@ object BackwardCompatibility {
} }
} }
// Mod decided you can't repair things anymore - get rid of old pillaged improvements
if (!ruleset.tileImprovements.containsKey(Constants.repair))
for (tile in tileMap.values) {
if (tile.roadIsPillaged) {
tile.roadStatus = RoadStatus.None
tile.roadIsPillaged = false
}
if (tile.improvementIsPillaged){
tile.improvement = null
tile.improvementIsPillaged = false
}
}
for (city in civilizations.asSequence().flatMap { it.cities.asSequence() }) { for (city in civilizations.asSequence().flatMap { it.cities.asSequence() }) {
changeBuildingNameIfNotInRuleset(ruleset, city.cityConstructions, "Hanse", "Bank") changeBuildingNameIfNotInRuleset(ruleset, city.cityConstructions, "Hanse", "Bank")

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

@ -883,11 +883,10 @@ open class Tile : IsPartOfGameInfoSerialization {
removeRoad() removeRoad()
} else { } else {
// otherwise use pillage/repair systems // otherwise use pillage/repair systems
if (canPillageTileImprovement()) { if (canPillageTileImprovement())
improvementIsPillaged = true improvementIsPillaged = true
} else { else
roadIsPillaged = true roadIsPillaged = true
}
} }
} }

2
core/src/com/unciv/ui/screens/worldscreen/unit/actions/UnitActions.kt
View File

@ -412,7 +412,7 @@ object UnitActions {
} }
private fun addRepairAction(unit: MapUnit, actionList: ArrayList<UnitAction>) { private fun addRepairAction(unit: MapUnit, actionList: ArrayList<UnitAction>) {
if (unit.currentTile.ruleset.tileImprovements[Constants.repair] == null) return if (!unit.currentTile.ruleset.tileImprovements.containsKey(Constants.repair)) return
if (!unit.cache.hasUniqueToBuildImprovements) return if (!unit.cache.hasUniqueToBuildImprovements) return
if (unit.isEmbarked()) return if (unit.isEmbarked()) return
val tile = unit.getTile() val tile = unit.getTile()