diff --git a/.gitattributes b/.gitattributes index e91624d3acb..71945bf0c1a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1884,6 +1884,7 @@ res/cardsfolder/jungle_lion.txt -text svneol=native#text/plain res/cardsfolder/jungle_shrine.txt -text svneol=native#text/plain res/cardsfolder/jungle_troll.txt -text svneol=native#text/plain res/cardsfolder/jungle_weaver.txt -text svneol=native#text/plain +res/cardsfolder/juniper_order_advocate.txt -text svneol=native#text/plain res/cardsfolder/juniper_order_ranger.txt -text svneol=native#text/plain res/cardsfolder/juntu_stakes.txt -text svneol=native#text/plain res/cardsfolder/junun_efreet.txt -text svneol=native#text/plain @@ -2703,6 +2704,7 @@ res/cardsfolder/primoc_escapee.txt -text svneol=native#text/plain res/cardsfolder/primordial_sage.txt -text svneol=native#text/plain res/cardsfolder/princess_lucrezia.txt -text svneol=native#text/plain res/cardsfolder/prismatic_lens.txt -text svneol=native#text/plain +res/cardsfolder/pristine_angel.txt -text svneol=native#text/plain res/cardsfolder/privileged_position.txt -text svneol=native#text/plain res/cardsfolder/prodigal_pyromancer.txt -text svneol=native#text/plain res/cardsfolder/prodigal_sorcerer.txt -text svneol=native#text/plain @@ -2780,6 +2782,7 @@ res/cardsfolder/rakdos_ickspitter.txt -text svneol=native#text/plain res/cardsfolder/rakdos_pit_dragon.txt -text svneol=native#text/plain res/cardsfolder/rakdos_signet.txt -text svneol=native#text/plain res/cardsfolder/rakka_mar.txt -text svneol=native#text/plain +res/cardsfolder/raksha_golden_cub.txt -text svneol=native#text/plain res/cardsfolder/ramirez_depietro.txt -text svneol=native#text/plain res/cardsfolder/ramosian_captain.txt -text svneol=native#text/plain res/cardsfolder/ramosian_commander.txt -text svneol=native#text/plain diff --git a/res/cardsfolder/juniper_order_advocate.txt b/res/cardsfolder/juniper_order_advocate.txt new file mode 100644 index 00000000000..96833209eb6 --- /dev/null +++ b/res/cardsfolder/juniper_order_advocate.txt @@ -0,0 +1,9 @@ +Name:Juniper Order Advocate +ManaCost:2 W +Types:Creature Human Knight +Text:no text +PT:1/2 +K:stPumpAll:Creature.Green:Permanents you Control:1/1:isUntapped:As long as Juniper Order Advocate is untapped, green creatures you control get +1/+1. +K:SVar:Rarity:Uncommon +K:SVar:Picture:http://www.wizards.com/global/images/magic/general/juniper_order_advocate.jpg +End diff --git a/res/cardsfolder/pristine_angel.txt b/res/cardsfolder/pristine_angel.txt new file mode 100644 index 00000000000..b088b294903 --- /dev/null +++ b/res/cardsfolder/pristine_angel.txt @@ -0,0 +1,11 @@ +Name:Pristine Angel +ManaCost:4 W W +Types:Creature Angel +Text:no text +PT:4/4 +K:Flying +K:stPumpAll:Creature:Self:0/0/Protection from artifacts/Protection from white/Protection from blue/Protection from black/Protection from red/Protection from green:isUntapped:As long as Pristine Angel is untapped, it has protection from artifacts and from all colors. +K:WheneverKeyword:CastSpell/Controller:Any:Play:UntapPermanent:Self:ASAP:Yes_No:No Special Condition:Whenever you cast a spell, you may untap Pristine Angel. +K:SVar:Rarity:Rare +K:SVar:Picture:http://www.wizards.com/global/images/magic/general/pristine_ange.jpg +End diff --git a/res/cardsfolder/raksha_golden_cub.txt b/res/cardsfolder/raksha_golden_cub.txt new file mode 100644 index 00000000000..151a570f20a --- /dev/null +++ b/res/cardsfolder/raksha_golden_cub.txt @@ -0,0 +1,10 @@ +Name:Raksha Golden Cub +ManaCost:5 W W +Types:Legendary Creature Cat Soldier +Text:no text +PT:3/4 +K:Vigilance +K:stPumpAll:Creature.Cat:Permanents you Control:2/2/Double Strike:isEquipped:As long as Raksha Golden Cub is equipped, Cat creatures you control get +2/+2 and have double strike. +K:SVar:Rarity:Rare +K:SVar:Picture:http://www.wizards.com/global/images/magic/general/raksha_golden_cub.jpg +End diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java index 11f15d0d4de..ecab555f0c2 100644 --- a/src/forge/GameActionUtil.java +++ b/src/forge/GameActionUtil.java @@ -11344,6 +11344,9 @@ public class GameActionUtil { if(SpecialConditions.contains("isEquipped")) { if (!SourceCard.isEquipped()) return false; } + if(SpecialConditions.contains("isUntapped")) { + if (!SourceCard.isUntapped()) return false; + } return true; }