diff --git a/core/src/com/unciv/logic/battle/TargetHelper.kt b/core/src/com/unciv/logic/battle/TargetHelper.kt index 85e0f01e10..2a4fb4289e 100644 --- a/core/src/com/unciv/logic/battle/TargetHelper.kt +++ b/core/src/com/unciv/logic/battle/TargetHelper.kt @@ -36,7 +36,7 @@ object TargetHelper { val tilesInAttackRange = if (unit.baseUnit.isMelee()) reachableTile.neighbors - else if (unit.hasUnique(UniqueType.IndirectFire, checkCivInfoUniques = true) || unit.baseUnit.movesLikeAirUnits) + else if (unit.baseUnit.movesLikeAirUnits || unit.hasUnique(UniqueType.IndirectFire, checkCivInfoUniques = true)) reachableTile.getTilesInDistance(rangeOfAttack) else reachableTile.tileMap.getViewableTiles(reachableTile.position, rangeOfAttack, true).asSequence() diff --git a/core/src/com/unciv/logic/city/managers/CityReligionManager.kt b/core/src/com/unciv/logic/city/managers/CityReligionManager.kt index 99a42bdc5f..5e600fe89c 100644 --- a/core/src/com/unciv/logic/city/managers/CityReligionManager.kt +++ b/core/src/com/unciv/logic/city/managers/CityReligionManager.kt @@ -320,8 +320,9 @@ class CityReligionManager : IsPartOfGameInfoSerialization { } // Founder beliefs of this religion - if (getMajorityReligion() != null) { - for (unique in getMajorityReligion()!!.getFounder().getMatchingUniques(UniqueType.NaturalReligionSpreadStrength)) + val majorityReligion = getMajorityReligion() + if (majorityReligion != null) { + for (unique in majorityReligion.getFounder().getMatchingUniques(UniqueType.NaturalReligionSpreadStrength)) if (pressuredCity.matchesFilter(unique.params[1])) pressure *= unique.params[0].toPercent() }