Resolved #12823 - "Cannot attack" accepts "vs" conditionals

yairm210 · Jan 18, 2025 · 629081f · 629081f
1 parent 263bb53
commit 629081f
Showing 1 changed file with 21 additions and 14 deletions.
diff --git a/core/src/com/unciv/logic/battle/TargetHelper.kt b/core/src/com/unciv/logic/battle/TargetHelper.kt
@@ -5,6 +5,7 @@ import com.unciv.logic.city.City
 import com.unciv.logic.map.mapunit.MapUnit
 import com.unciv.logic.map.mapunit.movement.PathsToTilesWithinTurn
 import com.unciv.logic.map.tile.Tile
+import com.unciv.models.ruleset.unique.StateForConditionals
 import com.unciv.models.ruleset.unique.UniqueType
 
 object TargetHelper {
@@ -112,29 +113,35 @@ object TargetHelper {
         )
             return false
 
-        if (combatant is MapUnitCombatant && combatant.hasUnique(UniqueType.CannotAttack))
-            return false
+
+        if (combatant is MapUnitCombatant) {
+            val stateForConditionals = StateForConditionals(
+                unit = (combatant as? MapUnitCombatant)?.unit, tile = tile, 
+                ourCombatant = combatant, theirCombatant = tileCombatant, combatAction = CombatAction.Attack)
 
-        if (combatant is MapUnitCombatant &&
-            combatant.unit.getMatchingUniques(UniqueType.CanOnlyAttackUnits).run {
-                any() && none { tileCombatant.matchesFilter(it.params[0]) }
-            }
-        )
-            return false
+            if (combatant.hasUnique(UniqueType.CannotAttack, stateForConditionals))
+                return false
 
-        if (combatant is MapUnitCombatant &&
-            combatant.unit.getMatchingUniques(UniqueType.CanOnlyAttackTiles).run {
-                any() && none { tile.matchesFilter(it.params[0]) }
-            }
-        )
-            return false
+            if (combatant.unit.getMatchingUniques(UniqueType.CanOnlyAttackUnits, stateForConditionals).run {
+                    any() && none { tileCombatant.matchesFilter(it.params[0]) }
+                }
+            )
+                return false
+
+            if (combatant.unit.getMatchingUniques(UniqueType.CanOnlyAttackTiles, stateForConditionals).run {
+                    any() && none { tile.matchesFilter(it.params[0]) }
+                }
+            )
+                return false
+        }
 
         // Only units with the right unique can view submarines (or other invisible units) from more then one tile away.
         // Garrisoned invisible units can be attacked by anyone, as else the city will be in invincible.
         if (tileCombatant.isInvisible(combatant.getCivInfo()) && !tile.isCityCenter()) {
             return combatant is MapUnitCombatant
                 && combatant.getCivInfo().viewableInvisibleUnitsTiles.map { it.position }.contains(tile.position)
         }
+
         return true
     }