AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-28 14:24:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tutorials are now popup tables - limits the width of tutorials so they don't go off-screen

Browse Source
This commit is contained in:
Yair Morgenstern 2019-11-25 14:28:32 +02:00
parent ad4bc86d52
commit 2da7c5be8f
2 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt
View File

@ -50,7 +50,7 @@ open class CameraStageBaseScreen : Screen {
override fun dispose() {} override fun dispose() {}
fun displayTutorials(name: String) { fun displayTutorials(name: String) {
tutorials.displayTutorials(name,stage) tutorials.displayTutorials(name,this)
} }

31
core/src/com/unciv/ui/utils/Tutorials.kt
View File

@ -1,16 +1,12 @@
package com.unciv.ui.utils package com.unciv.ui.utils
import com.badlogic.gdx.Gdx import com.badlogic.gdx.Gdx
import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.scenes.scene2d.Stage
import com.badlogic.gdx.scenes.scene2d.ui.Label
import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.badlogic.gdx.scenes.scene2d.ui.TextButton import com.badlogic.gdx.scenes.scene2d.ui.TextButton
import com.badlogic.gdx.utils.Align
import com.badlogic.gdx.utils.Array import com.badlogic.gdx.utils.Array
import com.unciv.UncivGame import com.unciv.UncivGame
import com.unciv.models.gamebasics.GameBasics import com.unciv.models.gamebasics.GameBasics
import com.unciv.models.gamebasics.tr import com.unciv.models.gamebasics.tr
import com.unciv.ui.worldscreen.optionstable.PopupTable
import java.util.* import java.util.*
import kotlin.collections.ArrayList import kotlin.collections.ArrayList
import kotlin.collections.HashMap import kotlin.collections.HashMap
@ -25,7 +21,7 @@ class Tutorials{
var isTutorialShowing = false var isTutorialShowing = false
fun displayTutorials(name: String, stage: Stage) { fun displayTutorials(name: String, screen:CameraStageBaseScreen) {
if (!UncivGame.Current.settings.showTutorials) return if (!UncivGame.Current.settings.showTutorials) return
if (UncivGame.Current.settings.tutorialsShown.contains(name)) return if (UncivGame.Current.settings.tutorialsShown.contains(name)) return
if(tutorialTexts.any { it.name==name }) return // currently showing if(tutorialTexts.any { it.name==name }) return // currently showing
@ -37,7 +33,7 @@ class Tutorials{
texts = ArrayList<String>().apply { add("Could not find matching tutorial!") } texts = ArrayList<String>().apply { add("Could not find matching tutorial!") }
} }
tutorialTexts.add(Tutorial(name, texts)) tutorialTexts.add(Tutorial(name, texts))
if (!isTutorialShowing) displayTutorial(stage) if (!isTutorialShowing) displayTutorial(screen)
} }
fun getTutorialsOfLanguage(language: String): HashMap<String, ArrayList<String>> { fun getTutorialsOfLanguage(language: String): HashMap<String, ArrayList<String>> {
@ -63,16 +59,15 @@ class Tutorials{
return getTutorialsOfLanguage("English")[name]!! return getTutorialsOfLanguage("English")[name]!!
} }
private fun displayTutorial(stage: Stage) { private fun displayTutorial(screen:CameraStageBaseScreen) {
isTutorialShowing = true isTutorialShowing = true
val tutorialTable = Table().pad(10f) val tutorialTable = PopupTable(screen)
tutorialTable.background = ImageGetter.getBackground(Color(0x101050cf))
val currentTutorial = tutorialTexts[0] val currentTutorial = tutorialTexts[0]
val label = Label(currentTutorial.texts[0], CameraStageBaseScreen.skin)
label.setAlignment(Align.center)
if(Gdx.files.internal("ExtraImages/"+currentTutorial.name).exists()) if(Gdx.files.internal("ExtraImages/"+currentTutorial.name).exists())
tutorialTable.add(Table().apply { add(ImageGetter.getExternalImage(currentTutorial.name)) }).row() tutorialTable.add(ImageGetter.getExternalImage(currentTutorial.name)).row()
tutorialTable.add(label).pad(10f).row()
tutorialTable.addGoodSizedLabel(currentTutorial.texts[0]).row()
val button = TextButton("Close".tr(), CameraStageBaseScreen.skin) val button = TextButton("Close".tr(), CameraStageBaseScreen.skin)
currentTutorial.texts.removeAt(0) currentTutorial.texts.removeAt(0)
@ -84,14 +79,12 @@ class Tutorials{
UncivGame.Current.settings.tutorialsShown.add(currentTutorial.name) UncivGame.Current.settings.tutorialsShown.add(currentTutorial.name)
UncivGame.Current.settings.save() UncivGame.Current.settings.save()
} }
if (!tutorialTexts.isEmpty()) if (tutorialTexts.isNotEmpty())
displayTutorial(stage) displayTutorial(screen)
else else
isTutorialShowing = false isTutorialShowing = false
} }
tutorialTable.add(button).pad(10f) tutorialTable.add(button).pad(10f)
tutorialTable.pack() tutorialTable.open()
tutorialTable.center(stage)
stage.addActor(tutorialTable)
} }
} }