From 75d7ae2a6e93e740bafa78a0bf117f376977656b Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sun, 18 Jan 2015 09:22:24 +0100 Subject: [PATCH] * Fixed a recently added bug of AttacksIfAbleAllEffect (e.g. causing Goblin Rabblemaster to not working correctly). --- Mage.Sets/src/mage/sets/magic2015/GoblinRabblemaster.java | 2 -- .../effects/common/combat/AttacksIfAbleAllEffect.java | 4 ++-- Utils/release/getting_implemented_cards.txt | 3 +++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Mage.Sets/src/mage/sets/magic2015/GoblinRabblemaster.java b/Mage.Sets/src/mage/sets/magic2015/GoblinRabblemaster.java index e638d5ec911..2b20eea57af 100644 --- a/Mage.Sets/src/mage/sets/magic2015/GoblinRabblemaster.java +++ b/Mage.Sets/src/mage/sets/magic2015/GoblinRabblemaster.java @@ -64,11 +64,9 @@ public class GoblinRabblemaster extends CardImpl { static { otherGoblinFilter.add(new AnotherPredicate()); otherGoblinFilter.add(new ControllerPredicate(TargetController.YOU)); - otherGoblinFilter.add(new SubtypePredicate("Goblin")); attackingFilter.add(new AttackingPredicate()); attackingFilter.add(new AnotherPredicate()); - attackingFilter.add(new SubtypePredicate("Goblin")); } public GoblinRabblemaster(UUID ownerId) { diff --git a/Mage/src/mage/abilities/effects/common/combat/AttacksIfAbleAllEffect.java b/Mage/src/mage/abilities/effects/common/combat/AttacksIfAbleAllEffect.java index e2124a37bb9..4cdc3b8317a 100644 --- a/Mage/src/mage/abilities/effects/common/combat/AttacksIfAbleAllEffect.java +++ b/Mage/src/mage/abilities/effects/common/combat/AttacksIfAbleAllEffect.java @@ -51,12 +51,12 @@ public class AttacksIfAbleAllEffect extends RequirementEffect { @Override public boolean mustAttack(Game game) { - return false; + return true; } @Override public boolean mustBlock(Game game) { - return true; + return false; } } diff --git a/Utils/release/getting_implemented_cards.txt b/Utils/release/getting_implemented_cards.txt index 455cfbeddcd..887d71b56f3 100644 --- a/Utils/release/getting_implemented_cards.txt +++ b/Utils/release/getting_implemented_cards.txt @@ -84,6 +84,9 @@ git log c4ad51c4af2467f3483204e29f23b76c53f8f880..HEAD --diff-filter=A --name-st since 1.3.0-2014-11-29v7 (2015-01-01) git log c370189787cff7fc129b1ccf1b223807143460de..HEAD --diff-filter=A --name-status | sed -ne "s/^A[^u]Mage.Sets\/src\/mage\/sets\///p" | sort > added_cards.txt +since 1.3.0-2014-11-29v8 (2015-01-17) +git log 79ceae999a72151e2fadd1e15ddd37ec76c3f205..HEAD --diff-filter=A --name-status | sed -ne "s/^A[^u]Mage.Sets\/src\/mage\/sets\///p" | sort > added_cards.txt + 3. Copy added_cards.txt to trunk\Utils folder 4. Run script: > perl extract_in_wiki_format.perl