mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-07 14:02:48 +07:00
Code Issues Packages Projects Releases Wiki Activity

Enemy units don't advance towards units they can't see (not viewable to civ)

Browse Source
This commit is contained in:
Yair Morgenstern 2018-04-04 17:16:28 +03:00
parent 541c73a9a5
commit 36c2afd026
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/com/unciv/logic/GameInfo.kt
View File

@ -86,8 +86,10 @@ class GameInfo {
if(unit.health < 50) continue // do nothing but heal
// if there is an attackable unit in the vicinity, attack!
val tilesViewableToCiv = civInfo.getViewableTiles().toHashSet()
val distanceToTiles = unit.getDistanceToTiles()
val unitTileToAttack = distanceToTiles.keys.firstOrNull{ it.unit != null && it.unit!!.owner != civInfo.civName && !it.isCityCenter }
val unitTileToAttack = distanceToTiles.keys.firstOrNull{ tilesViewableToCiv.contains(it) &&
it.unit != null && it.unit!!.owner != civInfo.civName && !it.isCityCenter }
if(unitTileToAttack!=null){
val unitToAttack =unitTileToAttack.unit!!
if(unitToAttack.getBaseUnit().unitType == UnitType.Civilian){ // kill
@ -115,9 +117,8 @@ class GameInfo {
// todo
// else, find the closest enemy unit that we know of within 5 spaces and advance towards it
// todo this doesn't take into account which tiles are visible to the civ
val closestUnit = tileMap.getTilesInDistance(unit.getTile().position, 5)
.firstOrNull{ it.unit!=null && it.unit!!.owner!=civInfo.civName }
.firstOrNull{ tilesViewableToCiv.contains(it) && it.unit!=null && it.unit!!.owner!=civInfo.civName }
if(closestUnit!=null){
unit.headTowards(closestUnit.position)