diff --git a/android/assets/jsons/Civ V - Vanilla/Policies.json b/android/assets/jsons/Civ V - Vanilla/Policies.json index 670b8684f9..08c7df4a3f 100644 --- a/android/assets/jsons/Civ V - Vanilla/Policies.json +++ b/android/assets/jsons/Civ V - Vanilla/Policies.json @@ -105,7 +105,7 @@ }, { "name": "Military Tradition", - "uniques":["Military units gain 50% more Experience from combat"], + "uniques":["[Military] units gain [50]% more Experience from combat"], "requires": ["Warrior Code"], "row": 2, "column": 2 diff --git a/core/src/com/unciv/logic/battle/Battle.kt b/core/src/com/unciv/logic/battle/Battle.kt index a180768cfe..080a0e6814 100644 --- a/core/src/com/unciv/logic/battle/Battle.kt +++ b/core/src/com/unciv/logic/battle/Battle.kt @@ -258,7 +258,12 @@ object Battle { return var XPModifier = 1f + // deprecated as of 3.12.10, keeping this for now in to avoid breaking mods if (thisCombatant.getCivInfo().hasUnique("Military units gain 50% more Experience from combat")) XPModifier += 0.5f + for (unique in thisCombatant.getCivInfo().getMatchingUniques("[] units gain []% more Experience from combat")) { + if (thisCombatant.unit.matchesFilter(unique.params[0])) + XPModifier += unique.params[1].toFloat() / 100 + } for (unique in thisCombatant.unit.getMatchingUniques("[]% Bonus XP gain")) XPModifier += unique.params[0].toFloat() / 100 @@ -504,4 +509,4 @@ object Battle { return true } -} \ No newline at end of file +}