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

Resolved #8556 - crash when purchasing inquisitor

Browse Source
This commit is contained in:
Yair Morgenstern 2023-02-03 13:03:36 +02:00
parent 4c7d7e1119
commit 5329b9125b
4 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/com/unciv/logic/civilization/diplomacy/DiplomacyFunctions.kt
View File

@ -12,7 +12,6 @@ import com.unciv.models.ruleset.unique.UniqueType
import com.unciv.models.stats.Stat import com.unciv.models.stats.Stat
import com.unciv.models.stats.Stats import com.unciv.models.stats.Stats
import com.unciv.models.translations.tr import com.unciv.models.translations.tr
import com.unciv.ui.utils.extensions.withItem
class DiplomacyFunctions(val civInfo:Civilization){ class DiplomacyFunctions(val civInfo:Civilization){

2
core/src/com/unciv/logic/map/mapunit/MapUnitCache.kt
View File

@ -88,7 +88,7 @@ class MapUnitCache(val mapUnit: MapUnit) {
doubleMovementInTerrain.clear() doubleMovementInTerrain.clear()
for (unique in mapUnit.getMatchingUniques(UniqueType.DoubleMovementOnTerrain)) { for (unique in mapUnit.getMatchingUniques(UniqueType.DoubleMovementOnTerrain)) {
val param = unique.params[0] val param = unique.params[0]
val terrain = mapUnit.currentTile.ruleset.terrains[param] val terrain = mapUnit.civ.gameInfo.ruleSet.terrains[param]
doubleMovementInTerrain[param] = when { doubleMovementInTerrain[param] = when {
terrain == null -> DoubleMovementTerrainTarget.Filter terrain == null -> DoubleMovementTerrainTarget.Filter
terrain.name == Constants.hill -> DoubleMovementTerrainTarget.Hill terrain.name == Constants.hill -> DoubleMovementTerrainTarget.Hill

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

@ -262,6 +262,7 @@ open class Tile : IsPartOfGameInfoSerialization {
fun getTileImprovement(): TileImprovement? = if (improvement == null) null else ruleset.tileImprovements[improvement!!] fun getTileImprovement(): TileImprovement? = if (improvement == null) null else ruleset.tileImprovements[improvement!!]
fun getUnpillagedTileImprovement(): TileImprovement? = if (getUnpillagedImprovement() == null) null else ruleset.tileImprovements[improvement!!] fun getUnpillagedTileImprovement(): TileImprovement? = if (getUnpillagedImprovement() == null) null else ruleset.tileImprovements[improvement!!]
fun getTileImprovementInProgress(): TileImprovement? = if (improvementInProgress == null) null else ruleset.tileImprovements[improvementInProgress!!] fun getTileImprovementInProgress(): TileImprovement? = if (improvementInProgress == null) null else ruleset.tileImprovements[improvementInProgress!!]
fun getImprovementToPillage(): TileImprovement? { fun getImprovementToPillage(): TileImprovement? {
if (canPillageTileImprovement()) if (canPillageTileImprovement())
return ruleset.tileImprovements[improvement]!! return ruleset.tileImprovements[improvement]!!
@ -297,18 +298,8 @@ open class Tile : IsPartOfGameInfoSerialization {
&& !ruleset.tileImprovements[roadStatus.name]!!.hasUnique(UniqueType.Unpillagable) && !ruleset.tileImprovements[roadStatus.name]!!.hasUnique(UniqueType.Unpillagable)
&& !ruleset.tileImprovements[roadStatus.name]!!.hasUnique(UniqueType.Irremovable) && !ruleset.tileImprovements[roadStatus.name]!!.hasUnique(UniqueType.Irremovable)
} }
fun getUnpillagedImprovement(): String? { fun getUnpillagedImprovement(): String? = if (improvementIsPillaged) null else improvement
return if (improvementIsPillaged) fun getUnpillagedRoad(): RoadStatus = if (roadIsPillaged) RoadStatus.None else roadStatus
null
else
improvement
}
fun getUnpillagedRoad(): RoadStatus {
return if (roadIsPillaged)
RoadStatus.None
else
roadStatus
}
fun getUnpillagedRoadImprovement(): TileImprovement? { fun getUnpillagedRoadImprovement(): TileImprovement? {
return if (getUnpillagedRoad() == RoadStatus.None) null return if (getUnpillagedRoad() == RoadStatus.None) null
else ruleset.tileImprovements[getUnpillagedRoad().name] else ruleset.tileImprovements[getUnpillagedRoad().name]

1
core/src/com/unciv/ui/pickerscreens/PolicyPickerScreen.kt
View File

@ -29,7 +29,6 @@ import com.unciv.ui.utils.extensions.colorFromRGB
import com.unciv.ui.utils.extensions.darken import com.unciv.ui.utils.extensions.darken
import com.unciv.ui.utils.extensions.disable import com.unciv.ui.utils.extensions.disable
import com.unciv.ui.utils.extensions.enable import com.unciv.ui.utils.extensions.enable
import com.unciv.ui.utils.extensions.isEnabled
import com.unciv.ui.utils.extensions.onClick import com.unciv.ui.utils.extensions.onClick
import com.unciv.ui.utils.extensions.pad import com.unciv.ui.utils.extensions.pad
import com.unciv.ui.utils.extensions.toGroup import com.unciv.ui.utils.extensions.toGroup