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

Deprecated "Bonus vs <unitType> <amount>%" in favor of "+[amount]% Strength vs [unittype]"

Browse Source
This commit is contained in:
Yair Morgenstern 2021-06-13 22:47:41 +03:00
parent 60d8adce38
commit d1f6c5ac0a
1 changed files with 1 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,5 @@
package com.unciv.logic.battle package com.unciv.logic.battle
import com.unciv.logic.map.MapUnit
import com.unciv.logic.map.TileInfo import com.unciv.logic.map.TileInfo
import com.unciv.models.Counter import com.unciv.models.Counter
import com.unciv.models.ruleset.unit.UnitType import com.unciv.models.ruleset.unit.UnitType
@ -16,39 +15,11 @@ class BattleDamageModifier(val vs:String, val modificationAmount:Float){
object BattleDamage { object BattleDamage {
const val BONUS_VS_UNIT_TYPE = """(Bonus|Penalty) vs (.*) (\d*)%"""
// This should be deprecated and converted to "+[]% Strength vs []", "-[]% Strength vs []"
private fun getBattleDamageModifiersOfUnit(unit: MapUnit): MutableList<BattleDamageModifier> {
val modifiers = mutableListOf<BattleDamageModifier>()
for (ability in unit.getUniques()) {
// This beut allows us to have generic unit uniques: "Bonus vs City 75%", "Penatly vs Mounted 25%" etc.
val regexResult = Regex(BONUS_VS_UNIT_TYPE).matchEntire(ability.text)
if (regexResult == null) continue
val vs = regexResult.groups[2]!!.value
val modificationAmount = regexResult.groups[3]!!.value.toFloat()
if (regexResult.groups[1]!!.value == "Bonus")
modifiers.add(BattleDamageModifier(vs, modificationAmount))
else
modifiers.add(BattleDamageModifier(vs, -modificationAmount))
}
return modifiers
}
private fun getGeneralModifiers(combatant: ICombatant, enemy: ICombatant): Counter<String> { private fun getGeneralModifiers(combatant: ICombatant, enemy: ICombatant): Counter<String> {
val modifiers = Counter<String>() val modifiers = Counter<String>()
fun addToModifiers(BDM: BattleDamageModifier) =
modifiers.add(BDM.getText(), (BDM.modificationAmount).toInt())
val civInfo = combatant.getCivInfo() val civInfo = combatant.getCivInfo()
if (combatant is MapUnitCombatant) { if (combatant is MapUnitCombatant) {
for (BDM in getBattleDamageModifiersOfUnit(combatant.unit)) {
if (enemy.matchesCategory(BDM.vs)) {
addToModifiers(BDM)
}
}
for (unique in combatant.unit.getMatchingUniques("+[]% Strength vs []")) { for (unique in combatant.unit.getMatchingUniques("+[]% Strength vs []")) {
if (enemy.matchesCategory(unique.params[1])) if (enemy.matchesCategory(unique.params[1]))
modifiers.add("vs [${unique.params[1]}]", unique.params[0].toInt()) modifiers.add("vs [${unique.params[1]}]", unique.params[0].toInt())
@ -75,7 +46,7 @@ object BattleDamage {
} }
} }
var adjacentUnitBonus = 0; var adjacentUnitBonus = 0
for (unique in civInfo.getMatchingUniques("+[]% Strength for [] units which have another [] unit in an adjacent tile")) { for (unique in civInfo.getMatchingUniques("+[]% Strength for [] units which have another [] unit in an adjacent tile")) {
if (combatant.matchesCategory(unique.params[1]) if (combatant.matchesCategory(unique.params[1])
&& combatant.getTile().neighbors.flatMap { it.getUnits() } && combatant.getTile().neighbors.flatMap { it.getUnits() }