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

External merge resolve of #1566

Browse Source 
Merge branch 'spain' of https://github.com/r3versi/Unciv into r3versi-spain
This commit is contained in:
Yair Morgenstern
2019-12-29 17:56:05 +02:00
parent 7b8042ac8b
commit 006b2d7690
27 changed files with 240 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -692,7 +692,43 @@
"Nan","Tak","Suphanburi","Hongsawadee","Thawaii","Ayutthuya","Taphan Hin","Uthai Thani","Lap Buri","Ratchasima",
"Ban Phai","Loci","Khan Kaen","Surin"]
},
{
name:"Spain",
leaderName:"Isabella",
adjective:["Spanish"],
startBias:["Coast"],
preferredVictoryType:"Domination",
startIntroPart1: "Blessed Isabella, servant of God, holy queen of Castille and Leòn! Your people greet and welcome you. You are the ruler of Spain, a beautiful and ancient country at the crossroads of the world between Europe and Africa, one shor on the Mediterranean and the other on the mighty Atlantic Ocean. The Spanish are a multicultural people with roots in the Muslim and Christian worlds. A seafaring race, Spanish explorers found and conquered much of the New World, and, for many centuries, its gold and silver brought Spain unrivalled wealth and power, making the Spanish court the envy of the world."
startIntroPart2: "O fair and virtuous Isabella! Will you rebuld the Spanish empire and show the world again the greatness of your people? Will your take up the mantle of the holy monarchy, and vanquish your foes under heaven's watchful eyes? Your adoring subjects await your command! Will you build a civilization that stands the test of time?"
declaringWar:"God will probably forgive you... but I shall not. Prepare for war."
attacked:"Repugnant spawn of the devil! You will pay!"
defeated:"If my defeat is, without any doubt, the will of God, then I will accept it."
introduction:"God blesses those who deserve it. I am Isabel of Spain."
neutralHello:"Greetings."
neutralLetsHearIt:["Proceed","I'm listening.","Yes?"]
neutralNo:["We refuse.","Not before God.","No way."]
neutralYes:["Very well.","Excellent.","With the blessing of God, I accept."]
hateHello:"Well?"
hateLetsHearIt:["Onward","What were you saying?","Continue."]
hateNo:["That is unacceptable.","Of course not.","Are you crazy?"]
hateYes:["I agree.","Fine.","I think that I am obliged to accept."]
afterPeace:"May God bless you for your clemency to the defeated enemy."
tradeRequest:"I hope this deal will receive your blessing."
outerColor:[102,0,0],
innerColor:[255,102,102],
uniqueName:"Seven Cities of Gold"
unique:"100 Gold for discovering a Natural Wonder (bonus enhanced to 500 Gold if first to discover it). Culture, Happiness and tile yields from Natural Wonders doubled.",
cities:["Madrid","Barcelona","Seville","Cordoba","Toledo","Santiago","Salamanca","Murcia","Valencia","Zaragoza","Pamplona",
"Vitoria","Santander","Oviedo","Jaen","Logroño","Valladolid","Palma","Teruel","Almeria","Leon","Zamora","Mida",
"Lugo","Alicante","Càdiz","Eiche","Alcorcon","Burgos","Vigo","Badajoz","La Coruña","Guadalquivir","Bilbao",
"San Sebastian","Granada","Mérida","Huelva","Ibiza","Las Palmas","Tenerife"]
},
/*
{ // REQUIRES RIVERS
@ -770,44 +806,6 @@
"Baruun-Urt","Ereen","Batshireet","Choyr","Ulaangom","Tosontsengel","Atlay","Uliastay","Bayanhongor",
"Har-Ayrag","Nalayh","Tes"]
},
{
/////NEEDS NATURAL WONDERS
name:"Spanish",
leaderName:"Isabella",
adjective:["Spanish"],
startBias:["Coast"],
preferredVictoryType:"Domination",
startIntroPart1: "Blessed Isabella, servant of God, holy queen of Castille and Leòn! Your people greet and welcome you. You are the ruler of Spain, a beautiful and ancient country at the crossroads of the world between Europe and Africa, one shor on the Mediterranean and the other on the mighty Atlantic Ocean. The Spanish are a multicultural people with roots in the Muslim and Christian worlds. A seafaring race, Spanish explorers found and conquered much of the New World, and, for many centuries, its gold and silver brought Spain unrivalled wealth and power, making the Spanish court the envy of the world."
startIntroPart2: "O fair and virtuous Isabella! Will you rebuld the Spanish empire and show the world again the greatness of your people? Will your take up the mantle of the holy monarchy, and vanquish your foes under heaven's watchful eyes? Your adoring subjects await your command! Will you build a civilization that stands the test of time?"
declaringWar:"God will probably forgive you... but I shall not. Prepare for war."
attacked:"Repugnant spawn of the devil! You will pay!"
defeated:"If my defeat is, without any doubt, the will of God, then I will accept it."
introduction:"God blesses those who deserve it. I am Isabel of Spain."
neutralHello:"Greetings."
neutralLetsHearIt:["Proceed","I'm listening.","Yes?"]
neutralNo:["We refuse.","Not before God.","No way."]
neutralYes:["Very well.","Excellent.","With the blessing of God, I accept."]
hateHello:"Well?"
hateLetsHearIt:["Onward","What were you saying?","Continue."]
hateNo:["That is unacceptable.","Of course not.","Are you crazy?"]
hateYes:["I agree.","Fine.","I think that I am obliged to accept."]
afterPeace:"May God bless you for your clemency to the defeated enemy."
tradeRequest:"I hope this deal will receive your blessing."
outerColor:[102,0,0],
innerColor:[255,102,102],
uniqueName:"Seven Cities of Gold"
unique:"100 Gold for discovering a Natural Wonder (bonus enhanced to 500 Gold if first to discover it). Culture, Happiness and tile yields from Natural Wonders doubled.",
cities:["Madrid","Barcelona","Seville","Cordoba","Toledo","Santiago","Salamanca","Murcia","Valencia","Zaragoza","Pamplona",
"Vitoria","Santander","Oviedo","Jaen","Logroño","Valladolid","Palma","Teruel","Almeria","Leon","Zamora","Mida",
"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",