mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-08-01 07:39:20 +07:00
Code Issues Packages Projects Releases Wiki Activity

Notification log fix (#8509)

Browse Source 
* Fix ruin notification and broken conditional check

* Translate idle production description
This commit is contained in:
OptimizedForDensity
2023-01-31 16:08:17 -05:00
committed by GitHub
parent 913cb3cf00
commit c3da760c3b
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/logic/civilization/managers/RuinsManager.kt
View File

@ -49,7 +49,7 @@ class RuinsManager : IsPartOfGameInfoSerialization {
&& (civInfo.civConstructions.boughtItemsWithIncreasingPrice[civInfo.religionManager.getGreatProphetEquivalent()] ?: 0) > 0
) continue
if (possibleReward.getMatchingUniques(UniqueType.OnlyAvailableWhen)
if (possibleReward.getMatchingUniques(UniqueType.OnlyAvailableWhen, StateForConditionals.IgnoreConditionals)
.any { !it.conditionalsApply(StateForConditionals(civInfo, unit=triggeringUnit, tile = triggeringUnit.getTile()) ) })
continue

2
core/src/com/unciv/ui/cityscreen/ConstructionInfoTable.kt
View File

@ -82,7 +82,7 @@ class ConstructionInfoTable(val cityScreen: CityScreen): Table() {
is BaseUnit -> construction.getDescription(city)
is Building -> construction.getDescription(city, true)
is PerpetualStatConversion -> construction.description.replace("[rate]", "[${construction.getConversionRate(city)}]").tr()
is PerpetualConstruction -> construction.description
is PerpetualConstruction -> construction.description.tr()
else -> "" // Should never happen
}

2
core/src/com/unciv/ui/overviewscreen/NotificationsOverviewTable.kt
View File

@ -88,7 +88,7 @@ class NotificationsOverviewTable(
for (notification in categoryNotifications) {
val notificationTable = Table(BaseScreen.skin)
val labelWidth = maxEntryWidth * notification.icons.size - 10f
val labelWidth = maxEntryWidth - iconSize * notification.icons.size - 10f
val label = WrappableLabel(notification.text, labelWidth, Color.BLACK, 20)
notificationTable.add(label)