AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-28 06:16:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #387 from ninjatao/chinese_unique

Browse Source 
Chinese unique ability.
This commit is contained in:
Yair Morgenstern 2018-12-30 07:58:19 +02:00 committed by GitHub
commit 11066b84e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
android/assets/jsons/Nations.json
View File

@ -19,6 +19,7 @@
name:"China", name:"China",
mainColor:[9, 112, 84], mainColor:[9, 112, 84],
secondaryColor:[255,255,255], 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", cities:["Beijing","Shanghai","Guangzhou","Nanjing","Xian","Chengdu","Hangzhou","Tianjin","Macau","Shandong",
"Kaifeng","Ningbo","Baoding","Yangzhou","Harbin","Chongqing","Luoyang","Kunming","Taipei","Shenyang", "Kaifeng","Ningbo","Baoding","Yangzhou","Harbin","Chongqing","Luoyang","Kunming","Taipei","Shenyang",
"Taiyuan","Tainan","Dalian","Lijiang","Wuxi","Suzhou","Maoming","Shaoguan","Yangjiang","Heyuan"] "Taiyuan","Tainan","Dalian","Lijiang","Wuxi","Suzhou","Maoming","Shaoguan","Yangjiang","Heyuan"]

3
android/assets/jsons/Translations.json
View File

@ -3446,6 +3446,9 @@
Spanish:"+2 de movimiento a las unidades navales" Spanish:"+2 de movimiento a las unidades navales"
Simplified_Chinese:"所有有海军+2行动力" Simplified_Chinese:"所有有海军+2行动力"
} }
"Great general provides double combat bonus, and spawns 50% faster":{
Simplified_Chinese:"大军事家提供双倍战斗加成，出生速率+50%"
}
"France":{ "France":{
Italian:"Francia" Italian:"Francia"

4
core/src/com/unciv/logic/battle/Battle.kt
View File

@ -96,6 +96,10 @@ class Battle(val gameInfo:GameInfo) {
var amountToAdd = amount var amountToAdd = amount
if(thisCombatant.getCivilization().policies.isAdopted("Military Tradition")) amountToAdd = (amountToAdd * 1.5f).toInt() if(thisCombatant.getCivilization().policies.isAdopted("Military Tradition")) amountToAdd = (amountToAdd * 1.5f).toInt()
thisCombatant.unit.promotions.XP += amountToAdd 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 thisCombatant.getCivilization().greatPeople.greatGeneralPoints += amountToAdd
} }

5
core/src/com/unciv/logic/battle/BattleDamage.kt
View File

@ -68,7 +68,10 @@ class BattleDamage{
.filter {it.civilianUnit?.civInfo == combatant.unit.civInfo} .filter {it.civilianUnit?.civInfo == combatant.unit.civInfo}
.map {it.civilianUnit} .map {it.civilianUnit}
if (nearbyCivUnits.any { it!!.hasUnique("Bonus for land units in 2 radius 15%") }) { 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
}
} }
} }
} }