wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rejuvenation icon + Unique promotions are listed in PromotionPickerScreen (#1506)

Browse source
This commit is contained in:
r3versi 2019-12-22 14:29:40 +01:00 committed by Yair Morgenstern
parent 4af80be189
commit c2dc0217b6
5 changed files with 246 additions and 237 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
android/Images/UnitPromotionIcons/Rejuvenation.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 747 B

479
android/assets/game.atlas
View file

File diff suppressed because it is too large Load diff

BIN
android/assets/game.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 877 KiB

After

Width:  |  Height:  |  Size: 877 KiB

BIN
android/assets/game2.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 292 KiB

After

Width:  |  Height:  |  Size: 295 KiB

4
core/src/com/unciv/ui/pickerscreens/PromotionPickerScreen.kt
View file

@ -41,7 +41,9 @@ class PromotionPickerScreen(val unit: MapUnit) : PickerScreen() {
availablePromotionsGroup.space(10f)
val unitType = unit.type
val promotionsForUnitType = unit.civInfo.gameInfo.ruleSet.UnitPromotions.values.filter { it.unitTypes.contains(unitType.toString()) }
val promotionsForUnitType = unit.civInfo.gameInfo.ruleSet.UnitPromotions.values.filter {
it.unitTypes.contains(unitType.toString())
|| unit.promotions.promotions.contains(it.name) }
val unitAvailablePromotions = unit.promotions.getAvailablePromotions()
for (promotion in promotionsForUnitType) {