AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-27 22:06:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Better unique for defending vs units

Browse Source
This commit is contained in:
Yair Morgenstern 2021-07-27 05:02:13 +03:00
parent 1271c86d03
commit 183b94702e
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/assets/jsons/Civ V - Vanilla/UnitPromotions.json
View File

@ -412,13 +412,13 @@
// Mixed // Mixed
{ {
"name": "Cover I", "name": "Cover I",
"effect": "[+33]% Strength when defending vs [Ranged]", "effect": "[+33]% Strength when defending vs [Ranged] units",
"unitTypes": ["Melee","Ranged","Siege"] "unitTypes": ["Melee","Ranged","Siege"]
}, },
{ {
"name": "Cover II", "name": "Cover II",
"prerequisites": ["Cover I"], "prerequisites": ["Cover I"],
"effect": "[+33]% Strength when defending vs [Ranged]", "effect": "[+33]% Strength when defending vs [Ranged] units",
"unitTypes": ["Melee","Ranged","Siege"] "unitTypes": ["Melee","Ranged","Siege"]
}, },

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

@ -646,9 +646,6 @@ object Battle {
private fun tryInterceptAirAttack(attacker: MapUnitCombatant, defender: ICombatant) { private fun tryInterceptAirAttack(attacker: MapUnitCombatant, defender: ICombatant) {
if (attacker.unit.hasUnique("Cannot be intercepted")) return if (attacker.unit.hasUnique("Cannot be intercepted")) return
// Deprecated since 3.15.6
if (attacker.unit.hasUnique("Can not be intercepted")) return
// End deprecation
val attackedTile = defender.getTile() val attackedTile = defender.getTile()
for (interceptor in defender.getCivInfo().getCivUnits().filter { it.canIntercept(attackedTile) }) { for (interceptor in defender.getCivInfo().getCivUnits().filter { it.canIntercept(attackedTile) }) {
if (Random().nextFloat() > 100f / interceptor.interceptChance()) continue if (Random().nextFloat() > 100f / interceptor.interceptChance()) continue

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

@ -196,7 +196,7 @@ object BattleDamage {
) )
modifiers["Tile"] = (tileDefenceBonus * 100).toInt() modifiers["Tile"] = (tileDefenceBonus * 100).toInt()
for (unique in defender.unit.getMatchingUniques("[]% Strength when defending vs []")) { for (unique in defender.unit.getMatchingUniques("[]% Strength when defending vs [] units")) {
if (attacker.matchesCategory(unique.params[1])) if (attacker.matchesCategory(unique.params[1]))
modifiers.add("defence vs [${unique.params[1]}] ", unique.params[0].toInt()) modifiers.add("defence vs [${unique.params[1]}] ", unique.params[0].toInt())
} }