diff --git a/android/build.gradle b/android/build.gradle index d8ac87c205..59f8123eb1 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,8 +21,8 @@ android { applicationId "com.unciv.app" minSdkVersion 14 targetSdkVersion 28 - versionCode 257 - versionName "2.17.6" + versionCode 258 + versionName "2.17.7" } // Had to add this crap for Travis to build, it wanted to sign the app diff --git a/core/src/com/unciv/ui/EmpireOverviewScreen.kt b/core/src/com/unciv/ui/EmpireOverviewScreen.kt index 9c5ecd92e4..a8985b9424 100644 --- a/core/src/com/unciv/ui/EmpireOverviewScreen.kt +++ b/core/src/com/unciv/ui/EmpireOverviewScreen.kt @@ -11,6 +11,7 @@ import com.unciv.logic.civilization.CivilizationInfo import com.unciv.logic.civilization.diplomacy.DiplomaticStatus import com.unciv.logic.trade.Trade import com.unciv.logic.trade.TradeOffersList +import com.unciv.models.gamebasics.tile.ResourceType import com.unciv.models.gamebasics.tr import com.unciv.ui.utils.* import java.text.DecimalFormat @@ -367,7 +368,9 @@ class EmpireOverviewScreen : CameraStageBaseScreen(){ // First row of table has all the icons resourcesTable.add() - val resources = resourceDrilldown.map { it.resource }.distinct() + val resources = resourceDrilldown.map { it.resource } + .filter { it.resourceType!=ResourceType.Bonus }.distinct().sortedBy { it.resourceType } + for(resource in resources) resourcesTable.add(ImageGetter.getResourceImage(resource.name,30f)) resourcesTable.addSeparator() @@ -382,7 +385,7 @@ class EmpireOverviewScreen : CameraStageBaseScreen(){ } resourcesTable.row() } - + resourcesTable.add("Total".toLabel()) for(resource in resources){ val sum = resourceDrilldown.filter { it.resource==resource }.sumBy { it.amount }