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

Solved super rare edge-case where units try to attack over hidden tiles that they can't actually move through

Browse Source
This commit is contained in:
Yair Morgenstern 2021-08-02 23:26:14 +03:00
parent f773a547b3
commit 6370f0ac02
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/com/unciv/logic/battle/Battle.kt
View File

@ -25,6 +25,15 @@ object Battle {
fun moveAndAttack(attacker: ICombatant, attackableTile: AttackableTile) { fun moveAndAttack(attacker: ICombatant, attackableTile: AttackableTile) {
if (attacker is MapUnitCombatant) { if (attacker is MapUnitCombatant) {
attacker.unit.movement.moveToTile(attackableTile.tileToAttackFrom) attacker.unit.movement.moveToTile(attackableTile.tileToAttackFrom)
/** You might ask: When can this possibly happen?
* We always receive an AttackableTile, which means that it was returned from getAttackableTiles!
* The answer is: when crossing a HIDDEN TILE.
* When calculating movement distance, we assume that a hidden tile is 1 movement point,
* which can lead to EXCEEDINGLY RARE edge cases where you think
* that you can attack a tile by passing through a hidden tile,
* but the hidden tile is actually IMPASSIBLE so you stop halfway!
*/
if (attacker.getTile() != attackableTile.tileToAttackFrom) return
if (attacker.unit.hasUnique("Must set up to ranged attack") && attacker.unit.action != Constants.unitActionSetUp) { if (attacker.unit.hasUnique("Must set up to ranged attack") && attacker.unit.action != Constants.unitActionSetUp) {
attacker.unit.action = Constants.unitActionSetUp attacker.unit.action = Constants.unitActionSetUp
attacker.unit.useMovementPoints(1f) attacker.unit.useMovementPoints(1f)