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

Performance improvement for canPassThrough

Browse Source
This commit is contained in:
Yair Morgenstern
2024-01-09 22:09:29 +02:00
parent 975b2ba165
commit 7845aea440
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,22 +53,17 @@ class MapUnitCache(private val mapUnit: MapUnit) {
val doubleMovementInTerrain = HashMap<String, DoubleMovement>() val doubleMovementInTerrain = HashMap<String, DoubleMovement>()
var canEnterIceTiles = false var canEnterIceTiles = false
var cannotEnterOceanTiles = false var cannotEnterOceanTiles = false
var canEnterForeignTerrain: Boolean = false var canEnterForeignTerrain: Boolean = false
var canEnterCityStates: Boolean = false
var costToDisembark: Float? = null var costToDisembark: Float? = null
var costToEmbark: Float? = null var costToEmbark: Float? = null
var paradropRange = 0 var paradropRange = 0
var hasUniqueToBuildImprovements = false // not canBuildImprovements to avoid confusion var hasUniqueToBuildImprovements = false // not canBuildImprovements to avoid confusion
var hasUniqueToCreateWaterImprovements = false var hasUniqueToCreateWaterImprovements = false
var hasStrengthBonusInRadiusUnique = false var hasStrengthBonusInRadiusUnique = false
var hasCitadelPlacementUnique = false var hasCitadelPlacementUnique = false
fun updateUniques() { fun updateUniques() {
@ -119,6 +114,8 @@ class MapUnitCache(private val mapUnit: MapUnit) {
canEnterForeignTerrain = mapUnit.hasUnique(UniqueType.CanEnterForeignTiles) canEnterForeignTerrain = mapUnit.hasUnique(UniqueType.CanEnterForeignTiles)
|| mapUnit.hasUnique(UniqueType.CanEnterForeignTilesButLosesReligiousStrength) || mapUnit.hasUnique(UniqueType.CanEnterForeignTilesButLosesReligiousStrength)
canEnterCityStates = mapUnit.hasUnique(UniqueType.CanTradeWithCityStateForGoldAndInfluence)
hasStrengthBonusInRadiusUnique = mapUnit.hasUnique(UniqueType.StrengthBonusInRadius) hasStrengthBonusInRadiusUnique = mapUnit.hasUnique(UniqueType.StrengthBonusInRadius)
hasCitadelPlacementUnique = mapUnit.getMatchingUniques(UniqueType.ConstructImprovementInstantly) hasCitadelPlacementUnique = mapUnit.getMatchingUniques(UniqueType.ConstructImprovementInstantly)
.mapNotNull { mapUnit.civ.gameInfo.ruleset.tileImprovements[it.params[0]] } .mapNotNull { mapUnit.civ.gameInfo.ruleset.tileImprovements[it.params[0]] }

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

@ -780,7 +780,7 @@ class UnitMovement(val unit: MapUnit) {
if (!unitSpecificAllowOcean && unit.cache.cannotEnterOceanTiles) return false if (!unitSpecificAllowOcean && unit.cache.cannotEnterOceanTiles) return false
} }
if (unit.hasUnique(UniqueType.CanTradeWithCityStateForGoldAndInfluence) && tile.getOwner()?.isCityState() == true) if (unit.cache.canEnterCityStates && tile.getOwner()?.isCityState() == true)
return true return true
if (!unit.cache.canEnterForeignTerrain && !tile.canCivPassThrough(unit.civ)) return false if (!unit.cache.canEnterForeignTerrain && !tile.canCivPassThrough(unit.civ)) return false