Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

wip

Browse source
This commit is contained in:
htrajan 2020-04-16 15:53:51 -07:00
parent f09a6d847e
commit cab436e9e5
9 changed files with 186 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

47
Mage/src/main/java/mage/game/combat/CombatGroup.java
View file

@ -5,6 +5,7 @@ import java.io.Serializable;
import java.util.*;
import java.util.stream.Stream;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.ControllerAssignCombatDamageToBlockersAbility;
import mage.abilities.common.ControllerDivideCombatDamageAbility;
@ -19,12 +20,15 @@ import mage.abilities.keyword.TrampleAbility;
import mage.constants.AsThoughEffectType;
import mage.constants.Outcome;
import mage.filter.StaticFilters;
import mage.filter.common.FilterCreaturePermanent;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.util.Copyable;
import static java.util.Collections.emptyList;
/**
*
* @author BetaSteward_at_googlemail.com
@ -271,12 +275,7 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
if (blocked && canDamage(attacker, first)) {
int damage = getDamageValueFromPermanent(attacker, game);
if (hasTrample(attacker)) {
int lethalDamage;
if (attacker.getAbilities().containsKey(DeathtouchAbility.getInstance().getId())) {
lethalDamage = 1;
} else {
lethalDamage = Math.max(blocker.getToughness().getValue() - blocker.getDamage(), 0);
}
int lethalDamage = getLethalDamage(blocker, attacker, game);
if (lethalDamage >= damage) {
blocker.markDamage(damage, attacker.getId(), game, true, true);
} else {
@ -325,12 +324,7 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
for (UUID blockerId : new ArrayList<>(blockerOrder)) { // prevent ConcurrentModificationException
Permanent blocker = game.getPermanent(blockerId);
if (blocker != null) {
int lethalDamage;
if (attacker.getAbilities().containsKey(DeathtouchAbility.getInstance().getId())) {
lethalDamage = 1;
} else {
lethalDamage = Math.max(blocker.getToughness().getValue() - blocker.getDamage(), 0);
}
int lethalDamage = getLethalDamage(blocker, attacker, game);
if (lethalDamage >= damage) {
if (!oldRuleDamage) {
assigned.put(blockerId, damage);
@ -521,12 +515,7 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
for (UUID attackerId : attackerOrder) {
Permanent attacker = game.getPermanent(attackerId);
if (attacker != null) {
int lethalDamage;
if (blocker.getAbilities().containsKey(DeathtouchAbility.getInstance().getId())) {
lethalDamage = 1;
} else {
lethalDamage = Math.max(attacker.getToughness().getValue() - attacker.getDamage(), 0);
}
int lethalDamage = getLethalDamage(attacker, blocker, game);
if (lethalDamage >= damage) {
if (!oldRuleDamage) {
assigned.put(attackerId, damage);
@ -936,4 +925,26 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
}
return false;
}
private static int getLethalDamage(Permanent blocker, Permanent attacker, Game game) {
int lethalDamage;
if (attacker.getAbilities().containsKey(DeathtouchAbility.getInstance().getId())) {
lethalDamage = 1;
} else {
lethalDamage = getLethalDamage(blocker, game);
}
return lethalDamage;
}
public static int getLethalDamage(Permanent damagedPermanent, Game game) {
List<FilterCreaturePermanent> usePowerInsteadOfToughnessForDamageLethalityFilters = game.getActiveUsePowerInsteadOfToughnessForDamageLethalityFilters();
/*
* for handling Zilortha, Strength Incarnate:
* Any time the game is checking whether damage is lethal or if a creature should be destroyed for having lethal damage marked on it, use the power of your creatures rather than their toughness to check the damage against. This includes being assigned trample damage, damage from Flame Spill, and so on.
*/
boolean usePowerInsteadOfToughnessForDamageLethality = usePowerInsteadOfToughnessForDamageLethalityFilters.stream()
.anyMatch(filter -> filter.match(damagedPermanent, game));
MageInt lethalDamageThreshold = usePowerInsteadOfToughnessForDamageLethality? damagedPermanent.getPower() : damagedPermanent.getToughness();
return Math.max(lethalDamageThreshold.getValue() - damagedPermanent.getDamage(), 0);
}
}