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

Fix Navies capturing Land Civilians (#6223)

Browse Source 
* Correct logic for blocking Naval Melee from capturing Civilians on Land

* Even better solution now that we can move on to unguarded Civilian tiles. But still won't let us capture Civilians if we can't get there

Co-authored-by: itanasi <spellman23@gmail.com>
This commit is contained in:
itanasi
2022-02-24 04:38:17 -08:00
committed by GitHub
parent 261e09e336
commit f14a201afb
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/com/unciv/logic/automation/BattleHelper.kt
View File

@ -39,16 +39,16 @@ object BattleHelper {
): ArrayList<AttackableTile> { ): ArrayList<AttackableTile> {
val tilesWithEnemies = (tilesToCheck ?: unit.civInfo.viewableTiles) val tilesWithEnemies = (tilesToCheck ?: unit.civInfo.viewableTiles)
.filter { containsAttackableEnemy(it, MapUnitCombatant(unit)) } .filter { containsAttackableEnemy(it, MapUnitCombatant(unit)) }
// Filter out invalid Civilian Captures
.filterNot { .filterNot {
val mapCombatant = Battle.getMapCombatantOfTile(it) val mapCombatant = Battle.getMapCombatantOfTile(it)
// IF all of these are true, THEN the action we'll be taking is in fact CAPTURING the civilian. // IF all of these are true, THEN the action we'll be taking is in fact CAPTURING the civilian.
unit.baseUnit.isMelee() && mapCombatant is MapUnitCombatant && mapCombatant.unit.isCivilian() unit.baseUnit.isMelee() && mapCombatant is MapUnitCombatant && mapCombatant.unit.isCivilian()
// If we can't pass though that tile, we can't capture the civilian "remotely" // If we can't pass though that tile, we can't capture the civilian "remotely"
// DO NOT use "!unit.movement.canPassThrough(it)" since then we won't be able to // Can use "unit.movement.canPassThrough(it)" now that we can move through
// capture enemy units since we can't move through them! // unguarded Civilian tiles. And this catches Naval trying to capture Land
&& !it.canCivPassThrough(unit.civInfo) // Civilians or Land attacking Water Civilians it can't Embark on
// Land Unit can't capture Naval and vice versa && !unit.movement.canPassThrough(it)
&& !(unit.type.isLandUnit() && it.isWater || unit.type.isWaterUnit() && it.isLand)
} }
val rangeOfAttack = unit.getRange() val rangeOfAttack = unit.getRange()