mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-12 16:59:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Tutorials saved between turns

Browse Source 
No notification for "discovering" barbarians
This commit is contained in:
Yair Morgenstern
2018-07-27 00:07:32 +03:00
parent 041f904f6c
commit 1689005fef
5 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/com/unciv/GameSettings.kt
View File

@ -1,11 +1,17 @@
package com.unciv package com.unciv
import com.unciv.logic.GameSaver
class GameSettings { class GameSettings {
var showWorkedTiles: Boolean = true var showWorkedTiles: Boolean = true
var showResourcesAndImprovements: Boolean = true var showResourcesAndImprovements: Boolean = true
var language: String = "English" var language: String = "English"
var resolution: String = "1050x700" var resolution: String = "1050x700"
var tutorialsShown = ArrayList<String>() var tutorialsShown = ArrayList<String>()
fun save(){
GameSaver().setGeneralSettings(this)
}
} }

2
core/src/com/unciv/logic/civilization/CivilizationInfo.kt
View File

@ -261,7 +261,7 @@ class CivilizationInfo {
val viewedCivs = viewablePositions val viewedCivs = viewablePositions
.flatMap { it.getUnits().map { u->u.civInfo }.union(listOf(it.getOwner())) } .flatMap { it.getUnits().map { u->u.civInfo }.union(listOf(it.getOwner())) }
.filterNotNull().filterNot { it==this } .filterNotNull().filterNot { it==this || it.isBarbarianCivilization() }
for(otherCiv in viewedCivs) for(otherCiv in viewedCivs)
if(!diplomacy.containsKey(otherCiv.civName)){ if(!diplomacy.containsKey(otherCiv.civName)){

2
core/src/com/unciv/ui/LanguagePickerScreen.kt
View File

@ -54,7 +54,7 @@ class LanguagePickerScreen: PickerScreen(){
rightSideButton.setText("Pick language".tr()) rightSideButton.setText("Pick language".tr())
rightSideButton.addClickListener { rightSideButton.addClickListener {
UnCivGame.Current.settings.language = chosenLanguage UnCivGame.Current.settings.language = chosenLanguage
GameSaver().setGeneralSettings(UnCivGame.Current.settings) UnCivGame.Current.settings.save()
UnCivGame.Current.startNewGame() UnCivGame.Current.startNewGame()
dispose() dispose()
} }

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

@ -62,6 +62,7 @@ open class CameraStageBaseScreen : Screen {
fun displayTutorials(name: String) { fun displayTutorials(name: String) {
if (UnCivGame.Current.settings.tutorialsShown.contains(name)) return if (UnCivGame.Current.settings.tutorialsShown.contains(name)) return
UnCivGame.Current.settings.tutorialsShown.add(name) UnCivGame.Current.settings.tutorialsShown.add(name)
UnCivGame.Current.settings.save()
val texts = GameBasics.Tutorials[name]!! val texts = GameBasics.Tutorials[name]!!
tutorialTexts.addAll(texts) tutorialTexts.addAll(texts)
if (!isTutorialShowing) displayTutorial() if (!isTutorialShowing) displayTutorial()

9
core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenDisplayOptionsTable.kt
View File

@ -4,7 +4,6 @@ import com.badlogic.gdx.scenes.scene2d.Actor
import com.badlogic.gdx.scenes.scene2d.ui.SelectBox import com.badlogic.gdx.scenes.scene2d.ui.SelectBox
import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener
import com.unciv.UnCivGame import com.unciv.UnCivGame
import com.unciv.logic.GameSaver
import com.unciv.models.gamebasics.GameBasics import com.unciv.models.gamebasics.GameBasics
import com.unciv.ui.utils.CameraStageBaseScreen import com.unciv.ui.utils.CameraStageBaseScreen
import com.unciv.ui.utils.center import com.unciv.ui.utils.center
@ -16,9 +15,11 @@ class WorldScreenDisplayOptionsTable() : PopupTable(){
} }
fun update() { fun update() {
val settings = UnCivGame.Current.settings
settings.save()
clear() clear()
val tileMapHolder = UnCivGame.Current.worldScreen.tileMapHolder val tileMapHolder = UnCivGame.Current.worldScreen.tileMapHolder
val settings = UnCivGame.Current.settings
if (settings.showWorkedTiles) addButton("{Hide} {worked tiles}") { settings.showWorkedTiles = false; update() } if (settings.showWorkedTiles) addButton("{Hide} {worked tiles}") { settings.showWorkedTiles = false; update() }
else addButton("{Show} {worked tiles}") { settings.showWorkedTiles = true; update() } else addButton("{Show} {worked tiles}") { settings.showWorkedTiles = true; update() }
@ -35,7 +36,7 @@ class WorldScreenDisplayOptionsTable() : PopupTable(){
languageSelectBox.addListener(object : ChangeListener() { languageSelectBox.addListener(object : ChangeListener() {
override fun changed(event: ChangeEvent?, actor: Actor?) { override fun changed(event: ChangeEvent?, actor: Actor?) {
UnCivGame.Current.settings.language = languageSelectBox.selected; UnCivGame.Current.settings.language = languageSelectBox.selected;
GameSaver().setGeneralSettings(UnCivGame.Current.settings) UnCivGame.Current.settings.save()
UnCivGame.Current.worldScreen = WorldScreen() UnCivGame.Current.worldScreen = WorldScreen()
UnCivGame.Current.setWorldScreen() UnCivGame.Current.setWorldScreen()
UnCivGame.Current.worldScreen.stage.addActor(WorldScreenDisplayOptionsTable()) UnCivGame.Current.worldScreen.stage.addActor(WorldScreenDisplayOptionsTable())
@ -52,7 +53,7 @@ class WorldScreenDisplayOptionsTable() : PopupTable(){
resolutionSelectBox.addListener(object : ChangeListener() { resolutionSelectBox.addListener(object : ChangeListener() {
override fun changed(event: ChangeEvent?, actor: Actor?) { override fun changed(event: ChangeEvent?, actor: Actor?) {
UnCivGame.Current.settings.resolution = resolutionSelectBox.selected UnCivGame.Current.settings.resolution = resolutionSelectBox.selected
GameSaver().setGeneralSettings(UnCivGame.Current.settings) UnCivGame.Current.settings.save()
UnCivGame.Current.worldScreen = WorldScreen() UnCivGame.Current.worldScreen = WorldScreen()
UnCivGame.Current.setWorldScreen() UnCivGame.Current.setWorldScreen()
UnCivGame.Current.worldScreen.stage.addActor(WorldScreenDisplayOptionsTable()) UnCivGame.Current.worldScreen.stage.addActor(WorldScreenDisplayOptionsTable())