From 6c898174d95df426eba44a55032d81dfd8815bae Mon Sep 17 00:00:00 2001 From: Smashfanful <41149920+Smashfanful@users.noreply.github.com> Date: Wed, 16 Oct 2019 17:13:51 +0200 Subject: [PATCH 1/7] Update Units.json (#1206) --- android/assets/jsons/Units.json | 63 +++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/android/assets/jsons/Units.json b/android/assets/jsons/Units.json index 1446eab6..8c6c0be2 100644 --- a/android/assets/jsons/Units.json +++ b/android/assets/jsons/Units.json @@ -945,6 +945,10 @@ cost: 375, requiredTech:"Radar", requiredResource:"Oil", + /* + upgradesTo:"Jet Fighter", + obsoleteTech:"Lasers", + */ hurryCostModifier:20, uniques:["[100]% chance to intercept air attacks","Bonus vs Bomber 150%", "6 tiles in every direction always visible"] @@ -976,6 +980,10 @@ cost: 375, requiredTech:"Radar", requiredResource:"Oil", + /* + upgradesTo:"Stealth Bomber", + obsoleteTech:"Stealth", + */ hurryCostModifier:20, attackSound:"shot" }, @@ -1174,10 +1182,65 @@ cost: 425, requiredTech:"Lasers", requiredResource:"Aluminum", + /* + upgradesTo:"Giant Death Robot", + obsoleteTech:"Nuclear Fusion", + */ uniques:["Can move after attacking","No defensive terrain bonus"] hurryCostModifier:20, }, + /* + // Information Era + + { + name:"Jet Fighter", + unitType:"Fighter", + movement:2, + strength:45, + rangedStrength:75, + range:10, + cost: 425, + requiredTech:"Lasers", + requiredResource:"Aluminium", + hurryCostModifier:20, + uniques:["[100]% chance to intercept air attacks", + "Bonus vs Bomber 150%", + "6 tiles in every direction always visible"] + attackSound:"shot" + }, + { + name:"Stealth Bomber", + unitType:"Bomber", + movement:2, + strength:85, + rangedStrength:65, + range:20, + cost: 425, + requiredTech:"Stealth", + requiredResource:"Aluminium", + hurryCostModifier:20, + uniques:["Evasion"] + attackSound:"shot" + }, + */ + + /* + // Future Era + + { + name:"Giant Death Robot", + unitType:"Armor", + movement:5, + strength:150, + cost: 550, + requiredTech:"Nuclear Fusion", + requiredResource:"Uranium", + uniques:["Can move after attacking","No defensive terrain bonus"] + hurryCostModifier:20, + }, + */ + /* Great people */ From aa55fdb424b91fccb3a85b8b2b5aec7123926b80 Mon Sep 17 00:00:00 2001 From: Smashfanful <41149920+Smashfanful@users.noreply.github.com> Date: Wed, 16 Oct 2019 17:14:39 +0200 Subject: [PATCH 2/7] Update Units,Promotions.json (#1205) --- .../assets/jsons/Translations/Units,Promotions.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/android/assets/jsons/Translations/Units,Promotions.json b/android/assets/jsons/Translations/Units,Promotions.json index f7eb8957..9802078a 100644 --- a/android/assets/jsons/Translations/Units,Promotions.json +++ b/android/assets/jsons/Translations/Units,Promotions.json @@ -228,6 +228,11 @@ German:"Krieger" } + + "Maori Warrior":{ + Italian:"Guerriero Maori" + } + "Archer":{ Italian:"Arciere" Russian:"Лучник" @@ -2083,4 +2088,12 @@ Russian:"Засада II" } + "Haka War Dance":{ + Italian:"Danza di guerra Haka" + } + + "-10% combat strength for adjacent enemy units":{ + Italian:"-10% Forza alle unità nemiche adiacenti a questa unità" + } + } From cd1fa9b79ec1a107b5a20b845c174c5d8cf4e833 Mon Sep 17 00:00:00 2001 From: Smashfanful <41149920+Smashfanful@users.noreply.github.com> Date: Wed, 16 Oct 2019 11:33:59 +0200 Subject: [PATCH 3/7] Update Notifications.json --- android/assets/jsons/Translations/Notifications.json | 1 + 1 file changed, 1 insertion(+) diff --git a/android/assets/jsons/Translations/Notifications.json b/android/assets/jsons/Translations/Notifications.json index 57042d0a..f21f5d85 100644 --- a/android/assets/jsons/Translations/Notifications.json +++ b/android/assets/jsons/Translations/Notifications.json @@ -536,6 +536,7 @@ } "[cityName] has been connected to your capital!":{ + Italian:"Itinerario costruito tra la Capitale e [cityName]!" } // Trade From f7f7d8999203a815f6e3d718308464ec1bc3454c Mon Sep 17 00:00:00 2001 From: Smashfanful <41149920+Smashfanful@users.noreply.github.com> Date: Wed, 16 Oct 2019 11:31:34 +0200 Subject: [PATCH 4/7] Update NewGame,SaveGame,LoadGame,Options.json --- .../jsons/Translations/NewGame,SaveGame,LoadGame,Options.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/android/assets/jsons/Translations/NewGame,SaveGame,LoadGame,Options.json b/android/assets/jsons/Translations/NewGame,SaveGame,LoadGame,Options.json index 958dd686..1933eb56 100644 --- a/android/assets/jsons/Translations/NewGame,SaveGame,LoadGame,Options.json +++ b/android/assets/jsons/Translations/NewGame,SaveGame,LoadGame,Options.json @@ -715,6 +715,10 @@ Russian:"Автопроизводство в городах" } + "Auto-build roads":{ + Italian:"Costruzione strade automatica" + } + "Show minimap":{ Italian:"Mostra minimappa", Simplified_Chinese:"显示小地图" From 200931cfd66d3696758a77321f3d564c629f6f9f Mon Sep 17 00:00:00 2001 From: Smashfanful <41149920+Smashfanful@users.noreply.github.com> Date: Wed, 16 Oct 2019 11:40:33 +0200 Subject: [PATCH 5/7] Update Other.json Italian translations and corrections --- android/assets/jsons/Translations/Other.json | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/android/assets/jsons/Translations/Other.json b/android/assets/jsons/Translations/Other.json index f56e4be0..883afa30 100644 --- a/android/assets/jsons/Translations/Other.json +++ b/android/assets/jsons/Translations/Other.json @@ -438,7 +438,7 @@ } "Start Golden Age":{ - Italian:"Inizia Età dell'Oro" + Italian:"Avvia Età dell'Oro" French:"Commencer un Age d'Or" Simplified_Chinese:"开启黄金时代" Russian:"Начать золотой век" @@ -712,7 +712,7 @@ } "Buy for [amount] gold":{ - Italian:"Acquista con [amount] oro" + Italian:"Acquista ([amount] oro)" Russian:"Купить за [amount] золота" French:"Acheter avec [amount] or" Romanian:"Cumpără cu [amount] aur" @@ -738,7 +738,7 @@ } "Would you like to purchase [constructionName] for [buildingGoldCost] gold?":{ - Italian:"Vuoi acquistare [constructionName] per [buildingGoldCost] oro?" + Italian:"Vuoi acquistare [constructionName] ([buildingGoldCost] oro)?" Russian:"Хотите купить [constructionName] за [buildingGoldCost] золота?" French:"Souhaitez-vous acheter [constructionName] pour [buildingGoldCost] gold?" Romanian:"Doriți să achiziționați [buildingName] pentru aur [buildingGoldCost]?" @@ -1834,8 +1834,11 @@ }, "Annexed cities become part of your regular empire.":{ + Italian:"Le città annesse faranno parte regolare del tuo impero." } + "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." } "Puppet":{ @@ -1844,15 +1847,19 @@ } "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." } "You have no control over the the production of puppeted cities.":{ + Italian:"Non hai alcun controllo sulla produzione delle città fantoccio." } "Puppeted cities also generate 25% less Gold and Science.":{ + Italian:"Gli stati fantoccio generano anche il 25% di Oro e Scienza in meno." } "A puppeted city can be annexed at any time.":{ + Italian:"Puoi annettere una città fantoccio ogni volta che vuoi" } "Liberate":{ @@ -1861,6 +1868,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!" } "Raze":{ @@ -1871,9 +1879,11 @@ } "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." } "The population will gradually dwindle until the city is destroyed.":{ + Italian:"La popolazione diminuirà gradualmente fino alla distruzione della città." } From 00d0f278710ff32a31d830e06b310d4a66b12f80 Mon Sep 17 00:00:00 2001 From: Smashfanful <41149920+Smashfanful@users.noreply.github.com> Date: Wed, 16 Oct 2019 11:30:13 +0200 Subject: [PATCH 6/7] Update Diplomacy,Trade,Nations.json --- .../assets/jsons/Translations/Diplomacy,Trade,Nations.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json b/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json index be292137..8a1825a9 100644 --- a/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json +++ b/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json @@ -1271,6 +1271,10 @@ Portuguese:"Polinésia" } + "Kamehameha I":{ + Italian:"Kamehameha I" + } + "Can embark and move over Coasts and Oceans immediately. +1 Sight when embarked. +10% Combat Strenght 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" From 691a305e5061f0a78949a42d3a84b1c55d32bbfc Mon Sep 17 00:00:00 2001 From: Duan Tao Date: Wed, 16 Oct 2019 23:16:27 +0800 Subject: [PATCH 7/7] Duantao/settler food info (#1198) * Better info for building settler. * Shorter message. * Fix message. --- android/assets/jsons/Translations/Other.json | 4 ++++ core/src/com/unciv/ui/cityscreen/CityScreen.kt | 13 +++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/android/assets/jsons/Translations/Other.json b/android/assets/jsons/Translations/Other.json index 883afa30..a31b1eb1 100644 --- a/android/assets/jsons/Translations/Other.json +++ b/android/assets/jsons/Translations/Other.json @@ -950,6 +950,10 @@ Japanese:"[turnsToPopulation]新しい人口に目を向けます" } + "Food converts to production":{ + + } + "[turnsToStarvation] turns to lose population":{ Italian:"Perdita di popolazione tra [turnsToStarvation] turni" Russian:"[turnsToStarvation] ходов до уменьшения населения" diff --git a/core/src/com/unciv/ui/cityscreen/CityScreen.kt b/core/src/com/unciv/ui/cityscreen/CityScreen.kt index bc2a668c..799d5358 100644 --- a/core/src/com/unciv/ui/cityscreen/CityScreen.kt +++ b/core/src/com/unciv/ui/cityscreen/CityScreen.kt @@ -6,6 +6,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.scenes.scene2d.ui.TextButton import com.badlogic.gdx.utils.Align +import com.unciv.Constants import com.unciv.UnCivGame import com.unciv.logic.HexMath import com.unciv.logic.city.CityInfo @@ -132,10 +133,14 @@ class CityScreen(internal val city: CityInfo) : CameraStageBaseScreen() { val turnsToPopString : String if (city.cityStats.currentCityStats.food > 0) { - var turnsToPopulation = ceil((city.population.getFoodToNextPopulation()-city.population.foodStored) - / city.cityStats.currentCityStats.food).toInt() - if (turnsToPopulation < 1) turnsToPopulation = 1 - turnsToPopString = "[$turnsToPopulation] turns to new population".tr() + if (city.cityConstructions.currentConstruction == Constants.settler) { + turnsToPopString = "Food converts to production".tr() + } else { + var turnsToPopulation = ceil((city.population.getFoodToNextPopulation()-city.population.foodStored) + / city.cityStats.currentCityStats.food).toInt() + if (turnsToPopulation < 1) turnsToPopulation = 1 + turnsToPopString = "[$turnsToPopulation] turns to new population".tr() + } } else if (city.cityStats.currentCityStats.food < 0) { val turnsToStarvation = floor(city.population.foodStored / -city.cityStats.currentCityStats.food).toInt() + 1 turnsToPopString = "[$turnsToStarvation] turns to lose population".tr()