diff --git a/android/Images/NationIcons/Spain.png b/android/Images/NationIcons/Spain.png new file mode 100644 index 0000000000..5b86dc8ec3 Binary files /dev/null and b/android/Images/NationIcons/Spain.png differ diff --git a/android/Images/UnitIcons/Conquistador.png b/android/Images/UnitIcons/Conquistador.png new file mode 100644 index 0000000000..971e59197b Binary files /dev/null and b/android/Images/UnitIcons/Conquistador.png differ diff --git a/android/Images/UnitIcons/Tercio.png b/android/Images/UnitIcons/Tercio.png new file mode 100644 index 0000000000..7592265d95 Binary files /dev/null and b/android/Images/UnitIcons/Tercio.png differ diff --git a/android/assets/game.png b/android/assets/game.png index 01a0dba658..2708e003c8 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ diff --git a/android/assets/jsons/Nations/Nations.json b/android/assets/jsons/Nations/Nations.json index 9d914cf656..36910a86ab 100644 --- a/android/assets/jsons/Nations/Nations.json +++ b/android/assets/jsons/Nations/Nations.json @@ -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", diff --git a/android/assets/jsons/Units.json b/android/assets/jsons/Units.json index 3d77238f23..0e6566068c 100644 --- a/android/assets/jsons/Units.json +++ b/android/assets/jsons/Units.json @@ -583,6 +583,23 @@ attackSound:"arrow" //Camel Archer should have no penalty attacking cities }, + { + name:"Conquistador", + replaces:"Knight", + uniqueTo:"Spain", + unitType:"Mounted", + movement:4, + strength:20, + cost: 135, + requiredTech:"Chivalry", + requiredResource:"Horses", + upgradesTo:"Cavalry", + obsoleteTech:"Military Science", + uniques:["Can move after attacking","No defensive terrain bonus", "Founds a new city", "+2 Visibility Range", "Defense bonus when embarked"], + hurryCostModifier:20, + attackSound:"horse" + //Conquistador should have no penalty attacking cities + }, { name:"Naresuan's Elephant", unitType:"Mounted", @@ -735,6 +752,21 @@ hurryCostModifier:20, attackSound:"shot" }, + { + name:"Tercio", + unitType:"Melee", + replaces:"Musketman", + uniqueTo:"Spain", + movement:2, + strength:26, + cost: 160, + requiredTech:"Gunpowder", + upgradesTo:"Rifleman", + obsoleteTech:"Rifling", + uniques:["Bonus vs Mounted 50%"], + hurryCostModifier:20, + attackSound:"shot" + }, { name:"Frigate", unitType:"WaterRanged", diff --git a/android/assets/jsons/translationsByLanguage/Czech.properties b/android/assets/jsons/translationsByLanguage/Czech.properties index 5f94c2aa33..64ef0eba08 100644 --- a/android/assets/jsons/translationsByLanguage/Czech.properties +++ b/android/assets/jsons/translationsByLanguage/Czech.properties @@ -1331,6 +1331,7 @@ El Dorado = Fountain of Youth = Fontána mládí # Natural Wonders Uniques + # Requires translation! Grants 500 Gold to the first civilization to discover it = # Requires translation! @@ -1469,16 +1470,24 @@ Pikeman = Pikenýr Landsknecht = Landsknecht Knight = Rytíř Camel Archer = Lučištník na velbloudu + # Requires translation! +Conquistador = + # Requires translation! +Defense bonus when embarked = Naresuan's Elephant = Naresuanův slon Samurai = Samuraj Combat very likely to create Great Generals = Má velkou šanci získat Velkého generála v bitvě Caravel = Karavela Turtle Ship = Želví loď +1 Visibility Range = +1 větší viditelnost + # Requires translation! ++2 Visibility Range = Cannon = Dělo Musketman = Střelec s mušketou Musketeer = Mušketýr Janissary = Janičář + # Requires translation! +Tercio = Heals [amountHealed] damage if it kills a unit = Léčí [amountHealed] zranění pokud zabije jednotku Minuteman = Minutemen Frigate = Fregata diff --git a/android/assets/jsons/translationsByLanguage/Dutch.properties b/android/assets/jsons/translationsByLanguage/Dutch.properties index 50139ae121..ec62e90a16 100644 --- a/android/assets/jsons/translationsByLanguage/Dutch.properties +++ b/android/assets/jsons/translationsByLanguage/Dutch.properties @@ -2162,6 +2162,7 @@ El Dorado = Fountain of Youth = # Natural Wonders Uniques + # Requires translation! Grants 500 Gold to the first civilization to discover it = # Requires translation! @@ -2365,6 +2366,10 @@ Knight = # Requires translation! Camel Archer = # Requires translation! +Conquistador = + # Requires translation! +Defense bonus when embarked = + # Requires translation! Naresuan's Elephant = # Requires translation! Samurai = @@ -2377,6 +2382,8 @@ Turtle Ship = # Requires translation! +1 Visibility Range = # Requires translation! ++2 Visibility Range = + # Requires translation! Cannon = # Requires translation! Musketman = @@ -2385,6 +2392,8 @@ Musketeer = # Requires translation! Janissary = # Requires translation! +Tercio = + # Requires translation! Heals [amountHealed] damage if it kills a unit = # Requires translation! Minuteman = diff --git a/android/assets/jsons/translationsByLanguage/English.properties b/android/assets/jsons/translationsByLanguage/English.properties index e28623cf30..9ca19779d0 100644 --- a/android/assets/jsons/translationsByLanguage/English.properties +++ b/android/assets/jsons/translationsByLanguage/English.properties @@ -2408,6 +2408,7 @@ El Dorado = Fountain of Youth = # Natural Wonders Uniques + # Requires translation! Grants 500 Gold to the first civilization to discover it = # Requires translation! @@ -2668,6 +2669,10 @@ Knight = # Requires translation! Camel Archer = # Requires translation! +Conquistador = + # Requires translation! +Defense bonus when embarked = + # Requires translation! Naresuan's Elephant = # Requires translation! Samurai = @@ -2680,6 +2685,8 @@ Turtle Ship = # Requires translation! +1 Visibility Range = # Requires translation! ++2 Visibility Range = + # Requires translation! Cannon = # Requires translation! Musketman = @@ -2688,6 +2695,8 @@ Musketeer = # Requires translation! Janissary = # Requires translation! +Tercio = + # Requires translation! Heals [amountHealed] damage if it kills a unit = # Requires translation! Minuteman = diff --git a/android/assets/jsons/translationsByLanguage/French.properties b/android/assets/jsons/translationsByLanguage/French.properties index 8fffaf984e..8ece66aff7 100644 --- a/android/assets/jsons/translationsByLanguage/French.properties +++ b/android/assets/jsons/translationsByLanguage/French.properties @@ -1298,6 +1298,7 @@ El Dorado = El Dorado Fountain of Youth = Fontaine de Jouvence # Natural Wonders Uniques + # Requires translation! Grants 500 Gold to the first civilization to discover it = # Requires translation! @@ -1436,16 +1437,24 @@ Pikeman = Piquier Landsknecht = Lansquenet Knight = Chevalier Camel Archer = Archer méhariste + # Requires translation! +Conquistador = + # Requires translation! +Defense bonus when embarked = Naresuan's Elephant = Elephant de Naresuan Samurai = Samuraï Combat very likely to create Great Generals = A de grande chance de faire apparaitre un général illustre suite à un combat Caravel = Caravelle Turtle Ship = Bateau Tortue +1 Visibility Range = +1 à la Portée de Vision + # Requires translation! ++2 Visibility Range = Cannon = Canon Musketman = Arquebusier Musketeer = Mousquetaire Janissary = Janissaire + # Requires translation! +Tercio = Heals [amountHealed] damage if it kills a unit = Soigne [amountHealed] dégâts si il tue une unité Minuteman = Minuteman Frigate = Frégate diff --git a/android/assets/jsons/translationsByLanguage/German.properties b/android/assets/jsons/translationsByLanguage/German.properties index f251bc9fcc..5764790506 100644 --- a/android/assets/jsons/translationsByLanguage/German.properties +++ b/android/assets/jsons/translationsByLanguage/German.properties @@ -1339,6 +1339,7 @@ El Dorado = El Dorado Fountain of Youth = Jungbrunnen # Natural Wonders Uniques + # Requires translation! Grants 500 Gold to the first civilization to discover it = # Requires translation! @@ -1477,16 +1478,24 @@ Pikeman = PikenierIn Landsknecht = Landsknecht Knight = RitterIn Camel Archer = Kamel-Bogenschütze + # Requires translation! +Conquistador = + # Requires translation! +Defense bonus when embarked = Naresuan's Elephant = Naresuans Elefant Samurai = Samurai Combat very likely to create Great Generals = Der Kampf wird sehr wahrscheinlich große Generäle schaffen. Caravel = Karavelle Turtle Ship = Schildkrötenboot +1 Visibility Range = +1 Sichtweite + # Requires translation! ++2 Visibility Range = Cannon = Kanone Musketman = Musketschütze Musketeer = Musketier Janissary = Janitschar + # Requires translation! +Tercio = Heals [amountHealed] damage if it kills a unit = Heilt [amountHealed] Schaden beim Töten einer Einheit Minuteman = Minuteman Frigate = Fregatte diff --git a/android/assets/jsons/translationsByLanguage/Indonesian.properties b/android/assets/jsons/translationsByLanguage/Indonesian.properties index 8f2cbbd18b..51b02f2022 100644 --- a/android/assets/jsons/translationsByLanguage/Indonesian.properties +++ b/android/assets/jsons/translationsByLanguage/Indonesian.properties @@ -2105,6 +2105,7 @@ El Dorado = Fountain of Youth = # Natural Wonders Uniques + # Requires translation! Grants 500 Gold to the first civilization to discover it = # Requires translation! @@ -2369,6 +2370,10 @@ Knight = # Requires translation! Camel Archer = # Requires translation! +Conquistador = + # Requires translation! +Defense bonus when embarked = + # Requires translation! Naresuan's Elephant = # Requires translation! Samurai = @@ -2381,6 +2386,8 @@ Turtle Ship = # Requires translation! +1 Visibility Range = # Requires translation! ++2 Visibility Range = + # Requires translation! Cannon = # Requires translation! Musketman = @@ -2389,6 +2396,8 @@ Musketeer = # Requires translation! Janissary = # Requires translation! +Tercio = + # Requires translation! Heals [amountHealed] damage if it kills a unit = # Requires translation! Minuteman = diff --git a/android/assets/jsons/translationsByLanguage/Italian.properties b/android/assets/jsons/translationsByLanguage/Italian.properties index 759f3ff781..b56ecd1736 100644 --- a/android/assets/jsons/translationsByLanguage/Italian.properties +++ b/android/assets/jsons/translationsByLanguage/Italian.properties @@ -1433,16 +1433,20 @@ Pikeman = Picchiere Landsknecht = Lanzichenecco Knight = Cavaliere Camel Archer = Arciere su cammello +Conquistador = Conquistador +Defense bonus when embarked = Difesa bonus quando imbarcato Naresuan's Elephant = Elefante di Naresuan Samurai = Samurai Combat very likely to create Great Generals = Può generare un Grande Generale combattendo Caravel = Caravella Turtle Ship = Nave tartaruga +1 Visibility Range = +1 raggio di Visione ++2 Visibility Range = +2 raggio di Visione Cannon = Cannone Musketman = Soldato con moschetto Musketeer = Moschettiere Janissary = Giannizzero +Tercio = Tercio Heals [amountHealed] damage if it kills a unit = Cura [amountHealed] PF quando uccide un'unità nemica Minuteman = Minuteman Frigate = Fregata diff --git a/android/assets/jsons/translationsByLanguage/Korean.properties b/android/assets/jsons/translationsByLanguage/Korean.properties index 748f9ad85a..fa06ce6314 100644 --- a/android/assets/jsons/translationsByLanguage/Korean.properties +++ b/android/assets/jsons/translationsByLanguage/Korean.properties @@ -1363,6 +1363,7 @@ El Dorado = Fountain of Youth = # Natural Wonders Uniques + # Requires translation! Grants 500 Gold to the first civilization to discover it = # Requires translation! @@ -1501,16 +1502,24 @@ Pikeman = 장창병 Landsknecht = 란츠크네흐트 Knight = 기사 Camel Archer = 낙타궁병 + # Requires translation! +Conquistador = + # Requires translation! +Defense bonus when embarked = Naresuan's Elephant = 나레수안 전투코끼리 Samurai = 사무라이 Combat very likely to create Great Generals = 전투 시 위대한 장군 출현율 크게 증가 Caravel = 캐러벨 Turtle Ship = 거북선 +1 Visibility Range = 시야 범위 +1 + # Requires translation! ++2 Visibility Range = Cannon = 대포 Musketman = 머스킷총병 Musketeer = 총사대 Janissary = 예니체리 + # Requires translation! +Tercio = Heals [amountHealed] damage if it kills a unit = 유닛 처치 시 체력 [amountHealed] 회복 Minuteman = 민병대 Frigate = 프리깃 diff --git a/android/assets/jsons/translationsByLanguage/Malay.properties b/android/assets/jsons/translationsByLanguage/Malay.properties index ddd95c299b..03d088b145 100644 --- a/android/assets/jsons/translationsByLanguage/Malay.properties +++ b/android/assets/jsons/translationsByLanguage/Malay.properties @@ -2215,6 +2215,7 @@ El Dorado = Fountain of Youth = # Natural Wonders Uniques + # Requires translation! Grants 500 Gold to the first civilization to discover it = # Requires translation! @@ -2479,6 +2480,10 @@ Knight = # Requires translation! Camel Archer = # Requires translation! +Conquistador = + # Requires translation! +Defense bonus when embarked = + # Requires translation! Naresuan's Elephant = # Requires translation! Samurai = @@ -2491,6 +2496,8 @@ Turtle Ship = # Requires translation! +1 Visibility Range = # Requires translation! ++2 Visibility Range = + # Requires translation! Cannon = # Requires translation! Musketman = @@ -2499,6 +2506,8 @@ Musketeer = # Requires translation! Janissary = # Requires translation! +Tercio = + # Requires translation! Heals [amountHealed] damage if it kills a unit = # Requires translation! Minuteman = diff --git a/android/assets/jsons/translationsByLanguage/Polish.properties b/android/assets/jsons/translationsByLanguage/Polish.properties index 1e812caea5..ce5ae09fdd 100644 --- a/android/assets/jsons/translationsByLanguage/Polish.properties +++ b/android/assets/jsons/translationsByLanguage/Polish.properties @@ -1297,6 +1297,7 @@ El Dorado = El Dorado Fountain of Youth = Źródło młodości # Natural Wonders Uniques + # Requires translation! Grants 500 Gold to the first civilization to discover it = # Requires translation! @@ -1435,16 +1436,24 @@ Pikeman = Wojownik z piką Landsknecht = Landsknecht Knight = Rycerz Camel Archer = Łucznik na wielbłądzie + # Requires translation! +Conquistador = + # Requires translation! +Defense bonus when embarked = Naresuan's Elephant = Słoń Naresuan Samurai = Samuraj Combat very likely to create Great Generals = Walka może wyłonić Wielkich Generałów Caravel = Karawela Turtle Ship = Geobukseon +1 Visibility Range = +1 do pola widzenia + # Requires translation! ++2 Visibility Range = Cannon = Armata Musketman = Strzelec z muszkietem Musketeer = Muszkieter Janissary = Janczar + # Requires translation! +Tercio = Heals [amountHealed] damage if it kills a unit = Leczy [amountHealed] obrażeń po zabiciu jednostki Minuteman = Minuteman Frigate = Fregata diff --git a/android/assets/jsons/translationsByLanguage/Portuguese.properties b/android/assets/jsons/translationsByLanguage/Portuguese.properties index 2587d31e3e..0e50a62927 100644 --- a/android/assets/jsons/translationsByLanguage/Portuguese.properties +++ b/android/assets/jsons/translationsByLanguage/Portuguese.properties @@ -1514,6 +1514,7 @@ El Dorado = Fountain of Youth = # Natural Wonders Uniques + # Requires translation! Grants 500 Gold to the first civilization to discover it = # Requires translation! @@ -1652,16 +1653,24 @@ Pikeman = Piqueiro Landsknecht = Landsknecht Knight = Cavaleiro Camel Archer = Arqueiro de camelo + # Requires translation! +Conquistador = + # Requires translation! +Defense bonus when embarked = Naresuan's Elephant = Elefante de Naresuan Samurai = Samurai Combat very likely to create Great Generals = Combate muito provável de criar Grandes Generais Caravel = Caravela Turtle Ship = Navio Tartaruga +1 Visibility Range = +1 de alcance do campo de visão + # Requires translation! ++2 Visibility Range = Cannon = Canhão Musketman = Soldado com mosquete Musketeer = Mosqueteiro Janissary = Janisário + # Requires translation! +Tercio = Heals [amountHealed] damage if it kills a unit = Cura [amountHealed] de dano se destruir uma unidade Minuteman = Mílicia Frigate = Fragata diff --git a/android/assets/jsons/translationsByLanguage/Romanian.properties b/android/assets/jsons/translationsByLanguage/Romanian.properties index 6d594e8394..044d78e14a 100644 --- a/android/assets/jsons/translationsByLanguage/Romanian.properties +++ b/android/assets/jsons/translationsByLanguage/Romanian.properties @@ -1869,6 +1869,7 @@ El Dorado = Fountain of Youth = # Natural Wonders Uniques + # Requires translation! Grants 500 Gold to the first civilization to discover it = # Requires translation! @@ -2037,6 +2038,10 @@ Landsknecht = Knight = Cavaler Camel Archer = Arcaș pe cămilă # Requires translation! +Conquistador = + # Requires translation! +Defense bonus when embarked = + # Requires translation! Naresuan's Elephant = # Requires translation! Samurai = @@ -2046,12 +2051,16 @@ Caravel = Caravelă # Requires translation! Turtle Ship = +1 Visibility Range = +1 Rază vizuală + # Requires translation! ++2 Visibility Range = Cannon = Tun Musketman = Muschetar Musketeer = Muschetar # Requires translation! Janissary = # Requires translation! +Tercio = + # Requires translation! Heals [amountHealed] damage if it kills a unit = Minuteman = Rezervist Frigate = Fregată diff --git a/android/assets/jsons/translationsByLanguage/Russian.properties b/android/assets/jsons/translationsByLanguage/Russian.properties index 74e90c646c..b7219e06eb 100644 --- a/android/assets/jsons/translationsByLanguage/Russian.properties +++ b/android/assets/jsons/translationsByLanguage/Russian.properties @@ -1298,6 +1298,7 @@ El Dorado = Эльдорадо Fountain of Youth = Фонтан вечной молодости # Natural Wonders Uniques + # Requires translation! Grants 500 Gold to the first civilization to discover it = # Requires translation! @@ -1436,16 +1437,24 @@ Pikeman = Пикинер Landsknecht = Ландскнехт Knight = Рыцарь Camel Archer = Лучник на верблюде + # Requires translation! +Conquistador = + # Requires translation! +Defense bonus when embarked = Naresuan's Elephant = Слон Наресуана Samurai = Самурай Combat very likely to create Great Generals = Большой шанс получения Великого Полководца в бою Caravel = Каравелла Turtle Ship = Кобуксон +1 Visibility Range = +1 Диапазон видимости + # Requires translation! ++2 Visibility Range = Cannon = Пушка Musketman = Стрельцы Musketeer = Мушкетёр Janissary = Янычары + # Requires translation! +Tercio = Heals [amountHealed] damage if it kills a unit = Восстаналивает [amountHealed] здоровья при уничтожении юнита Minuteman = Минитмэн Frigate = Фрегат diff --git a/android/assets/jsons/translationsByLanguage/Simplified_Chinese.properties b/android/assets/jsons/translationsByLanguage/Simplified_Chinese.properties index 9fd957d0b2..0aa1e71168 100644 --- a/android/assets/jsons/translationsByLanguage/Simplified_Chinese.properties +++ b/android/assets/jsons/translationsByLanguage/Simplified_Chinese.properties @@ -1329,6 +1329,7 @@ El Dorado = 黄金国 Fountain of Youth = 青春之泉 # Natural Wonders Uniques + # Requires translation! Grants 500 Gold to the first civilization to discover it = # Requires translation! @@ -1467,16 +1468,24 @@ Pikeman = 长枪兵 Landsknecht = 自由佣兵 Knight = 骑士 Camel Archer = 骆驼骑射手 + # Requires translation! +Conquistador = + # Requires translation! +Defense bonus when embarked = Naresuan's Elephant = 纳黎萱战象 Samurai = 日本武士 Combat very likely to create Great Generals = 战斗能更快地产生出大军事家 Caravel = 轻帆船 Turtle Ship = 龟船 +1 Visibility Range = +1视野 + # Requires translation! ++2 Visibility Range = Cannon = 加农炮 Musketman = 火枪手 Musketeer = 法国火枪手 Janissary = 苏丹亲兵 + # Requires translation! +Tercio = Heals [amountHealed] damage if it kills a unit = 消灭敌方单位后回复[amountHealed]生命值 Minuteman = 快速民兵 Frigate = 护卫舰 diff --git a/android/assets/jsons/translationsByLanguage/Spanish.properties b/android/assets/jsons/translationsByLanguage/Spanish.properties index 633440e1a2..0d559a1a83 100644 --- a/android/assets/jsons/translationsByLanguage/Spanish.properties +++ b/android/assets/jsons/translationsByLanguage/Spanish.properties @@ -1297,6 +1297,7 @@ El Dorado = El Dorado Fountain of Youth = Fuente de la juventud # Natural Wonders Uniques + # Requires translation! Grants 500 Gold to the first civilization to discover it = # Requires translation! @@ -1435,16 +1436,24 @@ Pikeman = Piquero Landsknecht = Lansquenete Knight = Caballero Camel Archer = Arquero a camello + # Requires translation! +Conquistador = + # Requires translation! +Defense bonus when embarked = Naresuan's Elephant = Elefante Naresuan Samurai = Samurai Combat very likely to create Great Generals = Es mas probable que se creen Grandes Generales a través del combate Caravel = Caravela Turtle Ship = Barco tortuga +1 Visibility Range = +1 al Rango de Visibilidad + # Requires translation! ++2 Visibility Range = Cannon = Cañón Musketman = Mosquetero Musketeer = Mosquetero Revolucionario Janissary = Jenízaro + # Requires translation! +Tercio = Heals [amountHealed] damage if it kills a unit = Se cura [amountHealed] de daño si mata a una unidad Minuteman = Milicia Revolucionaria Frigate = Fragata diff --git a/android/assets/jsons/translationsByLanguage/Traditional_Chinese.properties b/android/assets/jsons/translationsByLanguage/Traditional_Chinese.properties index be9977065d..3f58671a6b 100644 --- a/android/assets/jsons/translationsByLanguage/Traditional_Chinese.properties +++ b/android/assets/jsons/translationsByLanguage/Traditional_Chinese.properties @@ -1329,6 +1329,7 @@ El Dorado = 黃金國 Fountain of Youth = 青春之泉 # Natural Wonders Uniques + # Requires translation! Grants 500 Gold to the first civilization to discover it = # Requires translation! @@ -1467,16 +1468,24 @@ Pikeman = 長槍兵 Landsknecht = 自由傭兵 Knight = 騎士 Camel Archer = 駱駝騎射手 + # Requires translation! +Conquistador = + # Requires translation! +Defense bonus when embarked = Naresuan's Elephant = 納黎萱戰象 Samurai = 日本武士 Combat very likely to create Great Generals = 戰鬥能更快的產生大軍事家 Caravel = 輕帆船 Turtle Ship = 龜船 +1 Visibility Range = +1視野 + # Requires translation! ++2 Visibility Range = Cannon = 加農砲 Musketman = 火槍手 Musketeer = 法國火槍手 Janissary = 蘇丹親兵 + # Requires translation! +Tercio = Heals [amountHealed] damage if it kills a unit = 消滅敵方單位後回復[amountHealed]生命值 Minuteman = 快速民兵 Frigate = 護衛艦 diff --git a/android/assets/jsons/translationsByLanguage/Ukrainian.properties b/android/assets/jsons/translationsByLanguage/Ukrainian.properties index b2c82a8d89..c06269ddeb 100644 --- a/android/assets/jsons/translationsByLanguage/Ukrainian.properties +++ b/android/assets/jsons/translationsByLanguage/Ukrainian.properties @@ -490,7 +490,7 @@ Isabella = Ізабелла # New game screen Uniques = Унікальні -Promotions = Акції +Promotions = Підвищення Barbarians = Варвари Load copied data = Завантажити копію даних Could not load game from clipboard! = Неможливо завантажити гру з буфера обміну @@ -994,12 +994,11 @@ Citizenship = Права і обов'язки громадянина Tile improvement speed +25%, receive a free worker near the capital = Покращення клітинок відбувається на +25% швидше, новий працівник коло столиці Republic = Республіка # Requires translation! -+1 construction in every city, +5% construction when constructing buildings = ++1 construction in every city, +5% construction when constructing buildings = Representation = Представництво Each city founded increases culture cost of policies 33% less than normal. Starts a golden age. = Кожне засноване місто зменшує ціну інституту на 33%. Розпочинає золотий вік. Meritocracy = Меритократія +1 happiness for every city connected to capital, -5% unhappiness from citizens = +1 щастя в кожному місті з'єднаному зі столицею, -5% нещастя від громадян - # Requires translation! Liberty Complete = Лібералізм завершено Free Great Person of choice near capital = Безкоштовна велика людина біля столиці @@ -1304,6 +1303,7 @@ El Dorado = Ельдорадо Fountain of Youth = Джерело вічної молодості # Natural Wonders Uniques + # Requires translation! Grants 500 Gold to the first civilization to discover it = # Requires translation! @@ -1442,16 +1442,24 @@ Pikeman = Пікінер Landsknecht = Ландскнехт Knight = Лицар Camel Archer = Лучник на верблюді + # Requires translation! +Conquistador = + # Requires translation! +Defense bonus when embarked = Naresuan's Elephant = Слон Наресуана Samurai = Самурай Combat very likely to create Great Generals = Висока вірогідність отримати у битві видатного генерала Caravel = Каравела Turtle Ship = Кобуксон +1 Visibility Range = Дальність огляду +1 + # Requires translation! ++2 Visibility Range = Cannon = Гармата Musketman = Мушкетник Musketeer = Мушкетер Janissary = Яничари + # Requires translation! +Tercio = Heals [amountHealed] damage if it kills a unit = Відновлення [amountHealed] пошкоджень при знищенні підрозділу Minuteman = Ополченець Frigate = Фрегат diff --git a/android/assets/jsons/translationsByLanguage/completionPercentages.properties b/android/assets/jsons/translationsByLanguage/completionPercentages.properties index 23f1e18758..cc29468571 100644 --- a/android/assets/jsons/translationsByLanguage/completionPercentages.properties +++ b/android/assets/jsons/translationsByLanguage/completionPercentages.properties @@ -1,18 +1,17 @@ Traditional_Chinese = 97 Italian = 100 -Polish = 99 Russian = 99 Polish = 99 -Romanian = 49 +Romanian = 48 Korean = 94 Simplified_Chinese = 97 German = 96 English = 0 -Ukrainian = 98 +Ukrainian = 99 French = 99 -Portuguese = 84 +Portuguese = 83 Indonesian = 21 -Czech = 97 -Malay = 13 Spanish = 99 -Dutch = 22 +Malay = 13 +Czech = 97 +Dutch = 21 diff --git a/android/assets/jsons/translationsByLanguage/template.properties b/android/assets/jsons/translationsByLanguage/template.properties index e08b1d0cf8..a98aeb1cd9 100644 --- a/android/assets/jsons/translationsByLanguage/template.properties +++ b/android/assets/jsons/translationsByLanguage/template.properties @@ -1433,16 +1433,20 @@ Pikeman = Landsknecht = Knight = Camel Archer = +Conquistador = +Defense bonus when embarked = Naresuan's Elephant = Samurai = Combat very likely to create Great Generals = Caravel = Turtle Ship = +1 Visibility Range = ++2 Visibility Range = Cannon = Musketman = Musketeer = Janissary = +Tercio = Heals [amountHealed] damage if it kills a unit = Minuteman = Frigate = diff --git a/core/src/com/unciv/logic/battle/BattleDamage.kt b/core/src/com/unciv/logic/battle/BattleDamage.kt index b5632fc345..c2f92c2efe 100644 --- a/core/src/com/unciv/logic/battle/BattleDamage.kt +++ b/core/src/com/unciv/logic/battle/BattleDamage.kt @@ -141,10 +141,17 @@ class BattleDamage{ } fun getDefenceModifiers(attacker: ICombatant, defender: MapUnitCombatant): HashMap { - if(defender.unit.isEmbarked()) // embarked units get no defensive modifiers - return HashMap() + val modifiers = HashMap() - val modifiers = getGeneralModifiers(defender, attacker) + if (defender.unit.isEmbarked()) { + // embarked units get no defensive modifiers apart from this unique + if (defender.unit.hasUnique("Defense bonus when embarked")) + modifiers["Embarkation"] = 1f + + return modifiers + } + + modifiers.putAll(getGeneralModifiers(defender, attacker)) modifiers.putAll(getTileSpecificModifiers(defender, defender.getTile())) diff --git a/core/src/com/unciv/logic/map/MapUnit.kt b/core/src/com/unciv/logic/map/MapUnit.kt index 2af412ede9..07be3c4d45 100644 --- a/core/src/com/unciv/logic/map/MapUnit.kt +++ b/core/src/com/unciv/logic/map/MapUnit.kt @@ -136,6 +136,7 @@ class MapUnit { else { var visibilityRange = 2 visibilityRange += getUniques().count { it == "+1 Visibility Range" } + if (hasUnique("+2 Visibility Range")) visibilityRange += 2 // This shouldn't be stackable if (hasUnique("Limited Visibility")) visibilityRange -= 1 if (civInfo.nation.unique == "All land military units have +1 sight, 50% discount when purchasing tiles") visibilityRange += 1