From 5b47dfbcb7f378fc9372002fb47e73a871b9d2da Mon Sep 17 00:00:00 2001 From: swordshine Date: Mon, 9 Sep 2013 05:05:12 +0000 Subject: [PATCH] - Scheme: Added Rotted Ones, Lay Siege --- .gitattributes | 1 + res/cardsfolder/c/chaotic_backlash.txt | 2 +- res/cardsfolder/e/essence_backlash.txt | 2 +- res/cardsfolder/t/the_dead_shall_serve.txt | 9 +++++++++ src/main/java/forge/card/ability/AbilityUtils.java | 2 ++ .../java/forge/card/ability/effects/PumpAllEffect.java | 3 +++ 6 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 res/cardsfolder/t/the_dead_shall_serve.txt diff --git a/.gitattributes b/.gitattributes index 82bbcf9d775..1779c416aaf 100644 --- a/.gitattributes +++ b/.gitattributes @@ -11411,6 +11411,7 @@ res/cardsfolder/t/the_abyss.txt svneol=native#text/plain res/cardsfolder/t/the_aether_flues.txt -text res/cardsfolder/t/the_brute.txt svneol=native#text/plain res/cardsfolder/t/the_dark_barony.txt -text +res/cardsfolder/t/the_dead_shall_serve.txt -text res/cardsfolder/t/the_eon_fog.txt -text res/cardsfolder/t/the_fallen.txt -text res/cardsfolder/t/the_fourth_sphere.txt -text diff --git a/res/cardsfolder/c/chaotic_backlash.txt b/res/cardsfolder/c/chaotic_backlash.txt index 1eb024097d2..8b05fd1a714 100644 --- a/res/cardsfolder/c/chaotic_backlash.txt +++ b/res/cardsfolder/c/chaotic_backlash.txt @@ -1,7 +1,7 @@ Name:Chaotic Backlash ManaCost:4 R Types:Instant -A:SP$ DealDamage | Cost$ 4 R | NumDmg$ Backlash | TgtPrompt$ Select target player to damage | ValidTgts$ Player | SpellDescription$ CARDNAME deals damage to target player equal to twice the number of white and/or blue permanents he or she controls. +A:SP$ DealDamage | Cost$ 4 R | NumDmg$ Backlash | References$ Backlash | TgtPrompt$ Select target player to damage | ValidTgts$ Player | SpellDescription$ CARDNAME deals damage to target player equal to twice the number of white and/or blue permanents he or she controls. SVar:Backlash:Count$Valid Permanent.Blue+TargetedPlayerCtrl,Permanent.White+TargetedPlayerCtrl/Times.2 SVar:Picture:http://www.wizards.com/global/images/magic/general/chaotic_backlash.jpg Oracle:Chaotic Backlash deals damage to target player equal to twice the number of white and/or blue permanents he or she controls. \ No newline at end of file diff --git a/res/cardsfolder/e/essence_backlash.txt b/res/cardsfolder/e/essence_backlash.txt index 22d2a843166..4423f9d0d08 100644 --- a/res/cardsfolder/e/essence_backlash.txt +++ b/res/cardsfolder/e/essence_backlash.txt @@ -2,7 +2,7 @@ Name:Essence Backlash ManaCost:2 U R Types:Instant A:SP$ Counter | Cost$ 2 U R | TargetType$ Spell | TgtPrompt$ Select target Creature spell | ValidTgts$ Creature | SubAbility$ DBDamage | SpellDescription$ Counter target creature spell. CARDNAME deals damage equal to that spell's power to its controller. -SVar:DBDamage:DB$ DealDamage | Cost$ 0 | NumDmg$ Backlash | Defined$ TargetedController +SVar:DBDamage:DB$ DealDamage | Cost$ 0 | NumDmg$ Backlash | References$ Backlash | Defined$ TargetedController SVar:Backlash:Targeted$CardPower SVar:Picture:http://www.wizards.com/global/images/magic/general/essence_backlash.jpg Oracle:Counter target creature spell. Essence Backlash deals damage equal to that spell's power to its controller. \ No newline at end of file diff --git a/res/cardsfolder/t/the_dead_shall_serve.txt b/res/cardsfolder/t/the_dead_shall_serve.txt new file mode 100644 index 00000000000..2464fca31d4 --- /dev/null +++ b/res/cardsfolder/t/the_dead_shall_serve.txt @@ -0,0 +1,9 @@ +Name:The Dead Shall Serve +ManaCost:no cost +Types:Scheme +T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ TrigControl | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, for each opponent, put up to one target creature card from that player's graveyard onto the battlefield under your control. Each of those creatures attacks its owner each combat if able. +SVar:TrigControl:AB$ ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | ValidTgts$ Creature.OppCtrl | TgtZone$ Graveyard | TgtPrompt$ Choose target creature card in each opponent's graveyard | TargetMin$ 0 | TargetMax$ OneEach | References$ OneEach | TargetsWithDifferentControllers$ True | RememberChanged$ True | SubAbility$ DBPump +SVar:DBPump:DB$ PumpAll | ValidCards$ Card.IsRemembered | KW$ HIDDEN CARDNAME attacks specific player each combat if able:CardOwner | UntilLoseControl$ True | SubAbility$ DBCleanup +SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True +SVar:OneEach:PlayerCountOpponents$Amount +SVar:Picture:http://www.cardforge.org/fpics/lq_schemes/the_dead_shall_serve.jpg \ 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 586f24430aa..3dab188cd60 100644 --- a/src/main/java/forge/card/ability/AbilityUtils.java +++ b/src/main/java/forge/card/ability/AbilityUtils.java @@ -947,6 +947,8 @@ public class AbilityUtils { if (!players.contains(p)) { players.add(p); } + } else if (defined.equals("CardOwner")) { + players.add(card.getOwner()); } else if (defined.startsWith("PlayerNamed_")) { for (Player p : game.getPlayers()) { System.out.println("Named player " + defined.substring(12)); diff --git a/src/main/java/forge/card/ability/effects/PumpAllEffect.java b/src/main/java/forge/card/ability/effects/PumpAllEffect.java index f221ddb2d78..5c52fd3460d 100644 --- a/src/main/java/forge/card/ability/effects/PumpAllEffect.java +++ b/src/main/java/forge/card/ability/effects/PumpAllEffect.java @@ -91,6 +91,9 @@ public class PumpAllEffect extends SpellAbilityEffect { game.getEndOfCombat().addUntil(untilEOT); } else if (sa.hasParam("UntilYourNextTurn")) { game.getCleanup().addUntil(sa.getActivatingPlayer(), untilEOT); + } else if (sa.hasParam("UntilLoseControl")) { + tgtC.addLeavesPlayCommand(untilEOT); + tgtC.addChangeControllerCommand(untilEOT); } else { game.getEndOfTurn().addUntil(untilEOT); }