From 5ce48e46eceeed447f136963c09e06e6462dea7d Mon Sep 17 00:00:00 2001 From: Sloth Date: Sun, 25 Sep 2011 11:22:40 +0000 Subject: [PATCH] - Added the player keyword "Prevent all damage that would be dealt to you". - Added Personal Sanctuary. --- .gitattributes | 1 + res/cardsfolder/p/personal_sanctuary.txt | 10 ++++++++++ src/main/java/forge/Player.java | 4 ++++ 3 files changed, 15 insertions(+) create mode 100644 res/cardsfolder/p/personal_sanctuary.txt diff --git a/.gitattributes b/.gitattributes index 24d0bafb95e..8ea5e12cd31 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5656,6 +5656,7 @@ res/cardsfolder/p/perish.txt svneol=native#text/plain res/cardsfolder/p/perish_the_thought.txt svneol=native#text/plain res/cardsfolder/p/permafrost_trap.txt svneol=native#text/plain res/cardsfolder/p/pernicious_deed.txt svneol=native#text/plain +res/cardsfolder/p/personal_sanctuary.txt -text res/cardsfolder/p/personal_tutor.txt svneol=native#text/plain res/cardsfolder/p/persuasion.txt svneol=native#text/plain res/cardsfolder/p/pestermite.txt svneol=native#text/plain diff --git a/res/cardsfolder/p/personal_sanctuary.txt b/res/cardsfolder/p/personal_sanctuary.txt new file mode 100644 index 00000000000..899aae52dbb --- /dev/null +++ b/res/cardsfolder/p/personal_sanctuary.txt @@ -0,0 +1,10 @@ +Name:Personal Sanctuary +ManaCost:2 W +Types:Enchantment +Text:no text +S:Mode$ Continuous | Affected$ You | AddKeyword$ Prevent all damage that would be dealt to you | PlayerTurn$ True | Description$ During your turn, prevent all damage that would be dealt to you. +SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/personal_sanctuary.jpg +SetInfo:M12|Rare|http://magiccards.info/scans/en/m12/30.jpg +Oracle:During your turn, prevent all damage that would be dealt to you. +End \ No newline at end of file diff --git a/src/main/java/forge/Player.java b/src/main/java/forge/Player.java index 60b4c07cba1..95b25aa3697 100644 --- a/src/main/java/forge/Player.java +++ b/src/main/java/forge/Player.java @@ -403,6 +403,10 @@ public abstract class Player extends GameEntity { if (source.hasKeyword("Prevent all damage that would be dealt to and dealt by CARDNAME.")) return 0; if (source.hasKeyword("Prevent all damage that would be dealt by CARDNAME.")) return 0; if (AllZoneUtil.isCardInPlay("Purity", this) && !isCombat) return 0; + + if (hasKeyword("Prevent all damage that would be dealt to you")) { + return 0; + } //stPreventDamage CardList allp = AllZoneUtil.getCardsIn(Zone.Battlefield);