diff --git a/.gitattributes b/.gitattributes index 38f47b718ce..bb389123d9c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -638,6 +638,7 @@ res/cardsfolder/charging_paladin.txt -text svneol=native#text/plain res/cardsfolder/charging_slateback.txt -text svneol=native#text/plain res/cardsfolder/charging_troll.txt -text svneol=native#text/plain res/cardsfolder/chartooth_cougar.txt -text svneol=native#text/plain +res/cardsfolder/chastise.txt -text svneol=native#text/plain res/cardsfolder/chatter_of_the_squirrel.txt -text svneol=native#text/plain res/cardsfolder/child_of_alara.txt -text svneol=native#text/plain res/cardsfolder/child_of_gaea.txt -text svneol=native#text/plain @@ -710,6 +711,7 @@ res/cardsfolder/composite_golem.txt -text svneol=native#text/plain res/cardsfolder/compulsive_research.txt -text svneol=native#text/plain res/cardsfolder/concentrate.txt -text svneol=native#text/plain res/cardsfolder/concordant_crossroads.txt -text svneol=native#text/plain +res/cardsfolder/condemn.txt -text svneol=native#text/plain res/cardsfolder/confound.txt -text svneol=native#text/plain res/cardsfolder/congregate.txt -text svneol=native#text/plain res/cardsfolder/conquerors_pledge.txt -text svneol=native#text/plain @@ -3416,6 +3418,7 @@ res/cardsfolder/snow_covered_island.txt -text svneol=native#text/plain res/cardsfolder/snow_covered_mountain.txt -text svneol=native#text/plain res/cardsfolder/snow_covered_plains.txt -text svneol=native#text/plain res/cardsfolder/snow_covered_swamp.txt -text svneol=native#text/plain +res/cardsfolder/snow_devil.txt -text svneol=native#text/plain res/cardsfolder/sokenzan_bruiser.txt -text svneol=native#text/plain res/cardsfolder/sol_ring.txt -text svneol=native#text/plain res/cardsfolder/soldevi_simulacrum.txt -text svneol=native#text/plain @@ -3497,6 +3500,7 @@ res/cardsfolder/spiraling_embers.txt -text svneol=native#text/plain res/cardsfolder/spire_barrage.txt -text svneol=native#text/plain res/cardsfolder/spire_golem.txt -text svneol=native#text/plain res/cardsfolder/spire_owl.txt -text svneol=native#text/plain +res/cardsfolder/spirit_of_the_night.txt -text svneol=native#text/plain res/cardsfolder/spirit_shackle.txt -text svneol=native#text/plain res/cardsfolder/spiritmonger.txt -text svneol=native#text/plain res/cardsfolder/spiritual_guardian.txt -text svneol=native#text/plain diff --git a/res/cardsfolder/cavalry_master.txt b/res/cardsfolder/cavalry_master.txt index 851f95e1f5e..f76909887e5 100644 --- a/res/cardsfolder/cavalry_master.txt +++ b/res/cardsfolder/cavalry_master.txt @@ -4,7 +4,7 @@ Types:Creature Human Knight Text:no text PT:3/3 K:Flanking -K:StaticEffect:Play:Permanents you Control:Keyword/Flanking:Type.Creature!with.Flanking!NotSelf:Other creatures you control with flanking have flanking. (Each instance of flanking triggers separately.) +K:stPumpOther:Creature.withFlanking+YouCtrl:0/0/Flanking:No Condition:Other creatures you control with flanking have flanking. (Each instance of flanking triggers separately.) SVar:PlayMain1:TRUE SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/cavalry_master.jpg diff --git a/res/cardsfolder/chastise.txt b/res/cardsfolder/chastise.txt new file mode 100644 index 00000000000..3d4d520fe98 --- /dev/null +++ b/res/cardsfolder/chastise.txt @@ -0,0 +1,10 @@ +Name:Chastise +ManaCost:3 W +Types:Instant +Text:Destroy target attacking creature. You gain life equal to its power. +K:spDestroyTgt:Creature.attacking:Drawback$YouGainLife/dX +SVar:dX:Count$TgtCardPower +SVar:RemAIDeck:True +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/chastise.jpg +End diff --git a/res/cardsfolder/condemn.txt b/res/cardsfolder/condemn.txt new file mode 100644 index 00000000000..3accf86fbc2 --- /dev/null +++ b/res/cardsfolder/condemn.txt @@ -0,0 +1,10 @@ +Name:Condemn +ManaCost:W +Types:Instant +Text:Put target attacking creature on the bottom of its owner's library. Its controller gains life equal to its toughness. +K:spBounceTgt:Creature.attacking:BottomofLibrary:Drawback$GainLifeTgtOwner/dX +SVar:dX:Count$TgtCardPower +SVar:RemAIDeck:True +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/condemn.jpg +End diff --git a/res/cardsfolder/snow_devil.txt b/res/cardsfolder/snow_devil.txt new file mode 100644 index 00000000000..cf7960f019b --- /dev/null +++ b/res/cardsfolder/snow_devil.txt @@ -0,0 +1,10 @@ +Name:Snow Devil +ManaCost:1 U +Types:Enchantment Aura +Text:Enchanted creature has flying. +K:Enchant creature +K:enPump:+0/+0/Flying +K:stPumpEnchanted:Creature.blocking:0/0/First Strike:isPresent Land.Snow+YouCtrl:Enchanted creature has first strike as long as it's blocking and you control a snow land. +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/snow_devil.jpg +End diff --git a/res/cardsfolder/spirit_of_the_night.txt b/res/cardsfolder/spirit_of_the_night.txt new file mode 100644 index 00000000000..5a3a2207876 --- /dev/null +++ b/res/cardsfolder/spirit_of_the_night.txt @@ -0,0 +1,13 @@ +Name:Spirit of the Night +ManaCost:6 B B B +Types:Creature Demon Spirit +Text:no text +PT:6/5 +K:Flying +K:Trample +K:Haste +K:Protection from black +K:stPumpSelf:Creature.attacking:0/0/First Strike:No Condition:Spirit of the Night has first strike as long as it's attacking. +SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/spirit_of_the_night.jpg +End diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java index 68499dff01d..1881ea1136a 100644 --- a/src/forge/CardFactory.java +++ b/src/forge/CardFactory.java @@ -3186,6 +3186,13 @@ public class CardFactory implements NewConstants { tgtType = tgtType.substring(0, i); Selec[0] += tgtType + " to put on top of the library."; } + else if (Destination.equals("BottomofLibrary")) + { + tgtType = card.getSpellText().substring("Put target ".length()); + int i = tgtType.indexOf(" on the bottom of its owner's library."); + tgtType = tgtType.substring(0, i); + Selec[0] += tgtType + " to put on the bottom of the library."; + } else { Selec[0] = card.getSpellText(); @@ -3252,6 +3259,8 @@ public class CardFactory implements NewConstants { { if(Destination.equals("TopofLibrary")) AllZone.GameAction.moveToTopOfLibrary(tgtC); + else if(Destination.equals("BottomofLibrary")) + AllZone.GameAction.moveToBottomOfLibrary(tgtC); else if(Destination.equals("ShuffleIntoLibrary")) { AllZone.GameAction.moveToTopOfLibrary(tgtC);