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

Added tutorial task for viewing stats breakdown

Browse source 
Added an animation to "Pick language" on the language picker screen, because someone actually got stuck on that 0_0
This commit is contained in:
Yair Morgenstern 2019-12-13 14:31:42 +02:00
parent 906bf19426
commit 307bccb7d0
4 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/src/com/unciv/logic/civilization/CivInfoStats.kt
View file

@ -17,7 +17,8 @@ class CivInfoStats(val civInfo: CivilizationInfo){
val baseUnitCost = 0.5f
val freeUnits = 3
var unitsToPayFor = civInfo.getCivUnits()
if(civInfo.policies.isAdopted("Oligarchy")) unitsToPayFor = unitsToPayFor.filterNot { it.getTile().isCityCenter() }
if(civInfo.policies.isAdopted("Oligarchy"))
unitsToPayFor = unitsToPayFor.filterNot { it.getTile().isCityCenter() }
var numberOfUnitsToPayFor = max(0f, unitsToPayFor.count().toFloat() - freeUnits)
if(civInfo.nation.unique=="67% chance to earn 25 Gold and recruit a Barbarian unit from a conquered encampment, -25% land units maintenance."){

1
core/src/com/unciv/ui/EmpireOverviewScreen.kt
View file

@ -44,6 +44,7 @@ class EmpireOverviewScreen : CameraStageBaseScreen(){
val setStatsInfoButton = TextButton("Stats".tr(),skin)
setStatsInfoButton.onClick {
game.settings.addCompletedTutorialTask("See your stats breakdown")
centerTable.clear()
centerTable.add(ScrollPane(Table().apply {
defaults().pad(40f)

6
core/src/com/unciv/ui/LanguagePickerScreen.kt
View file

@ -2,6 +2,7 @@ package com.unciv.ui
import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.scenes.scene2d.Touchable
import com.badlogic.gdx.scenes.scene2d.actions.Actions
import com.badlogic.gdx.scenes.scene2d.ui.Label
import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.unciv.UncivGame
@ -69,6 +70,11 @@ class LanguagePickerScreen: PickerScreen(){
it.onClick {
chosenLanguage = it.language
rightSideButton.enable()
rightSideButton.clearActions()
rightSideButton.addAction(Actions.forever(Actions.sequence(
Actions.color(Color.GREEN,0.5f),
Actions.color(Color.WHITE,0.5f)
)))
update()
}
topTable.add(it).pad(10f).row()

3
core/src/com/unciv/ui/worldscreen/WorldScreen.kt
View file

@ -252,6 +252,9 @@ class WorldScreen(val viewingCiv:CivilizationInfo) : CameraStageBaseScreen() {
if(viewingCiv.getCivUnits().any { it.type.isAirUnit() } && !completedTasks.contains("Move an air unit"))
return "Move an air unit!\nSelect an air unit > select another city withing range > " +
"\nMove the unit to the other city"
if(!completedTasks.contains("See your stats breakdown"))
return "See your stats breakdown!\nEnter the Overview screen (top right corner) >" +
"\nClick on 'Stats'"
return ""
}