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

Maori Warrior debuff only applies to enemy units

Browse Source
This commit is contained in:
Yair Morgenstern 2021-07-30 15:07:21 +03:00
parent 8ae4ae1cb1
commit 864fd2ce64
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/com/unciv/logic/battle/BattleDamage.kt
View File

@ -60,7 +60,8 @@ object BattleDamage {
}
}
for (unique in adjacentUnits.flatMap { it.getMatchingUniques("[]% Strength for enemy [] units in adjacent [] tiles") })
for (unique in adjacentUnits.filter { it.civInfo.isAtWarWith(combatant.getCivInfo()) }
.flatMap { it.getMatchingUniques("[]% Strength for enemy [] units in adjacent [] tiles") })
if (combatant.matchesCategory(unique.params[1]) && combatant.getTile().matchesFilter(unique.params[2]))
modifiers.add("Adjacent enemy units", unique.params[0].toInt())

3
core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt
View File

@ -546,7 +546,8 @@ class UnitMovementAlgorithms(val unit:MapUnit) {
class PathsToTilesWithinTurn : LinkedHashMap<TileInfo, UnitMovementAlgorithms.ParentTileAndTotalDistance>() {
fun getPathToTile(tile: TileInfo): List<TileInfo> {
if (!containsKey(tile)) throw Exception("Can't reach this tile!")
if (!containsKey(tile))
throw Exception("Can't reach this tile!")
val reversePathList = ArrayList<TileInfo>()
var currentTile = tile
while (get(currentTile)!!.parentTile != currentTile) {