From f2e6c1b08fc195d81f05849e671af0b168d231f3 Mon Sep 17 00:00:00 2001 From: Duan Tao Date: Sun, 30 Dec 2018 12:24:01 +0800 Subject: [PATCH] Chinese unique ability. --- android/assets/jsons/Nations.json | 1 + android/assets/jsons/Translations.json | 3 +++ core/src/com/unciv/logic/battle/Battle.kt | 4 ++++ core/src/com/unciv/logic/battle/BattleDamage.kt | 5 ++++- 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/android/assets/jsons/Nations.json b/android/assets/jsons/Nations.json index 3783ff502d..f96ab68123 100644 --- a/android/assets/jsons/Nations.json +++ b/android/assets/jsons/Nations.json @@ -19,6 +19,7 @@ name:"China", mainColor:[9, 112, 84], secondaryColor:[255,255,255], + unique:"Great general provides double combat bonus, and spawns 50% faster" cities:["Beijing","Shanghai","Guangzhou","Nanjing","Xian","Chengdu","Hangzhou","Tianjin","Macau","Shandong", "Kaifeng","Ningbo","Baoding","Yangzhou","Harbin","Chongqing","Luoyang","Kunming","Taipei","Shenyang", "Taiyuan","Tainan","Dalian","Lijiang","Wuxi","Suzhou","Maoming","Shaoguan","Yangjiang","Heyuan"] diff --git a/android/assets/jsons/Translations.json b/android/assets/jsons/Translations.json index aea16146d2..d723e6524c 100644 --- a/android/assets/jsons/Translations.json +++ b/android/assets/jsons/Translations.json @@ -3446,6 +3446,9 @@ Spanish:"+2 de movimiento a las unidades navales" Simplified_Chinese:"所有有海军+2行动力" } + "Great general provides double combat bonus, and spawns 50% faster":{ + Simplified_Chinese:"大军事家提供双倍战斗加成，出生速率+50%" + } "France":{ Italian:"Francia" diff --git a/core/src/com/unciv/logic/battle/Battle.kt b/core/src/com/unciv/logic/battle/Battle.kt index 5b2e634140..ead96b1ec8 100644 --- a/core/src/com/unciv/logic/battle/Battle.kt +++ b/core/src/com/unciv/logic/battle/Battle.kt @@ -96,6 +96,10 @@ class Battle(val gameInfo:GameInfo) { var amountToAdd = amount if(thisCombatant.getCivilization().policies.isAdopted("Military Tradition")) amountToAdd = (amountToAdd * 1.5f).toInt() thisCombatant.unit.promotions.XP += amountToAdd + + if(thisCombatant.getCivilization().getNation().unique + == "Great general provides double combat bonus, and spawns 50% faster") + amountToAdd = (amountToAdd * 1.5f).toInt() thisCombatant.getCivilization().greatPeople.greatGeneralPoints += amountToAdd } diff --git a/core/src/com/unciv/logic/battle/BattleDamage.kt b/core/src/com/unciv/logic/battle/BattleDamage.kt index 7a1ffbb114..4d19b0c9dd 100644 --- a/core/src/com/unciv/logic/battle/BattleDamage.kt +++ b/core/src/com/unciv/logic/battle/BattleDamage.kt @@ -68,7 +68,10 @@ class BattleDamage{ .filter {it.civilianUnit?.civInfo == combatant.unit.civInfo} .map {it.civilianUnit} if (nearbyCivUnits.any { it!!.hasUnique("Bonus for land units in 2 radius 15%") }) { - modifiers["Great general"]=0.15f + modifiers["Great general"]= when { + combatant.unit.civInfo.getNation().unique == "Great general provides double combat bonus, and spawns 50% faster" -> 0.3f + else -> 0.15f + } } } }