From 24145e7da80019eb9c8bfb6cc63d0a0e41ba5710 Mon Sep 17 00:00:00 2001 From: swordshine Date: Wed, 3 Apr 2013 00:20:08 +0000 Subject: [PATCH] - Added Heroism --- .gitattributes | 1 + res/cardsfolder/h/heroism.txt | 10 ++++++++++ src/main/java/forge/card/ability/AbilityUtils.java | 2 +- src/main/java/forge/game/GameActionUtil.java | 4 ++-- 4 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 res/cardsfolder/h/heroism.txt diff --git a/.gitattributes b/.gitattributes index 0e721e172b4..7133280fb28 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4867,6 +4867,7 @@ res/cardsfolder/h/hero_of_oxid_ridge.txt svneol=native#text/plain res/cardsfolder/h/heroes_remembered.txt svneol=native#text/plain res/cardsfolder/h/heroes_reunion.txt svneol=native#text/plain res/cardsfolder/h/heroic_defiance.txt -text +res/cardsfolder/h/heroism.txt -text res/cardsfolder/h/heros_demise.txt svneol=native#text/plain res/cardsfolder/h/heros_resolve.txt svneol=native#text/plain res/cardsfolder/h/hesitation.txt -text svneol=unset#text/plain diff --git a/res/cardsfolder/h/heroism.txt b/res/cardsfolder/h/heroism.txt new file mode 100644 index 00000000000..6c626fbaa5c --- /dev/null +++ b/res/cardsfolder/h/heroism.txt @@ -0,0 +1,10 @@ +Name:Heroism +ManaCost:2 W +Types:Enchantment +A:AB$ RepeatEach | Cost$ Sac<1/Creature.White/White Creature> | RepeatCards$ Creature.attacking+Red | RepeatSubAbility$ DBPump | SpellDescription$ For each attacking red creature, prevent all combat damage that would be dealt by that creature this turn unless its controller pays 2 R. +SVar:DBPump:DB$ Pump | Defined$ Remembered | KW$ HIDDEN Prevent all combat damage that would be dealt by CARDNAME. | UnlessCost$ 2 R | UnlessPayer$ RememberedController +SVar:RemRandomDeck:True +SVar:RemAIDeck:True +SVar:Picture:http://www.wizards.com/global/images/magic/general/heroism.jpg +Oracle:Sacrifice a white creature: For each attacking red creature, prevent all combat damage that would be dealt by that creature this turn unless its controller pays {2}{R}. +SetInfo:FEM Uncommon \ No newline at end of file diff --git a/src/main/java/forge/card/ability/AbilityUtils.java b/src/main/java/forge/card/ability/AbilityUtils.java index c6c8c5cea1d..eecefd1e829 100644 --- a/src/main/java/forge/card/ability/AbilityUtils.java +++ b/src/main/java/forge/card/ability/AbilityUtils.java @@ -1181,7 +1181,7 @@ public class AbilityUtils { private static boolean willAIPayForAbility(SpellAbility sa, Player payer, SpellAbility ability, boolean paid, List payers) { Card source = sa.getSourceCard(); boolean payForOwnOnly = "OnlyOwn".equals(sa.getParam("UnlessAI")); - boolean payOwner = sa.getParam("UnlessAI").startsWith("Defined"); + boolean payOwner = sa.hasParam("UnlessAI") ? sa.getParam("UnlessAI").startsWith("Defined") : false; boolean payNever = "Never".equals(sa.getParam("UnlessAI")); boolean isMine = sa.getActivatingPlayer().equals(payer); diff --git a/src/main/java/forge/game/GameActionUtil.java b/src/main/java/forge/game/GameActionUtil.java index 6e01632b5f3..d117414a1b5 100644 --- a/src/main/java/forge/game/GameActionUtil.java +++ b/src/main/java/forge/game/GameActionUtil.java @@ -406,12 +406,12 @@ public final class GameActionUtil { final Player p = ability.getActivatingPlayer(); final Card source = ability.getSourceCard(); Card current = null; // Used in spells with RepeatEach effect to distinguish cards, Cut the Tethers - if (!source.getRemembered().isEmpty() && source.isSpell()) { + if (!source.getRemembered().isEmpty()) { if (source.getRemembered().get(0) instanceof Card) { current = (Card) source.getRemembered().get(0); } } - if (!source.getImprinted().isEmpty() && source.isSpell()) { + if (!source.getImprinted().isEmpty()) { current = source.getImprinted().get(0); }