From a01b5712f4013cdec8ce9a35e76701a58b94809c Mon Sep 17 00:00:00 2001 From: YueR Date: Sat, 28 Sep 2019 01:44:20 +0800 Subject: [PATCH] update --- android/assets/jsons/Buildings.json | 6 +++--- .../assets/jsons/Translations/Buildings.json | 7 +++++-- .../Translations/Diplomacy,Trade,Nations.json | 6 ++++++ .../jsons/Translations/Units,Promotions.json | 4 ++++ android/assets/jsons/Units.json | 19 ++----------------- core/src/com/unciv/logic/map/TileInfo.kt | 4 ++-- 6 files changed, 22 insertions(+), 24 deletions(-) diff --git a/android/assets/jsons/Buildings.json b/android/assets/jsons/Buildings.json index bf987e1796..ce19bada75 100644 --- a/android/assets/jsons/Buildings.json +++ b/android/assets/jsons/Buildings.json @@ -397,7 +397,7 @@ production:2, specialistSlots:{production:1}, hurryCostModifier:25, - uniques:["Forests provide +1 production"], + uniques:["+1 Production from each worked Forest tile"], requiredTech:"Metal Casting" }, { @@ -423,7 +423,7 @@ percentStatBonus:{science:33}, specialistSlots:{science:2}, requiredBuilding:"Library", - uniques:["Jungles provide +2 science"], + uniques:["+2 Science from each worked Jungle tile"], requiredTech:"Education" }, { @@ -447,7 +447,7 @@ specialistSlots:{science:2}, culture:1, requiredBuilding:"Library", - uniques:["Jungles provide +2 science"], + uniques:["+2 Science from each worked Jungle tile"], requiredTech:"Education" }, */ diff --git a/android/assets/jsons/Translations/Buildings.json b/android/assets/jsons/Translations/Buildings.json index da15b9eb34..0e72b3790a 100644 --- a/android/assets/jsons/Translations/Buildings.json +++ b/android/assets/jsons/Translations/Buildings.json @@ -798,12 +798,14 @@ Italian:"Casa Lunga" French:"Longère" Polish:"Długi dom" + Simplified_Chinese:"长屋" } "+1 Production from each worked Forest tile":{ Italian:"+1 Produzione da ogni casella di Foresta sfruttata dalla città" French:"+1 production pour chaque cases de forêt exploitées par la ville." Polish:"+1 do produkcji za każde pracujące pole lasu" + Simplified_Chinese:"每个工作的森林地块+1产能" } "Forge":{ @@ -866,7 +868,7 @@ Polish:"Uniwersytet" } - "Jungles provide +2 science":{ + "+2 Science from each worked Jungle tile":{ Italian:"+2 Scienza dalle Giungle" Russian:"Джунгли обеспечивают +2 науки" French:"Jungles fournissent +2 science" @@ -874,7 +876,7 @@ German:"Dschungel produziert +2 Wissenschaft" Dutch:"Oerwouden leveren +2 Wetenschap" Spanish:"Las selvas proporcionan +2 ciencia" - Simplified_Chinese:"丛林+2科研" + Simplified_Chinese:"每个工作的丛林地块+2科研" Portuguese:"Selvas proporcionam +2 ciência" Polish:"+2 nauki z pól dżungli" } @@ -1107,6 +1109,7 @@ Italian:"Corte del Satrapo" French:"Cour de Satrape" Polish:"Dwór satrapy" + Simplified_Chinese:"总督府" } "Forbidden Palace":{ diff --git a/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json b/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json index 9bae7d7995..8815db088a 100644 --- a/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json +++ b/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json @@ -1223,16 +1223,19 @@ Italian:"Irochese" French:"Iroquois" Portuguese:"Tribo Iroquois" //tribo meaning tribe of course + Simplified_Chinese:"易洛魁" } "Hiawatha":{ Italian:"Hiawatha"//Same as in Italian + Simplified_Chinese:"海华沙" } "All units move through Forest and Jungle Tiles in friendly territory as if they have roads. These tiles can be used to establish City Connections upon researching the Wheel.":{ Italian:"Le caselle di Foreste e Giungle in territorio amico agiscono come strade, e sono usate per stabilire Rotte Commerciali quando scopri la Ruota." Portuguese:"Mova-se por florestas e selvas em território amigo como se fossem estradas. Estas terras podem ser usadas para estabelecer rotas de comércio após pesquisar a roda." French:"Les Forêt et les Jungles en territoire alliés ont les mêmes attributs que les routes. A la découverte de la Roue, elles peuvent établir des routes commerciales." + Simplified_Chinese:"单位在己方森林和丛林地块上移动时视同在道路上移动，此类地块在研究轮子科技后可建立城市连接" } @@ -1240,16 +1243,19 @@ Italian:"Persia" French:"Perse" Portuguese:"Pérsia" + Simplified_Chinese:"波斯" } "Darius I":{ Italian:"Dario I" + Simplified_Chinese:"大流士一世" } "Golden Ages last 50% longer. During a Golden Age, units receive +1 Movement and +10% Strength":{ Italian:"+50% durata delle Età dell'Oro, durante le quali le unità ricevono +1 Movimento e +10% Forza." Portuguese:"Idades douradas duram 50% mais, unidades recebem 1 movimento a mais e um bonus de +10% em força de combate." French:"Les Ages d'Or durent 50% plus longtemps. Durant les Ages d'Or, les unités gagnent +1 mouvement et +10% de force de Combat." + Simplified_Chinese:"黄金时代持续时间+50%，处于黄金时代时单位+1移动力、+10%战斗力" } /* diff --git a/android/assets/jsons/Translations/Units,Promotions.json b/android/assets/jsons/Translations/Units,Promotions.json index b03c62822d..2a736985cb 100644 --- a/android/assets/jsons/Translations/Units,Promotions.json +++ b/android/assets/jsons/Translations/Units,Promotions.json @@ -384,10 +384,12 @@ "Immortal":{ // Persian unique Italian:"Immortale" + Simplified_Chinese:"波斯长生军" } "+10 HP when healing":{ Italian:"+10 PF quando si cura" + Simplified_Chinese:"生命回复时额外回复10生命值" } ////// Classical Era Units @@ -449,10 +451,12 @@ "Mohawk Warrior":{ Italian:"Guerriero Mohawk" + Simplified_Chinese:"莫霍克战士" } "+33% combat bonus in Forest/Jungle":{ Italian:"+33% Forza su Foreste o Giungle" + Simplified_Chinese:"位于森林/丛林时战斗力+33%" } "Legion":{ diff --git a/android/assets/jsons/Units.json b/android/assets/jsons/Units.json index b6e0cd36fe..5f5f0b507f 100644 --- a/android/assets/jsons/Units.json +++ b/android/assets/jsons/Units.json @@ -50,7 +50,7 @@ cost: 40, hurryCostModifier:20, obsoleteTech:"Metal Casting", - uniques:["Combat Bonus in Forest/Jungle 33%","Woodsmah","Heals 25 damage if it kills an Unit"], + uniques:["+33% combat bonus in Forest/Jungle","Woodsmah","Heals 25 damage if it kills an Unit"], upgradesTo:"Swordsman", attackSound:"nonmetalhit" //Aztec unique unit, moves faster and fights better in Forest and Jungle. He also heals 25 if he kills an enemy. @@ -319,21 +319,6 @@ hurryCostModifier:20, attackSound:"metalhit" }, - { - name:"Mohawk Warrior", - unitType:"Melee", - replaces:"Swordsman", - uniqueTo:"Iroquois", - movement:2, - strength:14, - cost: 75, - requiredTech:"Iron Working", - upgradesTo:"Longswordsman", - obsoleteTech:"Steel", - uniques:["+33% combat bonus in Forest/Jungle"] - hurryCostModifier:20, - attackSound:"metalhit" - }, { name:"Legion", unitType:"Melee", @@ -362,7 +347,7 @@ upgradesTo:"Longswordsman", obsoleteTech:"Gunpowder", hurryCostModifier:20, - uniques:["Combat Bonus in Forest/Jungle 33%"], + uniques:["+33% combat bonus in Forest/Jungle"], attackSound:"metalhit" }, { diff --git a/core/src/com/unciv/logic/map/TileInfo.kt b/core/src/com/unciv/logic/map/TileInfo.kt index 1874b408bb..3efaab930e 100644 --- a/core/src/com/unciv/logic/map/TileInfo.kt +++ b/core/src/com/unciv/logic/map/TileInfo.kt @@ -141,13 +141,13 @@ open class TileInfo { stats.add(terrainFeatureBase) if (terrainFeature == Constants.jungle && city != null - && city.containsBuildingUnique("Jungles provide +2 science")) + && city.containsBuildingUnique("+2 Science from each worked Jungle tile")) stats.science += 2f if (terrainFeature == "Oasis" && city != null && city.containsBuildingUnique("+2 Gold for each source of Oil and oasis")) stats.gold += 2 if (terrainFeature == Constants.forest && city != null - && city.containsBuildingUnique("Forests provide +1 production")) + && city.containsBuildingUnique("+1 Production from each worked Forest tile")) stats.production += 1 }