Merge branch 'master' into master
This commit is contained in:
Yair Morgenstern
GitHub
commit
5f5adb1fcb
16 changed files with 641 additions and 565 deletions
BIN
android/Images/NationIcons/Korea.png
Normal file
BIN
android/Images/NationIcons/Korea.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.7 KiB |
BIN
android/Images/UnitIcons/Hwach'a.png
Normal file
BIN
android/Images/UnitIcons/Hwach'a.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.5 KiB |
BIN
android/Images/UnitIcons/Turtle Ship.png
Normal file
BIN
android/Images/UnitIcons/Turtle Ship.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.6 KiB |
File diff suppressed because it is too large
Load diff
|
|
@ -505,6 +505,42 @@
|
|||
"Bodrum","Eregli","Silifke","Sivas","Amasya","Marmaris","Trabzon","Erzurum","Urfa","Izmit","Afyonkarhisar",
|
||||
"Bitlis","Yalova"]
|
||||
},
|
||||
{
|
||||
name:"Korea",
|
||||
leaderName:"Sejong",
|
||||
adjective:["Korean"],
|
||||
startBias:["Coast"],
|
||||
preferredVictoryType:"Scientific",
|
||||
|
||||
startIntroPart1: "Greetings to you, exalted King Sejong the Great, servant to the people and protector of the Choson Dynasty! Your glorious vision of prosperity and overwhelming benevolence towards the common man made you the most beloved of all Korean kings. From the earliest days of your reign, the effort you took to provide a fair and just society for all was surpassed only by the technological advances spurred onwards by your unquenched thirst for knowledge. Guided by your wisdom, the scholars of the Jade Hall developed Korea's first written language, Hangul, bringing the light of literature and science to the masses after centuries of literary darkness."
|
||||
startIntroPart2: "Honorable Sejong, once more the people look to your for guidance. Will you rise to the occasion, bringing harmony and understanding to the people? Can you once again advance your kingdom's standing to such wondrous heights? Can you build a civilization that stands the test of time?"
|
||||
|
||||
declaringWar:"Jip-hyun-jun (Hall of Worthies) will no longer tolerate your irksome behavior. We will liberate the citizens under your oppression even with force, and enlighten them!"
|
||||
attacked:"Foolish, miserable wretch! You will be crushed by this country's magnificent scientific power!"
|
||||
defeated:"Now the question is who will protect my people. A dark age has come."
|
||||
introduction:"Welcome to the palace of Choson, stanger. I am the learned King Sejong, who looks after his great people."
|
||||
|
||||
neutralHello:"Hello."
|
||||
neutralLetsHearIt:["I will hear it.","Go on","Continue."]
|
||||
neutralNo:["I cannot do that.","Apologies, but I will not accept it."]
|
||||
neutralYes:["That is good.","I understand.","Of course!"]
|
||||
|
||||
hateHello:"Oh, it's you"
|
||||
hateLetsHearIt:["What do you wish to say?","So?","Continue your speech."]
|
||||
hateNo:["Heaven forbid","That is crazy talk!","I cannot do that."]
|
||||
hateYes:["Hm... very well, fine.","I suppose I should agree...","Very well..."]
|
||||
|
||||
afterPeace:"It seems you implemented some interesting strategies... Very well, perhaps we should call it a tie."
|
||||
tradeRequest:"We have many things to discuss and have much to benefit from each other."
|
||||
|
||||
outerColor:[20,25,73],
|
||||
innerColor:[187,33,51],
|
||||
uniqueName:"Scholars of the Jade Hall"
|
||||
unique:"+2 Science for all specialists and Great Person tile improvements",
|
||||
cities:["Seoul","Busan","Jeonju","Daegu","Pyongyang","Kaesong","Suwon","Gwangju","Gangneung","Hamhung","Wonju","Ulsan",
|
||||
"Changwon","Andong","Gongju","Haeju","Cheongju","Mokpo","Dongducheon","Geoje","Suncheon","Jinju","Sangju",
|
||||
"Rason","Gyeongju","Chungju","Sacheon","Gimje","Anju"]
|
||||
},
|
||||
|
||||
/*
|
||||
{ // REQUIRES RIVERS
|
||||
|
|
@ -695,42 +731,6 @@
|
|||
"Rakahanga","Bora Bora","Kailua","Uvea","Futuna","Rotuma","Tokelau","Lahaina","Bellona","Mungava","Tikopia",
|
||||
"Emae","Kapingamarangi","Takuu","Nukuoro","Sikaiana","Anuta","Nuguria","Pileni","Nukumanu"]
|
||||
},
|
||||
{
|
||||
name:"Korean",
|
||||
leaderName:"Sejong",
|
||||
adjective:["Korean"],
|
||||
startBias:["Coast"],
|
||||
preferredVictoryType:"Scientific",
|
||||
|
||||
startIntroPart1: "Greetings to you, exalted King Sejong the Great, servant to the people and protector of the Choson Dynasty! Your glorious vision of prosperity and overwhelming benevolence towards the common man made you the most beloved of all Korean kings. From the earliest days of your reign, the effort you took to provide a fair and just society for all was surpassed only by the technological advances spurred onwards by your unquenched thirst for knowledge. Guided by your wisdom, the scholars of the Jade Hall developed Korea's first written language, Hangul, bringing the light of literature and science to the masses after centuries of literary darkness."
|
||||
startIntroPart2: "Honorable Sejong, once more the people look to your for guidance. Will you rise to the occasion, bringing harmony and understanding to the people? Can you once again advance your kingdom's standing to such wondrous heights? Can you build a civilization that stands the test of time?"
|
||||
|
||||
declaringWar:"Jip-hyun-jun (Hall of Worthies) will no longer tolerate your irksome behavior. We will liberate the citizens under your oppression even with force, and enlighten them!"
|
||||
attacked:"Foolish, miserable wretch! You will be crushed by this country's magnificent scientific power!"
|
||||
defeated:"Now the question is who will protect my people. A dark age has come."
|
||||
introduction:"Welcome to the palace of Choson, stanger. I am the learned King Sejong, who looks after his great people."
|
||||
|
||||
neutralHello:"Hello."
|
||||
neutralLetsHearIt:["I will hear it.","Go on","Continue."]
|
||||
neutralNo:["I cannot do that.","Apologies, but I will not accept it."]
|
||||
neutralYes:["That is good.","I understand.","Of course!"]
|
||||
|
||||
hateHello:"Oh, it's you"
|
||||
hateLetsHearIt:["What do you wish to say?","So?","Continue your speech."]
|
||||
hateNo:["Heaven forbid","That is crazy talk!","I cannot do that."]
|
||||
hateYes:["Hm... very well, fine.","I suppose I should agree...","Very well..."]
|
||||
|
||||
afterPeace:"It seems you implemented some interesting strategies... Very well, perhaps we should call it a tie."
|
||||
tradeRequest:"We have many things to discuss and have much to benefit from each other."
|
||||
|
||||
outerColor:[0,0,255],
|
||||
innerColor:[255,0,0],
|
||||
uniqueName:"Scholars of the Jade Hall"
|
||||
unique:"+2 Science for all Great Person tile improvements. Receive a tech boost each time a scientific building/Wonder is built in the Korean capital.",
|
||||
cities:["Seoul","Busan","Jeonju","Daegu","Pyongyang","Kaesong","Suwon","Gwangju","Gangneung","Hamhung","Wonju","Ulsan",
|
||||
"Changwon","Andong","Gongju","Haeju","Cheongju","Mokpo","Dongducheon","Geoje","Suncheon","Jinju","Sangju",
|
||||
"Rason","Gyeongju","Chungju","Sacheon","Gimje","Anju"]
|
||||
},
|
||||
{
|
||||
name:"Songhai",
|
||||
leaderName:"Askia",
|
||||
|
|
@ -873,7 +873,7 @@
|
|||
outerColor:[51,25,0],
|
||||
innerColor:[255,255,102],
|
||||
uniqueName:"Viking Fury"
|
||||
unique:"+1 Movement to all embarked units, whom pay just 1 movement point to move from sea to land and viceversa. Melee units pay no movement cost to pillage.",
|
||||
unique:"+1 Movement to all embarked units, units pay only 1 movement point to embark and disembark. Melee units pay no movement cost to pillage.",
|
||||
cities:["Copenhagen","Aarhus","Kaupang","Ribe","Viborg","Tunsbers","Roskilde","Hedeby","Oslo","Jelling","Truso",
|
||||
"Bergen","Faeroerne","Reykjavik","Trondheim","Godthab","Helluland","Lillehammer","Markland","Elsinore",
|
||||
"Sarpsborg","Odense","Aalborg","Stavanger","Vorbasse","Schleswig","Kristiansand","Halogaland","Randers",
|
||||
|
|
|
|||
|
|
@ -1099,6 +1099,7 @@
|
|||
}
|
||||
|
||||
"Must not be on hill":{
|
||||
Italian:"Non deve trovarsi su Collina"
|
||||
French:"Doit être sur une colline"
|
||||
Polish:"Nie może być na wzgórzu"
|
||||
Russian:"Не может быть построено на холме"
|
||||
|
|
|
|||
|
|
@ -696,6 +696,10 @@
|
|||
Portuguese:"[resourceName] não requirido"
|
||||
}
|
||||
|
||||
"Does not have ":{ // as in Does not have +1 Visibility Range (or any other unit unique)
|
||||
Italian:"Non possiede "
|
||||
}
|
||||
|
||||
"National ability":{ // the unique ability that each nation has
|
||||
Italian:"Abilità della civiltà"
|
||||
Romanian:"Abilitate a națiunii"
|
||||
|
|
@ -754,6 +758,7 @@
|
|||
|
||||
"City-State Influence degrades at half and recovers at twice the normal rate": {
|
||||
Simplified_Chinese:"对城邦影响力衰减速度减半，恢复速度加倍"
|
||||
Italian:"L'influenza sulle città-stato diminuisce il doppio più lentamente e aumenta il doppio più velocemente."
|
||||
},
|
||||
|
||||
"China":{
|
||||
|
|
@ -1061,6 +1066,19 @@
|
|||
French:"50% de chance de convertir une unité barbare navale et de gagner 25 Or. Les unités navales coutent 3 fois moins à entretenir."
|
||||
Simplified_Chinese:"海上单位维护费为正常值的1/3，海军近战单位拥有1/3几率俘获战败的敌方海军单位"
|
||||
}
|
||||
|
||||
"Korea":{
|
||||
Italian:"Corea"
|
||||
French:"Corée"
|
||||
Portuguese:"Coréia"
|
||||
}
|
||||
|
||||
"+1 Science for all Specialists and Great Person tile improvements. Receive a tech boost each time a scientific building/Wonder is built in the Korean Capital.":{
|
||||
Italian:"+1 Scienza per ogni Specialista e miglioramento Grande Personaggio. Ricevi uno sprint tecnologico ogni volta che la tua Capitale costruisce un edificio o una Meraviglia scientifica."
|
||||
Portuguese:"+1 ciência por todas as melhorias de terras de especialístas e grandes pessoas. Receba um bonus de pesquisa a cada construção/maravilha ciêntifica é construida na capital"
|
||||
French:"+1 Science pour chaque spécialistes et amélioration de case de personnage illustre. Reçoit un bonus de science à chaque fois qu'un batiment ou une merveille scientifique est construit dans la capitale"
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
"Iroquois":{
|
||||
|
|
@ -1117,18 +1135,6 @@
|
|||
French:"+30% Force d'attaque lors des combats contre les villes ou unités des Cités-états. +1 mouvement pour les unités montées."
|
||||
}
|
||||
|
||||
"Korea":{
|
||||
Italian:"Corea"
|
||||
French:"Corée"
|
||||
Portuguese:"Coréia"
|
||||
}
|
||||
|
||||
"+1 Science for all Specialists and Great Person tile improvements. Receive a tech boost each time a scientific building/Wonder is built in the Korean Capital.":{
|
||||
Italian:"+1 Scienza per ogni Specialista e miglioramento Grande Personaggio. Ricevi uno sprint tecnologico ogni volta che la tua Capitale costruisce un edificio o una Meraviglia scientifica."
|
||||
Portuguese:"+1 ciência por todas as melhorias de terras de especialístas e grandes pessoas. Receba um bonus de pesquisa a cada construção/maravilha ciêntifica é construida na capital"
|
||||
French:"+1 Science pour chaque spécialistes et amélioration de case de personnage illustre. Reçoit un bonus de science à chaque fois qu'un batiment ou une merveille scientifique est construit dans la capitale"
|
||||
}
|
||||
|
||||
"Siam":{
|
||||
Italian:"Siam"
|
||||
French:"Siam"
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@
|
|||
|
||||
"A [greatPerson] has been born!":{ //Smashfanful sayd: "You should add WHERE the Great Person is born, so it should be "A [greatPerson] is born in [cityName]""
|
||||
Italian:"È nato un [greatPerson]!"
|
||||
Russian:"[greatPerson] родился!!"
|
||||
Russian:"[greatPerson] родился!"
|
||||
French:"Un [greatPerson] est né!"
|
||||
Romanian:"S-a născut un [greatPerson]!"
|
||||
Spanish:"¡Un [greatPerson] ha nacido!"
|
||||
|
|
@ -137,6 +137,7 @@
|
|||
"[wonder] has been built in a faraway land":{
|
||||
Italian:"La Meraviglia [wonder] è stata costruita in una terra lontana"
|
||||
French:"[wonder] a été construit(e) dans un lointain pays"
|
||||
Russian:"[wonder] был построен в далёких землях"
|
||||
}
|
||||
|
||||
"Work has started on [construction]":{
|
||||
|
|
@ -155,6 +156,7 @@
|
|||
"[cityName] cannot continue work on [construction]":{
|
||||
Italian:"[cityName] non può più costruire [construction]"
|
||||
French:"[cityName] ne peut plus travailler sur [construction]"
|
||||
Russian:"[cityName] не может продолжать работу над [construction]"
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -214,7 +216,7 @@
|
|||
|
||||
"An enemy [unit] has attacked our [ourUnit]":{
|
||||
Italian:"Un'unità nemica [unit] ha attaccato [ourUnit]"
|
||||
Russian:"Вражеский [unit] атаковал нашего [ourUnit]"
|
||||
Russian:"Наш [ourUnit] был атакован вражеским [unit]"
|
||||
French:"Un(e) [unit] ennemi(e) a attaqué [ourUnit]" // Gender sensitive
|
||||
Romanian:"Un [unit] inamic ne-a atacat un [ourUnit]"
|
||||
German:"Ein(e) feindliche(r) [unit] hat unsere(n) [ourUnit] angegriffen" // Gender sensitive
|
||||
|
|
@ -228,11 +230,12 @@
|
|||
"Enemy city [cityName] has attacked our [ourUnit]":{
|
||||
Italian:"La città nemica [cityName] ha attaccato [ourUnit]"
|
||||
French:"La cité ennemie [cityName] a attaqué notre [ourUnit]"
|
||||
Russian:"Наш [ourUnit] был атакован вражеским городом [cityName]"
|
||||
}
|
||||
|
||||
"An enemy [unit] has captured [cityname]":{
|
||||
Italian:"Un'unità nemica [unit] ha conquistato [cityname]"
|
||||
Russian:"Вражеский [unit] захватил [cityname]"
|
||||
Russian:"Наш город [cityname] был захвачен вражеским [unit]"
|
||||
French:"Un(e) [unit] ennemi(e) a capturé [cityname]" // Gender sensitive
|
||||
Romanian:"Un [unit] inamic a capturat [cityname]"
|
||||
German:"Ein(e) feindliche(r) [unit] hat [cityname] eingenommen" // Gender sensitive
|
||||
|
|
@ -245,7 +248,7 @@
|
|||
|
||||
"An enemy [unit] has captured our [ourUnit]":{
|
||||
Italian:"Un'unità nemica [unit] ha catturato [ourUnit]"
|
||||
Russian:"Вражеский [unit] захватил нашего [ourUnit]"
|
||||
Russian:"Наш [ourUnit] был захвачен вражеским [unit]"
|
||||
French:"Un(e) [unit] ennemi(e) a capturé [ourUnit]" // Gender sensitive
|
||||
Romanian:"Un [unit] inamic ne-a capturat un [ourUnit]"
|
||||
German:"Ein(e) feindliche(r) [unit] hat unsere(n) [ourUnit] gefangen genommen" // Gender sensitive
|
||||
|
|
@ -258,7 +261,7 @@
|
|||
|
||||
"An enemy [unit] has destroyed our [ourUnit]":{
|
||||
Italian:"Un'unità nemica [unit] ha distrutto [ourUnit]"
|
||||
Russian:"Вражеский [unit] уничтожил нашего [ourUnit]"
|
||||
Russian:"Наш [ourUnit] был уничтожен вражеским [unit]"
|
||||
French:"Un(e) [unit] ennemi(e) a détruit [ourUnit]" // Gender sensitive
|
||||
Romanian:"Un [unit] inamic ne-a distrus un [ourUnit]"
|
||||
German:"Ein(e) feindliche(r) [unit] hat unsere(n) [ourUnit] zerstört" // Gender sensitive
|
||||
|
|
@ -272,6 +275,7 @@
|
|||
"Enemy city [cityName] has destroyed our [ourUnit]":{
|
||||
Italian:"La città nemica [cityName] ha distrutto [ourUnit]"
|
||||
French:"La cité ennemie [cityName] a détruit notre [ourUnit]"
|
||||
Russian:"Наш [ourUnit] был уничтожен вражеским городом [cityName]"
|
||||
}
|
||||
|
||||
"An enemy [unit] was destroyed while attacking [cityname]":{
|
||||
|
|
@ -303,21 +307,25 @@
|
|||
"Our [attackerName] was destroyed by an intercepting [interceptorName]":{
|
||||
Italian:"La nostra unità [attackerName] è stata distrutta dall'intercettante [interceptorName]"
|
||||
French:"Notre [attackerName] a été intercepté et détruit par un(e) [interceptorName] ennemie"
|
||||
Russian:"Наш [attackerName], был перехвачен и уничтожен вражеским [interceptorName]"
|
||||
}
|
||||
|
||||
"Our [interceptorName] intercepted and destroyed an enemy [attackerName]":{
|
||||
Italian:"La nostra unità [interceptorName] ha intercettato e distrutto l'unità nemica [attackerName]"
|
||||
French:"Notre [interceptorName] a intercepté et détruit un(e) [attackerName] ennemie"
|
||||
Russian:"Наш [interceptorName] перехватил и уничтожил вражеский [attackerName]"
|
||||
}
|
||||
|
||||
"Our [$attackerName] was attacked by an intercepting [$interceptorName]":{
|
||||
Italian:"La nostra unità [$attackerName] è stata attaccata dall'intercettante [$interceptorName]"
|
||||
French:"Notre [$attackerName] a été intercepté par un(e) [$interceptorName] ennemie"
|
||||
Russian:"Наш [$attackerName], был перехвачен и атакован вражеским [$interceptorName]"
|
||||
}
|
||||
|
||||
"Our [$interceptorName] intercepted and attacked an enemy [$attackerName]":{
|
||||
Italian:"La nostra unità [$interceptorName] ha intercettato e attaccato l'unità nemica [$attackerName]"
|
||||
French:"Notre [$interceptorName] a intercepté un(e) [$attackerName] ennemie"
|
||||
Russian:"Наш [$interceptorName] перехватил и атаковал вражеский [$attackerName]"
|
||||
}
|
||||
|
||||
"An enemy [unit] was spotted near our territory":{
|
||||
|
|
@ -351,6 +359,7 @@
|
|||
German:"[amount] feindliche Einheiten wurden nahe unserer Grenzen entdeckt"
|
||||
Simplified_Chinese:"在我们的领土附近发现了[amount]个敌方单位"
|
||||
French:"[amount] unités ennemies ont été repérées proche de notre territoire"
|
||||
Russian:"[amount] вражеских юнитов было замечено у нашей территории"
|
||||
}
|
||||
|
||||
"[amount] enemy units were spotted in our territory": {
|
||||
|
|
@ -358,6 +367,7 @@
|
|||
German:"[amount] feindliche Einheiten wurden in unseren Grenzen entdeckt"
|
||||
Simplified_Chinese:"在我们的领土内发现了[amount]个敌方单位"
|
||||
French:"[amount] unités ennemies ont été repérées sur notre territoire"
|
||||
Russian:"[amount] вражеских юнитов было замечено на нашей территории"
|
||||
}
|
||||
|
||||
"The civilization of [civName] has been destroyed!":{
|
||||
|
|
@ -376,16 +386,19 @@
|
|||
"The City-State of [name] has been destroyed!":{
|
||||
Italian:"La Città-Stato di [name] è stata distrutta!"
|
||||
French:"La Cité état [name] a été détruite"
|
||||
Russian:"Город-государство [name] был уничтожен!"
|
||||
}
|
||||
|
||||
"We have captured a barbarian encampment and recovered [goldAmount] gold!":{ //shouldn't it be "we have destroyed ..." ?
|
||||
Italian:"Abbiamo distrutto un accampamento barbaro e recuperato [goldAmount] Oro!"
|
||||
French:"Nous avons capturé un campement barbare et pillé [goldAmount] ors"
|
||||
Russian:"Мы разгромили лагерь варваров и нашли [goldAmount] золота!"
|
||||
}
|
||||
|
||||
"A barbarian [unitType] has joined us!":{
|
||||
Italian:"L'unità barbarica [unitType] si è unita a noi!"
|
||||
French:"Un [unitType] barbare nous a rejoins!"
|
||||
Russian:"Варварский [unitType] присоединился к нам!"
|
||||
}
|
||||
|
||||
///////////////// ruins
|
||||
|
|
@ -458,50 +471,60 @@
|
|||
Italian:"[unit] non sta più esplorando."
|
||||
German: "[unit] hat die Erkundung abgeschlossen."
|
||||
French:"[unit] a fini d'explorer"
|
||||
Russian:"[unit] завершил исследование местности."
|
||||
},
|
||||
|
||||
"[unit] has no work to do.": {
|
||||
Italian:"[unit] è ora inattivo."
|
||||
German:"[unit] hat keine Arbeit mehr."
|
||||
French:"[unit] n'a rien à faire"
|
||||
Russian:"[unit] завершил все доступные работы."
|
||||
}
|
||||
|
||||
"You're losing control of [name].":{ //When you're about to lose your friendship with a City-State
|
||||
Italian:"Stai perdendo il controllo di [name]."
|
||||
French:"Vous perdez le contrôle de [name]"
|
||||
Russian:"Вы теряете влияние на [name]."
|
||||
}
|
||||
|
||||
"You and [name] are no longer friends!":{ // When you lose friendship with a City-State (Relationship fall less than 30)
|
||||
Italian:"Non sei più amico di [name]!"
|
||||
French:"Vous et [name] n'êtes plus amis!"
|
||||
Russian:"Вы и [name] больше не друзья!"
|
||||
}
|
||||
|
||||
"Your alliance with [name] is faltering.":{ //When you're about to lose your alliance with a City-State
|
||||
Italian:"L'alleanza con [name] si sta sfaldando."
|
||||
French:"Votre alliance avec [name] est vacillante."
|
||||
Russian:"Ваш союз с [name] заканчивается."
|
||||
}
|
||||
|
||||
"You and [name] are no longer allies!":{ // When you lose alliance with a City-State (Relationship fall less than 60)
|
||||
Italian:"Non sei più alleato con [name]!"
|
||||
French:"Vous et [name] n'êtes plus alliés!"
|
||||
Russian:"Вы и [name] больше не союзники!"
|
||||
},
|
||||
|
||||
"[civName] gave us a [untiName] as gift near [cityName]!":{ // When a city state gives a unit as gift.
|
||||
Italian:"[civName] ci ha dato [untiName] come regalo vicino a [cityName]!"
|
||||
French:"[civName] nous offre un(e) [untiName] prêt de [cityName]!"
|
||||
Russian:"[civName] передал нам в дар [untiName] около города [cityName]!"
|
||||
}
|
||||
|
||||
"[civName] has denounced us!":{
|
||||
Italian:"[civName] ci ha denunciati pubblicamente!"
|
||||
Russian:"[civName] публично осудил нас!"
|
||||
}
|
||||
|
||||
// Trade
|
||||
"[civName] has accepted your trade request":{
|
||||
Italian:"[civName] ha accettato la nostra offerta commerciale."
|
||||
Russian:"[civName] принимает ваше торговое предложение"
|
||||
}
|
||||
|
||||
"[civName] has denied your trade request":{
|
||||
Italian:"[civName] ha rifiutato la nostra offerta commerciale."
|
||||
Russian:"[civName] отклонил ваше торговое предложение"
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -510,17 +533,20 @@
|
|||
Simplified_Chinese:"与[civName]的[tradeOffer]协议已经结束"
|
||||
French:"[tradeOffer] de [otherCivName] a pris fin"
|
||||
Portuguese:"[tradeOffer] de [otherCivName] terminou"
|
||||
Russian:"Предложение [tradeOffer] из [otherCivName] завершилось"
|
||||
}
|
||||
|
||||
|
||||
"One of our trades with [nation] has ended": {
|
||||
Italian:"Un nostro accordo con [nation] è terminato."
|
||||
French:"Un de nos échanges avec [nation] a pris fin"
|
||||
Russian:"Торговая сделка с [nation] завершилась"
|
||||
},
|
||||
|
||||
"One of our trades with [nation] has been cut short": {
|
||||
Italian:"Un nostro accordo con [nation] è stato interrotto."
|
||||
French:"L'un de nos accord commercial avec [nation] s'est arrêté"
|
||||
Russian:"Торговая сделка с [nation] была завершена досрочно"
|
||||
},
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@
|
|||
Italian:"marittima civile" //Unità marittima civile
|
||||
Simplified_Chinese:"海上平民单位"
|
||||
French:"Civil embarqué"
|
||||
Russian:"Мирный, морской"
|
||||
}
|
||||
|
||||
"Melee":{
|
||||
|
|
@ -36,6 +37,7 @@
|
|||
Italian:"marittima da mischia" //Unità marittima da mischia
|
||||
Simplified_Chinese:"海军近战单位"
|
||||
French:"Navire de combat rapproché"
|
||||
Russian:"Ближний бой (море)"
|
||||
}
|
||||
|
||||
"Ranged":{
|
||||
|
|
@ -54,12 +56,14 @@
|
|||
Italian:"marittima a distanza" //Unità marittima a distanza
|
||||
Simplified_Chinese:"海军远程单位"
|
||||
French:"Navire de combat à distance"
|
||||
Russian:"Дальний бой (море)"
|
||||
}
|
||||
|
||||
"WaterSubmarine":{ //In the file "Uints.json", every unit have the "unitType".This unitType includes submarine and nuclear submarine.
|
||||
Italian:"sottomarina" //Unità sottomarina
|
||||
Simplified_Chinese:"海军潜艇单位"
|
||||
French:"Navires sous-marins"
|
||||
Russian:"Субмарина"
|
||||
}
|
||||
|
||||
"Siege":{
|
||||
|
|
@ -102,6 +106,7 @@
|
|||
Italian:"corazzata" //Unità corazzata
|
||||
Simplified_Chinese:"装甲单位"
|
||||
French:"Blindé"
|
||||
Russian:"Бронемашина"
|
||||
}
|
||||
|
||||
"City":{
|
||||
|
|
@ -172,7 +177,7 @@
|
|||
|
||||
"Ignores terrain cost":{
|
||||
Italian:"Ignora i costi di movimento su terreno"
|
||||
Russian:"Игнорирует стоимость местности"
|
||||
Russian:"Игнорирует штрафы местности"
|
||||
French:"Ignore le coût du terrain"
|
||||
Romanian:"Ignoră costul terenului"
|
||||
German:"Ignoriert Geländekosten"
|
||||
|
|
@ -364,6 +369,7 @@
|
|||
Simplified_Chinese:"复合弓兵"
|
||||
German:"Kompositbogenschütze"
|
||||
French:"Archer composite"
|
||||
Russian:"Лучник (составной лук)"
|
||||
}
|
||||
|
||||
"Catapult":{
|
||||
|
|
@ -627,6 +633,7 @@
|
|||
Italian:"Può generare un Grande Generale combattendo"
|
||||
Simplified_Chinese:"战斗能更快地产生出大军事家"
|
||||
French:"A de grande chance de faire apparaitre un général illustre suite à un combat"
|
||||
Russian:"Большой шанс получения Великого Полководца в бою"
|
||||
}
|
||||
|
||||
////// Renaissance units
|
||||
|
|
@ -751,6 +758,7 @@
|
|||
"No movement cost to pillage":{
|
||||
Italian:"Nessun costo di movimento per il saccheggio"
|
||||
French:"L'action pillage ne coûte pas de point de mouvement"
|
||||
Russian:"Разграбление не тратит очков передвижения"
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -933,7 +941,7 @@
|
|||
Romanian:"Tun antiaerian"
|
||||
Spanish:"Arma Anti-Aerea"
|
||||
Simplified_Chinese:"高射炮"
|
||||
Russian:"Зенитка"
|
||||
Russian:"Зенитное орудие"
|
||||
German:"FLAK"
|
||||
French:"Canon anti-aérien"
|
||||
}
|
||||
|
|
@ -973,6 +981,7 @@
|
|||
Italian:"[amount]% Bonus in attacco"
|
||||
Simplified_Chinese:"主动攻击时+75%战斗力"
|
||||
French:"Bonus en tant qu'attaquant +[amount]%"
|
||||
Russian:"Бонус при атаке +[amount]%"
|
||||
}
|
||||
|
||||
"Invisible to others":{
|
||||
|
|
@ -986,7 +995,7 @@
|
|||
Italian:"Può attaccare solo unità acquatiche"
|
||||
Simplified_Chinese:"只能攻击海上目标"
|
||||
French:"Ne peut attaquer que les unités marines"
|
||||
Russian:"Может атакаовать только морские юниты"
|
||||
Russian:"Может атаковать только морские юниты"
|
||||
}
|
||||
|
||||
"Carrier":{ // aircrat carrier
|
||||
|
|
@ -1065,7 +1074,7 @@
|
|||
Romanian:"Tanc antiaerian"
|
||||
Spanish:"Vehiculo SAM"
|
||||
Simplified_Chinese:"防空导弹车"
|
||||
Russian:"Мобильное ПВО"
|
||||
Russian:"Мобильный ЗРК"
|
||||
German:"Mobile Flugabwehrrakte"
|
||||
French:"Lance-missiles SAM mobile"
|
||||
}
|
||||
|
|
@ -1182,7 +1191,8 @@
|
|||
"Unbuildable":{
|
||||
Italian:"Non costruibile"
|
||||
Simplified_Chinese:"不可组建单位"
|
||||
French:"Ne peut être construit" // or Inconstruisible but not sure that it's correct
|
||||
French:"Ne peut être construit" // or Inconstruisible but not sure that it's correct
|
||||
Russian:"Невозможно построить"
|
||||
}
|
||||
|
||||
"Can start an 8-turn golden age":{
|
||||
|
|
@ -1319,6 +1329,7 @@
|
|||
"Bonus for units in 2 tile radius 15%" :{
|
||||
Italian:"15% Bonus per le unità nel raggio di 2 caselle"
|
||||
French:"Bonus de combat +15% pour les unités dans un rayon de 2 cases"
|
||||
Russian:"Бонус к атаке юнитам в радиусе 2-х клеток"
|
||||
}
|
||||
|
||||
/* Not in use now, but will be when we eventually add Great Admiral and split the job
|
||||
|
|
@ -1818,13 +1829,14 @@
|
|||
Italian:"Forestali"
|
||||
Simplified_Chinese:"林地幽灵"
|
||||
French:"Bûcheron"
|
||||
Russian:"Передвижение через лес"
|
||||
}
|
||||
|
||||
"Double movement rate through Forest and Jungle":{
|
||||
Italian:"Movimento doppio attraverso Foreste e Giungle."
|
||||
Simplified_Chinese:"森林和丛林移动时双倍移动力"
|
||||
French:"Déplacement doublé dans la Forêt et la Jungle"
|
||||
Russian:"Удвоенное продвижение через Лес и Джунгли"
|
||||
Russian:"Передвижение через Лес и Джунгли тратит вдвое меньше очков действия"
|
||||
}
|
||||
|
||||
"Heal Instantly":{
|
||||
|
|
@ -1931,6 +1943,7 @@
|
|||
"Bonus when performing air sweep [bonusAmount]%":{
|
||||
Italian:"+[bonusAmount]% Forza nella distruzione delle difese aeree"
|
||||
French:"Bonus de combat aérien +[bonusAmount]%"
|
||||
Russian:"Бонус +[bonusAmount]% при выполнении отвлекающего манёвра (воздух)"
|
||||
}
|
||||
|
||||
"Dogfighting II":{
|
||||
|
|
@ -1954,6 +1967,7 @@
|
|||
"Bonus when intercepting [bonusAmount]%":{
|
||||
Italian:"+[bonusAmount]% Bonus d'intercettazione"
|
||||
French:"Bonus d'interception +[bonusAmount]%"
|
||||
Russian:"Бонус при перехвате +[bonusAmount]%"
|
||||
}
|
||||
|
||||
"Interception II":{
|
||||
|
|
@ -1977,6 +1991,7 @@
|
|||
"Bonus vs City 33%":{ //i think that it already exist somewhere
|
||||
Italian:"+33% Forza contro le Città"
|
||||
French:"Bonus contre les villes +33%"
|
||||
Russian:"Бонус против городов +33%"
|
||||
}
|
||||
|
||||
"Siege II":{
|
||||
|
|
@ -1994,16 +2009,19 @@
|
|||
"Bonus vs City 34%":{
|
||||
Italian:"+34% Forza contro le Città"
|
||||
French:"Bonus contre les villes +34%"
|
||||
Russian:"Бонус против городов +34%"
|
||||
}
|
||||
|
||||
"Evasion":{
|
||||
Italian:"Manovre evasive"
|
||||
French:"Esquive"
|
||||
Russian:"Уклонение"
|
||||
}
|
||||
|
||||
"Reduces damage taken from interception by 50%":{
|
||||
Italian:"Dimezza i danni da intercettazione contraerea"
|
||||
French:"Réduit les dégâts des unités d'interception de 50%"
|
||||
Russian:"Уменьшает урон от перехвата на 50%"
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -448,7 +448,6 @@
|
|||
hurryCostModifier:20,
|
||||
attackSound:"throw"
|
||||
},
|
||||
/*
|
||||
{
|
||||
name:"Hwach'a",
|
||||
unitType:"Siege",
|
||||
|
|
@ -461,11 +460,10 @@
|
|||
requiredTech:"Physics",
|
||||
obsoleteTech:"Chemistry",
|
||||
upgradesTo:"Cannon",
|
||||
uniques:["Bonus vs City 200%","No defensive terrain bonus","Must set up to ranged attack"],
|
||||
uniques:["No defensive terrain bonus","Must set up to ranged attack"],
|
||||
hurryCostModifier:20,
|
||||
attackSound:"throw"
|
||||
},
|
||||
*/
|
||||
{
|
||||
name:"Longswordsman",
|
||||
unitType:"Melee",
|
||||
|
|
@ -661,7 +659,6 @@
|
|||
uniques:["+1 Visibility Range"],
|
||||
hurryCostModifier:20
|
||||
},
|
||||
/*
|
||||
{
|
||||
name:"Turtle Ship",
|
||||
unitType:"WaterMelee",
|
||||
|
|
@ -673,10 +670,9 @@
|
|||
requiredTech:"Astronomy",
|
||||
upgradesTo:"Ironclad",
|
||||
obsoleteTech:"Combustion",
|
||||
uniques:["+1 Visibility Range"],
|
||||
uniques:["Cannot enter ocean tiles"],
|
||||
hurryCostModifier:20
|
||||
},
|
||||
*/
|
||||
{
|
||||
name:"Cannon",
|
||||
unitType:"Siege",
|
||||
|
|
|
|||
|
|
@ -230,6 +230,8 @@ class CityStats {
|
|||
if (policies.contains("Secularism")) stats.science += 2
|
||||
if (cityInfo.containsBuildingUnique("+1 Production from specialists"))
|
||||
stats.production += 1
|
||||
if(cityInfo.civInfo.nation.unique=="+2 Science for all specialists and Great Person tile improvements")
|
||||
stats.science+=2
|
||||
return stats
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -430,7 +430,7 @@ class CivilizationInfo {
|
|||
updateStatsForNextTurn()
|
||||
}
|
||||
|
||||
fun giftMilitaryUnitBy(otherCiv: CivilizationInfo) {
|
||||
fun giftMilitaryUnitTo(otherCiv: CivilizationInfo) {
|
||||
val city = NextTurnAutomation().getClosestCities(this, otherCiv).city1
|
||||
val militaryUnit = city.cityConstructions.getConstructableUnits()
|
||||
.filter { !it.unitType.isCivilian() && it.unitType.isLandUnit() }
|
||||
|
|
|
|||
|
|
@ -269,13 +269,13 @@ class DiplomacyManager() {
|
|||
for(flag in flagsCountdown.keys.toList()) {
|
||||
flagsCountdown[flag] = flagsCountdown[flag]!! - 1
|
||||
if(flagsCountdown[flag]==0) {
|
||||
if(flag==DiplomacyFlags.ProvideMilitaryUnit.name && civInfo.cities.isEmpty())
|
||||
if(flag==DiplomacyFlags.ProvideMilitaryUnit.name && civInfo.cities.isEmpty() || otherCiv().cities.isEmpty())
|
||||
continue
|
||||
flagsCountdown.remove(flag)
|
||||
if(flag==DiplomacyFlags.AgreedToNotSettleNearUs.name)
|
||||
addModifier(DiplomaticModifiers.FulfilledPromiseToNotSettleCitiesNearUs,10f)
|
||||
else if(flag==DiplomacyFlags.ProvideMilitaryUnit.name)
|
||||
civInfo.giftMilitaryUnitBy(otherCiv())
|
||||
civInfo.giftMilitaryUnitTo(otherCiv())
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -182,6 +182,8 @@ open class TileInfo {
|
|||
stats.science += 1f
|
||||
if (containsGreatImprovement() && observingCiv.policies.isAdopted("Freedom Complete"))
|
||||
stats.add(improvement) // again, for the double effect
|
||||
if (containsGreatImprovement() && city != null && city.civInfo.nation.unique == "+2 Science for all specialists and Great Person tile improvements")
|
||||
stats.science += 2
|
||||
}
|
||||
|
||||
if(city!=null && isWater && city.containsBuildingUnique("+1 gold from worked water tiles in city"))
|
||||
|
|
|
|||
|
|
@ -83,8 +83,11 @@ class NationTable(val nation: Nation, width:Float, onClick:()->Unit)
|
|||
textList += " " + "[${originalUnit.requiredResource}] not required".tr()
|
||||
for (unique in unit.uniques.filterNot { it in originalUnit.uniques })
|
||||
textList += " " + Translations.translateBonusOrPenalty(unique)
|
||||
for(unique in originalUnit.uniques.filterNot { it in unit.uniques })
|
||||
textList += " "+"Does not have ".tr()+Translations.translateBonusOrPenalty(unique)
|
||||
for (promotion in unit.promotions.filter { it !in originalUnit.promotions })
|
||||
textList += " " + promotion.tr() + " (" + Translations.translateBonusOrPenalty(GameBasics.UnitPromotions[promotion]!!.effect) + ")"
|
||||
|
||||
textList += ""
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -436,6 +436,7 @@ Unless otherwise specified, all the following are from [the Noun Project](https:
|
|||
* [Family Crest Komon](https://thenounproject.com/search/?q=oda&i=2293528) by sahua d for Japan
|
||||
* [Ashika Chakra](https://thenounproject.com/search/?q=ashoka%20chakra&i=2328559) by sahua d for India
|
||||
* Variation on [crecent moon](https://thenounproject.com/search/?q=crescents&i=1438333) by Estu Suhartono for The Ottomans
|
||||
* [Korea](https://thenounproject.com/search/?q=korea&i=1689701) by CJS for Korea
|
||||
|
||||
## Others
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue