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

Spanish Civ is not production-ready, and natural wonders should be opt-in at the beginning

Browse Source
This commit is contained in:
Yair Morgenstern 2019-12-17 16:56:07 +02:00
parent 4f03322565
commit 113531a695
6 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
android/assets/jsons/Nations/Nations.json
View File

@ -769,7 +769,7 @@
"Almarikh","Ulaanbaatar","Hovd","Darhan","Dalandzadgad","Mandalgovi","Choybalsan","Erdenet","Tsetserieg", "Almarikh","Ulaanbaatar","Hovd","Darhan","Dalandzadgad","Mandalgovi","Choybalsan","Erdenet","Tsetserieg",
"Baruun-Urt","Ereen","Batshireet","Choyr","Ulaangom","Tosontsengel","Atlay","Uliastay","Bayanhongor", "Baruun-Urt","Ereen","Batshireet","Choyr","Ulaangom","Tosontsengel","Atlay","Uliastay","Bayanhongor",
"Har-Ayrag","Nalayh","Tes"] "Har-Ayrag","Nalayh","Tes"]
},*/ },
{ {
/////NEEDS NATURAL WONDERS /////NEEDS NATURAL WONDERS
name:"Spanish", name:"Spanish",
@ -808,7 +808,6 @@
"Lugo","Alicante","Càdiz","Eiche","Alcorcon","Burgos","Vigo","Badajoz","La Coruña","Guadalquivir","Bilbao", "Lugo","Alicante","Càdiz","Eiche","Alcorcon","Burgos","Vigo","Badajoz","La Coruña","Guadalquivir","Bilbao",
"San Sebastian","Granada","Mérida","Huelva","Ibiza","Las Palmas","Tenerife"] "San Sebastian","Granada","Mérida","Huelva","Ibiza","Las Palmas","Tenerife"]
}, },
/*
{ {
name:"Incan", name:"Incan",
leaderName:"Pachacuti", leaderName:"Pachacuti",

4
android/build.gradle
View File

@ -21,8 +21,8 @@ android {
applicationId "com.unciv.app" applicationId "com.unciv.app"
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 29 targetSdkVersion 29
versionCode 343 versionCode 344
versionName "3.3.9-patch1" versionName "3.4.0"
archivesBaseName = "Unciv" archivesBaseName = "Unciv"
} }

2
core/src/com/unciv/logic/automation/NextTurnAutomation.kt
View File

@ -53,7 +53,7 @@ class NextTurnAutomation{
otherCiv.addNotification("[${civInfo.civName}] has accepted your trade request", Color.GOLD) otherCiv.addNotification("[${civInfo.civName}] has accepted your trade request", Color.GOLD)
} }
else{ 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() civInfo.tradeRequests.clear()

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

@ -71,7 +71,7 @@ class CivInfoTransientUpdater(val civInfo: CivilizationInfo){
for (tile in viewedNaturalWonders) { for (tile in viewedNaturalWonders) {
if (!civInfo.naturalWonders.contains(tile.naturalWonder)) { 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) civInfo.addNotification("We have discovered [" + tile.naturalWonder + "]!", tile.position, Color.GOLD)
var goldGained = 0 var goldGained = 0

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

@ -260,7 +260,7 @@ class CivilizationInfo {
UncivGame.Current.settings.addCompletedTutorialTask("Meet another civilization") UncivGame.Current.settings.addCompletedTutorialTask("Meet another civilization")
} }
fun discoveryNaturalWonder(naturalWonderName: String) fun discoverNaturalWonder(naturalWonderName: String)
{ {
naturalWonders.add(naturalWonderName) naturalWonders.add(naturalWonderName)
} }

2
core/src/com/unciv/logic/map/MapParameters.kt
View File

@ -5,5 +5,5 @@ class MapParameters {
var type = MapType.pangaea var type = MapType.pangaea
var radius = 20 var radius = 20
var noRuins = false var noRuins = false
var noNaturalWonders = false var noNaturalWonders = true
} }