From 8a5247324c1149e332d7c0105ef56afe74ee7405 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sun, 6 Dec 2020 22:16:03 +0200 Subject: [PATCH] 3.11.18 --- .../assets/jsons/Civ V - Vanilla/Units.json | 3 +- .../Brazilian_Portuguese.properties | 11 +- .../jsons/translations/Czech.properties | 11 +- .../jsons/translations/Dutch.properties | 14 +- .../jsons/translations/English.properties | 14 +- .../jsons/translations/Finnish.properties | 13 +- .../jsons/translations/French.properties | 13 +- .../jsons/translations/German.properties | 11 +- .../jsons/translations/Hungarian.properties | 14 +- .../jsons/translations/Indonesian.properties | 12 +- .../jsons/translations/Italian.properties | 11 +- .../jsons/translations/Japanese.properties | 12 +- .../jsons/translations/Korean.properties | 12 +- .../jsons/translations/Lithuanian.properties | 13 +- .../jsons/translations/Malay.properties | 14 +- .../Persian_(Pinglish-DIN).properties | 13 +- .../Persian_(Pinglish-UN).properties | 13 +- .../jsons/translations/Polish.properties | 11 +- .../jsons/translations/Portuguese.properties | 13 +- .../jsons/translations/Romanian.properties | 13 +- .../jsons/translations/Russian.properties | 11 +- .../Simplified_Chinese.properties | 11 +- .../jsons/translations/Spanish.properties | 11 +- .../Traditional_Chinese.properties | 11 +- .../jsons/translations/Turkish.properties | 13 +- .../jsons/translations/Ukrainian.properties | 11 +- .../jsons/translations/template.properties | 4 +- buildSrc/src/main/kotlin/BuildConfig.kt | 4 +- changelog.md | 16 +++ core/src/com/unciv/logic/map/MapUnit.kt | 136 ++++++++++-------- 30 files changed, 337 insertions(+), 132 deletions(-) diff --git a/android/assets/jsons/Civ V - Vanilla/Units.json b/android/assets/jsons/Civ V - Vanilla/Units.json index 831d9674f5..c78b07533a 100644 --- a/android/assets/jsons/Civ V - Vanilla/Units.json +++ b/android/assets/jsons/Civ V - Vanilla/Units.json @@ -1246,7 +1246,8 @@ "cost": 425, "requiredTech": "Computers", "requiredResource": "Aluminum", - "uniques": ["Bonus vs Armor 100%", "No defensive terrain bonuses", "Can move after attacking", "All tiles cost 1 movement", "Can pass through impassable tiles", "Unable to capture cities"], + "uniques": ["Bonus vs Armor 100%", "No defensive terrain bonus", "Can move after attacking", "All tiles cost 1 movement", + "Can pass through impassable tiles", "Unable to capture cities"], "attackSound": "shot" }, { diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index 1f2d451120..7c19297361 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -936,6 +936,7 @@ Are you SURE you want to delete this mod? = Tem CERTEZA que deseja deletar este Must be next to [terrain] = Deve estar próximo ao [terrain] Must be on [terrain] = Deve estar no [terrain] +[amount]% vs [unitType] = +[amount]% vs [unitType] ++[amount] Movement for all [unitType] units = +[amount] Movimento para todas as unidades [unitType] # City filters in this city = nesta cidade @@ -944,6 +945,7 @@ in capital = na capital # Requires translation! in every coastal city = + #################### Lines from Buildings from Civ V - Vanilla #################### Indicates the capital city = Indica a Capital @@ -1494,7 +1496,6 @@ Would you be interested in a trade agreement with England? = Estaria interessado Hello, again. = Ola, novamente. Oh, it's you! = A, é você! Sun Never Sets = O Sol Nunca se Põe -+2 movement for all naval units = +2 de movimento para todas as unidades navais London = Londres York = Iorque Nottingham = Nottingham @@ -2870,7 +2871,6 @@ I am not always this generous, but we hope you take this rare opportunity we giv So what now? = E agora? Mongol Terror = Terror Mongol +30% Strength when fighting City-State units and cities = +30% Força quando estiver lutando contra unidades e cidades de Cidades-Estado -+[amount] Movement for all [unitType] units = +[amount] Movimento para todas as unidades [unitType] # Requires translation! Karakorum = # Requires translation! @@ -4192,6 +4192,13 @@ Panzer = Panzer Anti-Tank Gun = Arma anti-tanque + # Requires translation! +Unable to capture cities = + # Requires translation! +All tiles cost 1 movement = + # Requires translation! +Can pass through impassable tiles = + Rocket Artillery = Artilharia de foguetes Mechanized Infantry = Infantaria mecanizada diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties index fb61f1b37f..6655875ae1 100644 --- a/android/assets/jsons/translations/Czech.properties +++ b/android/assets/jsons/translations/Czech.properties @@ -924,6 +924,7 @@ Are you SURE you want to delete this mod? = OPRAVDU chcete smazat tento mod? Must be next to [terrain] = Musí být u políčka [terrain] Must be on [terrain] = Musí být na políčku [terrain] +[amount]% vs [unitType] = +[amount]% proti [unitType] ++[amount] Movement for all [unitType] units = +[amount] pohyb pro [unitType] jednotky # City filters in this city = v tomto městě @@ -932,6 +933,7 @@ in capital = v hlavním městě # Requires translation! in every coastal city = + #################### Lines from Buildings from Civ V - Vanilla #################### Indicates the capital city = Označuje hlavní město @@ -1481,7 +1483,6 @@ Would you be interested in a trade agreement with England? = Měli byste zájem Hello, again. = Opět vás zdravím. Oh, it's you! = Oh, to jste vy! Sun Never Sets = Slunce nikdy nezapadá -+2 movement for all naval units = +2 pohyb pro všechny námořní jednotky London = Londýn York = York Nottingham = Nottingham @@ -2900,7 +2901,6 @@ I am not always this generous, but we hope you take this rare opportunity we giv So what now? = Mongol Terror = Mongolský teror +30% Strength when fighting City-State units and cities = +30% síla proti jednotkám Městských států nebo Městským státům samotným -+[amount] Movement for all [unitType] units = +[amount] pohyb pro [unitType] jednotky # Requires translation! Karakorum = # Requires translation! @@ -4285,6 +4285,13 @@ Panzer = Panzer Anti-Tank Gun = Protitanková zbraň + # Requires translation! +Unable to capture cities = + # Requires translation! +All tiles cost 1 movement = + # Requires translation! +Can pass through impassable tiles = + Rocket Artillery = Raketové dělostřelectvo Mechanized Infantry = Mechanizovaná pěchota diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties index 4eb54e361c..fab9d46a79 100644 --- a/android/assets/jsons/translations/Dutch.properties +++ b/android/assets/jsons/translations/Dutch.properties @@ -1352,6 +1352,8 @@ Must be next to [terrain] = Must be on [terrain] = # Requires translation! +[amount]% vs [unitType] = + # Requires translation! ++[amount] Movement for all [unitType] units = # City filters # Requires translation! @@ -1363,6 +1365,7 @@ in capital = # Requires translation! in every coastal city = + #################### Lines from Buildings from Civ V - Vanilla #################### # Requires translation! @@ -2315,8 +2318,6 @@ Oh, it's you! = # Requires translation! Sun Never Sets = # Requires translation! -+2 movement for all naval units = - # Requires translation! London = # Requires translation! York = @@ -4013,8 +4014,6 @@ Mongol Terror = # Requires translation! +30% Strength when fighting City-State units and cities = # Requires translation! -+[amount] Movement for all [unitType] units = - # Requires translation! Karakorum = # Requires translation! Beshbalik = @@ -5897,6 +5896,13 @@ Panzer = # Requires translation! Anti-Tank Gun = + # Requires translation! +Unable to capture cities = + # Requires translation! +All tiles cost 1 movement = + # Requires translation! +Can pass through impassable tiles = + # Requires translation! Rocket Artillery = diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties index 57b180d6c2..353681853f 100644 --- a/android/assets/jsons/translations/English.properties +++ b/android/assets/jsons/translations/English.properties @@ -1723,6 +1723,8 @@ Must be next to [terrain] = Must be on [terrain] = # Requires translation! +[amount]% vs [unitType] = + # Requires translation! ++[amount] Movement for all [unitType] units = # City filters # Requires translation! @@ -1734,6 +1736,7 @@ in capital = # Requires translation! in every coastal city = + #################### Lines from Buildings from Civ V - Vanilla #################### # Requires translation! @@ -2707,8 +2710,6 @@ Oh, it's you! = # Requires translation! Sun Never Sets = # Requires translation! -+2 movement for all naval units = - # Requires translation! London = # Requires translation! York = @@ -4406,8 +4407,6 @@ Mongol Terror = # Requires translation! +30% Strength when fighting City-State units and cities = # Requires translation! -+[amount] Movement for all [unitType] units = - # Requires translation! Karakorum = # Requires translation! Beshbalik = @@ -6427,6 +6426,13 @@ Panzer = # Requires translation! Anti-Tank Gun = + # Requires translation! +Unable to capture cities = + # Requires translation! +All tiles cost 1 movement = + # Requires translation! +Can pass through impassable tiles = + # Requires translation! Rocket Artillery = diff --git a/android/assets/jsons/translations/Finnish.properties b/android/assets/jsons/translations/Finnish.properties index 68d0009c67..dd0fa8a14f 100644 --- a/android/assets/jsons/translations/Finnish.properties +++ b/android/assets/jsons/translations/Finnish.properties @@ -1000,6 +1000,8 @@ Must be next to [terrain] = Täytyy sijaita maaston [terrain] vieressä Must be on [terrain] = # Requires translation! +[amount]% vs [unitType] = + # Requires translation! ++[amount] Movement for all [unitType] units = # City filters # Requires translation! @@ -1011,6 +1013,7 @@ in capital = # Requires translation! in every coastal city = + #################### Lines from Buildings from Civ V - Vanilla #################### Indicates the capital city = Sijaitsee pääkaupungissa @@ -1642,7 +1645,6 @@ Would you be interested in a trade agreement with England? = Kiinnostaisiko kaup Hello, again. = Hei taas. Oh, it's you! = Ai, sinä! Sun Never Sets = Aurinko ei laske koskaan -+2 movement for all naval units = +2 siirtojen kantavuus laivastoyksiköille London = Lontoo York = York Nottingham = Nottingham @@ -2758,8 +2760,6 @@ Mongol Terror = Mongoolien Hirmuvalta # Requires translation! +30% Strength when fighting City-State units and cities = # Requires translation! -+[amount] Movement for all [unitType] units = - # Requires translation! Karakorum = # Requires translation! Beshbalik = @@ -4615,6 +4615,13 @@ Panzer = # Requires translation! Anti-Tank Gun = + # Requires translation! +Unable to capture cities = + # Requires translation! +All tiles cost 1 movement = + # Requires translation! +Can pass through impassable tiles = + # Requires translation! Rocket Artillery = diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index 6cd4c0bc53..538933b4f5 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -1011,6 +1011,8 @@ Must be next to [terrain] = Must be on [terrain] = # Requires translation! +[amount]% vs [unitType] = + # Requires translation! ++[amount] Movement for all [unitType] units = # City filters # Requires translation! @@ -1022,6 +1024,7 @@ in capital = # Requires translation! in every coastal city = + #################### Lines from Buildings from Civ V - Vanilla #################### Indicates the capital city = Indique la capitale @@ -1596,7 +1599,6 @@ Would you be interested in a trade agreement with England? = Seriez-vous intére Hello, again. = Bonjour, à nouveau. Oh, it's you! = Oh ! C'est vous ! Sun Never Sets = Le soleil ne se couche jamais -+2 movement for all naval units = +2 points de mouvement pour les unités navales London = Londres York = York Nottingham = Nottingham @@ -2474,8 +2476,6 @@ So what now? = Et maintenant ? Mongol Terror = Terreur mongole # Requires translation! +30% Strength when fighting City-State units and cities = - # Requires translation! -+[amount] Movement for all [unitType] units = Karakorum = Karakorum Beshbalik = Beshbalik Turfan = Turfan @@ -3777,6 +3777,13 @@ Panzer = Panzer Anti-Tank Gun = Canon antichar + # Requires translation! +Unable to capture cities = + # Requires translation! +All tiles cost 1 movement = + # Requires translation! +Can pass through impassable tiles = + Rocket Artillery = Lance-roquettes Mechanized Infantry = Infanterie mécanisée diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index 0c09b11c94..73947e8ccd 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -924,6 +924,7 @@ Are you SURE you want to delete this mod? = SICHER, dass diese Modifikation gel Must be next to [terrain] = Muss an einem [terrain] liegen Must be on [terrain] = Muss sich auf [terrain] befinden +[amount]% vs [unitType] = +[amount]% vs [unitType] ++[amount] Movement for all [unitType] units = +[amount] Bewegung für alle "[unitType]"-Einheiten # City filters in this city = in dieser Stadt @@ -932,6 +933,7 @@ in capital = in der Hauptstadt # Requires translation! in every coastal city = + #################### Lines from Buildings from Civ V - Vanilla #################### Indicates the capital city = Gibt die Hauptstadt an @@ -1481,7 +1483,6 @@ Would you be interested in a trade agreement with England? = Wärt Ihr an einer Hello, again. = Hallo, nochmals. Oh, it's you! = Oh, Ihr seid es! Sun Never Sets = Die Sonne geht nie unter -+2 movement for all naval units = +2 Bewegung für alle Marineeinheiten London = London York = York Nottingham = Nottingham @@ -2339,7 +2340,6 @@ I am not always this generous, but we hope you take this rare opportunity we giv So what now? = Was nun? Mongol Terror = Mongolischer Terror +30% Strength when fighting City-State units and cities = 30% Stärke im Kampf gegen Stadtstaaten-Einheiten und -Städte. -+[amount] Movement for all [unitType] units = +[amount] Bewegung für alle "[unitType]"-Einheiten Karakorum = Karakorum Beshbalik = Beshbaliq Turfan = Turpan @@ -3523,6 +3523,13 @@ Panzer = Panzer Anti-Tank Gun = Panzerabwehr-Kanone + # Requires translation! +Unable to capture cities = + # Requires translation! +All tiles cost 1 movement = + # Requires translation! +Can pass through impassable tiles = + Rocket Artillery = Raketenartillerie Mechanized Infantry = Mechanisierte Infanterie diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties index 34d9c1e7b1..7fc48864ee 100644 --- a/android/assets/jsons/translations/Hungarian.properties +++ b/android/assets/jsons/translations/Hungarian.properties @@ -930,6 +930,8 @@ Are you SURE you want to delete this mod? = Biztosan TÖRLI ezt a modot? Must be next to [terrain] = Egy [terrain] mellett kell lennie Must be on [terrain] = Egy [terrain] kell ez alatt lenni +[amount]% vs [unitType] = +[amount]% [unitType] ellen + # Requires translation! ++[amount] Movement for all [unitType] units = # City filters in this city = ebben a városban @@ -938,6 +940,7 @@ in capital = a fővárosban # Requires translation! in every coastal city = + #################### Lines from Buildings from Civ V - Vanilla #################### Indicates the capital city = A fővárost mutatja @@ -1599,8 +1602,6 @@ Hello, again. = Oh, it's you! = # Requires translation! Sun Never Sets = - # Requires translation! -+2 movement for all naval units = London = London York = York Nottingham = Nottingham @@ -2781,8 +2782,6 @@ Mongol Terror = # Requires translation! +30% Strength when fighting City-State units and cities = # Requires translation! -+[amount] Movement for all [unitType] units = - # Requires translation! Karakorum = # Requires translation! Beshbalik = @@ -4203,6 +4202,13 @@ Panzer = Páncélos Anti-Tank Gun = Páncéltörő löveg + # Requires translation! +Unable to capture cities = + # Requires translation! +All tiles cost 1 movement = + # Requires translation! +Can pass through impassable tiles = + Rocket Artillery = Rakétatüzérség Mechanized Infantry = Gépesített gyalogos diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index 8fc898129a..d5c39749f0 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -922,14 +922,15 @@ Are you SURE you want to delete this mod? = Apakah kamu YAKIN untuk menghapus mo Must be next to [terrain] = Harus di sebelah [terrain] Must be on [terrain] = Harus berada di [terrain] +[amount]% vs [unitType] = +[amount]% vs [unitType] ++[amount] Movement for all [unitType] units = +[amount] Pergerakan untuk semua [unitType]. # City filters in this city = di kota ini in every city = di semua kota in capital = di ibu kota - # Requires translation! in every coastal city = di setiap kota pesisir + #################### Lines from Buildings from Civ V - Vanilla #################### Indicates the capital city = Menandakan ibu kota @@ -1479,7 +1480,6 @@ Would you be interested in a trade agreement with England? = Apakah kau tertarik Hello, again. = Halo, lagi. Oh, it's you! = Oh, ini kau! Sun Never Sets = Matahari Tidak Pernah Terbenam -+2 movement for all naval units = +2 pergerakan untuk semua unit laut. London = London York = York Nottingham = Nottingham @@ -2337,7 +2337,6 @@ I am not always this generous, but we hope you take this rare opportunity we giv So what now? = Sekarang apalagi? Mongol Terror = Teror Mongol +30% Strength when fighting City-State units and cities = +30% Kekuatan ketika menyerang unit negara kota dan kota musuh. -+[amount] Movement for all [unitType] units = +[amount] Pergerakan untuk semua [unitType]. Karakorum = Karakorum Beshbalik = Beshbalik Turfan = Turfan @@ -3520,6 +3519,13 @@ Panzer = Panzer Anti-Tank Gun = Senjata Anti-Tank + # Requires translation! +Unable to capture cities = + # Requires translation! +All tiles cost 1 movement = + # Requires translation! +Can pass through impassable tiles = + Rocket Artillery = Artileri Roket Mechanized Infantry = Pasukan Mekanis diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index e795906ae6..6b377c7a33 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -922,6 +922,7 @@ Are you SURE you want to delete this mod? = Vuoi davvero cancellare questa mod? Must be next to [terrain] = La città deve rasentare [terrain] Must be on [terrain] = Deve ritrovarsi su [terrain] +[amount]% vs [unitType] = +[amount]% contro [unitType] ++[amount] Movement for all [unitType] units = +[amount] Movimento per tutte le unità [unitType] # City filters in this city = in questa città @@ -929,6 +930,7 @@ in every city = in tutte le città in capital = nella Capitale in every coastal city = in ogni città costiera + #################### Lines from Buildings from Civ V - Vanilla #################### Indicates the capital city = Indica la città capitale @@ -1478,7 +1480,6 @@ Would you be interested in a trade agreement with England? = Tutte le nazioni ci Hello, again. = Salve di nuovo. Oh, it's you! = Oh, sei tu! Sun Never Sets = Il Sole non tramonta mai -+2 movement for all naval units = +2 movimento per tutte le unità navali London = Londra York = York Nottingham = Nottingham @@ -2336,7 +2337,6 @@ I am not always this generous, but we hope you take this rare opportunity we giv So what now? = E dunque? Mongol Terror = Terrore mongolo +30% Strength when fighting City-State units and cities = +30% Forza quando combatti le Città-Stato e le loro unità -+[amount] Movement for all [unitType] units = +[amount] Movimento per tutte le unità [unitType] Karakorum = Karakorum Beshbalik = Beshbalik Turfan = Turfan @@ -3520,6 +3520,13 @@ Panzer = Panzer Anti-Tank Gun = Cannone anticarro + # Requires translation! +Unable to capture cities = + # Requires translation! +All tiles cost 1 movement = + # Requires translation! +Can pass through impassable tiles = + Rocket Artillery = Artiglieria lanciarazzi Mechanized Infantry = Fanteria meccanizzata diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties index 23b0d625df..8142ab76b8 100644 --- a/android/assets/jsons/translations/Japanese.properties +++ b/android/assets/jsons/translations/Japanese.properties @@ -922,14 +922,15 @@ Are you SURE you want to delete this mod? = このMODを削除しますか？ Must be next to [terrain] = [terrain]に隣接する必要がある Must be on [terrain] = [terrain]の上になければならない +[amount]% vs [unitType] = +[amount]% vs [unitType] ++[amount] Movement for all [unitType] units = すべての[unitType]に+[amount]の移動ポイントを付与 # City filters in this city = この都市で in every city = 全ての都市で in capital = 首都で - # Requires translation! in every coastal city = 全ての沿岸都市で + #################### Lines from Buildings from Civ V - Vanilla #################### Indicates the capital city = 首都を示します @@ -1479,7 +1480,6 @@ Would you be interested in a trade agreement with England? = あなたはイギ Hello, again. = また会いましたね。 Oh, it's you! = ああ、あなたか。 Sun Never Sets = 沈まぬ太陽 -+2 movement for all naval units = すべての海軍ユニットの移動ポイント+2 London = ロンドン York = ヨーク Nottingham = ノッティンガム @@ -2337,7 +2337,6 @@ I am not always this generous, but we hope you take this rare opportunity we giv So what now? = で、どうする？ Mongol Terror = モンゴルの脅威 +30% Strength when fighting City-State units and cities = 都市国家と都市国家ユニットとの戦闘時に戦闘力+30% -+[amount] Movement for all [unitType] units = すべての[unitType]に+[amount]の移動ポイントを付与 Karakorum = カラコルム Beshbalik = ベシバリク Turfan = トルファン @@ -3520,6 +3519,13 @@ Panzer = パンツァー Anti-Tank Gun = 対戦車砲 + # Requires translation! +Unable to capture cities = + # Requires translation! +All tiles cost 1 movement = + # Requires translation! +Can pass through impassable tiles = + Rocket Artillery = ロケット砲 Mechanized Infantry = 機械化歩兵 diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties index 1c1378724f..e942b54dcb 100644 --- a/android/assets/jsons/translations/Korean.properties +++ b/android/assets/jsons/translations/Korean.properties @@ -350,7 +350,6 @@ Move units with a single tap = 한 번의 탭으로 유닛 이동 Show tutorials = 튜토리얼 보기 Auto-assign city production = 도시 생산 선택 자동 Auto-build roads = 도로 건설 자동 - # Requires translation! Automated workers replace improvements = 일꾼 시설 대체 자동 Show minimap = 미니맵 보기 Show pixel units = 단위 픽셀 보기 @@ -926,6 +925,7 @@ Are you SURE you want to delete this mod? = 이 모드를 정말로 삭제하시 Must be next to [terrain] = 도시가 [terrain] 옆에 있어야 함 Must be on [terrain] = 도시가 [terrain] 위에 있어야 함 +[amount]% vs [unitType] = [unitType]에 대해 +[amount]% ++[amount] Movement for all [unitType] units = 모든 [unitType]의 행동력 +[amount] # City filters in this city = 이 도시에 @@ -933,6 +933,7 @@ in every city = 모든 도시에 in capital = 수도에 in every coastal city = 연안에 위치한 모든 도시에 + #################### Lines from Buildings from Civ V - Vanilla #################### Indicates the capital city = 수도를 나타내는 건물 @@ -1482,7 +1483,6 @@ Would you be interested in a trade agreement with England? = 영국과의 무역 Hello, again. = 어서 오십시오. 또 만났군요. Oh, it's you! = 아, 네놈이구나! Sun Never Sets = 해가 지지 않는 나라 -+2 movement for all naval units = 모든 해상 유닛의 행동력 +2 London = 런던 York = 요크 Nottingham = 노팅엄 @@ -2340,7 +2340,6 @@ I am not always this generous, but we hope you take this rare opportunity we giv So what now? = 또 뭐냐? Mongol Terror = 공포의 몽골 +30% Strength when fighting City-State units and cities = 도시 국가와 도국 유닛에 대해 전투력 +30% -+[amount] Movement for all [unitType] units = 모든 [unitType]의 행동력 +[amount] Karakorum = 카라코람 Beshbalik = 베쉬발리크 Turfan = 투루판 @@ -3523,6 +3522,13 @@ Panzer = 팬저 Anti-Tank Gun = 대전차포 + # Requires translation! +Unable to capture cities = + # Requires translation! +All tiles cost 1 movement = + # Requires translation! +Can pass through impassable tiles = + Rocket Artillery = 다연장 로켓포 Mechanized Infantry = 기계화보병 diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties index c359ccc8fa..0c42b2700e 100644 --- a/android/assets/jsons/translations/Lithuanian.properties +++ b/android/assets/jsons/translations/Lithuanian.properties @@ -1044,6 +1044,8 @@ Must be next to [terrain] = Must be on [terrain] = # Requires translation! +[amount]% vs [unitType] = + # Requires translation! ++[amount] Movement for all [unitType] units = # City filters # Requires translation! @@ -1055,6 +1057,7 @@ in capital = # Requires translation! in every coastal city = + #################### Lines from Buildings from Civ V - Vanilla #################### # Requires translation! @@ -2022,7 +2025,6 @@ Hello, again. = # Requires translation! Oh, it's you! = Sun Never Sets = Saulė niekada nenusileidžia -+2 movement for all naval units = +2 judėjimas visiems karinių jūrų pajėgų vienetams # Requires translation! London = # Requires translation! @@ -3702,8 +3704,6 @@ Mongol Terror = Mongolų teroras # Requires translation! +30% Strength when fighting City-State units and cities = # Requires translation! -+[amount] Movement for all [unitType] units = - # Requires translation! Karakorum = # Requires translation! Beshbalik = @@ -5729,6 +5729,13 @@ Panzer = # Requires translation! Anti-Tank Gun = + # Requires translation! +Unable to capture cities = + # Requires translation! +All tiles cost 1 movement = + # Requires translation! +Can pass through impassable tiles = + # Requires translation! Rocket Artillery = diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties index 8be0c90258..657b10cf6b 100644 --- a/android/assets/jsons/translations/Malay.properties +++ b/android/assets/jsons/translations/Malay.properties @@ -1604,6 +1604,8 @@ Must be next to [terrain] = Must be on [terrain] = # Requires translation! +[amount]% vs [unitType] = + # Requires translation! ++[amount] Movement for all [unitType] units = # City filters # Requires translation! @@ -1615,6 +1617,7 @@ in capital = # Requires translation! in every coastal city = + #################### Lines from Buildings from Civ V - Vanilla #################### # Requires translation! @@ -2523,8 +2526,6 @@ Oh, it's you! = # Requires translation! Sun Never Sets = # Requires translation! -+2 movement for all naval units = - # Requires translation! London = # Requires translation! York = @@ -4205,8 +4206,6 @@ Mongol Terror = # Requires translation! +30% Strength when fighting City-State units and cities = # Requires translation! -+[amount] Movement for all [unitType] units = - # Requires translation! Karakorum = # Requires translation! Beshbalik = @@ -6084,6 +6083,13 @@ Panzer = # Requires translation! Anti-Tank Gun = + # Requires translation! +Unable to capture cities = + # Requires translation! +All tiles cost 1 movement = + # Requires translation! +Can pass through impassable tiles = + # Requires translation! Rocket Artillery = diff --git a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties index ace0738dae..b1b3a4e78a 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties @@ -1005,6 +1005,8 @@ Must be next to [terrain] = Must be on [terrain] = # Requires translation! +[amount]% vs [unitType] = + # Requires translation! ++[amount] Movement for all [unitType] units = # City filters # Requires translation! @@ -1016,6 +1018,7 @@ in capital = # Requires translation! in every coastal city = + #################### Lines from Buildings from Civ V - Vanilla #################### Indicates the capital city = Nešān dahande ye pāytaḵt ast @@ -1956,7 +1959,6 @@ Hello, again. = # Requires translation! Oh, it's you! = Sun Never Sets = Ḵoršid Hičvağt Ğoroob Nemikonad -+2 movement for all naval units = +2 harekat barāye tamām e niroo hāye daryāi # Requires translation! London = # Requires translation! @@ -3633,8 +3635,6 @@ Mongol Terror = Tars az Moğol # Requires translation! +30% Strength when fighting City-State units and cities = # Requires translation! -+[amount] Movement for all [unitType] units = - # Requires translation! Karakorum = # Requires translation! Beshbalik = @@ -5660,6 +5660,13 @@ Panzer = # Requires translation! Anti-Tank Gun = + # Requires translation! +Unable to capture cities = + # Requires translation! +All tiles cost 1 movement = + # Requires translation! +Can pass through impassable tiles = + # Requires translation! Rocket Artillery = diff --git a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties index 1143d5629a..636602d16f 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties @@ -1002,6 +1002,8 @@ Must be next to [terrain] = Must be on [terrain] = # Requires translation! +[amount]% vs [unitType] = + # Requires translation! ++[amount] Movement for all [unitType] units = # City filters # Requires translation! @@ -1013,6 +1015,7 @@ in capital = # Requires translation! in every coastal city = + #################### Lines from Buildings from Civ V - Vanilla #################### Indicates the capital city = Neshaan dahande ye paaytakht ast @@ -1953,7 +1956,6 @@ Hello, again. = # Requires translation! Oh, it's you! = Sun Never Sets = Khorshid Hichvaght Ghoroob Nemikonad -+2 movement for all naval units = +2 harekat baraaye tamaam e niroo haaye daryaai # Requires translation! London = # Requires translation! @@ -3630,8 +3632,6 @@ Mongol Terror = Tars az Moghol # Requires translation! +30% Strength when fighting City-State units and cities = # Requires translation! -+[amount] Movement for all [unitType] units = - # Requires translation! Karakorum = # Requires translation! Beshbalik = @@ -5657,6 +5657,13 @@ Panzer = # Requires translation! Anti-Tank Gun = + # Requires translation! +Unable to capture cities = + # Requires translation! +All tiles cost 1 movement = + # Requires translation! +Can pass through impassable tiles = + # Requires translation! Rocket Artillery = diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index 413d20e6d2..fd291c2ff1 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -940,6 +940,7 @@ Are you SURE you want to delete this mod? = Czy jesteś pewny, że chcesz usun Must be next to [terrain] = Miasto musi być położone obok: [terrain] Must be on [terrain] = Musi być na [terrain] +[amount]% vs [unitType] = +[amount]% vs [unitType] ++[amount] Movement for all [unitType] units = +[amount] ruchu dla wszystkich jednostek [unitType] # City filters in this city = w tym mieście @@ -948,6 +949,7 @@ in capital = w stolicy # Requires translation! in every coastal city = + #################### Lines from Buildings from Civ V - Vanilla #################### Indicates the capital city = Wskazuje stolicę @@ -1512,7 +1514,6 @@ Would you be interested in a trade agreement with England? = Czy byłbyś zainte Hello, again. = Witaj, ponownie. Oh, it's you! = OH, to ty! Sun Never Sets = Słońce Nigdy Nie Zachodzi -+2 movement for all naval units = +2 ruchu dla wszystkich jednostek morskich. London = Londyn York = Jork Nottingham = Nottingham @@ -2372,7 +2373,6 @@ I am not always this generous, but we hope you take this rare opportunity we giv So what now? = Więc co teraz? Mongol Terror = Terror Mongolski +30% Strength when fighting City-State units and cities = +30% do siły bojowej podczas walki z jednostkami Państw-Miast lub ataku na samo Państwo-Miasto. -+[amount] Movement for all [unitType] units = +[amount] ruchu dla wszystkich jednostek [unitType] Karakorum = Karakorum Beshbalik = Beshbalik Turfan = Turfan @@ -3619,6 +3619,13 @@ Panzer = Panzer Anti-Tank Gun = Działo Przeciwpancerne + # Requires translation! +Unable to capture cities = + # Requires translation! +All tiles cost 1 movement = + # Requires translation! +Can pass through impassable tiles = + Rocket Artillery = Artyleria Rakietowa Mechanized Infantry = Piechota Zmechanizowana diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties index f6ba06311c..870460aa42 100644 --- a/android/assets/jsons/translations/Portuguese.properties +++ b/android/assets/jsons/translations/Portuguese.properties @@ -1089,6 +1089,8 @@ Must be next to [terrain] = Must be on [terrain] = # Requires translation! +[amount]% vs [unitType] = + # Requires translation! ++[amount] Movement for all [unitType] units = # City filters # Requires translation! @@ -1100,6 +1102,7 @@ in capital = # Requires translation! in every coastal city = + #################### Lines from Buildings from Civ V - Vanilla #################### Indicates the capital city = Indica a Capital! @@ -1898,7 +1901,6 @@ Hello, again. = # Requires translation! Oh, it's you! = Sun Never Sets = O Sol Nunca Se Põe -+2 movement for all naval units = +2 de movimento para todas as unidades navais # Requires translation! London = # Requires translation! @@ -3515,8 +3517,6 @@ Mongol Terror = Terror Mongol # Requires translation! +30% Strength when fighting City-State units and cities = # Requires translation! -+[amount] Movement for all [unitType] units = - # Requires translation! Karakorum = # Requires translation! Beshbalik = @@ -5079,6 +5079,13 @@ Panzer = Tanque-Panzer Anti-Tank Gun = Arma anti-tanque + # Requires translation! +Unable to capture cities = + # Requires translation! +All tiles cost 1 movement = + # Requires translation! +Can pass through impassable tiles = + Rocket Artillery = Artilharia de foguetes Mechanized Infantry = Infantaria mecanizada diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties index 41c448d6cb..bca1510dac 100644 --- a/android/assets/jsons/translations/Romanian.properties +++ b/android/assets/jsons/translations/Romanian.properties @@ -1094,6 +1094,8 @@ Must be next to [terrain] = Must be on [terrain] = # Requires translation! +[amount]% vs [unitType] = + # Requires translation! ++[amount] Movement for all [unitType] units = # City filters # Requires translation! @@ -1105,6 +1107,7 @@ in capital = # Requires translation! in every coastal city = + #################### Lines from Buildings from Civ V - Vanilla #################### Indicates the capital city = Stabilește orașul capitală @@ -1918,7 +1921,6 @@ Hello, again. = # Requires translation! Oh, it's you! = Sun Never Sets = Soarele Nu Apune Niciodată -+2 movement for all naval units = +2 deplasare pentru toate unitățile navale # Requires translation! London = # Requires translation! @@ -3575,8 +3577,6 @@ Mongol Terror = Teroarea Mongolă # Requires translation! +30% Strength when fighting City-State units and cities = # Requires translation! -+[amount] Movement for all [unitType] units = - # Requires translation! Karakorum = # Requires translation! Beshbalik = @@ -5234,6 +5234,13 @@ Panzer = Panzer Anti-Tank Gun = Tun antitanc + # Requires translation! +Unable to capture cities = + # Requires translation! +All tiles cost 1 movement = + # Requires translation! +Can pass through impassable tiles = + Rocket Artillery = Artilerie de Rachete # Requires translation! diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties index 4a6a2a9138..3d17ea0df4 100644 --- a/android/assets/jsons/translations/Russian.properties +++ b/android/assets/jsons/translations/Russian.properties @@ -926,6 +926,7 @@ Are you SURE you want to delete this mod? = Вы УВЕРЕНЫ что хоти Must be next to [terrain] = Рядом с городом должна быть клетка: [terrain] Must be on [terrain] = Должен находиться на клетке [terrain] +[amount]% vs [unitType] = +[amount]% против [unitType] ++[amount] Movement for all [unitType] units = +[amount] к очкам передвижения для [unitType] подразделений # City filters in this city = в этом городе @@ -934,6 +935,7 @@ in capital = в столице # Requires translation! in every coastal city = + #################### Lines from Buildings from Civ V - Vanilla #################### Indicates the capital city = Показывает, что этот город — столица империи @@ -1483,7 +1485,6 @@ Would you be interested in a trade agreement with England? = Вы заинтер Hello, again. = Снова здравствуйте. Oh, it's you! = А, это вы. Sun Never Sets = Над империей не заходит солнце -+2 movement for all naval units = +2 движения для всех военно-морских подразделений London = Лондон York = Йорк Nottingham = Ноттингем @@ -2341,7 +2342,6 @@ I am not always this generous, but we hope you take this rare opportunity we giv So what now? = Что теперь? Mongol Terror = Монгольский террор +30% Strength when fighting City-State units and cities = +30% Силы при атаке города-государства или сражении с его юнитами -+[amount] Movement for all [unitType] units = +[amount] к очкам передвижения для [unitType] подразделений Karakorum = Каракорум Beshbalik = Бишбалык Turfan = Турфан @@ -3526,6 +3526,13 @@ Panzer = Танк Тигр Anti-Tank Gun = Противотанковое орудие + # Requires translation! +Unable to capture cities = + # Requires translation! +All tiles cost 1 movement = + # Requires translation! +Can pass through impassable tiles = + Rocket Artillery = Ракетная Артиллерия Mechanized Infantry = Мотопехота diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index 404558ce4a..2ac1985974 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -928,6 +928,7 @@ Are you SURE you want to delete this mod? = 你确定要删除这个模组吗？ Must be next to [terrain] = 城市必须毗邻[terrain] Must be on [terrain] = 城市必须位于[terrain]之上 +[amount]% vs [unitType] = 对战[unitType]时+[amount]% ++[amount] Movement for all [unitType] units = 所有[unitType]+[amount]移动力 # City filters in this city = 在此城市 @@ -936,6 +937,7 @@ in capital = 在首都 # Requires translation! in every coastal city = + #################### Lines from Buildings from Civ V - Vanilla #################### Indicates the capital city = 表示首都 @@ -1486,7 +1488,6 @@ Would you be interested in a trade agreement with England? = 我亲爱的朋友 Hello, again. = 你好，又见面了。 Oh, it's you! = 是你啊，你好。 Sun Never Sets = 日不落帝国 -+2 movement for all naval units = 所有海上单位+2移动力 London = 伦敦 York = 约克 Nottingham = 诺丁汉 @@ -2345,7 +2346,6 @@ I am not always this generous, but we hope you take this rare opportunity we giv So what now? = 现在要做些什么？ Mongol Terror = 杀戮铁骑 +30% Strength when fighting City-State units and cities = 对战城邦单位或攻击城邦时+30%战斗力 -+[amount] Movement for all [unitType] units = 所有[unitType]+[amount]移动力 Karakorum = 哈拉和林 Beshbalik = 别失八里 Turfan = 吐鲁番 @@ -3541,6 +3541,13 @@ Panzer = “虎II”坦克 Anti-Tank Gun = 反坦克炮 + # Requires translation! +Unable to capture cities = + # Requires translation! +All tiles cost 1 movement = + # Requires translation! +Can pass through impassable tiles = + Rocket Artillery = 火箭炮 Mechanized Infantry = 机械化步兵 diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index 0f6a347680..f194281cfb 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -922,6 +922,7 @@ Are you SURE you want to delete this mod? = ¿Estás SEGURO de que deseas elimin Must be next to [terrain] = Debe estar al lado de [terrain] Must be on [terrain] = Debe estar en [terrain] +[amount]% vs [unitType] = +[amount]% vs [unitType] ++[amount] Movement for all [unitType] units = +[amount] Movimiento para todas las unidades [unitType] # City filters in this city = en esta ciudad @@ -930,6 +931,7 @@ in capital = en capital # Requires translation! in every coastal city = + #################### Lines from Buildings from Civ V - Vanilla #################### Indicates the capital city = Indica la capital @@ -1479,7 +1481,6 @@ Would you be interested in a trade agreement with England? = ¿Te interesaría u Hello, again. = Hola de nuevo. Oh, it's you! = ¡Oh, eres tú! Sun Never Sets = El Sol nunca se pone. -+2 movement for all naval units = +2 de movimiento para las unidades navales London = Londres York = York Nottingham = Nottingham @@ -2337,7 +2338,6 @@ I am not always this generous, but we hope you take this rare opportunity we giv So what now? = ¿Ahora qué? Mongol Terror = Terror Mongol +30% Strength when fighting City-State units and cities = +30% de fuerza al luchar contra unidades de ciudad-estado y ciudades -+[amount] Movement for all [unitType] units = +[amount] Movimiento para todas las unidades [unitType] Karakorum = Karakórum Beshbalik = Beshbalik Turfan = Trufan @@ -3520,6 +3520,13 @@ Panzer = Panzer Anti-Tank Gun = Anti-Tanque + # Requires translation! +Unable to capture cities = + # Requires translation! +All tiles cost 1 movement = + # Requires translation! +Can pass through impassable tiles = + Rocket Artillery = Artilleria de misiles Mechanized Infantry = Infanteria mecanizada diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties index d93fcff841..8c0deb1429 100644 --- a/android/assets/jsons/translations/Traditional_Chinese.properties +++ b/android/assets/jsons/translations/Traditional_Chinese.properties @@ -974,6 +974,7 @@ Are you SURE you want to delete this mod? = Must be next to [terrain] = 城市必須毗鄰[terrain] Must be on [terrain] = 城市必須位於[terrain]之上 +[amount]% vs [unitType] = 對戰[unitType]時+[amount]% ++[amount] Movement for all [unitType] units = 所有[unitType]單位+[amount]移動力 # City filters # Requires translation! @@ -985,6 +986,7 @@ in capital = # Requires translation! in every coastal city = + #################### Lines from Buildings from Civ V - Vanilla #################### Indicates the capital city = 表示首都 @@ -1550,7 +1552,6 @@ Would you be interested in a trade agreement with England? = 我親愛的朋友 Hello, again. = 你好，又見面了。 Oh, it's you! = 是你啊，你好。 Sun Never Sets = 日不落帝國 -+2 movement for all naval units = 所有海上單位+2移動力 London = 倫敦 York = 約克 Nottingham = 諾丁漢 @@ -2409,7 +2410,6 @@ I am not always this generous, but we hope you take this rare opportunity we giv So what now? = 現在要做些什麼？ Mongol Terror = 殺戮鐵騎 +30% Strength when fighting City-State units and cities = 對戰城邦單位或攻擊城邦時+30%戰鬥力 -+[amount] Movement for all [unitType] units = 所有[unitType]單位+[amount]移動力 Karakorum = 哈拉和林 Beshbalik = 別失八裡 Turfan = 吐魯番 @@ -3676,6 +3676,13 @@ Panzer = “虎II”坦克 Anti-Tank Gun = 反坦克炮 + # Requires translation! +Unable to capture cities = + # Requires translation! +All tiles cost 1 movement = + # Requires translation! +Can pass through impassable tiles = + Rocket Artillery = 火箭炮 Mechanized Infantry = 機械化步兵 diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties index d8e7781272..be3dba6c7c 100644 --- a/android/assets/jsons/translations/Turkish.properties +++ b/android/assets/jsons/translations/Turkish.properties @@ -1008,6 +1008,8 @@ Must be next to [terrain] = [terrain] yerinin yanında olmalı Must be on [terrain] = # Requires translation! +[amount]% vs [unitType] = + # Requires translation! ++[amount] Movement for all [unitType] units = # City filters # Requires translation! @@ -1019,6 +1021,7 @@ in capital = # Requires translation! in every coastal city = + #################### Lines from Buildings from Civ V - Vanilla #################### Indicates the capital city = Başkenti gösterir @@ -1681,7 +1684,6 @@ Would you be interested in a trade agreement with England? = İngiltere ile bir Hello, again. = Yeniden merhaba. Oh, it's you! = Ah, sensin! Sun Never Sets = Güneş Asla Batmaz -+2 movement for all naval units = Bütün deniz birimleri için +2 hareket London = Londra York = York Nottingham = Nottingham @@ -2857,8 +2859,6 @@ Mongol Terror = Moğol Terörü # Requires translation! +30% Strength when fighting City-State units and cities = # Requires translation! -+[amount] Movement for all [unitType] units = - # Requires translation! Karakorum = Beshbalik = Beşbalık Turfan = Turfan @@ -4316,6 +4316,13 @@ Panzer = Panzer Anti-Tank Gun = Tanksavar Silahı + # Requires translation! +Unable to capture cities = + # Requires translation! +All tiles cost 1 movement = + # Requires translation! +Can pass through impassable tiles = + Rocket Artillery = Roket Topçuları Mechanized Infantry = Mekanize Piyade diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties index f06f1b25e5..5c06459f6c 100644 --- a/android/assets/jsons/translations/Ukrainian.properties +++ b/android/assets/jsons/translations/Ukrainian.properties @@ -936,6 +936,7 @@ Are you SURE you want to delete this mod? = Ви СПРАВДІ хочете в Must be next to [terrain] = Біля міста має бути місцевість типу «[terrain]» Must be on [terrain] = Має бути на місцевості типу «[terrain]» +[amount]% vs [unitType] = +[amount]% проти [unitType] ++[amount] Movement for all [unitType] units = +[amount] переміщення для всіх підрозділів типу [unitType] # City filters in this city = в цьому місті @@ -944,6 +945,7 @@ in capital = в столиці # Requires translation! in every coastal city = + #################### Lines from Buildings from Civ V - Vanilla #################### Indicates the capital city = Позначає столицю @@ -1494,7 +1496,6 @@ Would you be interested in a trade agreement with England? = Ви зацікав Hello, again. = Привіт, знову. Oh, it's you! = О, ти! Sun Never Sets = Сонце ніколи не заходить -+2 movement for all naval units = +2 пересування для кожного морського підрозділу London = Лондон York = Йорк Nottingham = Ноттінгем @@ -2353,7 +2354,6 @@ I am not always this generous, but we hope you take this rare opportunity we giv So what now? = І що тепер? Mongol Terror = Терор монголів +30% Strength when fighting City-State units and cities = +30% сили при б’єтесь з підрозділами чи містами міст-держав -+[amount] Movement for all [unitType] units = +[amount] переміщення для всіх підрозділів типу [unitType] Karakorum = Каракорум Beshbalik = Бешбалік Turfan = Тюрфан @@ -3555,6 +3555,13 @@ Panzer = Танк Тигр Anti-Tank Gun = Протитанкова гармата + # Requires translation! +Unable to capture cities = + # Requires translation! +All tiles cost 1 movement = + # Requires translation! +Can pass through impassable tiles = + Rocket Artillery = Ракетна артилерія Mechanized Infantry = Механізована піхота diff --git a/android/assets/jsons/translations/template.properties b/android/assets/jsons/translations/template.properties index 3d3ffb27d6..a08a9b2859 100644 --- a/android/assets/jsons/translations/template.properties +++ b/android/assets/jsons/translations/template.properties @@ -924,9 +924,11 @@ Are you SURE you want to delete this mod? = Must be next to [terrain] = Must be on [terrain] = +[amount]% vs [unitType] = ++[amount] Movement for all [unitType] units = # City filters in this city = in every city = in capital = -in every coastal city = \ No newline at end of file +in every coastal city = + diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 704fe74d92..ad163508ab 100644 --- a/buildSrc/src/main/kotlin/BuildConfig.kt +++ b/buildSrc/src/main/kotlin/BuildConfig.kt @@ -3,8 +3,8 @@ package com.unciv.build object BuildConfig { const val kotlinVersion = "1.3.71" const val appName = "Unciv" - const val appCodeNumber = 506 - const val appVersion = "3.11.17-patch1" + const val appCodeNumber = 507 + const val appVersion = "3.11.18" const val gdxVersion = "1.9.12" const val roboVMVersion = "2.3.1" diff --git a/changelog.md b/changelog.md index e491b77283..9cb36a4e32 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,19 @@ +## 3.11.18 + +Improvements can't be built in neutral areas, as per Civ V + +Added button to add construction items directly to the queue + +Mods can handle removing existing buildings + +Don't allow AI to offer peace to city states allied with their enemies + +Helicopter Gunship - By givehub99 + +Workers stop building (most) duplicate roads connecting cities - By ninjatao + +Translation updates + ## 3.11.17 Fixed rare errors diff --git a/core/src/com/unciv/logic/map/MapUnit.kt b/core/src/com/unciv/logic/map/MapUnit.kt index c784c16938..b1e1beea9d 100644 --- a/core/src/com/unciv/logic/map/MapUnit.kt +++ b/core/src/com/unciv/logic/map/MapUnit.kt @@ -16,37 +16,52 @@ import kotlin.random.Random class MapUnit { - @Transient lateinit var civInfo: CivilizationInfo - @Transient lateinit var baseUnit: BaseUnit - @Transient internal lateinit var currentTile :TileInfo + @Transient + lateinit var civInfo: CivilizationInfo + @Transient + lateinit var baseUnit: BaseUnit + @Transient + internal lateinit var currentTile: TileInfo - @Transient val movement = UnitMovementAlgorithms(this) + @Transient + val movement = UnitMovementAlgorithms(this) // This is saved per each unit because if we need to recalculate viewable tiles every time a unit moves, // and we need to go over ALL the units, that's a lot of time spent on updating information we should already know! // About 10% of total NextTurn performance time, at the time of this change! - @Transient var viewableTiles = listOf() + @Transient + var viewableTiles = listOf() // These are for performance improvements to getMovementCostBetweenAdjacentTiles, // a major component of getDistanceToTilesWithinTurn, // which in turn is a component of getShortestPath and canReach - @Transient var ignoresTerrainCost = false - @Transient var allTilesCosts1 = false - @Transient var canPassThroughImpassableTiles = false - @Transient var roughTerrainPenalty = false - @Transient var doubleMovementInCoast = false - @Transient var doubleMovementInForestAndJungle = false - @Transient var doubleMovementInSnowTundraAndHills = false - @Transient var canEnterIceTiles = false - @Transient var cannotEnterOceanTiles = false - @Transient var cannotEnterOceanTilesUntilAstronomy = false + @Transient + var ignoresTerrainCost = false + @Transient + var allTilesCosts1 = false + @Transient + var canPassThroughImpassableTiles = false + @Transient + var roughTerrainPenalty = false + @Transient + var doubleMovementInCoast = false + @Transient + var doubleMovementInForestAndJungle = false + @Transient + var doubleMovementInSnowTundraAndHills = false + @Transient + var canEnterIceTiles = false + @Transient + var cannotEnterOceanTiles = false + @Transient + var cannotEnterOceanTilesUntilAstronomy = false lateinit var owner: String lateinit var name: String var currentMovement: Float = 0f - var health:Int = 100 + var health: Int = 100 - var action: String?=null // work, automation, fortifying, I dunno what. + var action: String? = null // work, automation, fortifying, I dunno what. var attacksThisTurn = 0 var promotions = UnitPromotions() @@ -73,12 +88,12 @@ class MapUnit { return toReturn } - val type:UnitType - get()=baseUnit.unitType + val type: UnitType + get() = baseUnit.unitType fun baseUnit(): BaseUnit = baseUnit fun getMovementString(): String = DecimalFormat("0.#").format(currentMovement.toDouble()) + "/" + getMaxMovement() - fun getTile(): TileInfo = currentTile + fun getTile(): TileInfo = currentTile fun getMaxMovement(): Int { if (isEmbarked()) return getEmbarkedMovement() @@ -106,12 +121,12 @@ class MapUnit { // This SHOULD NOT be a hashset, because if it is, then promotions with the same text (e.g. barrage I, barrage II) // will not get counted twice! - @Transient var tempUniques= ArrayList() + @Transient + var tempUniques = ArrayList() fun getUniques(): ArrayList = tempUniques - fun getMatchingUniques(placeholderText:String): Sequence - = tempUniques.asSequence().filter { it.placeholderText == placeholderText } + fun getMatchingUniques(placeholderText: String): Sequence = tempUniques.asSequence().filter { it.placeholderText == placeholderText } fun updateUniques() { val uniques = ArrayList() @@ -124,6 +139,7 @@ class MapUnit { tempUniques = uniques + // "All tiles costs 1" obsoleted in 3.11.18 allTilesCosts1 = hasUnique("All tiles cost 1 movement") || hasUnique("All tiles costs 1") canPassThroughImpassableTiles = hasUnique("Can pass through impassable tiles") ignoresTerrainCost = hasUnique("Ignores terrain cost") @@ -136,17 +152,16 @@ class MapUnit { cannotEnterOceanTilesUntilAstronomy = hasUnique("Cannot enter ocean tiles until Astronomy") } - fun hasUnique(unique:String): Boolean { + fun hasUnique(unique: String): Boolean { return getUniques().any { it.placeholderText == unique } } fun updateVisibleTiles() { - if(type.isAirUnit()) { + if (type.isAirUnit()) { viewableTiles = if (hasUnique("6 tiles in every direction always visible")) getTile().getTilesInDistance(6).toList() // it's that simple else listOf() // bomber units don't do recon - } - else { + } else { var visibilityRange = 2 visibilityRange += getUniques().count { it.text == "+1 Visibility Range" } if (hasUnique("+2 Visibility Range")) visibilityRange += 2 // This shouldn't be stackable @@ -228,8 +243,8 @@ class MapUnit { var unit = baseUnit() // Go up the upgrade tree until you find the last one which is buildable - while (unit.upgradesTo!=null && unit.getDirectUpgradeUnit(civInfo).requiredTech - .let { it==null || civInfo.tech.isResearched(it) }) + while (unit.upgradesTo != null && unit.getDirectUpgradeUnit(civInfo).requiredTech + .let { it == null || civInfo.tech.isResearched(it) }) unit = unit.getDirectUpgradeUnit(civInfo) return unit } @@ -268,18 +283,22 @@ class MapUnit { return true } - fun fortify() { action = "Fortify 0" } + fun fortify() { + action = "Fortify 0" + } - fun fortifyUntilHealed() { action = "Fortify 0 until healed" } + fun fortifyUntilHealed() { + action = "Fortify 0 until healed" + } fun fortifyIfCan() { if (canFortify()) fortify() } - private fun adjacentHealingBonus():Int{ + private fun adjacentHealingBonus(): Int { var healingBonus = 0 - if(hasUnique("This unit and all others in adjacent tiles heal 5 additional HP per turn")) healingBonus +=5 - if(hasUnique("This unit and all others in adjacent tiles heal 5 additional HP. This unit heals 5 additional HP outside of friendly territory.")) healingBonus +=5 + if (hasUnique("This unit and all others in adjacent tiles heal 5 additional HP per turn")) healingBonus += 5 + if (hasUnique("This unit and all others in adjacent tiles heal 5 additional HP. This unit heals 5 additional HP outside of friendly territory.")) healingBonus += 5 return healingBonus } @@ -295,7 +314,7 @@ class MapUnit { updateUniques() } - fun useMovementPoints(amount:Float) { + fun useMovementPoints(amount: Float) { currentMovement -= amount if (currentMovement < 0) currentMovement = 0f } @@ -352,7 +371,7 @@ class MapUnit { tile.roadStatus = RoadStatus.None else { // We put "tile.terrainFeature!=null" because of a strange edge case that SHOULD be solved from 3.11.11+, so we should remove it then and see - if (tile.terrainFeature!=null && tile.tileMap.gameInfo.ruleSet.terrains[tile.terrainFeature!!]!!.uniques + if (tile.terrainFeature != null && tile.tileMap.gameInfo.ruleSet.terrains[tile.terrainFeature!!]!!.uniques .contains("Provides a one-time Production bonus to the closest city when cut down")) tryProvideProductionToClosestCity() tile.terrainFeature = null @@ -368,14 +387,13 @@ class MapUnit { tile.improvementInProgress = null } - private fun tryProvideProductionToClosestCity() - { + private fun tryProvideProductionToClosestCity() { val tile = getTile() val closestCity = civInfo.cities.minBy { it.getCenterTile().aerialDistanceTo(tile) } if (closestCity == null) return val distance = closestCity.getCenterTile().aerialDistanceTo(tile) var productionPointsToAdd = if (distance == 1) 20 else 20 - (distance - 2) * 5 - if (tile.owningCity == null || tile.owningCity!!.civInfo != civInfo ) productionPointsToAdd = productionPointsToAdd * 2 / 3 + if (tile.owningCity == null || tile.owningCity!!.civInfo != civInfo) productionPointsToAdd = productionPointsToAdd * 2 / 3 if (productionPointsToAdd > 0) { closestCity.cityConstructions.addProductionPoints(productionPointsToAdd) civInfo.addNotification("Clearing a [${tile.terrainFeature}] has created [$productionPointsToAdd] Production for [${closestCity.name}]", closestCity.location, Color.BROWN) @@ -398,9 +416,9 @@ class MapUnit { healBy(amountToHealBy) } - fun healBy(amount:Int){ + fun healBy(amount: Int) { health += amount - if(health>100) health=100 + if (health > 100) health = 100 } /** Returns the health points [MapUnit] will receive if healing on [tileInfo] */ @@ -466,7 +484,7 @@ class MapUnit { movement.teleportToClosestMoveableTile() } - fun destroy(){ + fun destroy() { removeFromTile() civInfo.removeUnit(this) civInfo.updateViewableTiles() @@ -475,24 +493,24 @@ class MapUnit { .forEach { unit -> unit.destroy() } } - fun removeFromTile(){ + fun removeFromTile() { when { type.isAirUnit() -> currentTile.airUnits.remove(this) - type.isCivilian() -> getTile().civilianUnit=null - else -> getTile().militaryUnit=null + type.isCivilian() -> getTile().civilianUnit = null + else -> getTile().militaryUnit = null } } - fun moveThroughTile(tile: TileInfo){ - if(tile.improvement==Constants.ancientRuins && civInfo.isMajorCiv()) + fun moveThroughTile(tile: TileInfo) { + if (tile.improvement == Constants.ancientRuins && civInfo.isMajorCiv()) getAncientRuinBonus(tile) - if(tile.improvement==Constants.barbarianEncampment && !civInfo.isBarbarian()) + if (tile.improvement == Constants.barbarianEncampment && !civInfo.isBarbarian()) clearEncampment(tile) // addPromotion requires currentTile to be valid because it accesses ruleset through it currentTile = tile - if(!hasUnique("All healing effects doubled") && type.isLandUnit() && type.isMilitary()) { + if (!hasUnique("All healing effects doubled") && type.isLandUnit() && type.isMilitary()) { val gainDoubleHealPromotion = tile.neighbors .any { it.containsUnique("Grants Rejuvenation (all healing effects doubled) to adjacent military land units for the rest of the game") } if (gainDoubleHealPromotion && civInfo.gameInfo.ruleSet.unitPromotions.containsKey("Rejuvenation")) @@ -502,16 +520,16 @@ class MapUnit { updateVisibleTiles() } - fun putInTile(tile:TileInfo){ + fun putInTile(tile: TileInfo) { when { !movement.canMoveTo(tile) -> throw Exception("I can't go there!") type.isAirUnit() -> tile.airUnits.add(this) - type.isCivilian() -> tile.civilianUnit=this - else -> tile.militaryUnit=this + type.isCivilian() -> tile.civilianUnit = this + else -> tile.militaryUnit = this } // this check is here in order to not load the fresh built unit into carrier right after the build isTransported = !tile.isCityCenter() && - type.isAirUnit() // not moving civilians + type.isAirUnit() // not moving civilians moveThroughTile(tile) } @@ -519,7 +537,7 @@ class MapUnit { tile.improvement = null // Notify city states that this unit cleared a Barbarian Encampment, required for quests - civInfo.gameInfo.getAliveCityStates().forEach{ it.questManager.barbarianCampCleared(civInfo, tile.position) } + civInfo.gameInfo.getAliveCityStates().forEach { it.questManager.barbarianCampCleared(civInfo, tile.position) } var goldGained = civInfo.getDifficulty().clearBarbarianCampReward * civInfo.gameInfo.gameParameters.gameSpeed.modifier if (civInfo.hasUnique("Receive triple Gold from Barbarian encampments and pillaging Cities")) @@ -579,7 +597,7 @@ class MapUnit { val possibleUnits = listOf(Constants.settler, Constants.worker, "Warrior") .filter { civInfo.gameInfo.ruleSet.units.containsKey(it) } - if(possibleUnits.isNotEmpty()) + if (possibleUnits.isNotEmpty()) actions.add { val chosenUnit = possibleUnits.random(tileBasedRandom) if (!(civInfo.isCityState() || civInfo.isOneCityChallenger()) || chosenUnit != Constants.settler) { //City-States and OCC don't get settler from ruins @@ -620,7 +638,7 @@ class MapUnit { (actions.random(tileBasedRandom))() } - fun assignOwner(civInfo:CivilizationInfo, updateCivInfo:Boolean=true) { + fun assignOwner(civInfo: CivilizationInfo, updateCivInfo: Boolean = true) { owner = civInfo.civName this.civInfo = civInfo civInfo.addUnit(this, updateCivInfo) @@ -634,7 +652,7 @@ class MapUnit { return true } - fun interceptChance():Int{ + fun interceptChance(): Int { return getMatchingUniques("[]% chance to intercept air attacks").sumBy { it.params[0].toInt() } } @@ -663,7 +681,7 @@ class MapUnit { return true } - fun interceptDamagePercentBonus():Int { + fun interceptDamagePercentBonus(): Int { return getUniques().filter { it.placeholderText == "Bonus when intercepting []%" } .sumBy { it.params[0].toInt() } } @@ -701,7 +719,7 @@ class MapUnit { } } - fun matchesCategory(category:String): Boolean { + fun matchesCategory(category: String): Boolean { if (category == type.name) return true if (category == name) return true if ((category == "Wounded" || category == "wounded units") && health < 100) return true