From 949d64c53c055b777ef3c48088ed878a82d6ae4d Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Mon, 9 Jul 2018 22:51:50 +0300
Subject: [PATCH] Added tutorials for strategic and luxury resources

---
 android/assets/jsons/Tutorials.json           | 20 ++++++++++++++++++
 .../com/unciv/ui/worldscreen/WorldScreen.kt   | 21 +++++++------------
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/android/assets/jsons/Tutorials.json b/android/assets/jsons/Tutorials.json
index 0538dae2ab..f289a028fd 100644
--- a/android/assets/jsons/Tutorials.json
+++ b/android/assets/jsons/Tutorials.json
@@ -215,4 +215,24 @@
 		]
 	]
 	
+	LuxuryResource:  [
+		[
+			"You have gained your first luxury resource!",
+			"Each unique Luxury resource you have adds 5 happiness to your civilization,",
+			"  but extra resources of the same type don't add anything, ",
+			"  so use them for trading with other civilizations!"
+		]
+	]
+	
+	StrategicResource:  [
+		[
+			"You have gained your first strategic resource!",
+			"Strategic resources allow you to train units and construct buildings that",
+			"  require those specific resources, for example the Horseman requires Horses."
+			"Each unit 'consumes' a copy of that resource, but if the unit is killed you can ",
+			"  construct a new unit wth your now-unused resource.",
+			"The top bar keeps count of how many unused strategic resources you own."
+		]
+	]
+	
 }
diff --git a/core/src/com/unciv/ui/worldscreen/WorldScreen.kt b/core/src/com/unciv/ui/worldscreen/WorldScreen.kt
index 2f3831db60..65c4c243ce 100644
--- a/core/src/com/unciv/ui/worldscreen/WorldScreen.kt
+++ b/core/src/com/unciv/ui/worldscreen/WorldScreen.kt
@@ -8,6 +8,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextButton
 import com.unciv.UnCivGame
 import com.unciv.logic.GameSaver
 import com.unciv.logic.civilization.CivilizationInfo
+import com.unciv.models.gamebasics.tile.ResourceType
 import com.unciv.ui.TradeScreen
 import com.unciv.ui.pickerscreens.GreatPersonPickerScreen
 import com.unciv.ui.pickerscreens.PolicyPickerScreen
@@ -184,19 +185,13 @@ class WorldScreen : CameraStageBaseScreen() {
             update()
 
             displayTutorials("NextTurn")
-
-            if(civInfo.cities.size > 2)
-                displayTutorials("SecondCity")
-
-            if(civInfo.happiness<0)
-                displayTutorials("Unhappiness")
-
-            if(civInfo.goldenAges.isGoldenAge())
-                displayTutorials("GoldenAge")
-
-            if(gameInfo.turns>=100)
-                displayTutorials("ContactMe")
-
+            if(civInfo.cities.size > 2) displayTutorials("SecondCity")
+            if(civInfo.happiness<0) displayTutorials("Unhappiness")
+            if(civInfo.goldenAges.isGoldenAge()) displayTutorials("GoldenAge")
+            if(gameInfo.turns>=100) displayTutorials("ContactMe")
+            val resources = civInfo.getCivResources()
+            if(resources.keys.any { it.resourceType==ResourceType.Luxury }) displayTutorials("LuxuryResource")
+            if(resources.keys.any { it.resourceType==ResourceType.Strategic}) displayTutorials("StrategicResource")
             if(civInfo.exploredTiles.map { gameInfo.tileMap[it] }.any { it.isCityCenter() && it.getOwner()!=civInfo })
                 displayTutorials("EnemyCity")