diff --git a/.gitattributes b/.gitattributes index 6d01b7a4ff2..6226132f8d1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -636,6 +636,7 @@ res/cardsfolder/a/azimaet_drake.txt svneol=native#text/plain res/cardsfolder/a/azorius_aethermage.txt svneol=native#text/plain res/cardsfolder/a/azorius_arrester.txt -text res/cardsfolder/a/azorius_chancery.txt svneol=native#text/plain +res/cardsfolder/a/azorius_charm.txt -text res/cardsfolder/a/azorius_first_wing.txt svneol=native#text/plain res/cardsfolder/a/azorius_guildgate.txt -text res/cardsfolder/a/azorius_guildmage.txt svneol=native#text/plain @@ -644,6 +645,7 @@ res/cardsfolder/a/azorius_justiciar.txt -text res/cardsfolder/a/azorius_keyrune.txt -text res/cardsfolder/a/azorius_ploy.txt svneol=native#text/plain res/cardsfolder/a/azorius_signet.txt svneol=native#text/plain +res/cardsfolder/a/azors_elocutors.txt -text res/cardsfolder/a/azure_drake.txt svneol=native#text/plain res/cardsfolder/a/azure_mage.txt svneol=native#text/plain res/cardsfolder/a/azusa_lost_but_seeking.txt svneol=native#text/plain @@ -1323,6 +1325,7 @@ res/cardsfolder/c/caldera_hellion.txt svneol=native#text/plain res/cardsfolder/c/caldera_kavu.txt -text res/cardsfolder/c/caldera_lake.txt svneol=native#text/plain res/cardsfolder/c/call_for_blood.txt svneol=native#text/plain +res/cardsfolder/c/call_of_the_conclave.txt -text res/cardsfolder/c/call_of_the_herd.txt svneol=native#text/plain res/cardsfolder/c/call_of_the_wild.txt svneol=native#text/plain res/cardsfolder/c/call_the_skybreaker.txt svneol=native#text/plain @@ -1388,6 +1391,7 @@ res/cardsfolder/c/carnage_altar.txt svneol=native#text/plain res/cardsfolder/c/carnage_wurm.txt svneol=native#text/plain res/cardsfolder/c/carnassid.txt svneol=native#text/plain res/cardsfolder/c/carnifex_demon.txt svneol=native#text/plain +res/cardsfolder/c/carnival_hellsteed.txt -text res/cardsfolder/c/carnival_of_souls.txt svneol=native#text/plain res/cardsfolder/c/carnivorous_plant.txt svneol=native#text/plain res/cardsfolder/c/carnophage.txt svneol=native#text/plain @@ -1571,6 +1575,7 @@ res/cardsfolder/c/chartooth_cougar.txt svneol=native#text/plain res/cardsfolder/c/chasm_drake.txt svneol=native#text/plain res/cardsfolder/c/chastise.txt svneol=native#text/plain res/cardsfolder/c/chatter_of_the_squirrel.txt svneol=native#text/plain +res/cardsfolder/c/chemisters_trick.txt -text res/cardsfolder/c/chieftain_en_dal.txt svneol=native#text/plain res/cardsfolder/c/child_of_alara.txt svneol=native#text/plain res/cardsfolder/c/child_of_gaea.txt svneol=native#text/plain @@ -5819,6 +5824,7 @@ res/cardsfolder/m/malignus.txt -text res/cardsfolder/m/mammoth_harness.txt -text res/cardsfolder/m/mammoth_umbra.txt svneol=native#text/plain res/cardsfolder/m/man_o_war.txt svneol=native#text/plain +res/cardsfolder/m/mana_bloom.txt -text res/cardsfolder/m/mana_breach.txt svneol=native#text/plain res/cardsfolder/m/mana_chains.txt -text res/cardsfolder/m/mana_crypt.txt svneol=native#text/plain diff --git a/res/cardsfolder/a/azorius_charm.txt b/res/cardsfolder/a/azorius_charm.txt new file mode 100644 index 00000000000..fcb338dceb7 --- /dev/null +++ b/res/cardsfolder/a/azorius_charm.txt @@ -0,0 +1,13 @@ +Name:Azorius Charm +ManaCost:W U +Types:Instant +Text:no text +A:SP$ Charm | Cost$ W U | Choices$ PumpAll,DrawCard,ReturnCard | CharmNum$ 1 | SpellDescription$ Choose one - Creatures you control gain lifelink until end of turn; or draw a card; or put target attacking or blocking creature on top of its owner's library. +SVar:PumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ Lifelink | SpellDescription$ Creatures you control gain lifelink until end of turn. +SVar:DrawCard:DB$ Draw | Cost$ 0 | Defined$ You | NumCards$ 1 | SpellDescription$ Draw a card. +SVar:ReturnCard:DB$ ChangeZone | ValidTgts$ Creature.attacking,Creature.blocking | TgtPrompt$ Select target attacking or blocking creature. | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0 | SpellDescription$ Put target attacking or blocking creature on top of its owner's library. +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/azorius_charm.jpg +SetInfo:RTR|Uncommon|http://magiccards.info/scans/en/rtr/145.jpg +Oracle:Choose one - Creatures you control gain lifelink until end of turn; or draw a card; or put target attacking or blocking creature on top of its owner's library. +End \ No newline at end of file diff --git a/res/cardsfolder/a/azors_elocutors.txt b/res/cardsfolder/a/azors_elocutors.txt new file mode 100644 index 00000000000..c7cea75f6e2 --- /dev/null +++ b/res/cardsfolder/a/azors_elocutors.txt @@ -0,0 +1,16 @@ +Name:Azor's Elocutors +ManaCost:3 WU WU +Types:Creature Human Advisor +Text:no text +PT:3/5 +T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ PutCounter | TriggerDescription$ At the beginning of your upkeep, put a filibuster counter on CARDNAME. Then if CARDNAME has five or more filibuster counters on it, you win the game. +SVar:PutCounter:AB$ PutCounter | Cost$ 0 | Defined$ Self | CounterType$ FILIBUSTER | CounterNum$ 1 | SubAbility$ WinGame +SVar:WinGame:DB$ WinsGame | Cost$ 0 | Defined$ You | ConditionCheckSVar$ TalkedEnough | ConditionSVarCompare$ GE5 +SVar:TalkedEnough:Count$CardCounters.FILIBUSTER +T:Mode$ DamageDone | ValidTarget$ You | TriggerZones$ Battlefield | Execute$ RemoveCounter | TriggerDescription$ Whenever a source deals damage to you, remove a filibuster counter from CARDNAME. +SVar:RemoveCounter:AB$ RemoveCounter | Cost$ 0 | Defined$ Self | CounterType$ FILIBUSTER | CounterNum$ 1 +SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/azors_elocutors.jpg +SetInfo:RTR|Rare|http://magiccards.info/scans/en/rtr/210.jpg +Oracle:At the beginning of your upkeep, put a filibuster counter on Azor's Elocutors. Then if Azor's Elocutors has five or more filibuster counters on it, you win the game.\nWhenever a source deals damage to you, remove a filibuster counter from Azor's Elocutors. +End \ No newline at end of file diff --git a/res/cardsfolder/c/call_of_the_conclave.txt b/res/cardsfolder/c/call_of_the_conclave.txt new file mode 100644 index 00000000000..a14962e8c2b --- /dev/null +++ b/res/cardsfolder/c/call_of_the_conclave.txt @@ -0,0 +1,10 @@ +Name:Call of the Conclave +ManaCost:G W +Types:Sorcery +Text:no text +A:SP$ Token | Cost$ G W | TokenAmount$ 1 | TokenName$ Centaur | TokenTypes$ Creature,Centaur | TokenOwner$ You | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | SpellDescription$ Put a 3/3 green Centaur creature token onto the battlefield. +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/call_of_the_conclave.jpg +SetInfo:RTR|Uncommon|http://magiccards.info/scans/en/rtr/146.jpg +Oracle:Put a 3/3 green Centaur creature token onto the battlefield. +End \ No newline at end of file diff --git a/res/cardsfolder/c/carnival_hellsteed.txt b/res/cardsfolder/c/carnival_hellsteed.txt new file mode 100644 index 00000000000..9611a714bc0 --- /dev/null +++ b/res/cardsfolder/c/carnival_hellsteed.txt @@ -0,0 +1,16 @@ +Name:Carnival Hellsteed +ManaCost:4 B R +Types:Creature Nightmare Horse +Text:no text +PT:5/4 +K:First Strike +K:Haste +K:ETBReplacement:Other:Unleash:Optional +SVar:Unleash:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Unleash (You may have this creature enter the battlefield with a +1/+1 counter on it. It can't block as long as it has a +1/+1 counter on it.) +S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ HIDDEN CARDNAME can't block. | CheckSVar$ X | SVarCompare$ GE1 | References$ X +SVar:X:Count$NumCounters.P1P1 +SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/carnival_hellsteed.jpg +SetInfo:RTR|Rare|http://magiccards.info/scans/en/rtr/147.jpg +Oracle:First strike, haste\nUnleash (You may have this creature enter the battlefield with a +1/+1 counter on it. It can't block as long as it has a +1/+1 counter on it.) +End \ No newline at end of file diff --git a/res/cardsfolder/c/chemisters_trick.txt b/res/cardsfolder/c/chemisters_trick.txt new file mode 100644 index 00000000000..91ea656424b --- /dev/null +++ b/res/cardsfolder/c/chemisters_trick.txt @@ -0,0 +1,11 @@ +Name:Chemister's Trick +ManaCost:U R +Types:Instant +Text:no text +A:SP$ Pump | Cost$ U R | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature you don't control. | NumAtt$ -2 | KW$ HIDDEN CARDNAME attacks each turn if able. | SpellDescription$ Target creature you don't control gets -2/-0 until end of turn and attacks this turn if able. +A:SP$ PumpAll | Cost$ 3 U R | ValidCards$ Creature.YouDontCtrl | ValidDescription$ each creature you don't control. | NumAtt$ -2 | KW$ HIDDEN CARDNAME attacks each turn if able. | PrecostDesc$ Overload | CostDesc$ 3 U R | NonBasicSpell$ True | SpellDescription$ (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.".) +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/chemisters_trick.jpg +SetInfo:RTR|Common|http://magiccards.info/scans/en/rtr/149.jpg +Oracle:Target creature you don't control gets -2/-0 until end of turn and attacks this turn if able.\nOverload {3}{U}{R} (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.".) +End \ No newline at end of file diff --git a/res/cardsfolder/m/mana_bloom.txt b/res/cardsfolder/m/mana_bloom.txt new file mode 100644 index 00000000000..a51bf44a259 --- /dev/null +++ b/res/cardsfolder/m/mana_bloom.txt @@ -0,0 +1,15 @@ +Name:Mana Bloom +ManaCost:X G +Types:Enchantment +Text:no text +K:etbCounter:CHARGE:X +A:AB$ Mana | Cost$ SubCounter<1/CHARGE> | Produced$ Any | Amount$ 1 | ActivationLimit$ 1 | SpellDescription$ Add one mana of any color to your mana pool. Activate this ability only once each turn. +T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ NoCharge | SVarCompare$ EQ0 | Execute$ TrigReturn | TriggerDescription$ At the beginning of your upkeep, if CARDNAME has no charge counters on it, return it to its owner's hand. +SVar:TrigReturn:AB$ ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Battlefield | Destination$ Hand +SVar:NoCharge:Count$CardCounters.CHARGE +SVar:X:Count$xPaid +SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/mana_bloom.jpg +SetInfo:RTR|Rare|http://magiccards.info/scans/en/rtr/130.jpg +Oracle:Mana Bloom enters the battlefield with X charge counters on it.\nRemove a charge counter from Mana Bloom: Add one mana of any color to your mana pool. Activate this ability only once each turn.\nAt the beginning of your upkeep, if Mana Bloom has no charge counters on it, return it to its owner's hand. +End \ No newline at end of file diff --git a/src/main/java/forge/Counters.java b/src/main/java/forge/Counters.java index 68ec94d865c..7d713caa53d 100644 --- a/src/main/java/forge/Counters.java +++ b/src/main/java/forge/Counters.java @@ -110,6 +110,9 @@ public enum Counters { /** The FEATHER. */ FEATHER(), + /** The FILIBUSTER. */ + FILIBUSTER(), + /** The FLOOD. */ FLOOD(),