From 9f09c2dc55e63b8b68159e3acc3284be1afa5f4b Mon Sep 17 00:00:00 2001 From: Am-per-Sand <40436282+Am-per-Sand@users.noreply.github.com> Date: Sat, 16 Mar 2019 18:55:41 +0100 Subject: [PATCH 1/4] Variable names warning for translators --- android/assets/jsons/Translations.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/android/assets/jsons/Translations.json b/android/assets/jsons/Translations.json index 08be81ba43..1161c3c76e 100644 --- a/android/assets/jsons/Translations.json +++ b/android/assets/jsons/Translations.json @@ -3,6 +3,8 @@ // - Keep it uniform! Use the same word/style for the same thing when ever necessary. // Otherwise it may be confusing to the user // + // Keep the names in SQUARE BRACKETS UNTRANSLATED!!! + // // - Use the language feature of wikipedia (search the original tech in English // and then choose your language on the left) // From ea365082009258b29d4b528a0ab8b11085d570dc Mon Sep 17 00:00:00 2001 From: Duan Tao Date: Sun, 17 Mar 2019 11:39:32 +0800 Subject: [PATCH 2/4] Modern units upgrade tree. --- android/assets/jsons/Units.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/android/assets/jsons/Units.json b/android/assets/jsons/Units.json index bf0d6aec45..2250d18f58 100644 --- a/android/assets/jsons/Units.json +++ b/android/assets/jsons/Units.json @@ -826,6 +826,8 @@ rangedStrength:30, cost: 225, requiredTech:"Industrialization", + upgradesTo:"Machine Gun", + obsoleteTech:"Ballistics", hurryCostModifier:20, attackSound:"machinegun" }, @@ -914,6 +916,7 @@ range:3, cost: 320, requiredTech:"Dynamite", + upgradesTo:"Rocket Artillery", uniques:["Bonus vs City 200%","No defensive terrain bonus", "Must set up to ranged attack","Limited Visibility","Indirect Fire"], hurryCostModifier:20 @@ -942,6 +945,8 @@ cost: 350, requiredTech:"Combustion", requiredResource:"Oil", + upgradesTo:"Tank", + obsoleteTech:"Combustion", uniques:["Can move after attacking","No defensive terrain bonus"], hurryCostModifier:20 }, @@ -998,6 +1003,8 @@ strength:70, cost: 375, requiredTech:"Plastics", + upgradesTo:"Mechanized Infantry", + obsoleteTech:"Nuclear Fission", hurryCostModifier:20, attackSound:"shot" }, @@ -1021,6 +1028,8 @@ cost: 375, requiredTech:"Combined Arms", requiredResource:"Oil", + upgradesTo:"Modern Armor", + //obsoleteTech:"Robotics", uniques:["Can move after attacking","No defensive terrain bonus"] hurryCostModifier:20, }, From a4954134815bcfe756a86ca5d87b82353fbb6782 Mon Sep 17 00:00:00 2001 From: Duan Tao Date: Sun, 17 Mar 2019 14:48:05 +0800 Subject: [PATCH 3/4] Fix a very stupid obselete define. --- android/assets/jsons/Units.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/assets/jsons/Units.json b/android/assets/jsons/Units.json index 2250d18f58..9021865f29 100644 --- a/android/assets/jsons/Units.json +++ b/android/assets/jsons/Units.json @@ -946,7 +946,7 @@ requiredTech:"Combustion", requiredResource:"Oil", upgradesTo:"Tank", - obsoleteTech:"Combustion", + obsoleteTech:"Combined Arms", uniques:["Can move after attacking","No defensive terrain bonus"], hurryCostModifier:20 }, From f8a8d7bbfb22485bb106692c85cf9a400c6701b4 Mon Sep 17 00:00:00 2001 From: Duan Tao Date: Sun, 17 Mar 2019 15:50:52 +0800 Subject: [PATCH 4/4] Embarked civilian units should have no defense. --- core/src/com/unciv/logic/battle/MapUnitCombatant.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/com/unciv/logic/battle/MapUnitCombatant.kt b/core/src/com/unciv/logic/battle/MapUnitCombatant.kt index 3282c781ea..9d318d3e00 100644 --- a/core/src/com/unciv/logic/battle/MapUnitCombatant.kt +++ b/core/src/com/unciv/logic/battle/MapUnitCombatant.kt @@ -26,7 +26,7 @@ class MapUnitCombatant(val unit: MapUnit) : ICombatant { } override fun getDefendingStrength(): Int { - if(unit.isEmbarked()) return 5 * getCivInfo().getEra().ordinal + if(unit.isEmbarked() && !unit.type.isCivilian()) return 5 * getCivInfo().getEra().ordinal return unit.baseUnit().strength }