External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-22 19:41:59 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Implement Predatory Focus

Browse source
This commit is contained in:
Noah Gleason 2018-07-09 22:21:40 -04:00
parent 6dce0c26f3
commit 9108104fe5
No known key found for this signature in database
GPG key ID: EC030EC6B0650A40
4 changed files with 92 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Mage/src/main/java/mage/constants/AsThoughEffectType.java
View file

@ -18,6 +18,7 @@ public enum AsThoughEffectType {
BLOCK_SWAMPWALK,
BLOCK_MOUNTAINWALK,
BLOCK_FORESTWALK,
DAMAGE_NOT_BLOCKED,
BE_BLOCKED,
PLAY_FROM_NOT_OWN_HAND_ZONE,
CAST_AS_INSTANT,

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

@ -12,6 +12,7 @@ import mage.abilities.keyword.DeathtouchAbility;
import mage.abilities.keyword.DoubleStrikeAbility;
import mage.abilities.keyword.FirstStrikeAbility;
import mage.abilities.keyword.TrampleAbility;
import mage.constants.AsThoughEffectType;
import mage.constants.Outcome;
import mage.filter.StaticFilters;
import mage.game.Game;
@ -124,11 +125,14 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
return;
} else {
Player player = game.getPlayer(defenderAssignsCombatDamage(game) ? defendingPlayerId : attacker.getControllerId());
if (attacker.getAbilities().containsKey(DamageAsThoughNotBlockedAbility.getInstance().getId())) { // for handling creatures like Thorn Elemental
if (player.chooseUse(Outcome.Damage, "Do you wish to assign damage for " + attacker.getLogName() + " as though it weren't blocked?", null, game)) {
blocked = false;
unblockedDamage(first, game);
}
if ((attacker.getAbilities().containsKey(DamageAsThoughNotBlockedAbility.getInstance().getId()) &&
player.chooseUse(Outcome.Damage, "Do you wish to assign damage for "
+ attacker.getLogName() + " as though it weren't blocked?", null, game)) ||
game.getContinuousEffects().asThough(attacker.getId(), AsThoughEffectType.DAMAGE_NOT_BLOCKED
, null, attacker.getControllerId(), game) != null) {
// for handling creatures like Thorn Elemental
blocked = false;
unblockedDamage(first, game);
}
if (blockers.size() == 1) {
singleBlockerDamage(player, first, game);