From 362c67e348923dccea442ab76044ab3488a9ee93 Mon Sep 17 00:00:00 2001 From: lishaoxia1985 <49801619+lishaoxia1985@users.noreply.github.com> Date: Tue, 22 Oct 2019 04:00:36 +0800 Subject: [PATCH] 1. rename the unit "Immortal" and the Promotion "Range" 2. fix the korean translation, it lost a ("). (#1216) * update * update * update * update * update * update * update * range extension --- .../{Immortal.png => Persian Immortal.png} | Bin .../{Range.png => Extended Range.png} | Bin android/assets/game.atlas | 4 +- .../NewGame,SaveGame,LoadGame,Options.json | 44 +----------------- android/assets/jsons/Translations/Other.json | 3 ++ .../jsons/Translations/Units,Promotions.json | 6 +-- android/assets/jsons/UnitPromotions.json | 2 +- android/assets/jsons/Units.json | 4 +- 8 files changed, 13 insertions(+), 50 deletions(-) rename android/Images/UnitIcons/{Immortal.png => Persian Immortal.png} (100%) rename android/Images/UnitPromotionIcons/{Range.png => Extended Range.png} (100%) diff --git a/android/Images/UnitIcons/Immortal.png b/android/Images/UnitIcons/Persian Immortal.png similarity index 100% rename from android/Images/UnitIcons/Immortal.png rename to android/Images/UnitIcons/Persian Immortal.png diff --git a/android/Images/UnitPromotionIcons/Range.png b/android/Images/UnitPromotionIcons/Extended Range.png similarity index 100% rename from android/Images/UnitPromotionIcons/Range.png rename to android/Images/UnitPromotionIcons/Extended Range.png diff --git a/android/assets/game.atlas b/android/assets/game.atlas index 112879b854..1967e936d5 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -3126,7 +3126,7 @@ UnitIcons/Hwach'a orig: 100, 100 offset: 0, 0 index: -1 -UnitIcons/Immortal +UnitIcons/Persian Immortal rotate: false xy: 896, 1010 size: 100, 100 @@ -3602,7 +3602,7 @@ UnitPromotionIcons/Operational Range orig: 50, 50 offset: 0, 0 index: -1 -UnitPromotionIcons/Range +UnitPromotionIcons/Extended Range rotate: false xy: 1266, 16 size: 50, 50 diff --git a/android/assets/jsons/Translations/NewGame,SaveGame,LoadGame,Options.json b/android/assets/jsons/Translations/NewGame,SaveGame,LoadGame,Options.json index 2a4e60b75e..81795a67d9 100644 --- a/android/assets/jsons/Translations/NewGame,SaveGame,LoadGame,Options.json +++ b/android/assets/jsons/Translations/NewGame,SaveGame,LoadGame,Options.json @@ -464,53 +464,13 @@ - // Starting Era + // Starting Era, the Era names don't need to translate. "Starting Era":{ Italian:"Epoca iniziale" Simplified_Chinese:"开始时代" Korean:"시작 시대" } - - "Ancient":{ - Italian:"Antica" - Korean:"고대" - } - - "Classic":{ - Italian:"Classica" - Korean:"고전" - } - - "Medieval":{ - Italian:"Medievale" - Korean:"중세" - } - - "Renaissance":{ - Italian:"Rinascimentale" - Korean:"르네상스" - } - - "Industrial":{ - Italian:"Industriale" - Korean:"산업" - } - - "Modern":{ - Italian:"Moderna" - Korean:"현대" - } - - "Information":{ - Italian:"Informatica" - Korean:"정보" - } - - "Future":{ - Italian:"Futura" - Korean:"미래" - } //// @@ -776,7 +736,7 @@ German: "Untätige Einheiten anzeigen bei Rundenende" French:"Vérifier les unités inactives" Russian:"Найти незанятые юниты" - Korean:"턴이 끝나기 전에 미행동 유닛 보기 + Korean:"턴이 끝나기 전에 미행동 유닛 보기" } "Move units with a single tap":{ diff --git a/android/assets/jsons/Translations/Other.json b/android/assets/jsons/Translations/Other.json index a31b1eb1ac..8e23999af0 100644 --- a/android/assets/jsons/Translations/Other.json +++ b/android/assets/jsons/Translations/Other.json @@ -172,6 +172,9 @@ Japanese:"爆撃力" } + "Range":{ + Simplified_Chinese:"攻击范围" + } /////// Unit actions diff --git a/android/assets/jsons/Translations/Units,Promotions.json b/android/assets/jsons/Translations/Units,Promotions.json index 9802078a6f..2c70d410b3 100644 --- a/android/assets/jsons/Translations/Units,Promotions.json +++ b/android/assets/jsons/Translations/Units,Promotions.json @@ -387,7 +387,7 @@ French:"Hoplite" } - "Immortal":{ // Persian unique + "Persian Immortal":{ // Persian unique Italian:"Immortale" Simplified_Chinese:"波斯长生军" } @@ -1683,12 +1683,12 @@ Simplified_Chinese:"警戒能力" } - "Range":{ + "Extended Range":{ Italian:"Raggio di tiro ampliato" German:"Reichweite" French:"Portée" Russian:"Обзор" - Simplified_Chinese:"Range"// the unit attribute and the promotions ability have the same name,if we do not solve this problem,i will not translate it. + Simplified_Chinese:"射程拓展" } "+1 Range":{ diff --git a/android/assets/jsons/UnitPromotions.json b/android/assets/jsons/UnitPromotions.json index 8d38c47620..96a8760019 100644 --- a/android/assets/jsons/UnitPromotions.json +++ b/android/assets/jsons/UnitPromotions.json @@ -49,7 +49,7 @@ unitTypes:["Ranged","Siege"] } { - name:"Range", + name:"Extended Range", prerequisites:["Accuracy III","Barrage III","Targeting II","Bombardment II", "Wolfpack II"], effect:"+1 Range", unitTypes:["Ranged","Siege","WaterRanged","WaterSubmarine"] diff --git a/android/assets/jsons/Units.json b/android/assets/jsons/Units.json index 8c6c0be282..90c3bfee89 100644 --- a/android/assets/jsons/Units.json +++ b/android/assets/jsons/Units.json @@ -243,7 +243,7 @@ attackSound:"metalhit" }, { - name:"Immortal", + name:"Persian Immortal", replaces:"Spearman", uniqueTo:"Persia", unitType:"Melee", @@ -423,7 +423,7 @@ requiredTech:"Machinery", upgradesTo:"Gatling Gun", obsoleteTech:"Industrialization", - promotions:["Range"], + promotions:["Extended Range"], hurryCostModifier:20, attackSound:"arrow" },