From 588b99b57691f9bb9af9966cd2e45911c67ccefa Mon Sep 17 00:00:00 2001 From: swordshine Date: Tue, 11 Nov 2014 02:26:28 +0000 Subject: [PATCH] - C14: Added Crown of Doom --- .gitattributes | 1 + forge-game/src/main/java/forge/game/player/Player.java | 4 ++++ forge-gui/res/cardsfolder/c/crown_of_doom.txt | 8 ++++++++ 3 files changed, 13 insertions(+) create mode 100644 forge-gui/res/cardsfolder/c/crown_of_doom.txt diff --git a/.gitattributes b/.gitattributes index a4264a9b56f..4d35e85a6da 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3791,6 +3791,7 @@ forge-gui/res/cardsfolder/c/crowds_favor.txt -text forge-gui/res/cardsfolder/c/crown_of_ascension.txt -text forge-gui/res/cardsfolder/c/crown_of_awe.txt -text forge-gui/res/cardsfolder/c/crown_of_convergence.txt -text svneol=unset#text/plain +forge-gui/res/cardsfolder/c/crown_of_doom.txt -text forge-gui/res/cardsfolder/c/crown_of_empires.txt -text forge-gui/res/cardsfolder/c/crown_of_flames.txt svneol=native#text/plain forge-gui/res/cardsfolder/c/crown_of_fury.txt -text diff --git a/forge-game/src/main/java/forge/game/player/Player.java b/forge-game/src/main/java/forge/game/player/Player.java index 7c33d5041d6..34cad1ac236 100644 --- a/forge-game/src/main/java/forge/game/player/Player.java +++ b/forge-game/src/main/java/forge/game/player/Player.java @@ -1766,6 +1766,10 @@ public class Player extends GameEntity implements Comparable { if (equals(sourceController)) { return false; } + } else if (property.equals("OtherThanSourceOwner")) { + if (equals(source.getOwner())) { + return false; + } } else if (property.equals("wasDealtDamageBySourceThisGame")) { if (!source.getDamageHistory().getThisGameDamaged().contains(this)) { return false; diff --git a/forge-gui/res/cardsfolder/c/crown_of_doom.txt b/forge-gui/res/cardsfolder/c/crown_of_doom.txt new file mode 100644 index 00000000000..d9d6a64d298 --- /dev/null +++ b/forge-gui/res/cardsfolder/c/crown_of_doom.txt @@ -0,0 +1,8 @@ +Name:Crown of Doom +ManaCost:3 +Types:Artifact +T:Mode$ Attacks | ValidCard$ Creature | Attacked$ You,Planeswalker.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever a creature attacks you or a planeswalker you control, it gets +2/+0 until end of turn. +SVar:TrigPump:AB$ Pump | Cost$ 0 | Defined$ TriggeredAttacker | NumAtt$ +2 +A:AB$ GainControl | Cost$ 2 | Defined$ Self | ValidTgts$ Player.OtherThanSourceOwner | TgtPrompt$ Select target player other than the owner | PlayerTurn$ True | SpellDescription$ Target player other than CARDNAME's owner gains control of it. Activate this ability only during your turn. +SVar:RemAIDeck:True +SVar:Picture:http://www.wizards.com/global/images/magic/general/crown_of_doom.jpg