diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index 2860bb981c..80d359f8aa 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -137,7 +137,7 @@ Cultured = Cultural Maritime = Marítimo Mercantile = Mercantil Militaristic = Militar -Type: = Tipo: +Type = Tipo # Requires translation! Friendly = # Requires translation! @@ -145,8 +145,8 @@ Hostile = # Requires translation! Irrational = # Requires translation! -Personality: = -Influence: = Influência: +Personality = +Influence = Influência Reach 30 for friendship. = Alcançar 30 para amizade. Reach highest influence above 60 for alliance. = Alcançar influência máxima acima de 60 para aliança. Ally: = Aliado: diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties index d3b2b47834..2ab02878ab 100644 --- a/android/assets/jsons/translations/Czech.properties +++ b/android/assets/jsons/translations/Czech.properties @@ -137,12 +137,12 @@ Cultured = Kulturní Maritime = Námořní Mercantile = Obchodní Militaristic = Militaristický -Type: = Typ: +Type = Typ Friendly = Přátelský Hostile = Nepřátelský Irrational = Iracionální -Personality: = Osobnost: -Influence: = Vliv: +Personality = Osobnost +Influence = Vliv Reach 30 for friendship. = Získejte vliv 30 a více pro dosažení přátelství. Reach highest influence above 60 for alliance. = Získejte vliv 60 a více pro dosažení aliance. Ally: = Aliance: diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties index 4c8940464d..4fdfa56737 100644 --- a/android/assets/jsons/translations/Dutch.properties +++ b/android/assets/jsons/translations/Dutch.properties @@ -147,7 +147,7 @@ Cultured = Ontwikkeld Maritime = Maritiem Mercantile = Zakelijk Militaristic = Militarisme -Type: = Type: +Type = Type # Requires translation! Friendly = # Requires translation! @@ -155,8 +155,8 @@ Hostile = # Requires translation! Irrational = # Requires translation! -Personality: = -Influence: = Invloed +Personality = +Influence = Invloed Reach 30 for friendship. = Bereik 30 voor vriendschap Reach highest influence above 60 for alliance. = Bereik hoogste invloed boven 60 voor een alliantie Ally: = Bondgenoot diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties index 78a126d795..ee98df1014 100644 --- a/android/assets/jsons/translations/English.properties +++ b/android/assets/jsons/translations/English.properties @@ -253,7 +253,7 @@ Mercantile = # Requires translation! Militaristic = # Requires translation! -Type: = +Type = # Requires translation! Friendly = # Requires translation! @@ -261,9 +261,9 @@ Hostile = # Requires translation! Irrational = # Requires translation! -Personality: = +Personality = # Requires translation! -Influence: = +Influence = # Requires translation! Reach 30 for friendship. = # Requires translation! diff --git a/android/assets/jsons/translations/Finnish.properties b/android/assets/jsons/translations/Finnish.properties index 0f9fe8d250..3d5eb63d94 100644 --- a/android/assets/jsons/translations/Finnish.properties +++ b/android/assets/jsons/translations/Finnish.properties @@ -143,7 +143,7 @@ Cultured = Kulttuurillinen Maritime = Merellinen Mercantile = Palkkasotilaallinen Militaristic = Sotilaallinen -Type: = Tyyppi: +Type = Tyyppi # Requires translation! Friendly = # Requires translation! @@ -151,8 +151,8 @@ Hostile = # Requires translation! Irrational = # Requires translation! -Personality: = -Influence: = Vaikutusvalta: +Personality = +Influence = Vaikutusvalta Reach 30 for friendship. = Saavutat ystävyyden 30:sä Reach highest influence above 60 for alliance. = Saavutat liittolaisuuden omaamalla suurimman yli 60 pisteen Vaikutusvallan Ally: = Liittolainen: diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index 32aea50908..449ba7a000 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -139,7 +139,7 @@ Cultured = Culturelle Maritime = Maritime Mercantile = Marchande Militaristic = Militariste -Type: = Type : +Type = Type # Requires translation! Friendly = # Requires translation! @@ -147,8 +147,8 @@ Hostile = # Requires translation! Irrational = # Requires translation! -Personality: = -Influence: = Influence : +Personality = +Influence = Influence Reach 30 for friendship. = Atteignez 30 pour être amis. Reach highest influence above 60 for alliance. = Obtenez la plus grande Influence au-dessus de 60 pour être alliés. Ally: = Allié : diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index e19f2d2b14..b185e32e3c 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -137,12 +137,12 @@ Cultured = Kultiviert Maritime = Maritim Mercantile = Kaufmännisch Militaristic = Militärisch -Type: = Typ: +Type = Typ Friendly = Freundlich Hostile = Feindlich Irrational = Unvernünftig -Personality: = Persönlichkeit -Influence: = Einfluss: +Personality = Persönlichkeit +Influence = Einfluss Reach 30 for friendship. = Erreiche 30 für Freundschaft. Reach highest influence above 60 for alliance. = Erreiche den höchsten Einfluss über 60 für das Bündnis Ally: = Verbündete: diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties index c400a73e8a..81c27524c4 100644 --- a/android/assets/jsons/translations/Hungarian.properties +++ b/android/assets/jsons/translations/Hungarian.properties @@ -137,12 +137,12 @@ Cultured = Kultúrált Maritime = Tengerparti Mercantile = Kereskedelmi Militaristic = Katonai -Type: = Típus: +Type = Típus Friendly = Barátságos Hostile = Ellenséges Irrational = Irracionális -Personality: = Személyiség: -Influence: = Befolyás: +Personality = Személyiség +Influence = Befolyás Reach 30 for friendship. = Érj el 30-at a barátsághoz. Reach highest influence above 60 for alliance. = Érj el 60 feletti Befolyást a szövetséghez. Ally: = Szövetség: diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index 7ff2206678..38a113b857 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -137,12 +137,12 @@ Cultured = Budaya Maritime = Maritim Mercantile = Pedagang Militaristic = Militeristik -Type: = Jenis: +Type = Jenis Friendly = Bersahabat Hostile = Bermusuhan Irrational = Irasional -Personality: = Sifat -Influence: = Pengaruh: +Personality = Sifat +Influence = Pengaruh Reach 30 for friendship. = Capai 30 untuk persahabatan. Reach highest influence above 60 for alliance. = Capai pengaruh diatas 60 untuk persekutuan. Ally: = Sekutu: diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index 783c959aeb..6baec24298 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -137,12 +137,12 @@ Cultured = Acculturata Maritime = Marittima Mercantile = Mercantile Militaristic = Militaristica -Type: = Tipo: +Type = Tipo Friendly = Amichevole Hostile = Ostile Irrational = Irrazionale -Personality: = Personalità: -Influence: = Influenza: +Personality = Personalità +Influence = Influenza Reach 30 for friendship. = Stringi un'amicizia superando il limite minimo di 30 Influenza. Reach highest influence above 60 for alliance. = Stringi un'alleanza superando 60 Influenza al di sopra di tutti. Ally: = Alleati: diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties index c131db61f5..975b55b768 100644 --- a/android/assets/jsons/translations/Japanese.properties +++ b/android/assets/jsons/translations/Japanese.properties @@ -137,12 +137,12 @@ Cultured = 文化 Maritime = 海洋 Mercantile = 商業 Militaristic = 軍事 -Type: = タイプ: +Type = タイプ Friendly = 友好的 Hostile = 敵対的 Irrational = 中立 -Personality: = 関係： -Influence: = 影響力: +Personality = 関係： +Influence = 影響力 Reach 30 for friendship. = 友好的になるには影響力が30必要 Reach highest influence above 60 for alliance. = 同盟関係になるためには影響力60以上が必要 Ally: = 同盟: diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties index 88e4255acb..b2cac646ae 100644 --- a/android/assets/jsons/translations/Korean.properties +++ b/android/assets/jsons/translations/Korean.properties @@ -137,12 +137,12 @@ Cultured = 문화적 Maritime = 해양적 Mercantile = 상업적 Militaristic = 군사적 -Type: = 성향 : +Type = 성향 Friendly = 호의적 Hostile = 배타적 Irrational = 비이성적 -Personality: = 성향 : -Influence: = 영향력 : +Personality = 성향 +Influence = 영향력 Reach 30 for friendship. = 우호 관계가 되려면 30 이상의 영향력을 보유하십시오 Reach highest influence above 60 for alliance. = 동맹이 되려면 60 이상이면서 문명들 중 가장 높은 영향력을 보유하십시오. Ally: = 동맹 : diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties index 0b5458c826..fe1facf439 100644 --- a/android/assets/jsons/translations/Lithuanian.properties +++ b/android/assets/jsons/translations/Lithuanian.properties @@ -147,7 +147,7 @@ Cultured = Kultūringas Maritime = Jūrų Mercantile = Mercantile Militaristic = Militaristinis -Type: = Tipas: +Type = Tipas # Requires translation! Friendly = # Requires translation! @@ -155,8 +155,8 @@ Hostile = # Requires translation! Irrational = # Requires translation! -Personality: = -Influence: = Įtaka: +Personality = +Influence = Įtaka Reach 30 for friendship. = Užmegzkite 30 draugystę. Reach highest influence above 60 for alliance. = Pasiekite didžiausią aljanso įtaką, virš 60 metų. Ally: = Ally: diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties index 5bb2691ca0..aa3aa1f313 100644 --- a/android/assets/jsons/translations/Malay.properties +++ b/android/assets/jsons/translations/Malay.properties @@ -215,7 +215,7 @@ Maritime = Mercantile = # Requires translation! Militaristic = -Type: = Jenis: +Type = Jenis # Requires translation! Friendly = # Requires translation! @@ -223,9 +223,9 @@ Hostile = # Requires translation! Irrational = # Requires translation! -Personality: = +Personality = # Requires translation! -Influence: = +Influence = # Requires translation! Reach 30 for friendship. = # Requires translation! diff --git a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties index b937b6e72b..2cad468922 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties @@ -140,7 +140,7 @@ Cultured = Bā Farhang Maritime = Daryāi Mercantile = Bāzargāni Militaristic = Nezāmi -Type: = noe’e: +Type = noe’e # Requires translation! Friendly = # Requires translation! @@ -148,8 +148,8 @@ Hostile = # Requires translation! Irrational = # Requires translation! -Personality: = -Influence: = Nofooz +Personality = +Influence = Nofooz Reach 30 for friendship. = Baraye doosti be 30 beresid. Reach highest influence above 60 for alliance. = Be bištarin Nofooz, bālāye 60, beresid to ham-peymān šavid. Ally: = Ham-Peymān: diff --git a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties index 41e419dcb4..494329f76e 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties @@ -140,14 +140,14 @@ Cultured = Baa Farhang Maritime = Daryaai Mercantile = Baazargaani Militaristic = Nezaami -Type: = noe’e: +Type = noe’e Friendly = Doost o baraadar Hostile = Motekhasem # Requires translation! Irrational = # Requires translation! -Personality: = -Influence: = Nofooz +Personality = +Influence = Nofooz Reach 30 for friendship. = Baraye doosti be 30 beresid. Reach highest influence above 60 for alliance. = Be bishtarin Nofooz, baalaaye 60, beresid to ham-peymaan shavid. Ally: = Ham-Peymaan: diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index 1a4354f929..8658811fbd 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -143,7 +143,7 @@ Cultured = Kulturowe Maritime = Nadmorskie Mercantile = Kupieckie Militaristic = Militarne -Type: = Typ: +Type = Typ # Requires translation! Friendly = # Requires translation! @@ -151,8 +151,8 @@ Hostile = # Requires translation! Irrational = # Requires translation! -Personality: = -Influence: = Wpływy: +Personality = +Influence = Wpływy Reach 30 for friendship. = Osiągnij 30 dla przyjaźni. Reach highest influence above 60 for alliance. = Osiągnij najwyższy wpływ ponad 60 dla sojuszu. Ally: = Sojusznik: diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties index ef630e863f..ba0c880d59 100644 --- a/android/assets/jsons/translations/Portuguese.properties +++ b/android/assets/jsons/translations/Portuguese.properties @@ -145,7 +145,7 @@ Cultured = Cultural Maritime = Naval Mercantile = Mercantil Militaristic = Militar -Type: = Tipo: +Type = Tipo # Requires translation! Friendly = # Requires translation! @@ -153,8 +153,8 @@ Hostile = # Requires translation! Irrational = # Requires translation! -Personality: = -Influence: = Influência: +Personality = +Influence = Influência Reach 30 for friendship. = Alcançar 30 para amizade. Reach highest influence above 60 for alliance. = Alcançar influência máxima acima de 60 para aliança. Ally: = Alliado: diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties index ba1193e47b..c6fcfb8ddc 100644 --- a/android/assets/jsons/translations/Romanian.properties +++ b/android/assets/jsons/translations/Romanian.properties @@ -145,7 +145,7 @@ Cultured = Cult Maritime = Maritim Mercantile = Mercantil Militaristic = Militaristic -Type: = Tip: +Type = Tip # Requires translation! Friendly = # Requires translation! @@ -153,8 +153,8 @@ Hostile = # Requires translation! Irrational = # Requires translation! -Personality: = -Influence: = Influență: +Personality = +Influence = Influență Reach 30 for friendship. = Atinge 30 pentru prietenie. Reach highest influence above 60 for alliance. = Atinge cea mai mare influență peste 60 pentru alianță. Ally: = Aliat: diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties index 5ee039feef..8215169a50 100644 --- a/android/assets/jsons/translations/Russian.properties +++ b/android/assets/jsons/translations/Russian.properties @@ -137,12 +137,12 @@ Cultured = Культурный Maritime = Приморский Mercantile = Торговый Militaristic = Воинственный -Type: = Тип: +Type = Тип Friendly = Дружелюбный Hostile = Враждебный Irrational = Непредсказуемый -Personality: = Характер: -Influence: = Влияние: +Personality = Характер +Influence = Влияние Reach 30 for friendship. = Достигните 30 для дружбы. Reach highest influence above 60 for alliance. = Достигните влияния больше 60, чтобы стать союзником. Ally: = Союзник: diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index 35bd061ed1..5e6c623171 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -137,12 +137,12 @@ Cultured = 文化型 Maritime = 航海型 Mercantile = 商业型 Militaristic = 军事型 -Type: = 城邦类型： +Type = 城邦类型： Friendly = 友善 Hostile = 敌视 Irrational = 无理 -Personality: = 个性 -Influence: = 影响力： +Personality = 个性 +Influence = 影响力 Reach 30 for friendship. = 影响力到达30以建立友谊 Reach highest influence above 60 for alliance. = 影响力≥60且高于其他文明以成为友邦同盟 Ally: = 同盟： diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index 3657a8c1f0..d3f9e0070e 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -137,12 +137,12 @@ Cultured = Cultural Maritime = Marítimo Mercantile = Mercantil Militaristic = Militarista -Type: = Tipo: +Type = Tipo Friendly = amistoso Hostile = Hostil Irrational = Irracional -Personality: = Personalidad: -Influence: = Influencia: +Personality = Personalidad +Influence = Influencia Reach 30 for friendship. = Debes alcanzar 30 para lograr la amistad Reach highest influence above 60 for alliance. = Alcanza una influencia mayor a 60 para lograr alianza. Ally: = Aliado: diff --git a/android/assets/jsons/translations/Thai.properties b/android/assets/jsons/translations/Thai.properties index b6f424cbba..a884489dec 100644 --- a/android/assets/jsons/translations/Thai.properties +++ b/android/assets/jsons/translations/Thai.properties @@ -362,8 +362,8 @@ Cultured = มีวัฒนธรรม Maritime = เกี่ยวกับการเดินเรือ Mercantile = เกี่ยวกับการค้า Militaristic = เกี่ยวกับการทหาร -Type: = ชนิด: -Influence: = อิทธิพล +Type = ชนิด +Influence = อิทธิพล Reach 30 for friendship. = ทำให้ถึง 30 เพื่อเป็นมิตร Reach highest influence above 60 for alliance. = ค่าอิทธิพลสูงสุดเกิน 60 จะเป็นพันธมิตร Ally: = พันธมิตร: diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties index 1db8e7de99..763a47c20f 100644 --- a/android/assets/jsons/translations/Traditional_Chinese.properties +++ b/android/assets/jsons/translations/Traditional_Chinese.properties @@ -143,7 +143,7 @@ Cultured = 文化型 Maritime = 航海型 Mercantile = 商業型 Militaristic = 軍事型 -Type: = 城邦類型： +Type = 城邦類型： # Requires translation! Friendly = # Requires translation! @@ -151,8 +151,8 @@ Hostile = # Requires translation! Irrational = # Requires translation! -Personality: = -Influence: = 影響力： +Personality = +Influence = 影響力 Reach 30 for friendship. = 影響力到達30以建立友誼 Reach highest influence above 60 for alliance. = 影響力≥60且高於其他文明以成為友邦同盟 Ally: = 同盟： diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties index 2dcf7f08e6..84f567184d 100644 --- a/android/assets/jsons/translations/Turkish.properties +++ b/android/assets/jsons/translations/Turkish.properties @@ -143,7 +143,7 @@ Cultured = Kültürlü Maritime = Denizci Mercantile = Ticaret Militaristic = Askeri -Type: = Tür: +Type = Tür # Requires translation! Friendly = # Requires translation! @@ -151,8 +151,8 @@ Hostile = # Requires translation! Irrational = # Requires translation! -Personality: = -Influence: = Etki: +Personality = +Influence = Etki Reach 30 for friendship. = Arkadaşlık için 30'a ulaş. Reach highest influence above 60 for alliance. = İttifak için 60'ın üzerinde en yüksek etkiye ulaşın. Ally: = Müttefik: diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties index 0cc4444013..537ddf07d4 100644 --- a/android/assets/jsons/translations/Ukrainian.properties +++ b/android/assets/jsons/translations/Ukrainian.properties @@ -138,7 +138,7 @@ Cultured = Культурний Maritime = Морський Mercantile = Торгівельний Militaristic = Войовничий -Type: = Тип: +Type = Тип # Requires translation! Friendly = # Requires translation! @@ -146,8 +146,8 @@ Hostile = # Requires translation! Irrational = # Requires translation! -Personality: = -Influence: = Вплив: +Personality = +Influence = Вплив Reach 30 for friendship. = Досягніть 30 для дружби. Reach highest influence above 60 for alliance. = Досягніть найвищого впливу (понад 60) для союзу. Ally: = Союзник: diff --git a/android/assets/jsons/translations/Vietnamese.properties b/android/assets/jsons/translations/Vietnamese.properties index 7d4023f692..f111510a21 100644 --- a/android/assets/jsons/translations/Vietnamese.properties +++ b/android/assets/jsons/translations/Vietnamese.properties @@ -149,8 +149,8 @@ Cultured = Văn hóa Maritime = Hàng hải Mercantile = Thương nghiệp Militaristic = Quân sự -Type: = Loại: -Influence: = Uy quyền: +Type = Loại +Influence = Uy quyền Reach 30 for friendship. = Đạt 30 cho tình bạn Reach highest influence above 60 for alliance. = Đạt uy quyền cao nhất trên 60 để trở thành đồng minh Ally: = Đồng minh: diff --git a/android/assets/jsons/translations/template.properties b/android/assets/jsons/translations/template.properties index 27d93211a1..357306255d 100644 --- a/android/assets/jsons/translations/template.properties +++ b/android/assets/jsons/translations/template.properties @@ -137,16 +137,15 @@ Cultured = Maritime = Mercantile = Militaristic = -Type: = +Type = Friendly = Neutral = Hostile = Irrational = -Personality: = -Influence: = +Personality = +Influence = Reach 30 for friendship. = Reach highest influence above 60 for alliance. = -Ally: = # Trades diff --git a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt index 4b564f4959..53810fe480 100644 --- a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt +++ b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt @@ -100,12 +100,12 @@ class DiplomacyScreen(val viewingCiv:CivilizationInfo):CameraStageBaseScreen() { val diplomacyTable = Table() diplomacyTable.defaults().pad(10f) diplomacyTable.add(otherCiv.getLeaderDisplayName().toLabel(fontSize = 24)).row() - diplomacyTable.add("{Type: } {${otherCiv.cityStateType}}".toLabel()).row() - diplomacyTable.add("{Personality: } {${otherCiv.cityStatePersonality}}".toLabel()).row() + diplomacyTable.add("{Type}: {${otherCiv.cityStateType}}".toLabel()).row() + diplomacyTable.add("{Personality}: {${otherCiv.cityStatePersonality}}".toLabel()).row() otherCiv.updateAllyCivForCityState() val ally = otherCiv.getAllyCiv() if (ally != "") { - val allyString = "{Ally: }{$ally} {Influence: }".tr() + + val allyString = "{Ally}: {$ally} {Influence}: ".tr() + otherCiv.getDiplomacyManager(ally).influence.toString() diplomacyTable.add(allyString.toLabel()).row() } diff --git a/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt b/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt index 71bc959e9e..4d5275b2fc 100644 --- a/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt +++ b/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt @@ -146,13 +146,12 @@ internal object DesktopLauncher { packImagesIfOutdated(settings, "../ImagesToPackSeparately/BuildingIcons", ".", "BuildingIcons") packImagesIfOutdated(settings, "../ImagesToPackSeparately/FlagIcons", ".", "FlagIcons") packImagesIfOutdated(settings, "../ImagesToPackSeparately/UnitIcons", ".", "UnitIcons") - } // pack for mods as well val modDirectory = File("mods") - if(modDirectory.exists()) { - for (mod in modDirectory.listFiles()!!){ + if (modDirectory.exists()) { + for (mod in modDirectory.listFiles()!!) { if (!mod.isHidden && File(mod.path + "/Images").exists()) packImagesIfOutdated(settings, mod.path + "/Images", mod.path, "game") }