AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-27 13:55:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bug where statue off Zeus would not work (#5732)

Browse Source
This commit is contained in:
Xander Lenstra 2021-11-30 13:42:19 +01:00 committed by GitHub
parent 57f3bf2bb2
commit 06dd395efb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/assets/jsons/Civ V - Gods & Kings/Buildings.json
View File

@ -205,7 +205,7 @@
"name": "Statue of Zeus",
"culture": 1,
"isWonder": true,
"uniques": ["[+15]% Strength <for [All] units> <vs Cities> <when attacking>"],
"uniques": ["[+15]% Strength <for [All] units> <vs cities> <when attacking>"],
"requiredTech": "Bronze Working",
"quote": "'He spoke, the son of Kronos, and nodded his head with the dark brows, and the immortally anointed hair of the great god swept from his divine head, and all Olympos was shaken' - The Iliad"
// "Requires [Honor]" in BNW

2
android/assets/jsons/Civ V - Vanilla/Buildings.json
View File

@ -186,7 +186,7 @@
"name": "Statue of Zeus",
"culture": 1,
"isWonder": true,
"uniques": ["[+15]% Strength <for [All] units> <vs Cities> <when attacking>"],
"uniques": ["[+15]% Strength <for [All] units> <vs cities> <when attacking>"],
"requiredTech": "Bronze Working",
"quote": "'He spoke, the son of Kronos, and nodded his head with the dark brows, and the immortally anointed hair of the great god swept from his divine head, and all Olympos was shaken' - The Iliad"
// "Requires [Honor]" in BNW

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

@ -60,23 +60,6 @@ object BattleDamage {
modifiers.add("${unique.sourceObjectName} (${unique.sourceObjectType})", effect)
}
// Deprecated since 3.17.3
for (unique in
combatant.unit.getMatchingUniques("+[]% Strength vs []")
) {
if (enemy.matchesCategory(unique.params[1]))
modifiers.add("vs [${unique.params[1]}]", unique.params[0].toInt())
}
for (unique in combatant.unit.getMatchingUniques("-[]% Strength vs []")
) {
if (enemy.matchesCategory(unique.params[1]))
modifiers.add("vs [${unique.params[1]}]", -unique.params[0].toInt())
}
for (unique in combatant.unit.getMatchingUniques("+[]% Combat Strength"))
modifiers.add("Combat Strength", unique.params[0].toInt())
//
//https://www.carlsguides.com/strategy/civilization5/war/combatbonuses.php
val civHappiness = if (civInfo.isCityState() && civInfo.getAllyCiv() != null)
// If we are a city state with an ally we are vulnerable to their unhappiness.