wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More placeholder regex replacements

Browse source
This commit is contained in:
Yair Morgenstern 2020-07-20 00:21:17 +03:00
parent ceb456acab
commit e0dcf25e23
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/src/com/unciv/logic/battle/Battle.kt
View file

@ -13,6 +13,8 @@ import com.unciv.logic.map.RoadStatus
import com.unciv.logic.map.TileInfo
import com.unciv.models.AttackableTile
import com.unciv.models.ruleset.unit.UnitType
import com.unciv.models.translations.equalsPlaceholderText
import com.unciv.models.translations.getPlaceholderParameters
import java.util.*
import kotlin.math.max
@ -147,12 +149,11 @@ object Battle {
if (defender.isDefeated()
&& defender is MapUnitCombatant
&& attacker is MapUnitCombatant) {
val regex = Regex(BattleDamage.HEAL_WHEN_KILL)
for (unique in attacker.unit.getUniques()) {
val match = regex.matchEntire(unique)
if (match == null) continue
val amountToHeal = match.groups[1]!!.value.toInt()
attacker.unit.healBy(amountToHeal)
if(unique.equalsPlaceholderText("Heals [] damage if it kills a unit")){
val amountToHeal = unique.getPlaceholderParameters()[0].toInt()
attacker.unit.healBy(amountToHeal)
}
}
}
}

2
core/src/com/unciv/logic/battle/BattleDamage.kt
View file

@ -21,8 +21,6 @@ class BattleDamageModifier(val vs:String,val modificationAmount:Float){
object BattleDamage {
const val BONUS_VS_UNIT_TYPE = """(Bonus|Penalty) vs (.*) (\d*)%"""
const val BONUS_AS_ATTACKER = """Bonus as Attacker \[(\d*)]%"""
const val HEAL_WHEN_KILL = """Heals \[(\d*)] damage if it kills a unit"""
private fun getBattleDamageModifiersOfUnit(unit:MapUnit): MutableList<BattleDamageModifier> {
val modifiers = mutableListOf<BattleDamageModifier>()