From 88da508b82ac7fb3243d9dc4850539ec9b98bbcc Mon Sep 17 00:00:00 2001 From: lishaoxia1985 <49801619+lishaoxia1985@users.noreply.github.com> Date: Thu, 24 Oct 2019 02:59:20 +0800 Subject: [PATCH] update translation (#1222) * update * update * update * update * update * update * update * range extension * update * update * update * update * update * update * update * update * update * update * update * update --- .../Nations/Nations_Simplified_Chinese.json | 2 +- .../assets/jsons/Translations/Buildings.json | 2 +- .../Translations/Diplomacy,Trade,Nations.json | 11 +- .../NewGame,SaveGame,LoadGame,Options.json | 101 ++++-------------- .../jsons/Translations/Notifications.json | 13 +-- android/assets/jsons/Translations/Other.json | 22 ++-- .../Terrains,Resources,Improvements.json | 5 +- .../jsons/Translations/Units,Promotions.json | 5 +- android/assets/jsons/Units.json | 1 + core/src/com/unciv/logic/battle/Battle.kt | 2 +- .../src/com/unciv/ui/tilegroups/CityButton.kt | 2 +- .../optionstable/WorldScreenMenuTable.kt | 4 +- 12 files changed, 66 insertions(+), 104 deletions(-) diff --git a/android/assets/jsons/Nations/Nations_Simplified_Chinese.json b/android/assets/jsons/Nations/Nations_Simplified_Chinese.json index 50d84eb79e..d343ff1e6e 100644 --- a/android/assets/jsons/Nations/Nations_Simplified_Chinese.json +++ b/android/assets/jsons/Nations/Nations_Simplified_Chinese.json @@ -384,7 +384,7 @@ outerColor:[215,225,225], innerColor:[185,0,0], uniqueName:"武士道", - unique: "受伤单位战斗力不减", + unique: "受伤单位造成的伤害不减", cities:["京都","大阪","东京","萨摩","鹿儿岛","奈良","名古屋","出云","长崎","横滨","下关","松山","札幌","函馆","伊势","富山","福岛","周防","备前","越前","和泉","近江","越后","高崎","佐渡","神户","长野","广岛","高山","秋田","福冈","青森","镰仓","高知","那霸","仙台","岐阜","山口","大田","鸟取"] }, diff --git a/android/assets/jsons/Translations/Buildings.json b/android/assets/jsons/Translations/Buildings.json index 4ea483ca70..70837a8449 100644 --- a/android/assets/jsons/Translations/Buildings.json +++ b/android/assets/jsons/Translations/Buildings.json @@ -977,7 +977,7 @@ Italian:"Consente le rotte commerciali marittime" French:"Connecter des routes commerciales maritimes" Romanian:"Leagă rute comerciale pe apă" - Simplified_Chinese:"连接水上贸易路线" + Simplified_Chinese:"通过水路连接贸易路线" Portuguese:"Conecta rotas comerciais pela água" German:"Verbindet Handelsrouten über Wasser" Polish:"Tworzy wodne szlaki handlowe" diff --git a/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json b/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json index cfb3e7b17a..3be4f8a400 100644 --- a/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json +++ b/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json @@ -1253,7 +1253,7 @@ Italian:"Le unità combattono come se fossero perfettamente sane, anche quando gravemente ferite" Romanian:"Unitățile se luptă ca și cum ar fi la putere deplină chiar și atunci când sunt deteriorate" Spanish:"Las unidades luchan como si estuvieran con toda su fuerza incluso cuando están dañadas" - Simplified_Chinese:"受伤单位战斗力不减" + Simplified_Chinese:"受伤单位造成的伤害不减" German:"Einheiten kämpfen so, als wären sie selbst bei Beschädigung in voller Stärke" French:"Les unités combattent comme si elles étaient à pleine force même lorsqu'elles sont endommagées" Portuguese:"Unidades lutam como se estivessem em força total mesmo quando danificadas" @@ -1397,7 +1397,7 @@ "Darius I":{ Italian:"Dario I" - Simplified_Chinese:"大流士一世", + Simplified_Chinese:"大流士一世" Czech:"Dareios I." } @@ -1414,18 +1414,21 @@ French:"Polynésie" Portuguese:"Polinésia" Czech:"Polynésie" + Simplified_Chinese:"波利尼西亚" } "Kamehameha I":{ - Italian:"Kamehameha I", + Italian:"Kamehameha I" Czech:"Kamehameha I." + Simplified_Chinese:"卡美哈梅哈一世" } - "Can embark and move over Coasts and Oceans immediately. +1 Sight when embarked. +10% Combat Strenght bonus if within 2 tiles of a Moai.":{ + "Can embark and move over Coasts and Oceans immediately. +1 Sight when embarked. +10% Combat Strength bonus if within 2 tiles of a Moai.":{ Italian:"Le unità possono imbarcarsi e attraversare gli oceani fin da subito, e ricevono +1 Visione quando imbarcate, e +10% Forza entro 2 caselle con un Moai." Portuguese:"Pode embarcar e mover unidades sobre oceanos imediatamente. +1 visão quando embarcado" French:"Peut embarquer et bouger sur les océans dès le début. +1 Vision lorsque embarqué." Czech:"Může se okamžitě přesunovat mezi pevninou a mořem. +1 při nalodění. +10% bonus k bojové síle, pokud je v okolí 2 polí Moai." + Simplified_Chinese:"单位初始就拥有船运能力，可进入海滨和海洋地块，单位处于船运状态时+1视野。摩艾石像群周围2格内单位+10%战斗力" } /* diff --git a/android/assets/jsons/Translations/NewGame,SaveGame,LoadGame,Options.json b/android/assets/jsons/Translations/NewGame,SaveGame,LoadGame,Options.json index 3951491746..9e9acc0058 100644 --- a/android/assets/jsons/Translations/NewGame,SaveGame,LoadGame,Options.json +++ b/android/assets/jsons/Translations/NewGame,SaveGame,LoadGame,Options.json @@ -354,9 +354,9 @@ Czech:"Na tomto zařízení" } - "User Id":{ + "User ID":{ Italian:"ID Utente" - Simplified_Chinese:"玩家Id" + Simplified_Chinese:"玩家ID" Russian:"ID игрока" Korean:"사용자 Id" Czech:"Uživatelské ID" @@ -416,17 +416,17 @@ Czech:"Chybné ID hry" } - "Copy User Id":{ + "Copy User ID":{ Italian:"Copia ID Utente" - Simplified_Chinese:"复制玩家Id" + Simplified_Chinese:"复制玩家ID" Russian:"Скопировать ID игрока" Korean:"사용자 Id 복사" Czech:"Kopírovat uživatelské ID" } - "Copy Game Id":{ + "Copy Game ID":{ Italian:"Copia ID Partita" - Simplified_Chinese:"复制游戏Id" + Simplified_Chinese:"复制游戏ID" Russian:"Скопировать ID игры" Korean:"게임 Id 복사" Czech:"Kopírovat ID hry" @@ -436,12 +436,14 @@ Italian:"Imposta utente attuale" Korean:"현재 사용자 설정" Czech:"Nastavit aktuálního uživatele" + Simplified_Chinese:"设置为当前玩家" } "Player ID from clipboard":{ Italian:"Copia ID giocatore dagli appunti" Korean:"클립보드의 플레이어 ID" Czech:"Kopírovat ID hráče ze schránky" + Simplified_Chinese:"从剪贴板获取玩家ID" } /// tutorials for multiplayer @@ -449,24 +451,28 @@ Italian:"Per creare una partita multigiocatore, attiva la spunta su 'Multigiocatore' nella schermata Nuova Partita, e inserisci l'ID utente per del giocatore per ogni rispettivo giocatore umano" Korean:"멀티플레이어 게임을 만들려면 새로운 게임 화면에서 '멀티플레이어' 토글을 확인하고 각 인간 플레이어에 대해 해당 플레이어의 사용자 ID를 삽입하십시오." Czech:"Pro vytvoření hry pro více hráčů zaškrtněte 'Více hráčů' na obrazovce s novou hrou a pro každého lidského hráče vložte jeho hráčské ID." + Simplified_Chinese:"创建多人游戏时，首先请选中“开始新游戏”界面的“Online Multiplayer”复选框，同时将每个参与游戏的玩家ID填入他们想扮演文明的“Player ID”文本框内。" } "You can assign your own user ID there easily, and other players can copy their user IDs here and send them to you for you to include them in the game.":{ Italian:"Puoi assegnarvi facilmente il tuo ID Utente, e altri giocatori possono copiarvi il loro ID Utente e mandartelo per unirsi alla partita." Korean:"당신은 당신의 사용자 ID를 쉽게 거기에 할당할 수 있고, 다른 플레이어는 당신의 사용자 ID를 여기에 복사하여 당신이 게임에 포함하도록 당신에게 보낼 수 있습니다." Czech:"Svoje vlastní ID můžete přiřadit jednoduše, ostatní hráči můžou zkopírovat svoje uživatelské ID tady a poslat vám ho, aby jste je připojil ke hře." + Simplified_Chinese:"直接点击“设置为当前玩家”就可以自动填入你自己的玩家ID，对于其他玩家，他们可以点击当前界面“复制玩家ID”按钮将他们的ID复制到剪贴板并通过网络发送给你，你可以将他们的ID填入他们想扮演文明的“Player ID”文本框内使他们加入游戏。" } "Once you've created your game, enter this screen again to copy the Game ID and send it to the other players.":{ Italian:"Una volta creata la tua partita, ritorna in questa schermata per copiare l'ID Partita e mandala ad altri giocatori." Korean:"게임을 만든 후 이 화면을 다시 입력하여 게임 ID를 복사하여 다른 플레이어에게 전송하십시오." Czech:"Ve chvíli kdy vytvoříte hru, vraťte se zpět na tuto obrazovku, zkopírujte ID hry a pošlete ho ostatním hráčům." + Simplified_Chinese:"当你创建了多人游戏后，进入此界面同时点击“复制游戏ID”按钮将游戏ID复制到剪贴板并通过网络发送给其他玩家。" } - "Players can enter you game by copying the game ID to the clipboard, and clicking on the Join Game button":{ + "Players can enter your game by copying the game ID to the clipboard, and clicking on the Join Game button":{ Italian:"I giocatori possono entrare nella tua partita copiando il codice ID sugli appunti e cliccando il tasto Unisciti." Korean:"플레이어는 게임 ID를 클립보드에 복사하고 게임 참여 버튼을 클릭하여 게임에 들어갈 수 있습니다." Czech:"Ostatní hráči můžou vstoupit do hry zkopírováním ID hry do schránky a kliknutím na tlačítko 'Připojit se ke hře'" + Simplified_Chinese:"其他玩家可以将接收到的游戏ID复制到剪贴板，同时点击“加入游戏”按钮加入游戏" } @@ -522,54 +528,6 @@ Czech:"Doba počátku hry" } - "Ancient":{ - Italian:"Antica" - Korean:"고대" - Czech:"Starověk" -} - - "Classic":{ - Italian:"Classica" - Korean:"고전" - Czech:"Klasický starověk" -} - - "Medieval":{ - Italian:"Medievale" - Korean:"중세" - Czech:"Středověk" -} - - "Renaissance":{ - Italian:"Rinascimentale" - Korean:"르네상스" - Czech:"Renesance" -} - - "Industrial":{ - Italian:"Industriale" - Korean:"산업" - Czech:"Industrialní doba" -} - - "Modern":{ - Italian:"Moderna" - Korean:"현대" - Czech:"Moderní doba" -} - - "Information":{ - Italian:"Informatica" - Korean:"정보" - Czech:"Doba informačních technologií" -} - - "Future":{ - Italian:"Futura" - Korean:"미래" - Czech:"Budoucnost" -} - //// "It looks like we can't make a map with the parameters you requested!":{ @@ -822,33 +780,11 @@ } "Show worked tiles":{ - Italian:"Celle sfruttate" - Russian:"Обрабатываемые клетки" - French:"cases exploités" - Romanian:"celule lucrate" - German:"bearbeitete Felder" - Dutch:"Bewerkte velden" - Spanish:"casillas trabajadas" - Simplified_Chinese:"工作的地块" - Portuguese:"Terrenos trabalhados" - Japanese:"働いたタイル" - Korean:"작업된 타일" - Czech:"Obdělávané políčka" + Simplified_Chinese:"显示工作地块" } - "Resources and improvements":{ - Italian:"Risorse e miglioramenti" - Russian:"Ресурсы и улучшения" - French:"ressources et améliorations" - Romanian:"resurse și îmbunătățiri" - German:"Ressourcen und Verbesserungen" - Dutch:"Grondstoffen en Verbeteringen" - Spanish:"recursos y mejoras" - Simplified_Chinese:"资源与设施" - Portuguese:"recursos e melhorias" - Japanese:"リソースと改善" - Korean:"자원과 시설" - Czech:"Zdroje a vylepšení" + "Show resources and improvements":{ + Simplified_Chinese:"显示资源与地块设施" } "Check for idle units":{ @@ -892,6 +828,7 @@ Italian:"Costruzione strade automatica" Korean:"도로 자동 건설" Czech:"Automatická vystavba cest" + Simplified_Chinese:"自动建造道(铁)路" } "Show minimap":{ @@ -902,6 +839,10 @@ Czech:"Zobrazit minimapu" } + "Show pixel units":{ + Simplified_Chinese:"显示像素单位" +} + "Fontset":{ Italian:"Fontset" Simplified_Chinese:"字体设置" diff --git a/android/assets/jsons/Translations/Notifications.json b/android/assets/jsons/Translations/Notifications.json index 01e59472dd..e3b31770ce 100644 --- a/android/assets/jsons/Translations/Notifications.json +++ b/android/assets/jsons/Translations/Notifications.json @@ -527,7 +527,7 @@ Russian:"[unit] завершил исследование местности." Simplified_Chinese:"[unit]已完成了探索。", Czech:"Jednotka [unit] dokončila průzkum." - }, + } "[unit] has no work to do.": { Italian:"[unit] è ora inattivo." @@ -568,7 +568,7 @@ Russian:"Вы и [name] больше не союзники!" Simplified_Chinese:"你和[name]不再是盟友了！", Czech:"Naše říše a městský stát [name] už není v alianci!" - }, + } "[civName] gave us a [untiName] as gift near [cityName]!":{ // When a city state gives a unit as gift. Italian:"[civName] ci ha dato [untiName] come regalo vicino a [cityName]!" @@ -588,6 +588,7 @@ "[cityName] has been connected to your capital!":{ Italian:"Itinerario costruito tra la Capitale e [cityName]!", Czech:"Město [cityName] bylo propojeno s naším hlavním městem!" + Simplified_Chinese:"[cityName]与你的首都的连接已经建立！" } // Trade @@ -622,7 +623,7 @@ Russian:"Торговая сделка с [nation] завершилась" Simplified_Chinese:"我们与[nation]的贸易已经结束", Czech:"Jedna z našich obchodních spoluprací s národem [nation] je u konce" - }, + } "One of our trades with [nation] has been cut short": { Italian:"Un nostro accordo con [nation] è stato interrotto." @@ -630,20 +631,20 @@ Russian:"Торговая сделка с [nation] была завершена досрочно" Simplified_Chinese:"我们与[nation]的贸易已被消减", Czech:"Jedna z našich obchodních spoluprací s národem [nation] se blíží ke konci" - }, + } "[nation] agreed to stop settling cities near us!": { Italian:"[nation] ha promesso di smettere di fondare città vicino a noi!" Simplified_Chinese:"[nation]同意停止在我们附近建城！" Russian:"[nation] согласилась прекратить заселять города рядом с нами!", Czech:"Národ [nation] souhlasí, že nebude budovat své města poblíž našich hranic!" - }, + } "[nation] refused to stop settling cities near us!": { Italian:"[nation] ha rifiutato di smettere di fondare città vicino a noi!" Simplified_Chinese:"[nation]拒绝停止在我们附近建城！" Russian:"[nation] отказалась прекратить заселять города рядом с нами!", Czech:"Národ [nation] vypověděl dohodu o nebudování měst poblíž našich hranic!" - }, + } } diff --git a/android/assets/jsons/Translations/Other.json b/android/assets/jsons/Translations/Other.json index 59ca88394e..ba74c1a3fc 100644 --- a/android/assets/jsons/Translations/Other.json +++ b/android/assets/jsons/Translations/Other.json @@ -1035,6 +1035,7 @@ "Food converts to production":{ Italian:"Converte il Cibo in Produzione" Czech:"Jídlo směnit za produkci" + Simplified_Chinese:"食物转化为产能" } "[turnsToStarvation] turns to lose population":{ @@ -2005,16 +2006,18 @@ Simplified_Chinese:"吞并" Russian:"Аннексировать" Czech:"Anektovat" -}, +} "Annexed cities become part of your regular empire.":{ Italian:"Le città annesse faranno parte regolare del tuo impero." Czech:"Anektované města se stanou regulérní součástí naší říše." + Simplified_Chinese:"“吞并城市”意味着该城市将成为您的帝国直辖的一部分。" } "Their citizens generate 2x the unhappiness, unless you build a courthouse.":{ Italian:"I loro cittadini genereranno il doppio dell'Infelicità, fino a quando non costruirai un Palazzo di giustizia." Czech:"Jejich obyvatelé produkují 2x tolik nespokojenosti dokud napostavíte Soud." + Simplified_Chinese:"该城市人口产生的不满将是正常值的2倍，建造“法庭”可以使该值降低到正常值。" } "Puppet":{ @@ -2026,21 +2029,25 @@ "Puppeted cities do not increase your tech or policy cost, but their citizens generate 1.5x the regular unhappiness.":{ Italian:"Le città fantoccio non incrementano i costi di Scienza e Cultura, ma i loro cittadini generano Infelicità pari a una volta e mezzo." Czech:"Města s loutkovou vládou nezvyšují náklady na výzkum a kulturu, ale jejich obyvatelé generují 1,5x tolik nespokojenosti." + Simplified_Chinese:"“傀儡城市”不会额外增加您研发科技和推行社会政策时的花费，但其人口产生的不满是正常值的1.5倍。" } "You have no control over the the production of puppeted cities.":{ Italian:"Non hai alcun controllo sulla produzione delle città fantoccio." Czech:"Nemáme kontrolu nad produkcí ve městech s loutkovou vládou." + Simplified_Chinese:"您无法控制已傀儡城市的产能。" } "Puppeted cities also generate 25% less Gold and Science.":{ Italian:"Gli stati fantoccio generano anche il 25% di Oro e Scienza in meno." Czech:"Města s loutkovou vládou také generují o 25% méně Zlata a Výzkumu." + Simplified_Chinese:"已傀儡城市的金钱和科研产出-25%。" } "A puppeted city can be annexed at any time.":{ Italian:"Puoi annettere una città fantoccio ogni volta che vuoi" Czech:"Město s loutkovou vládou lze kdykoliv anektovat." + Simplified_Chinese:"可以在任何时候选择吞并已傀儡城市。" } "Liberate":{ @@ -2052,6 +2059,7 @@ "Liberating a city returns it to its original owner, giving you a massive relationship boost with them!":{ Italian:"Liberare una città la restituirà al suo possessore originale, dandoti un'enorme bonus diplomatico nei loro confronti!" Czech:"Osvobozené město se vrátí zpět k původnímu majiteli, což nám přinese masivní zlepšení vzájemných vztahů." + Simplified_Chinese:"“解放城市”会将该城市归还给初始拥有者，这样做会极大增进两者的关系！" } "Raze":{ @@ -2065,11 +2073,13 @@ "Razing the city annexes it, and starts razing the city to the ground.":{ Italian:"Questa opzione ti permetterà di annettere la città e poi di raderla al suolo." Czech:"Vyhlazování města zároveň způsobí jeho anektování a započne srovnávání města ze zemí." + Simplified_Chinese:"“摧毁城市”意味着吞并该城市，同时开始将该城市夷为平地。" } "The population will gradually dwindle until the city is destroyed.":{ Italian:"La popolazione diminuirà gradualmente fino alla distruzione della città." Czech:"Populace se bude postupně snižovat, až do úplného zmizení z mapy.." + Simplified_Chinese:"城市人口将会持续地减少直至该城市被完全摧毁。" } @@ -2168,7 +2178,7 @@ French:"Peut contenir [listOfResources]" Simplified_Chinese:"可能拥有下列资源：[listOfResources]" Portuguese:"Pode conter [listOfResources]" - Russian:"Может содержать [listOfResources]", + Russian:"Может содержать [listOfResources]" Czech:"Může obsahovat [listOfResources]" } @@ -2178,7 +2188,7 @@ French:"Améliorer en [upgradedUnit]" Simplified_Chinese:"可升级为[upgradedUnit]" Portuguese:"Melhorar para [upgradedUnit]" - Russian:"Улучшается до [upgradedUnit]", + Russian:"Улучшается до [upgradedUnit]" Czech:"Vylepšení na [upgradedUnit]" } @@ -2187,7 +2197,7 @@ French:"Obsolète avec [obsoleteTech]" Simplified_Chinese:"研发下列科技后过时：[obsoleteTech]" Portuguese:"Obsoleta(0) com [obsoleteTech]" - Russian:"Устаревает после [obsoleteTech]", + Russian:"Устаревает после [obsoleteTech]" Czech:"Zastará (přestane půspbit) s [obsoleteTech]" } @@ -2196,7 +2206,7 @@ French:"Doit possèder [listOfTerrains]" Simplified_Chinese:"可能出现在以下地形：[listOfTerrains]" Portuguese:"Ocorre em [listOfTerrains]" - Russian:"Появляется на [listOfTerrains]", + Russian:"Появляется на [listOfTerrains]" Czech:"Nalézá se v/na [listOfTerrains]" } @@ -2214,7 +2224,7 @@ Simplified_Chinese:"开发该资源所需要的设施：[improvement]" French:"Amélioré par [improvement]" Portuguese:"Melhorado por [improvement]" - Russian:"Улучшен [improvement]", + Russian:"Улучшен [improvement]" Czech:"Vylešen(a/o) díky [improvement]" } diff --git a/android/assets/jsons/Translations/Terrains,Resources,Improvements.json b/android/assets/jsons/Translations/Terrains,Resources,Improvements.json index 9c20529810..577440bd58 100644 --- a/android/assets/jsons/Translations/Terrains,Resources,Improvements.json +++ b/android/assets/jsons/Translations/Terrains,Resources,Improvements.json @@ -1002,18 +1002,21 @@ Italian:"Moai" Korean:"모아이" Czech:"Moai (kamenná socha)" + Simplified_Chinese:"摩艾石像群" } "+1 additional Culture for each adjacent Moai":{ Italian:"+1 Cultura aggiuntiva per ogni Moai adiacente" Korean:"인접한 각 Moai에 대해 +1 추가 문화" Czech:"+1 kulturní bod za každý Moai" + Simplified_Chinese:"每个相邻的摩艾石像群额外+1文化" } - "Can only be built on Coastal tile":{ + "Can only be built on Coastal tiles":{ Italian:"Costruibile solo su Costa" Korean:"해안 타일에만 제작 가능" Czech:"Může byt vybudován na pobřežním políčku" + Simplified_Chinese:"只能建造在沿海地块" } diff --git a/android/assets/jsons/Translations/Units,Promotions.json b/android/assets/jsons/Translations/Units,Promotions.json index 17f7bfdc65..cea3f4db0a 100644 --- a/android/assets/jsons/Translations/Units,Promotions.json +++ b/android/assets/jsons/Translations/Units,Promotions.json @@ -254,6 +254,7 @@ "Maori Warrior":{ Italian:"Guerriero Maori" Czech:"Maorský válěčník" + Simplified_Chinese:"毛利勇士" } "Archer":{ @@ -1299,7 +1300,7 @@ Czech:"Moderní tank" } - "B17,":{ // american unique + "B17":{ // american unique Italian:"B-17" Romanian:"B17" Spanish:"B-17" @@ -2307,11 +2308,13 @@ "Haka War Dance":{ Italian:"Danza di guerra Haka" Czech:"Haka - valečný tanec" + Simplified_Chinese:"哈卡战舞" } "-10% combat strength for adjacent enemy units":{ Italian:"-10% Forza alle unità nemiche adiacenti a questa unità" Czech:"-10% bojové síly pro nepřátelské jednotky na sousedních políčkách" + Simplified_Chinese:"相邻的敌方单位-10%战斗力" } } diff --git a/android/assets/jsons/Units.json b/android/assets/jsons/Units.json index 90c3bfee89..eb18a1fc9b 100644 --- a/android/assets/jsons/Units.json +++ b/android/assets/jsons/Units.json @@ -25,6 +25,7 @@ movement:2, strength:5, cost:25, + obsoleteTech:"Scientific Theory", uniques:["Ignores terrain cost"], attackSound:"nonmetalhit" }, diff --git a/core/src/com/unciv/logic/battle/Battle.kt b/core/src/com/unciv/logic/battle/Battle.kt index 15ae97ee42..2fe5ce1fb8 100644 --- a/core/src/com/unciv/logic/battle/Battle.kt +++ b/core/src/com/unciv/logic/battle/Battle.kt @@ -100,7 +100,7 @@ class Battle(val gameInfo:GameInfo) { private fun postBattleNotifications(attacker: ICombatant, defender: ICombatant, attackedTile: TileInfo) { if (attacker.getCivInfo() != defender.getCivInfo()) { // If what happened was that a civilian unit was captures, that's dealt with in the CaptureCilvilianUnit function val whatHappenedString = - if (attacker !is CityCombatant && attacker.isDefeated()) " {was destroyed while attacking}" + if (attacker !is CityCombatant && attacker.isDefeated()) " was destroyed while attacking" else " has " + (if (defender.isDefeated()) "destroyed" else "attacked") val attackerString = if (attacker.getUnitType() == UnitType.City) "Enemy city [" + attacker.getName() + "]" diff --git a/core/src/com/unciv/ui/tilegroups/CityButton.kt b/core/src/com/unciv/ui/tilegroups/CityButton.kt index 62fed364ce..8f25b496ed 100644 --- a/core/src/com/unciv/ui/tilegroups/CityButton.kt +++ b/core/src/com/unciv/ui/tilegroups/CityButton.kt @@ -53,7 +53,7 @@ class CityButton(val city: CityInfo, internal val tileGroup: WorldTileGroup, ski aircraftImage.color = secondarycolor airUnitTable.add(aircraftImage).size(15f) airUnitTable.add(tileGroup.tileInfo.airUnits.size.toString().toLabel() - .setFontColor(secondarycolor).setFontSize(15)) + .setFontColor(secondarycolor).setFontSize(14)) add(airUnitTable).row() } diff --git a/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenMenuTable.kt b/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenMenuTable.kt index 53529f92ed..33aff545ba 100644 --- a/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenMenuTable.kt +++ b/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenMenuTable.kt @@ -98,11 +98,11 @@ class WorldScreenMenuTable(val worldScreen: WorldScreen) : PopupTable(worldScree multiplayerPopup.addGoodSizedLabel("To create a multiplayer game, check the 'multiplayer' toggle in the New Game screen, and for each human player insert that player's user ID.").row() multiplayerPopup.addGoodSizedLabel("You can assign your own user ID there easily, and other players can copy their user IDs here and send them to you for you to include them in the game.").row() - multiplayerPopup.addButton("Copy User Id"){ Gdx.app.clipboard.contents = UnCivGame.Current.settings.userId }.row() + multiplayerPopup.addButton("Copy User ID"){ Gdx.app.clipboard.contents = UnCivGame.Current.settings.userId }.row() multiplayerPopup.addGoodSizedLabel("Once you've created your game, enter this screen again to copy the Game ID and send it to the other players.").row() - val copyGameIdButton = multiplayerPopup.addButton("Copy game ID".tr()) { + val copyGameIdButton = multiplayerPopup.addButton("Copy Game ID".tr()) { Gdx.app.clipboard.contents = worldScreen.gameInfo.gameId }.apply { row() } if(!worldScreen.gameInfo.gameParameters.isOnlineMultiplayer) copyGameIdButton.actor.disable()