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

Added missing "mustn't must attack" clause & some text fixes

Browse source
This commit is contained in:
Zzooouhh 2017-10-15 23:20:27 +02:00 • committed by GitHub
parent 56d93b0def
commit 4155b30af3
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Mage.Sets/src/mage/cards/m/MasterWarcraft.java
View file

@ -27,7 +27,7 @@
*/ */
package mage.cards.m; package mage.cards.m;
import java.util.UUID; import java.util.*;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.Mode; import mage.abilities.Mode;
import mage.abilities.common.CastOnlyDuringPhaseStepSourceAbility; import mage.abilities.common.CastOnlyDuringPhaseStepSourceAbility;
@ -64,10 +64,10 @@ public class MasterWarcraft extends CardImpl {
this.addAbility(new CastOnlyDuringPhaseStepSourceAbility(null, null, BeforeAttackersAreDeclaredCondition.instance)); this.addAbility(new CastOnlyDuringPhaseStepSourceAbility(null, null, BeforeAttackersAreDeclaredCondition.instance));
// You choose which creatures attack this turn. // You choose which creatures attack this turn.
this.getSpellAbility().addEffect(new MasterWarcraftChooseAttackersEffect().setText("You choose which creatures attack this turn.")); this.getSpellAbility().addEffect(new MasterWarcraftChooseAttackersEffect());
// You choose which creatures block this turn and how those creatures block. // You choose which creatures block this turn and how those creatures block.
this.getSpellAbility().addEffect(new MasterWarcraftChooseBlockersEffect().setText("You choose which creatures block this turn and how those creatures block.")); this.getSpellAbility().addEffect(new MasterWarcraftChooseBlockersEffect());
} }
public MasterWarcraft(final MasterWarcraft card) { public MasterWarcraft(final MasterWarcraft card) {
@ -84,7 +84,7 @@ class MasterWarcraftChooseAttackersEffect extends ReplacementEffectImpl {
public MasterWarcraftChooseAttackersEffect() { public MasterWarcraftChooseAttackersEffect() {
super(Duration.EndOfTurn, Outcome.Benefit); super(Duration.EndOfTurn, Outcome.Benefit);
this.staticText = "You choose which creatures attack this turn."; this.staticText = "You choose which creatures attack this turn";
} }
public MasterWarcraftChooseAttackersEffect(final MasterWarcraftChooseAttackersEffect effect) { public MasterWarcraftChooseAttackersEffect(final MasterWarcraftChooseAttackersEffect effect) {
@ -184,7 +184,12 @@ class MasterWarcraftCantAttackRestrictionEffect extends RestrictionEffect {
@Override @Override
public boolean applies(Permanent permanent, Ability source, Game game) { public boolean applies(Permanent permanent, Ability source, Game game) {
// TODO: Make Master Warcraft still respect "This must attack if able" clauses for (Map.Entry<RequirementEffect, Set<Ability>> entry : game.getContinuousEffects().getApplicableRequirementEffects(creature, false, game).entrySet()) {
RequirementEffect effect = entry.getKey();
if (effect.mustAttack(game)) {
return false;
}
}
return this.getTargetPointer().getFirst(game, source).equals(permanent.getId()); return this.getTargetPointer().getFirst(game, source).equals(permanent.getId());
} }
@ -203,7 +208,7 @@ class MasterWarcraftChooseBlockersEffect extends ReplacementEffectImpl {
public MasterWarcraftChooseBlockersEffect() { public MasterWarcraftChooseBlockersEffect() {
super(Duration.EndOfTurn, Outcome.Benefit); super(Duration.EndOfTurn, Outcome.Benefit);
staticText = "You choose which creatures block this turn and how those creatures block."; staticText = "You choose which creatures block this turn and how those creatures block";
} }
public MasterWarcraftChooseBlockersEffect(final MasterWarcraftChooseBlockersEffect effect) { public MasterWarcraftChooseBlockersEffect(final MasterWarcraftChooseBlockersEffect effect) {