From 3b9ab43bbecbead1acdf112b4c8c491ed83d02ef Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Mon, 24 Jun 2019 06:43:51 +0300
Subject: [PATCH] Resolved #898 - added option to disable tutorials

---
 ...LoadGame.json => NewGame,SaveGame,LoadGame,Options.json} | 3 +++
 core/src/com/unciv/GameSettings.kt                          | 1 +
 core/src/com/unciv/ui/utils/Tutorials.kt                    | 1 +
 .../ui/worldscreen/optionstable/WorldScreenOptionsTable.kt  | 6 ++++++
 4 files changed, 11 insertions(+)
 rename android/assets/jsons/Translations/{NewGame,SaveGame,LoadGame.json => NewGame,SaveGame,LoadGame,Options.json} (99%)

diff --git a/android/assets/jsons/Translations/NewGame,SaveGame,LoadGame.json b/android/assets/jsons/Translations/NewGame,SaveGame,LoadGame,Options.json
similarity index 99%
rename from android/assets/jsons/Translations/NewGame,SaveGame,LoadGame.json
rename to android/assets/jsons/Translations/NewGame,SaveGame,LoadGame,Options.json
index 1d6f0f6c11..12fe20eca2 100644
--- a/android/assets/jsons/Translations/NewGame,SaveGame,LoadGame.json
+++ b/android/assets/jsons/Translations/NewGame,SaveGame,LoadGame,Options.json
@@ -329,4 +329,7 @@
 		French:"Bouger les unités en un seul click"
 	}
 	
+	"Show tutorials":{
+	}
+	
 }
diff --git a/core/src/com/unciv/GameSettings.kt b/core/src/com/unciv/GameSettings.kt
index 7ae12e29e7..5e2305751f 100644
--- a/core/src/com/unciv/GameSettings.kt
+++ b/core/src/com/unciv/GameSettings.kt
@@ -14,6 +14,7 @@ class GameSettings {
     var soundEffectsVolume = 0.5f
     var turnsBetweenAutosaves = 1
     var tileSet:String = "FantasyHex"
+    var showTutorials: Boolean = true
 
     fun save(){
         GameSaver().setGeneralSettings(this)
diff --git a/core/src/com/unciv/ui/utils/Tutorials.kt b/core/src/com/unciv/ui/utils/Tutorials.kt
index d735a61b71..eb86a24b82 100644
--- a/core/src/com/unciv/ui/utils/Tutorials.kt
+++ b/core/src/com/unciv/ui/utils/Tutorials.kt
@@ -26,6 +26,7 @@ class Tutorials{
 
 
     fun displayTutorials(name: String, stage: Stage) {
+        if (UnCivGame.Current.settings.showTutorials) return
         if (UnCivGame.Current.settings.tutorialsShown.contains(name)) return
         val texts = getTutorials(name, UnCivGame.Current.settings.language)
         tutorialTexts.add(Tutorial(name,texts))
diff --git a/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt b/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt
index 6e21039690..4b3d52fbc1 100644
--- a/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt
+++ b/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt
@@ -62,6 +62,12 @@ class WorldScreenOptionsTable(screen:WorldScreen) : PopupTable(screen){
             update()
         }
 
+        add("Show tutorials".toLabel())
+        addButton(if(settings.showTutorials) "Yes".tr() else "No".tr()) {
+            settings.showTutorials= !settings.showTutorials
+            update()
+        }
+
         addLanguageSelectBox()
 
         addResolutionSelectBox()