mirror of
https://github.com/yairm210/Unciv.git
synced 2025-07-10 07:48:31 +07:00
Resources sorted and no bonus resources in Resource Overview
This commit is contained in:
@ -21,8 +21,8 @@ android {
|
|||||||
applicationId "com.unciv.app"
|
applicationId "com.unciv.app"
|
||||||
minSdkVersion 14
|
minSdkVersion 14
|
||||||
targetSdkVersion 28
|
targetSdkVersion 28
|
||||||
versionCode 257
|
versionCode 258
|
||||||
versionName "2.17.6"
|
versionName "2.17.7"
|
||||||
}
|
}
|
||||||
|
|
||||||
// Had to add this crap for Travis to build, it wanted to sign the app
|
// Had to add this crap for Travis to build, it wanted to sign the app
|
||||||
|
@ -11,6 +11,7 @@ import com.unciv.logic.civilization.CivilizationInfo
|
|||||||
import com.unciv.logic.civilization.diplomacy.DiplomaticStatus
|
import com.unciv.logic.civilization.diplomacy.DiplomaticStatus
|
||||||
import com.unciv.logic.trade.Trade
|
import com.unciv.logic.trade.Trade
|
||||||
import com.unciv.logic.trade.TradeOffersList
|
import com.unciv.logic.trade.TradeOffersList
|
||||||
|
import com.unciv.models.gamebasics.tile.ResourceType
|
||||||
import com.unciv.models.gamebasics.tr
|
import com.unciv.models.gamebasics.tr
|
||||||
import com.unciv.ui.utils.*
|
import com.unciv.ui.utils.*
|
||||||
import java.text.DecimalFormat
|
import java.text.DecimalFormat
|
||||||
@ -367,7 +368,9 @@ class EmpireOverviewScreen : CameraStageBaseScreen(){
|
|||||||
|
|
||||||
// First row of table has all the icons
|
// First row of table has all the icons
|
||||||
resourcesTable.add()
|
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)
|
for(resource in resources)
|
||||||
resourcesTable.add(ImageGetter.getResourceImage(resource.name,30f))
|
resourcesTable.add(ImageGetter.getResourceImage(resource.name,30f))
|
||||||
resourcesTable.addSeparator()
|
resourcesTable.addSeparator()
|
||||||
@ -382,7 +385,7 @@ class EmpireOverviewScreen : CameraStageBaseScreen(){
|
|||||||
}
|
}
|
||||||
resourcesTable.row()
|
resourcesTable.row()
|
||||||
}
|
}
|
||||||
|
|
||||||
resourcesTable.add("Total".toLabel())
|
resourcesTable.add("Total".toLabel())
|
||||||
for(resource in resources){
|
for(resource in resources){
|
||||||
val sum = resourceDrilldown.filter { it.resource==resource }.sumBy { it.amount }
|
val sum = resourceDrilldown.filter { it.resource==resource }.sumBy { it.amount }
|
||||||
|
Reference in New Issue
Block a user