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

Removed old StatExplainer code

Browse Source
This commit is contained in:
Yair Morgenstern 2018-12-03 17:42:41 +02:00
parent 7e7f5a1dbb
commit c12906f63b
2 changed files with 4 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
core/src/com/unciv/ui/cityscreen/CityScreen.kt
View File

@ -9,7 +9,6 @@ import com.unciv.UnCivGame
import com.unciv.logic.HexMath
import com.unciv.logic.city.CityInfo
import com.unciv.logic.map.TileInfo
import com.unciv.models.stats.Stats
import com.unciv.ui.utils.*
import java.util.*
@ -19,7 +18,6 @@ class CityScreen(internal val city: CityInfo) : CameraStageBaseScreen() {
private var tileTable = Table()
private var buildingsTable = BuildingsTable(this)
private var cityStatsTable = CityStatsTable(this)
private var statExplainer = Table(skin)
private var cityPickerTable = Table()
private var goToWorldButton = TextButton("Exit city".tr(), CameraStageBaseScreen.skin)
private var tileGroups = ArrayList<CityTileGroup>()
@ -58,47 +56,11 @@ class CityScreen(internal val city: CityInfo) : CameraStageBaseScreen() {
buildingsTable.update()
updateCityPickerTable()
cityStatsTable.update()
updateStatExplainer()
updateGoToWorldButton()
updateTileTable()
updateTileGroups()
}
private fun updateStatExplainer() {
statExplainer.defaults().pad(5f)
statExplainer.clear()
statExplainer.add()
statExplainer.add("Production")
statExplainer.add("Food")
statExplainer.add("Science")
statExplainer.add("Gold")
statExplainer.add("Culture")
statExplainer.add("Happiness")
val unifiedStatList = LinkedHashMap<String, Stats>(city.cityStats.baseStatList)
for(entry in city.cityStats.happinessList.filter { it.value!=0f }){
if(!unifiedStatList.containsKey(entry.key)) unifiedStatList[entry.key]= Stats()
unifiedStatList[entry.key]!!.happiness=entry.value
}
for (entry in unifiedStatList){
if(entry.value.toHashMap().values.all { it==0f }) continue //irrelevant!
statExplainer.row()
statExplainer.add(entry.key)
statExplainer.add(entry.value.production.toInt().toString())
statExplainer.add(entry.value.food.toInt().toString())
statExplainer.add(entry.value.science.toInt().toString())
statExplainer.add(entry.value.gold.toInt().toString())
statExplainer.add(entry.value.culture.toInt().toString())
statExplainer.add(entry.value.happiness.toInt().toString())
}
statExplainer.pack()
statExplainer.isTransform=true
statExplainer.setScale(0.8f)
statExplainer.setPosition(5f,cityStatsTable.top + 10)
}
private fun updateTileGroups() {
val nextTile = city.expansion.chooseNewTileToOwn()
for (tileGroup in tileGroups) {
@ -231,7 +193,7 @@ class CityScreen(internal val city: CityInfo) : CameraStageBaseScreen() {
scrollPane.setOrigin(stage.width / 2, stage.height / 2)
scrollPane.addListener(object : ActorGestureListener() {
var lastScale = 1f
internal var lastInitialDistance = 0f
var lastInitialDistance = 0f
override fun zoom(event: InputEvent?, initialDistance: Float, distance: Float) {
if (lastInitialDistance != initialDistance) {

7
core/src/com/unciv/ui/pickerscreens/GreatPersonPickerScreen.kt
View File

@ -4,6 +4,7 @@ import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.scenes.scene2d.ui.Button
import com.badlogic.gdx.scenes.scene2d.ui.Label
import com.unciv.UnCivGame
import com.unciv.logic.civilization.GreatPersonManager
import com.unciv.models.gamebasics.GameBasics
import com.unciv.models.gamebasics.unit.BaseUnit
import com.unciv.ui.utils.ImageGetter
@ -16,10 +17,8 @@ class GreatPersonPickerScreen : PickerScreen() {
init {
closeButton.isVisible=false
rightSideButton.setText("Choose a free great person")
for (unit in GameBasics.Units.values.filter { it.name.startsWith("Great Scientist")
|| it.name.startsWith("Great Artist")
|| it.name.startsWith("Great Engineer")
|| it.name.startsWith("Great Merchant") })
for (unit in GameBasics.Units.values
.filter { it.name in GreatPersonManager().statToGreatPersonMapping.values})
{
val button = Button(skin)