mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-08-03 16:49:15 +07:00
Code Issues Packages Projects Releases Wiki Activity

Pathfinding: Avoid unfriendly city state tiles when this doesn't affect movement speed - #12718

Browse Source
This commit is contained in:
yairm210
2024-12-29 12:37:22 +02:00
parent 905ef25cbb
commit d23f32d3e5
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@ package com.unciv.logic.map.mapunit.movement
import com.badlogic.gdx.math.Vector2
import com.unciv.Constants
import com.unciv.logic.civilization.diplomacy.RelationshipLevel
import com.unciv.logic.map.BFS
import com.unciv.logic.map.mapunit.MapUnit
import com.unciv.logic.map.tile.Tile
@ -138,11 +139,16 @@ class UnitMovement(val unit: MapUnit) {
while (true) {
newTilesToCheck.clear()
fun isUnfriendlyCityState(tile:Tile): Boolean = tile.getOwner().let { it != null && it.isCityState
&& it.getDiplomacyManager(unit.civ)?.isRelationshipLevelLT(RelationshipLevel.Friend) == true }
var tilesByPreference = tilesToCheck.sortedBy { it.aerialDistanceTo(destination) }
// Avoid embarkation when possible
if (unit.type.isLandUnit()) tilesByPreference = tilesByPreference.sortedByDescending { it.isLand }
// When comparing booleans, we get false first, so we need to negate the isLand / isCityState checks
// By order of preference: 1. Land tiles 2. Aerial distance 3. Not city states
val comparison: Comparator<Tile> = if (unit.type.isLandUnit())
compareBy({!it.isLand}, {it.aerialDistanceTo(destination)}, ::isUnfriendlyCityState)
else compareBy({it.aerialDistanceTo(destination)}, ::isUnfriendlyCityState)
val tilesByPreference = tilesToCheck.sortedWith(comparison)
for (tileToCheck in tilesByPreference) {
val distanceToTilesThisTurn = if (distance == 1) {