From b6dbc3a8330a914fb42040d629e5bf2d2f9bfdd0 Mon Sep 17 00:00:00 2001 From: r3versi Date: Mon, 23 Dec 2019 22:55:19 +0100 Subject: [PATCH] Fix nat wonder #2 (#1519) * Fix Natural Wonders tile worked happiness not computed & double bonus from discovering extended (like GBR) Natural Wonder in same turn * Bugfix Barbarians spawning on Natural Wonder + Notification on Barbarian Spawn * Added notification text to ranslations --- .../translationsByLanguage/Czech.properties | 4 +- .../translationsByLanguage/Dutch.properties | 2 + .../translationsByLanguage/English.properties | 4 +- .../translationsByLanguage/French.properties | 4 +- .../translationsByLanguage/German.properties | 2 + .../translationsByLanguage/Italian.properties | 19 ++-- .../translationsByLanguage/Korean.properties | 4 +- .../translationsByLanguage/Malay.properties | 4 +- .../translationsByLanguage/Polish.properties | 4 +- .../Portuguese.properties | 13 +-- .../Romanian.properties | 4 +- .../translationsByLanguage/Russian.properties | 5 +- .../Simplified_Chinese.properties | 6 +- .../translationsByLanguage/Spanish.properties | 2 + .../Traditional_Chinese.properties | 6 +- .../Ukrainian.properties | 104 ++---------------- .../completionPercentages.properties | 4 +- .../template.properties | 1 + core/src/com/unciv/logic/GameInfo.kt | 12 ++ 19 files changed, 74 insertions(+), 130 deletions(-) diff --git a/android/assets/jsons/translationsByLanguage/Czech.properties b/android/assets/jsons/translationsByLanguage/Czech.properties index 516b99cb72..7ca4184489 100644 --- a/android/assets/jsons/translationsByLanguage/Czech.properties +++ b/android/assets/jsons/translationsByLanguage/Czech.properties @@ -19,7 +19,7 @@ See your stats breakdown!\nEnter the Overview screen (top right corner) >\nClick Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send me (yairm210@hotmail.com) an email with the game information (menu -> save game -> copy game info -> paste into email) and I'll try to fix it as fast as I can! = Hrom do čepice! Vypadá to, že se něco HÓÓÓDNĚ pokaziloTohle by se v ŽÁDNÉM PŘÍPADĚ nemělo stávat! Prosím pošlete mi (yairm210@hotmail.com) email s informacemi o hře (menu -> uložit hru -> kopírovat herní info -> vložit do emailu) a já se to pokusím opravit jak nejrychleji budu umět! # Requires translation! -Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send us an report and we'll try to fix it as fast as we can! = +Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send us an report and we'll try to fix it as fast as we can! = # Buildings @@ -692,6 +692,8 @@ We have received [goldAmount] Gold for discovering [naturalWonder] = Your relationship with [cityStateName] is about to degrade = # Requires translation! Your relationship with [cityStateName] degraded = + # Requires translation! +A new barbarian encampment has spawned! = # World Screen UI diff --git a/android/assets/jsons/translationsByLanguage/Dutch.properties b/android/assets/jsons/translationsByLanguage/Dutch.properties index 9ba3396ffd..8899a363b8 100644 --- a/android/assets/jsons/translationsByLanguage/Dutch.properties +++ b/android/assets/jsons/translationsByLanguage/Dutch.properties @@ -1155,6 +1155,8 @@ We have received [goldAmount] Gold for discovering [naturalWonder] = Your relationship with [cityStateName] is about to degrade = # Requires translation! Your relationship with [cityStateName] degraded = + # Requires translation! +A new barbarian encampment has spawned! = # World Screen UI diff --git a/android/assets/jsons/translationsByLanguage/English.properties b/android/assets/jsons/translationsByLanguage/English.properties index f5bb9d9650..4708acef7e 100644 --- a/android/assets/jsons/translationsByLanguage/English.properties +++ b/android/assets/jsons/translationsByLanguage/English.properties @@ -31,7 +31,7 @@ Move an air unit!\nSelect an air unit > select another city withing range > \nMo See your stats breakdown!\nEnter the Overview screen (top right corner) >\nClick on 'Stats' = # Requires translation! -Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send me (yairm210@hotmail.com) an email with the game information (menu -> save game -> copy game info -> paste into email) and I'll try to fix it as fast as I can! = +Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send me (yairm210@hotmail.com) an email with the game information (menu -> save game -> copy game info -> paste into email) and I'll try to fix it as fast as I can! = # Requires translation! Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send us an report and we'll try to fix it as fast as we can! = @@ -1230,6 +1230,8 @@ We have received [goldAmount] Gold for discovering [naturalWonder] = Your relationship with [cityStateName] is about to degrade = # Requires translation! Your relationship with [cityStateName] degraded = + # Requires translation! +A new barbarian encampment has spawned! = # World Screen UI diff --git a/android/assets/jsons/translationsByLanguage/French.properties b/android/assets/jsons/translationsByLanguage/French.properties index 9294e5bf70..8c34d211e1 100644 --- a/android/assets/jsons/translationsByLanguage/French.properties +++ b/android/assets/jsons/translationsByLanguage/French.properties @@ -18,7 +18,7 @@ See your stats breakdown!\nEnter the Overview screen (top right corner) >\nClick Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send me (yairm210@hotmail.com) an email with the game information (menu -> save game -> copy game info -> paste into email) and I'll try to fix it as fast as I can! = Oh non ! On dirait que quelque chose ne s'est ABSOLUMENT pas passé comme prévu ! Ce n'est pas censé arriver ! S'il vous plaît, envoyez un mail à yairm210@hotmail.com avec les informations de la partie (Menu (en haut à gauche) -> Charger une partie -> Copy saved game to clipboard -> Copier dans le mail) et j'essayerai de régler cela aussi vite que possible ! # Requires translation! -Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send us an report and we'll try to fix it as fast as we can! = +Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send us an report and we'll try to fix it as fast as we can! = # Buildings @@ -691,6 +691,8 @@ We have received [goldAmount] Gold for discovering [naturalWonder] = Your relationship with [cityStateName] is about to degrade = # Requires translation! Your relationship with [cityStateName] degraded = + # Requires translation! +A new barbarian encampment has spawned! = # World Screen UI diff --git a/android/assets/jsons/translationsByLanguage/German.properties b/android/assets/jsons/translationsByLanguage/German.properties index d35f003162..9f38f8208c 100644 --- a/android/assets/jsons/translationsByLanguage/German.properties +++ b/android/assets/jsons/translationsByLanguage/German.properties @@ -697,6 +697,8 @@ We have received [goldAmount] Gold for discovering [naturalWonder] = Your relationship with [cityStateName] is about to degrade = # Requires translation! Your relationship with [cityStateName] degraded = + # Requires translation! +A new barbarian encampment has spawned! = # World Screen UI diff --git a/android/assets/jsons/translationsByLanguage/Italian.properties b/android/assets/jsons/translationsByLanguage/Italian.properties index 7e39c17827..9000415842 100644 --- a/android/assets/jsons/translationsByLanguage/Italian.properties +++ b/android/assets/jsons/translationsByLanguage/Italian.properties @@ -679,14 +679,11 @@ One of our trades with [nation] has been cut short = Un nostro accordo con [nati [nation] refused to stop settling cities near us! = [nation] ha rifiutato di smettere di fondare città vicino a noi! We have allied with [nation]. = Abbiamo stretto un'alleanza con [nation]. We have lost alliance with [nation]. = Non siamo più alleati di [nation]. - # Requires translation! -We have discovered [naturalWonder]! = - # Requires translation! -We have received [goldAmount] Gold for discovering [naturalWonder] = - # Requires translation! -Your relationship with [cityStateName] is about to degrade = - # Requires translation! -Your relationship with [cityStateName] degraded = +We have discovered [naturalWonder]! = Abbiamo scoperto [naturalWonder]! +We have received [goldAmount] Gold for discovering [naturalWonder] = Abbiamo ricevuto [goldAmount] gold per la scoperta di [naturalWonder] +Your relationship with [cityStateName] is about to degrade = Il rapporto con [cityStateName] sta per deteriorarsi +Your relationship with [cityStateName] degraded = Il rapporto con [cityStateName] si è deteriorato +A new barbarian encampment has spawned! = E' sorto un nuovo accampamento barbaro! # World Screen UI @@ -857,8 +854,7 @@ Closest city = Città più vicina Action = Azione Defeated = Sconfitto Tiles = Caselle - # Requires translation! -Natural Wonders = +Natural Wonders = Meraviglie Naturali #Victory @@ -1619,5 +1615,4 @@ Ambush II = Imboscata aerea II Haka War Dance = Danza di guerra Haka -10% combat strength for adjacent enemy units = -10% Forza alle unità nemiche adiacenti a questa unità Rejuvenation = Ringiovanimento - # Requires translation! -All healing effects doubled = +All healing effects doubled = Tutti gli effetti di cura sono raddoppiati diff --git a/android/assets/jsons/translationsByLanguage/Korean.properties b/android/assets/jsons/translationsByLanguage/Korean.properties index 39c58d733d..84bf1a6a60 100644 --- a/android/assets/jsons/translationsByLanguage/Korean.properties +++ b/android/assets/jsons/translationsByLanguage/Korean.properties @@ -32,7 +32,7 @@ See your stats breakdown!\nEnter the Overview screen (top right corner) >\nClick Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send me (yairm210@hotmail.com) an email with the game information (menu -> save game -> copy game info -> paste into email) and I'll try to fix it as fast as I can! = 이런, 뭔가 심각한 일이 일어난 것 같군요! 원래라면 일어나지 않아야 하는 일인데 말이죠! (yairm210@hotmail.com) 이메일로 게임 정보를 함께 보내주세요. (메뉴 -> 게임 저장 -> 게임 정보 복사 -> 이메일에 붙여넣기) 하루빨리 찾아서 이런 일이 일어나지 않도록 하겠습니다! # Requires translation! -Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send us an report and we'll try to fix it as fast as we can! = +Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send us an report and we'll try to fix it as fast as we can! = # Buildings @@ -715,6 +715,8 @@ We have received [goldAmount] Gold for discovering [naturalWonder] = Your relationship with [cityStateName] is about to degrade = # Requires translation! Your relationship with [cityStateName] degraded = + # Requires translation! +A new barbarian encampment has spawned! = # World Screen UI diff --git a/android/assets/jsons/translationsByLanguage/Malay.properties b/android/assets/jsons/translationsByLanguage/Malay.properties index 6eb646014c..782ee444c8 100644 --- a/android/assets/jsons/translationsByLanguage/Malay.properties +++ b/android/assets/jsons/translationsByLanguage/Malay.properties @@ -31,7 +31,7 @@ Move an air unit!\nSelect an air unit > select another city withing range > \nMo See your stats breakdown!\nEnter the Overview screen (top right corner) >\nClick on 'Stats' = # Requires translation! -Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send me (yairm210@hotmail.com) an email with the game information (menu -> save game -> copy game info -> paste into email) and I'll try to fix it as fast as I can! =\ +Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send me (yairm210@hotmail.com) an email with the game information (menu -> save game -> copy game info -> paste into email) and I'll try to fix it as fast as I can! = # Requires translation! Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send us an report and we'll try to fix it as fast as we can! = @@ -1119,6 +1119,8 @@ We have received [goldAmount] Gold for discovering [naturalWonder] = Your relationship with [cityStateName] is about to degrade = # Requires translation! Your relationship with [cityStateName] degraded = + # Requires translation! +A new barbarian encampment has spawned! = # World Screen UI diff --git a/android/assets/jsons/translationsByLanguage/Polish.properties b/android/assets/jsons/translationsByLanguage/Polish.properties index 6096efd804..8374301bf3 100644 --- a/android/assets/jsons/translationsByLanguage/Polish.properties +++ b/android/assets/jsons/translationsByLanguage/Polish.properties @@ -19,7 +19,7 @@ See your stats breakdown!\nEnter the Overview screen (top right corner) >\nClick Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send me (yairm210@hotmail.com) an email with the game information (menu -> save game -> copy game info -> paste into email) and I'll try to fix it as fast as I can! = O nie! Wygląda na to że coś przegapiłem! To absolutnie nie powinno się wydarzyć! Wyślij mi proszę (yairm210@hotmail.com) maila z informacją o grze (menu -> zapisz grę -> skopiuj informacje o grze -> wklej do maila) a ja postaram się to naprawić. Dziękuję za pomoc. # Requires translation! -Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send us an report and we'll try to fix it as fast as we can! = +Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send us an report and we'll try to fix it as fast as we can! = # Buildings @@ -686,6 +686,8 @@ We have received [goldAmount] Gold for discovering [naturalWonder] = Otrzymaliś Your relationship with [cityStateName] is about to degrade = # Requires translation! Your relationship with [cityStateName] degraded = + # Requires translation! +A new barbarian encampment has spawned! = # World Screen UI diff --git a/android/assets/jsons/translationsByLanguage/Portuguese.properties b/android/assets/jsons/translationsByLanguage/Portuguese.properties index 38d67be8a4..baa2690c2e 100644 --- a/android/assets/jsons/translationsByLanguage/Portuguese.properties +++ b/android/assets/jsons/translationsByLanguage/Portuguese.properties @@ -1,23 +1,14 @@ # Tutorial tasks - Move a unit!\nClick on a unit > Click on a destination > Click the arrow popup = Mova uma unidade!\nClique em uma unidade > Clique em uma destinação > Clique no popup da seta - Found a city!\nSelect the Settler (flag unit) > Click on 'Found city' (bottom-left corner) = Funde uma cidade!\nSelecione o colono (unidade da bandeira) > Clique em "Fundar cidade" (canto inferior esquerdo) - Enter the city screen!\nClick the city button twice = Entre no painel da cidade!\nClique no botão da cidade duas vezes - Pick a technology to research!\nClick on the tech button (greenish, top left) > \n select technology > click 'Research' (bottom right) = Escolha uma tecnologia para pesquisar!\nClique no botão de tecnologia (esverdeado, canto superior esquerdo) > \n selecione a tecnologia > clique "Pesquisar"(canto inferior direito) - Pick a construction!\nEnter city screen > Click on a unit or building (left side) = Escolha uma construção!\nEntre no painel da cidade > Clique em uma unidade ou edificação (lado esquerdo) - Pass a turn!\nCycle through units with 'Next unit' > Click 'Next turn' = Passe um turno!\nPercorra as unidades com "Próxima unidade" > Clique em "Próximo turno" - Reassign worked tiles!\nEnter city screen > click the assigned (green) tile to unassign > \n click an unassigned tile to assign population = Reatribua hexágonos trabalhados!\nEntre no painel da cidade > clique no hexágono atribuído (verde) para desatribuí-lo > \n clique em um hexágono não atribuído para atribuí-lo um habitante - Meet another civilization!\nExplore the map until you encounter another civilization! = Conheça outra civilização!\nExplore o mapa até encontrar outra civilização! - Open the options table!\nClick the menu button (top left) > click 'Options' = Abra a tabela de opções!\nClique no botão do menu (canto superior esquerdo) > Clique em "Opções" # Requires translation! Construct an improvement!\nConstruct a Worker unit > Move to a Plains or Grassland tile > \n Click 'Create improvement' (above the unit table, bottom left)\n > Choose the farm > \n Leave the worker there until it's finished = @@ -346,7 +337,7 @@ You declared war on us! = Você declarou guerra contra nós! Your warmongering ways are unacceptable to us. = Seus costumes de guerra são inaceitáveis para nós. You have captured our cities! = Você capturou nossas(nossa) cidades(cidade)! # Requires translation! -We applaud your liberation of our conquered cities! = +We applaud your liberation of our conquered cities! = Years of peace have strengthened our relations. = Anos de paz fortaleceram nossas relações. Our mutual military struggle brings us closer together. = Nossas lutas mutuas nos fazem mais próximos. We have signed a public declaration of friendship = Assinamos uma declaração pública de amizade @@ -808,6 +799,8 @@ We have received [goldAmount] Gold for discovering [naturalWonder] = Your relationship with [cityStateName] is about to degrade = # Requires translation! Your relationship with [cityStateName] degraded = + # Requires translation! +A new barbarian encampment has spawned! = # World Screen UI diff --git a/android/assets/jsons/translationsByLanguage/Romanian.properties b/android/assets/jsons/translationsByLanguage/Romanian.properties index 022ecb6e8b..44686917a2 100644 --- a/android/assets/jsons/translationsByLanguage/Romanian.properties +++ b/android/assets/jsons/translationsByLanguage/Romanian.properties @@ -31,7 +31,7 @@ Move an air unit!\nSelect an air unit > select another city withing range > \nMo See your stats breakdown!\nEnter the Overview screen (top right corner) >\nClick on 'Stats' = # Requires translation! -Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send me (yairm210@hotmail.com) an email with the game information (menu -> save game -> copy game info -> paste into email) and I'll try to fix it as fast as I can! = +Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send me (yairm210@hotmail.com) an email with the game information (menu -> save game -> copy game info -> paste into email) and I'll try to fix it as fast as I can! = # Requires translation! Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send us an report and we'll try to fix it as fast as we can! = @@ -1013,6 +1013,8 @@ We have received [goldAmount] Gold for discovering [naturalWonder] = Your relationship with [cityStateName] is about to degrade = # Requires translation! Your relationship with [cityStateName] degraded = + # Requires translation! +A new barbarian encampment has spawned! = # World Screen UI diff --git a/android/assets/jsons/translationsByLanguage/Russian.properties b/android/assets/jsons/translationsByLanguage/Russian.properties index d243ec0dd6..378a594e8f 100644 --- a/android/assets/jsons/translationsByLanguage/Russian.properties +++ b/android/assets/jsons/translationsByLanguage/Russian.properties @@ -17,7 +17,8 @@ Move an air unit!\nSelect an air unit > select another city withing range > \nMo See your stats breakdown!\nEnter the Overview screen (top right corner) >\nClick on 'Stats' = Посмотрите вашу статистику!\nОткройте экран обзора (верхний правый угол) >\nНажмите на 'Статистика' Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send me (yairm210@hotmail.com) an email with the game information (menu -> save game -> copy game info -> paste into email) and I'll try to fix it as fast as I can! = О нет! Кажется всё что-то пошло КАТАСТРОФИЧЕСКИ плохо! Это АБСОЛЮТНО не должно было произойти! Пожалуйста отправьте мне (yairm210@hotmail.com) емейл с информацией об игре (меню -> сохранить игру -> скопируйте информацию об игре -> вставьте в емейл) и я попытаюсь это исправить настолько быстро как я могу! -Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send us an report and we'll try to fix it as fast as we can! =О нет! Кажется всё что-то пошло КАТАСТРОФИЧЕСКИ плохо! Это АБСОЛЮТНО не должно было произойти! Пожалуйста отправьте нам отчет об ошибке и мы попытаемся это исправить как можно скорее! + # Requires translation! +Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send us an report and we'll try to fix it as fast as we can! = # Buildings @@ -694,6 +695,8 @@ We have received [goldAmount] Gold for discovering [naturalWonder] = Your relationship with [cityStateName] is about to degrade = # Requires translation! Your relationship with [cityStateName] degraded = + # Requires translation! +A new barbarian encampment has spawned! = # World Screen UI diff --git a/android/assets/jsons/translationsByLanguage/Simplified_Chinese.properties b/android/assets/jsons/translationsByLanguage/Simplified_Chinese.properties index 3ffc7f2947..32703bc79d 100644 --- a/android/assets/jsons/translationsByLanguage/Simplified_Chinese.properties +++ b/android/assets/jsons/translationsByLanguage/Simplified_Chinese.properties @@ -17,8 +17,8 @@ Move an air unit!\nSelect an air unit > select another city withing range > \nMo See your stats breakdown!\nEnter the Overview screen (top right corner) >\nClick on 'Stats' = 查看当前文明详细信息!\n点击概览按钮(右上角) >\n点击"统计" Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send me (yairm210@hotmail.com) an email with the game information (menu -> save game -> copy game info -> paste into email) and I'll try to fix it as fast as I can! = NO!看起来游戏好像出现了灾难性的Bug! 这绝对不应该发生! 请将游戏存档信息发送给我，方法如下：依次点击“菜单->保存游戏->复制当前游戏数据到剪贴板”，将剪贴板的内容通过email发送给我。我的email地址：yairm210@hotmail.com。我会尽快处理! -# Requires translation! -Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send us an report and we'll try to fix it as fast as we can! = + # Requires translation! +Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send us an report and we'll try to fix it as fast as we can! = # Buildings @@ -693,6 +693,8 @@ We have received [goldAmount] Gold for discovering [naturalWonder] = Your relationship with [cityStateName] is about to degrade = # Requires translation! Your relationship with [cityStateName] degraded = + # Requires translation! +A new barbarian encampment has spawned! = # World Screen UI diff --git a/android/assets/jsons/translationsByLanguage/Spanish.properties b/android/assets/jsons/translationsByLanguage/Spanish.properties index 74ae2c6f18..ef1b8e94ec 100644 --- a/android/assets/jsons/translationsByLanguage/Spanish.properties +++ b/android/assets/jsons/translationsByLanguage/Spanish.properties @@ -689,6 +689,8 @@ We have discovered [naturalWonder]! = ¡Hemos descubierto [naturalWonder]! We have received [goldAmount] Gold for discovering [naturalWonder] = Hemos recibido [goldAmount] de oro por descubrir [naturalWonder] Your relationship with [cityStateName] is about to degrade = Tus relaciones con [cityStateName] están a punto de empeorar Your relationship with [cityStateName] degraded = Tus relaciones con [cityStateName] han empeorado + # Requires translation! +A new barbarian encampment has spawned! = # World Screen UI diff --git a/android/assets/jsons/translationsByLanguage/Traditional_Chinese.properties b/android/assets/jsons/translationsByLanguage/Traditional_Chinese.properties index 72793c05a7..38cf546762 100644 --- a/android/assets/jsons/translationsByLanguage/Traditional_Chinese.properties +++ b/android/assets/jsons/translationsByLanguage/Traditional_Chinese.properties @@ -17,8 +17,8 @@ Move an air unit!\nSelect an air unit > select another city withing range > \nMo See your stats breakdown!\nEnter the Overview screen (top right corner) >\nClick on 'Stats' = 查看當前文明詳細信息!\n點擊概覽按鈕(右上角) >\n點擊"統計" Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send me (yairm210@hotmail.com) an email with the game information (menu -> save game -> copy game info -> paste into email) and I'll try to fix it as fast as I can! = NO!看起来游戏好像出现了灾难性的Bug!这绝对不应该发生!请将游戏存档信息发送给我，方法如下：依次点击“菜单->保存游戏->复制当前游戏数据到剪贴板”，将剪贴板的内容通过email发送给我。我的email地址：yairm210@hotmail.com。我会尽快处理! -# Requires translation! -Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send us an report and we'll try to fix it as fast as we can! = + # Requires translation! +Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send us an report and we'll try to fix it as fast as we can! = # Buildings @@ -693,6 +693,8 @@ We have received [goldAmount] Gold for discovering [naturalWonder] = Your relationship with [cityStateName] is about to degrade = # Requires translation! Your relationship with [cityStateName] degraded = + # Requires translation! +A new barbarian encampment has spawned! = # World Screen UI diff --git a/android/assets/jsons/translationsByLanguage/Ukrainian.properties b/android/assets/jsons/translationsByLanguage/Ukrainian.properties index c9dd3b742f..6ba68b681a 100644 --- a/android/assets/jsons/translationsByLanguage/Ukrainian.properties +++ b/android/assets/jsons/translationsByLanguage/Ukrainian.properties @@ -18,8 +18,8 @@ Move an air unit!\nSelect an air unit > select another city withing range > \nMo See your stats breakdown!\nEnter the Overview screen (top right corner) >\nClick on 'Stats' = Подивіться статистику\nУвійдіть до екрану огляну (верхній правий вугол) >\nНатисніть на «Статистика» Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send me (yairm210@hotmail.com) an email with the game information (menu -> save game -> copy game info -> paste into email) and I'll try to fix it as fast as I can! = Трясця! Схоже щось пішло КАТАСТРОФІЧНО неправильно! Цього АБСОЛЮТНО НЕ ПОВИННО БУЛО СТАТИСЯ! Будь ласка, надішліть мені (yairm210@hotmail.com) електронний лист з ігровою інформацією (меню -> зберегти гру -> копіювати інформацію про гру -> вставити до email) і я спробую виправити якнайшвидше! -# Requires translation! -Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send us an report and we'll try to fix it as fast as we can! = + # Requires translation! +Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send us an report and we'll try to fix it as fast as we can! = # Buildings @@ -313,7 +313,6 @@ We have encountered the City-State of [name]! = Ми зіткнулися з М Declare Friendship ([numberOfTurns] turns) = Заявити про дружбу ([numberOfTurns] ходів) May our nations forever remain united! = Нехай наші народи назавжди залишаються об’єднаними! Indeed! = Справді! - # Requires translation! Denounce ([numberOfTurns] turns) = Звинувачення (Ходів: [numberOfTurns]) We will remember this. = Ми пам’ятатимемо це. @@ -327,53 +326,30 @@ Ally = союзницькі ## Diplomatic modifiers - # Requires translation! You declared war on us! = Ви оголосили нам війну! - # Requires translation! Your warmongering ways are unacceptable to us. = Ваші войовничі способи неприйнятні для нас. You have captured our cities! = Ви захопили всі наші міста! - # Requires translation! We applaud your liberation of our conquered cities! = Ми плескаємо в долоні вашому звільненню наших завойованих міст! - # Requires translation! Years of peace have strengthened our relations. = Роки миру зміцнили наші відносини. - # Requires translation! Our mutual military struggle brings us closer together. = Наша взаємна військова боротьба зближує нас. - # Requires translation! We have signed a public declaration of friendship = Ми підписали публічну декларацію про дружбу - # Requires translation! You have declared friendship with our enemies! = Ви оголосили дружбу з нашими ворогами! - # Requires translation! You have declared friendship with our allies = Ви оголосили дружбу з нашими союзниками! - # Requires translation! Our open borders have brought us closer together. = Наші відкриті кордони зблизили нас. - # Requires translation! Your so-called 'friendship' is worth nothing. = Ваша так звана «дружба» нічого не варта. - # Requires translation! You have publicly denounced us! = Ви публічно засудили нас! - # Requires translation! You have denounced our allies = Ви засудили наших союзників - # Requires translation! You have denounced our enemies = Ви засудили наших ворогів - # Requires translation! You betrayed your promise to not settle cities near us = Ви зрадили свою обіцянку не засновувати міста поблизу нас - # Requires translation! You fulfilled your promise to stop settling cities near us! = Ви виконали свою обіцянку припинити заселяти міста біля нас! = - # Requires translation! You refused to stop settling cities near us = Ви відмовилися зупиняти заселення міст біля нас - # Requires translation! Your arrogant demands are in bad taste = Ваші пихаті вимоги - поганий смак - # Requires translation! Your use of nuclear weapons is disgusting! = Ваше використання ядерної зброї огидне! - # Requires translation! Demands = Вимоги - # Requires translation! Please don't settle new cities near us. = Будь ласка, не засновуйте нові міста поблизу нас. - # Requires translation! Very well, we shall look for new lands to settle. = Дуже добре, ми будемо шукати нові землі для заселення. - # Requires translation! We shall do as we please. = Ми будемо робити, як забажаємо. - # Requires translation! We noticed your new city near our borders, despite your promise. This will have....implications. = Ми помітили ваше нове місто біля наших кордонів, незважаючи на вашу обіцянку. Це матиме.... наслідки. # City states @@ -391,77 +367,50 @@ Gift [giftAmount] gold (+[influenceAmount] influence) = # Requires translation! Relationship changes in another [turnsToRelationshipChange] turns = - # Requires translation! Cultured = Культурний - # Requires translation! Maritime = Морський - # Requires translation! Mercantile = Торговельний - # Requires translation! Militaristic = Войовничий - # Requires translation! Type: = Тип: - # Requires translation! Influence: = Вплив # Requires translation! Reach 30 for friendship. = # Requires translation! Reach highest influence above 60 for alliance. = - # Requires translation! Ally: = СоюзникЖ # Trades - # Requires translation! Trade = Торгівля - # Requires translation! Offer trade = Запропонувати торгівлю - # Requires translation! Retract offer = Відкликання пропозиції - # Requires translation! What do you have in mind? = Що ви маєте на увазі? - # Requires translation! Our items = Наші предмети # Requires translation! Our trade offer = # Requires translation! [otherCiv]'s trade offer = - # Requires translation! [otherCiv]'s items = Предмети нації [otherCiv] # Requires translation! Pleasure doing business with you! = - # Requires translation! I think not. = Я думаю, що ні. - # Requires translation! That is acceptable. = Це не прийнятно - # Requires translation! Accept = Прийняти - # Requires translation! Keep going = Продовжуйте - # Requires translation! There's nothing on the table = На столі нічого немає - # Requires translation! Peace Treaty = Мирна угода - # Requires translation! Agreements = Угоди - # Requires translation! Open Borders = Відкриті кордони - # Requires translation! Gold per turn = Золота за хід - # Requires translation! Cities = Міста Technologies = Технології - # Requires translation! Declarations of war = Оголошення війни - # Requires translation! Introduction to [nation] = Вступ до [nation] - # Requires translation! Declare war on [nation] = Огосити війну [nation] Luxury resources = Ресурси розкоші Strategic resources = Стратегічні ресурси replaces = замінює [resourceName] not required = [resourceName] не потрібен - # Requires translation! Lost ability = Утрачена здібність National ability = Національна здібність @@ -517,7 +466,6 @@ Otto von Bismark = Отто фон Бісмарк India = Індія Gandhi = Магатма Ґанді - # Requires translation! Unhappiness from number of Cities doubled, Unhappiness from number of Citizens halved. = Нещастя від кількості міст подвоюється, нещастя від кількості населення зменшується удвічі The Ottomans = Османи @@ -548,11 +496,8 @@ Songhai = Сонгаї Askia = Аскія Receive triple Gold from Barbarian encampments and pillaging Cities. Embarked units can defend themselves. = Отримують утрічі більше золота з варварських таборів та розграблення міст. Підрозділи, які на воді, можуть захищатися. - # Requires translation! Spain = Іспанія - # Requires translation! Isabella = Ізаела - # Requires translation! 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. = 100 золота за виявлення природного дива (бонус збільшується до 500 золотих, якщо ви були першими). Культура, щастя та врожайність клітин біля природних чудес подвоїлися. # New game screen @@ -573,7 +518,6 @@ Number of city-states = Міст-держав One City Challenge = Випробовування «Одне місто» No barbarians = Без варварів No ancient ruins = Без древніх руїн - # Requires translation! No Natural Wonders = Без природних див Victory conditions = Умови перемоги Scientific = Наукова @@ -747,10 +691,14 @@ One of our trades with [nation] has been cut short = Достроково зак [nation] refused to stop settling cities near us! = [nation]: відмова не будувати міста поруч з нами! We have allied with [nation]. = Ми тепер союзники з [nation]. We have lost alliance with [nation]. = Тепер ми не союзники з [nation]. - # Requires translation! We have discovered [naturalWonder]! = Ми винайшли [naturalWonder]! - # Requires translation! We have received [goldAmount] Gold for discovering [naturalWonder] = Ми отримали [goldAmount] золота за винаходження [naturalWonder] + # Requires translation! +Your relationship with [cityStateName] is about to degrade = + # Requires translation! +Your relationship with [cityStateName] degraded = + # Requires translation! +A new barbarian encampment has spawned! = # World Screen UI @@ -921,7 +869,6 @@ Closest city = Найближче місто Action = Дія Defeated = Переможено Tiles = Клітини - # Requires translation! Natural Wonders = Природні дива #Victory @@ -930,7 +877,8 @@ Science victory = Научна перемога Cultural victory = Культурна перемога Conquest victory = Завоювання Complete all the spaceship parts\n to win! = Побудуйте усі частини космічного корабля\n, щоб виграти! -Complete 4 policy branches\n to win! = Завершіть 4 галузі політики\n,щоб виграти! + # Requires translation! +Complete 5 policy branches\n to win! = Destroy all enemies\n to win! = Знищь всіх ворогів\n, щоб виграти! You have won a scientific victory! = Ви здобули научну перемогу! You have won a cultural victory! = Ви здобули культурну перемогу! @@ -1008,46 +956,27 @@ Requires = Потребує # Civilopedia Tutorials names - # Requires translation! After Conquering = Після завоювання - # Requires translation! City Range = Дальність міста - # Requires translation! Contact Me = Зв’яжіться зі мною - # Requires translation! Culture and Policies = Культура і політика - # Requires translation! Embarking = На борту - # Requires translation! Enemy City = Вороже місто - # Requires translation! Idle Units = Незайняті одиниці - # Requires translation! Injured Units = Пошкоджені підрозділи - # Requires translation! Introduction = Введення - # Requires translation! Luxury Resource = Ресурси - # Requires translation! New Game = Нова гра - # Requires translation! Roads and Railroads = Дороги і колії - # Requires translation! Siege Units = Облогові підрозділи - # Requires translation! Strategic Resource = Стратегічний ресурс - # Requires translation! Unhappiness = Нещастя - # Requires translation! Victory Types = Види перемоги - # Requires translation! Workers = Робітники # Other civilopedia things - # Requires translation! Nations = Нації Promotions = Акції - # Requires translation! Available for [unitTypes] = Доступно для # Policies @@ -1059,33 +988,23 @@ Unlocked at = Розблокується у Tradition = Традиція +3 culture in capital and increased rate of border expansion = +3 культури в столиці і підвищення швидкості розширення кордонів Aristocracy = Аристокатія - # Requires translation! +15% production when constructing wonders, +1 happiness for every 10 citizens in a city = +15% Виробництва при будуванні див, +1 щастя за кожних 10 мешканців в місті - # Requires translation! Legalism = Легалізм - # Requires translation! Immediately creates a cheapest available cultural building in each of your first 4 cities for free = Негайно створює найдешевшу культурну будівлю в кожному з перших чотирьої твоїх міст безкоштовно Oligarchy = Олігархія # Requires translation! Units in cities cost no Maintenance, garrisoned city +50% attacking strength = # Requires translation! Landed Elite = - # Requires translation! +10% food growth and +2 food in capital = +10% до зростання їжі і +2 ї - # Requires translation! Monarchy = Монархія - # Requires translation! +1 gold and -1 unhappiness for every 2 citizens in capital = +1 золото і -1 нещастя за кожних двух жителів у столиці - # Requires translation! Tradition Complete = Традиція завершена - # Requires translation! +15% growth and +2 food in all cities = +15% зростання і +2 їжі у всіх містах # Requires translation! Liberty = - # Requires translation! +1 culture in every city = +1 культура в кожному місті - # Requires translation! Collective Rule = Колективне керівництво # Requires translation! Training of settlers increased +50% in capital, receive a new settler near the capital = @@ -1483,7 +1402,6 @@ Grand Mesa = Велика меса Great Barrier Reef = Великий бар'єрний риф Krakatoa = Кракатау Mount Fuji = Гора Фудзі - # Requires translation! Old Faithful = Старий служака Rock of Gibraltar = Гібралтарська скеля Cerro de Potosi = Серро-Ріко @@ -1704,7 +1622,6 @@ Bonus for units in 2 tile radius 15% = Підрозділи в радіусі 2 # Promotions Pick promotion = Обрати поліпшення - # Requires translation! OR = Або Bonus vs [unitType] = Перевага проти типу: [unitType] Penalty vs [unitType] = Поступається підрозділам типу: [unitType] @@ -1792,5 +1709,4 @@ Ambush II = Повітряна засідка II Haka War Dance = Бойовий танець Гака -10% combat strength for adjacent enemy units = Сусідні ворожі підрозділи отримують силу атаки -10% Rejuvenation = Відновлення здоров’я - # Requires translation! All healing effects doubled = Усі відновлювлювальні ефекти подвоюються diff --git a/android/assets/jsons/translationsByLanguage/completionPercentages.properties b/android/assets/jsons/translationsByLanguage/completionPercentages.properties index 1ec834ef23..93df8cb1f1 100644 --- a/android/assets/jsons/translationsByLanguage/completionPercentages.properties +++ b/android/assets/jsons/translationsByLanguage/completionPercentages.properties @@ -7,10 +7,10 @@ Korean = 95 Simplified_Chinese = 97 German = 96 English = 0 -Ukrainian = 85 +Ukrainian = 91 French = 97 Portuguese = 77 -Spanish = 92 +Spanish = 94 Malay = 13 Czech = 97 Dutch = 22 diff --git a/android/assets/jsons/translationsByLanguage/template.properties b/android/assets/jsons/translationsByLanguage/template.properties index d75a37d046..93ad893b82 100644 --- a/android/assets/jsons/translationsByLanguage/template.properties +++ b/android/assets/jsons/translationsByLanguage/template.properties @@ -682,6 +682,7 @@ We have discovered [naturalWonder]! = We have received [goldAmount] Gold for discovering [naturalWonder] = Your relationship with [cityStateName] is about to degrade = Your relationship with [cityStateName] degraded = +A new barbarian encampment has spawned! = # World Screen UI diff --git a/core/src/com/unciv/logic/GameInfo.kt b/core/src/com/unciv/logic/GameInfo.kt index 8406c83cd5..b6305d2711 100644 --- a/core/src/com/unciv/logic/GameInfo.kt +++ b/core/src/com/unciv/logic/GameInfo.kt @@ -154,12 +154,14 @@ class GameInfo { val viableTiles = tileMap.values.filter { !it.getBaseTerrain().impassable && it.isLand && it.terrainFeature==null + && it.naturalWonder==null && it !in tilesWithin3ofExistingEncampment && it !in allViewableTiles } if (viableTiles.isEmpty()) return null // no place for more barbs =( val tile = viableTiles.random() tile.improvement = Constants.barbarianEncampment + notifyCivsOfBarbarianEncampment(tile) return tile } @@ -187,6 +189,16 @@ class GameInfo { tileMap.placeUnitNearTile(tileToPlace.position, unit, getBarbarianCivilization()) } + /** + * [CivilizationInfo.addNotification][Add a notification] to every civilization that have + * adopted Honor policy and have explored the [tile] where the Barbarian Encampent has spawned. + */ + fun notifyCivsOfBarbarianEncampment(tile: TileInfo) { + civilizations.filter { it.policies.isAdopted("Honor") + && it.exploredTiles.contains(tile.position) } + .forEach { it.addNotification("A new barbarian encampment has spawned!", tile.position, Color.RED) } + } + // All cross-game data which needs to be altered (e.g. when removing or changing a name of a building/tech) // will be done here, and not in CivInfo.setTransients or CityInfo fun setTransients() {