From b6e1c02f07a3d540f83204ea8783f9971c5d14a7 Mon Sep 17 00:00:00 2001 From: swordshine Date: Tue, 11 Mar 2014 04:42:18 +0000 Subject: [PATCH] - Added Mogg Assassin --- .gitattributes | 1 + forge-ai/src/main/java/forge/ai/ability/PumpAi.java | 6 ++++++ forge-gui/res/cardsfolder/m/mogg_assassin.txt | 12 ++++++++++++ 3 files changed, 19 insertions(+) create mode 100644 forge-gui/res/cardsfolder/m/mogg_assassin.txt diff --git a/.gitattributes b/.gitattributes index 9a24acabe8e..d9cdb0e9abf 100644 --- a/.gitattributes +++ b/.gitattributes @@ -8027,6 +8027,7 @@ forge-gui/res/cardsfolder/m/mobile_fort.txt svneol=native#text/plain forge-gui/res/cardsfolder/m/mobilization.txt svneol=native#text/plain forge-gui/res/cardsfolder/m/mobilize.txt svneol=native#text/plain forge-gui/res/cardsfolder/m/mogg_alarm.txt svneol=native#text/plain +forge-gui/res/cardsfolder/m/mogg_assassin.txt -text forge-gui/res/cardsfolder/m/mogg_bombers.txt svneol=native#text/plain forge-gui/res/cardsfolder/m/mogg_cannon.txt -text forge-gui/res/cardsfolder/m/mogg_conscripts.txt -text diff --git a/forge-ai/src/main/java/forge/ai/ability/PumpAi.java b/forge-ai/src/main/java/forge/ai/ability/PumpAi.java index 38ff6748e47..7afb5d06ce0 100644 --- a/forge-ai/src/main/java/forge/ai/ability/PumpAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/PumpAi.java @@ -191,6 +191,12 @@ public class PumpAi extends PumpAiBase { final Player opp = ai.getOpponent(); final TargetRestrictions tgt = sa.getTargetRestrictions(); sa.resetTargets(); + if (sa.hasParam("TargetingPlayer") && sa.getActivatingPlayer().equals(ai)) { + Player targetingPlayer = AbilityUtils.getDefinedPlayers(source, sa.getParam("TargetingPlayer"), sa).get(0); + sa.setTargetingPlayer(targetingPlayer); + return targetingPlayer.getController().chooseTargetsFor(sa); + } + List list = new ArrayList(); if (sa.hasParam("AILogic")) { if (sa.getParam("AILogic").equals("HighestPower")) { diff --git a/forge-gui/res/cardsfolder/m/mogg_assassin.txt b/forge-gui/res/cardsfolder/m/mogg_assassin.txt new file mode 100644 index 00000000000..68f88f1b1db --- /dev/null +++ b/forge-gui/res/cardsfolder/m/mogg_assassin.txt @@ -0,0 +1,12 @@ +Name:Mogg Assassin +ManaCost:2 R +Types:Creature Goblin Assassin +PT:2/1 +A:AB$ Pump | Cost$ T | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | RememberObjects$ ThisTargetedCard | IsCurse$ True | SubAbility$ DBPump | StackDescription$ You choose {c:ThisTargetedCard} | SpellDescription$ You choose target creature an opponent controls, and that opponent chooses target creature. Flip a coin. If you win the flip, destroy the creature you chose. If you lose the flip, destroy the creature your opponent chose. +SVar:DBPump:DB$ Pump | ValidTgts$ Creature | TargetingPlayer$ Player.Opponent | IsCurse$ True | ImprintCards$ ThisTargetedCard | SubAbility$ DBFlip | StackDescription$ That player chooses {c:ThisTargetedCard} +SVar:DBFlip:DB$ FlipACoin | WinSubAbility$ DestroyRemembered | LoseSubAbility$ DestroyImprinted | SubAbility$ DBCleanup +SVar:DestroyRemembered:DB$ Destroy | Defined$ Remembered +SVar:DestroyImprinted:DB$ Destroy | Defined$ Imprinted +SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearImprinted$ True +SVar:Picture:http://www.wizards.com/global/images/magic/general/mogg_assassin.jpg +Oracle:{T}: You choose target creature an opponent controls, and that opponent chooses target creature. Flip a coin. If you win the flip, destroy the creature you chose. If you lose the flip, destroy the creature your opponent chose.