From 113531a695178c2d59b58ad8949540da8feaddaa Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Tue, 17 Dec 2019 16:56:07 +0200
Subject: [PATCH] Spanish Civ is not production-ready, and natural wonders
 should be opt-in at the beginning

---
 android/assets/jsons/Nations/Nations.json                     | 3 +--
 android/build.gradle                                          | 4 ++--
 core/src/com/unciv/logic/automation/NextTurnAutomation.kt     | 2 +-
 .../com/unciv/logic/civilization/CivInfoTransientUpdater.kt   | 2 +-
 core/src/com/unciv/logic/civilization/CivilizationInfo.kt     | 2 +-
 core/src/com/unciv/logic/map/MapParameters.kt                 | 2 +-
 6 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/android/assets/jsons/Nations/Nations.json b/android/assets/jsons/Nations/Nations.json
index 0e31207137..cf59e442e8 100644
--- a/android/assets/jsons/Nations/Nations.json
+++ b/android/assets/jsons/Nations/Nations.json
@@ -769,7 +769,7 @@
 			"Almarikh","Ulaanbaatar","Hovd","Darhan","Dalandzadgad","Mandalgovi","Choybalsan","Erdenet","Tsetserieg",
 			"Baruun-Urt","Ereen","Batshireet","Choyr","Ulaangom","Tosontsengel","Atlay","Uliastay","Bayanhongor",
 			"Har-Ayrag","Nalayh","Tes"]
-	},*/
+	},
 	{
 		/////NEEDS NATURAL WONDERS
 		name:"Spanish",
@@ -808,7 +808,6 @@
 			"Lugo","Alicante","Càdiz","Eiche","Alcorcon","Burgos","Vigo","Badajoz","La Coruña","Guadalquivir","Bilbao",
 			"San Sebastian","Granada","Mérida","Huelva","Ibiza","Las Palmas","Tenerife"]
 	},
-	/*
 	{
 		name:"Incan",
 		leaderName:"Pachacuti",
diff --git a/android/build.gradle b/android/build.gradle
index c41f314301..795e54f2fd 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -21,8 +21,8 @@ android {
         applicationId "com.unciv.app"
         minSdkVersion 14
         targetSdkVersion 29
-        versionCode 343
-        versionName "3.3.9-patch1"
+        versionCode 344
+        versionName "3.4.0"
 
         archivesBaseName = "Unciv"
     }
diff --git a/core/src/com/unciv/logic/automation/NextTurnAutomation.kt b/core/src/com/unciv/logic/automation/NextTurnAutomation.kt
index 42a966c758..08371be4de 100644
--- a/core/src/com/unciv/logic/automation/NextTurnAutomation.kt
+++ b/core/src/com/unciv/logic/automation/NextTurnAutomation.kt
@@ -53,7 +53,7 @@ class NextTurnAutomation{
                 otherCiv.addNotification("[${civInfo.civName}] has accepted your trade request", Color.GOLD)
             }
             else{
-                otherCiv.addNotification("[${civInfo.civName}] has denied your trade request", Color.GOLD) // todo translation
+                otherCiv.addNotification("[${civInfo.civName}] has denied your trade request", Color.GOLD)
             }
         }
         civInfo.tradeRequests.clear()
diff --git a/core/src/com/unciv/logic/civilization/CivInfoTransientUpdater.kt b/core/src/com/unciv/logic/civilization/CivInfoTransientUpdater.kt
index 9c8deaa5ce..cc912e084f 100644
--- a/core/src/com/unciv/logic/civilization/CivInfoTransientUpdater.kt
+++ b/core/src/com/unciv/logic/civilization/CivInfoTransientUpdater.kt
@@ -71,7 +71,7 @@ class CivInfoTransientUpdater(val civInfo: CivilizationInfo){
 
             for (tile in viewedNaturalWonders) {
                 if (!civInfo.naturalWonders.contains(tile.naturalWonder)) {
-                    civInfo.discoveryNaturalWonder(tile.naturalWonder!!)
+                    civInfo.discoverNaturalWonder(tile.naturalWonder!!)
                     civInfo.addNotification("We have discovered [" + tile.naturalWonder + "]!", tile.position, Color.GOLD)
 
                     var goldGained = 0
diff --git a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt
index e39e04fe7e..07cf3a2d67 100644
--- a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt
+++ b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt
@@ -260,7 +260,7 @@ class CivilizationInfo {
             UncivGame.Current.settings.addCompletedTutorialTask("Meet another civilization")
     }
 
-    fun discoveryNaturalWonder(naturalWonderName: String)
+    fun discoverNaturalWonder(naturalWonderName: String)
     {
         naturalWonders.add(naturalWonderName)
     }
diff --git a/core/src/com/unciv/logic/map/MapParameters.kt b/core/src/com/unciv/logic/map/MapParameters.kt
index 9bd4368b81..faa5371dad 100644
--- a/core/src/com/unciv/logic/map/MapParameters.kt
+++ b/core/src/com/unciv/logic/map/MapParameters.kt
@@ -5,5 +5,5 @@ class MapParameters {
     var type = MapType.pangaea
     var radius = 20
     var noRuins = false
-    var noNaturalWonders = false
+    var noNaturalWonders = true
 }
\ No newline at end of file