mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-22 05:41:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #3622 - Can no longer try to send air units into unexplored tiles

Browse Source
This commit is contained in:
Yair Morgenstern
2021-02-28 23:03:12 +02:00
parent 7eeeee5212
commit 97546a7499
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/logic/map/mapgenerator/MapGenerator.kt
View File

@ -236,8 +236,8 @@ class MapGenerator(val ruleset: Ruleset) {
val matchingTerrain = ruleset.terrains.values.firstOrNull {
it.uniqueObjects.any {
it.placeholderText == "Occurs at temperature between [] and [] and humidity between [] and []"
&& it.params[0].toFloat() < temperature && temperature < it.params[1].toFloat()
&& it.params[2].toFloat() < humidity && humidity < it.params[3].toFloat()
&& it.params[0].toFloat() < temperature && temperature <= it.params[1].toFloat()
&& it.params[2].toFloat() < humidity && humidity <= it.params[3].toFloat()
}
}

4
core/src/com/unciv/ui/worldscreen/WorldMapHolder.kt
View File

@ -114,7 +114,7 @@ class WorldMapHolder(internal val worldScreen: WorldScreen, internal val tileMap
&& worldScreen.isPlayersTurn
&& previousSelectedUnits.any {
it.movement.canMoveTo(tileInfo) ||
it.movement.isUnknownTileWeShouldAssumeToBePassable(tileInfo)
it.movement.isUnknownTileWeShouldAssumeToBePassable(tileInfo) && !it.type.isAirUnit()
}) {
// this can take a long time, because of the unit-to-tile calculation needed, so we put it in a different thread
addTileOverlaysWithUnitMovement(previousSelectedUnits, tileInfo)
@ -382,7 +382,7 @@ class WorldMapHolder(internal val worldScreen: WorldScreen, internal val tileMap
// The tile is within move range
tileToColor.showCircle(Color.BLUE, 0.3f)
}
if (unit.movement.canMoveTo(tile) || unit.movement.isUnknownTileWeShouldAssumeToBePassable(tile))
if (unit.movement.canMoveTo(tile) || unit.movement.isUnknownTileWeShouldAssumeToBePassable(tile) && !unit.type.isAirUnit())
tileToColor.showCircle(Color.WHITE,
if (UncivGame.Current.settings.singleTapMove || isAirUnit) 0.7f else 0.3f)
}