diff --git a/android/assets/game.atlas b/android/assets/game.atlas index 4a206e5ec4..b859d48811 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -697,20 +697,6 @@ ImprovementIcons/Quarry orig: 100, 100 offset: 0, 0 index: -1 -ImprovementIcons/Railroad - rotate: false - xy: 1734, 722 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -OtherIcons/Railroad - rotate: false - xy: 1734, 722 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 ImprovementIcons/Road rotate: false xy: 347, 407 @@ -788,6 +774,20 @@ OtherIcons/Pentagon orig: 100, 100 offset: 0, 0 index: -1 +OtherIcons/Railroad + rotate: false + xy: 1734, 722 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ImprovementIcons/Railroad + rotate: false + xy: 1734, 722 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 OtherIcons/Shield rotate: false xy: 692, 622 @@ -2608,3 +2608,24 @@ UnitPromotionIcons/Volley_(Civ5) orig: 20, 20 offset: 0, 0 index: -1 +UnitPromotionIcons/Wolfpack_III_(Civ5) + rotate: false + xy: 380, 5 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Wolfpack_II_(Civ5) + rotate: false + xy: 402, 27 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Wolfpack_I_(Civ5) + rotate: false + xy: 1983, 532 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 diff --git a/android/assets/game.png b/android/assets/game.png index b8c087de15..a5d4ce0175 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ diff --git a/core/src/com/unciv/logic/battle/BattleDamage.kt b/core/src/com/unciv/logic/battle/BattleDamage.kt index 4d19b0c9dd..886970cc02 100644 --- a/core/src/com/unciv/logic/battle/BattleDamage.kt +++ b/core/src/com/unciv/logic/battle/BattleDamage.kt @@ -105,7 +105,10 @@ class BattleDamage{ for (ability in attacker.unit.getUniques()) { val regexResult = Regex("""Bonus as Attacker (\d*)%""").matchEntire(ability) //to do: extend to defender, and penalyy if (regexResult == null) continue - modifiers["Attacker Bonus"] = regexResult.groups[1]!!.value.toFloat() / 100 + val bonus = regexResult.groups[1]!!.value.toFloat() / 100 + if (modifiers.containsKey("Attacker Bonus")) + modifiers["Attacker Bonus"] =modifiers["Attacker Bonus"]!! + bonus + else modifiers["Attacker Bonus"] = bonus } }