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

Update wolfpack bonus, icons.

Browse Source
This commit is contained in:
Duan Tao 2018-12-31 19:58:24 +08:00
parent ed96534d34
commit 19ce158ccb
3 changed files with 39 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
android/assets/game.atlas
View File

@ -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

BIN
android/assets/game.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 833 KiB

After

Width:  |  Height:  |  Size: 837 KiB

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

@ -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
}
}