From 806d82ebc07ce1d0d96d31eacf038a392d6c1e9f Mon Sep 17 00:00:00 2001 From: Sloth Date: Tue, 24 Nov 2015 12:54:05 +0000 Subject: [PATCH] - Added Thief of Blood. --- .gitattributes | 1 + .../ability/effects/CountersRemoveAllEffect.java | 5 +++++ forge-gui/res/cardsfolder/t/thief_of_blood.txt | 13 +++++++++++++ 3 files changed, 19 insertions(+) create mode 100644 forge-gui/res/cardsfolder/t/thief_of_blood.txt diff --git a/.gitattributes b/.gitattributes index 58d5e0c1257..6443c41fcbf 100644 --- a/.gitattributes +++ b/.gitattributes @@ -14725,6 +14725,7 @@ forge-gui/res/cardsfolder/t/thespians_stage.txt -text forge-gui/res/cardsfolder/t/thick_skinned_goblin.txt -text forge-gui/res/cardsfolder/t/thicket_basilisk.txt svneol=native#text/plain forge-gui/res/cardsfolder/t/thicket_elemental.txt -text +forge-gui/res/cardsfolder/t/thief_of_blood.txt -text forge-gui/res/cardsfolder/t/thief_of_hope.txt svneol=native#text/plain forge-gui/res/cardsfolder/t/thieves_auction.txt -text forge-gui/res/cardsfolder/t/thieves_fortune.txt -text diff --git a/forge-game/src/main/java/forge/game/ability/effects/CountersRemoveAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CountersRemoveAllEffect.java index e7036ccc3ad..6b7e218714d 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/CountersRemoveAllEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/CountersRemoveAllEffect.java @@ -57,10 +57,12 @@ public class CountersRemoveAllEffect extends SpellAbilityEffect { cards = CardLists.filterControlledBy(cards, pl); } + int numberRemoved = 0; for (final Card tgtCard : cards) { if (sa.hasParam("AllCounterTypes")) { Set types = tgtCard.getCounters().keySet(); for(CounterType ct : types) { + numberRemoved += tgtCard.getCounters(ct); tgtCard.subtractCounter(ct, tgtCard.getCounters(ct)); } //tgtCard.getCounters().clear(); @@ -72,5 +74,8 @@ public class CountersRemoveAllEffect extends SpellAbilityEffect { tgtCard.subtractCounter(CounterType.valueOf(type), counterAmount); } + if (sa.hasParam("RememberAmount")) { + sa.getHostCard().setChosenNumber(numberRemoved); + } } } diff --git a/forge-gui/res/cardsfolder/t/thief_of_blood.txt b/forge-gui/res/cardsfolder/t/thief_of_blood.txt new file mode 100644 index 00000000000..3107beeb3dd --- /dev/null +++ b/forge-gui/res/cardsfolder/t/thief_of_blood.txt @@ -0,0 +1,13 @@ +Name:Thief of Blood +ManaCost:4 B B +Types:Creature Vampire +PT:1/1 +K:Flying +K:ETBReplacement:Other:DBRemoveCounterAll +SVar:DBRemoveCounterAll:DB$ RemoveCounterAll | ValidCards$ Permanent | AllCounterTypes$ True | StackDescription$ SpellDescription | SubAbility$ DBPutCounters| RememberAmount$ True | SpellDescription$ As CARDNAME enters the battlefield, remove all counters from all permanents. CARDNAME enters the battlefield with a +1/+1 counter on it for each counter removed this way. +SVar:DBPutCounters:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ X | SubAbility$ DBCleanup +SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True +SVar:X:Count$ChosenNumber +SVar:RemRandomDeck:True +SVar:Picture:http://www.wizards.com/global/images/magic/general/thief_of_blood.jpg +Oracle:Flying\nAs Thief of Blood enters the battlefield, remove all counters from all permanents. Thief of Blood enters the battlefield with a +1/+1 counter on it for each counter removed this way.