diff --git a/.gitattributes b/.gitattributes index 431b22fdaf9..8a162f4afda 100644 --- a/.gitattributes +++ b/.gitattributes @@ -52,6 +52,7 @@ res/cardsfolder/acolyte_of_xathrid.txt -text svneol=native#text/plain res/cardsfolder/acorn_harvest.txt -text svneol=native#text/plain res/cardsfolder/acquire.txt -text svneol=native#text/plain res/cardsfolder/acridian.txt -text svneol=native#text/plain +res/cardsfolder/act_of_aggression.txt -text svneol=native#text/plain res/cardsfolder/act_of_treason.txt -text svneol=native#text/plain res/cardsfolder/active_volcano.txt -text svneol=native#text/plain res/cardsfolder/adamaro_first_to_desire.txt -text svneol=native#text/plain @@ -688,6 +689,7 @@ res/cardsfolder/blind_spot_giant.txt -text svneol=native#text/plain res/cardsfolder/blind_with_anger.txt -text svneol=native#text/plain res/cardsfolder/blinding_light.txt -text svneol=native#text/plain res/cardsfolder/blinding_mage.txt -text svneol=native#text/plain +res/cardsfolder/blinding_souleater.txt -text svneol=native#text/plain res/cardsfolder/blinking_spirit.txt -text svneol=native#text/plain res/cardsfolder/blinkmoth_infusion.txt -text svneol=native#text/plain res/cardsfolder/blinkmoth_nexus.txt -text svneol=native#text/plain @@ -1304,6 +1306,7 @@ res/cardsfolder/corpse_cur.txt -text svneol=native#text/plain res/cardsfolder/corpse_harvester.txt -text svneol=native#text/plain res/cardsfolder/corpsehatch.txt -text svneol=native#text/plain res/cardsfolder/corpulent_corpse.txt -text svneol=native#text/plain +res/cardsfolder/corrosive_gale.txt -text svneol=native#text/plain res/cardsfolder/corrosive_mentor.txt -text svneol=native#text/plain res/cardsfolder/corrupt.txt -text svneol=native#text/plain res/cardsfolder/corrupt_court_official.txt -text svneol=native#text/plain @@ -1700,6 +1703,7 @@ res/cardsfolder/disentomb.txt -text svneol=native#text/plain res/cardsfolder/disfigure.txt -text svneol=native#text/plain res/cardsfolder/disintegrate.txt -text svneol=native#text/plain res/cardsfolder/dismal_failure.txt -text svneol=native#text/plain +res/cardsfolder/dismember.txt -text svneol=native#text/plain res/cardsfolder/dismiss.txt -text svneol=native#text/plain res/cardsfolder/disorient.txt -text svneol=native#text/plain res/cardsfolder/dispel.txt -text svneol=native#text/plain @@ -2913,6 +2917,7 @@ res/cardsfolder/guma.txt -text svneol=native#text/plain res/cardsfolder/gush.txt -text svneol=native#text/plain res/cardsfolder/gust_skimmer.txt -text svneol=native#text/plain res/cardsfolder/gustrider_exuberant.txt svneol=native#text/plain +res/cardsfolder/gut_shot.txt -text svneol=native#text/plain res/cardsfolder/gutless_ghoul.txt -text svneol=native#text/plain res/cardsfolder/guttural_response.txt -text svneol=native#text/plain res/cardsfolder/guul_draz_assassin.txt -text svneol=native#text/plain @@ -3234,6 +3239,7 @@ res/cardsfolder/imaginary_pet.txt -text svneol=native#text/plain res/cardsfolder/imi_statue.txt -text svneol=native#text/plain res/cardsfolder/immaculate_magistrate.txt -text svneol=native#text/plain res/cardsfolder/immobilizing_ink.txt -text svneol=native#text/plain +res/cardsfolder/immolating_souleater.txt -text svneol=native#text/plain res/cardsfolder/immolation.txt -text svneol=native#text/plain res/cardsfolder/impending_disaster.txt svneol=native#text/plain res/cardsfolder/imperial_edict.txt -text svneol=native#text/plain @@ -3294,6 +3300,7 @@ res/cardsfolder/inner_flame_acolyte.txt -text svneol=native#text/plain res/cardsfolder/innocence_kami.txt -text svneol=native#text/plain res/cardsfolder/innocent_blood.txt -text svneol=native#text/plain res/cardsfolder/inquisition_of_kozilek.txt -text svneol=native#text/plain +res/cardsfolder/insatiable_souleater.txt -text svneol=native#text/plain res/cardsfolder/inside_out.txt -text svneol=native#text/plain res/cardsfolder/insidious_bookworms.txt -text svneol=native#text/plain res/cardsfolder/insight.txt -text svneol=native#text/plain @@ -3716,6 +3723,7 @@ res/cardsfolder/laquatuss_champion.txt -text svneol=native#text/plain res/cardsfolder/larceny.txt -text svneol=native#text/plain res/cardsfolder/lash_out.txt svneol=native#text/plain res/cardsfolder/lashknife_barrier.txt svneol=native#text/plain +res/cardsfolder/lashwrithe.txt -text svneol=native#text/plain res/cardsfolder/last_breath.txt -text svneol=native#text/plain res/cardsfolder/last_caress.txt -text svneol=native#text/plain res/cardsfolder/last_gasp.txt -text svneol=native#text/plain @@ -4047,6 +4055,7 @@ res/cardsfolder/mark_of_the_oni.txt svneol=native#text/plain res/cardsfolder/marker_beetles.txt svneol=native#text/plain res/cardsfolder/maro.txt -text svneol=native#text/plain res/cardsfolder/marrow_gnawer.txt -text svneol=native#text/plain +res/cardsfolder/marrow_shards.txt -text svneol=native#text/plain res/cardsfolder/marsh_boa.txt -text svneol=native#text/plain res/cardsfolder/marsh_crocodile.txt -text svneol=native#text/plain res/cardsfolder/marsh_flats.txt -text svneol=native#text/plain @@ -4376,6 +4385,7 @@ res/cardsfolder/murkfiend_liege.txt -text svneol=native#text/plain res/cardsfolder/murmuring_bosk.txt -text svneol=native#text/plain res/cardsfolder/muscle_burst.txt -text svneol=native#text/plain res/cardsfolder/muscle_sliver.txt -text svneol=native#text/plain +res/cardsfolder/mutagenic_growth.txt -text svneol=native#text/plain res/cardsfolder/mutavault.txt -text svneol=native#text/plain res/cardsfolder/mutilate.txt -text svneol=native#text/plain res/cardsfolder/muzzle.txt -text svneol=native#text/plain @@ -4841,6 +4851,7 @@ res/cardsfolder/pestilence.txt -text svneol=native#text/plain res/cardsfolder/pestilence_demon.txt -text svneol=native#text/plain res/cardsfolder/pestilence_rats.txt -text svneol=native#text/plain res/cardsfolder/pestilent_kathari.txt -text svneol=native#text/plain +res/cardsfolder/pestilent_souleater.txt -text svneol=native#text/plain res/cardsfolder/petradon.txt -text svneol=native#text/plain res/cardsfolder/petrahydrox.txt -text svneol=native#text/plain res/cardsfolder/petravark.txt -text svneol=native#text/plain @@ -4927,6 +4938,7 @@ res/cardsfolder/pit_raptor.txt -text svneol=native#text/plain res/cardsfolder/pit_scorpion.txt -text svneol=native#text/plain res/cardsfolder/pit_trap.txt -text svneol=native#text/plain res/cardsfolder/pitfall_trap.txt -text svneol=native#text/plain +res/cardsfolder/pith_driller.txt -text svneol=native#text/plain res/cardsfolder/pithing_needle.txt -text svneol=native#text/plain res/cardsfolder/pixie_queen.txt -text svneol=native#text/plain res/cardsfolder/plague_beetle.txt -text svneol=native#text/plain @@ -4984,6 +4996,7 @@ res/cardsfolder/possessed_aven.txt -text svneol=native#text/plain res/cardsfolder/possessed_barbarian.txt -text svneol=native#text/plain res/cardsfolder/possessed_centaur.txt -text svneol=native#text/plain res/cardsfolder/possessed_nomad.txt -text svneol=native#text/plain +res/cardsfolder/postmortem_lunge.txt -text svneol=native#text/plain res/cardsfolder/poultice_sliver.txt -text svneol=native#text/plain res/cardsfolder/pouncing_jaguar.txt -text svneol=native#text/plain res/cardsfolder/powder_keg.txt -text svneol=native#text/plain @@ -5156,6 +5169,7 @@ res/cardsfolder/radiants_dragoons.txt -text svneol=native#text/plain res/cardsfolder/radiants_judgment.txt -text svneol=native#text/plain res/cardsfolder/rafiq_of_the_many.txt -text svneol=native#text/plain res/cardsfolder/ragamuffyn.txt svneol=native#text/plain +res/cardsfolder/rage_extractor.txt -text svneol=native#text/plain res/cardsfolder/rage_nimbus.txt -text svneol=native#text/plain res/cardsfolder/rage_reflection.txt -text svneol=native#text/plain res/cardsfolder/rage_weaver.txt -text svneol=native#text/plain @@ -5541,6 +5555,7 @@ res/cardsfolder/rusting_golem.txt svneol=native#text/plain res/cardsfolder/rustrazor_butcher.txt -text svneol=native#text/plain res/cardsfolder/rustspore_ram.txt -text svneol=native#text/plain res/cardsfolder/ruthless_cullblade.txt -text svneol=native#text/plain +res/cardsfolder/ruthless_invasion.txt -text svneol=native#text/plain res/cardsfolder/ryusei_the_falling_star.txt -text svneol=native#text/plain res/cardsfolder/saber_ants.txt svneol=native#text/plain res/cardsfolder/saberclaw_golem.txt -text svneol=native#text/plain @@ -6065,6 +6080,7 @@ res/cardsfolder/skywing_aven.txt -text svneol=native#text/plain res/cardsfolder/slag_fiend.txt -text svneol=native#text/plain res/cardsfolder/slagstorm.txt -text svneol=native#text/plain res/cardsfolder/slagwurm_armor.txt -text svneol=native#text/plain +res/cardsfolder/slash_panther.txt -text svneol=native#text/plain res/cardsfolder/slashing_tiger.txt svneol=native#text/plain res/cardsfolder/slate_of_ancestry.txt -text svneol=native#text/plain res/cardsfolder/slaughter.txt -text svneol=native#text/plain @@ -6293,6 +6309,7 @@ res/cardsfolder/spine_of_ish_sah.txt -text svneol=native#text/plain res/cardsfolder/spined_basher.txt -text svneol=native#text/plain res/cardsfolder/spined_fluke.txt -text svneol=native#text/plain res/cardsfolder/spined_sliver.txt -text svneol=native#text/plain +res/cardsfolder/spined_thopter.txt -text svneol=native#text/plain res/cardsfolder/spined_wurm.txt -text svneol=native#text/plain res/cardsfolder/spineless_thug.txt -text svneol=native#text/plain res/cardsfolder/spinneret_sliver.txt -text svneol=native#text/plain @@ -6785,6 +6802,7 @@ res/cardsfolder/tetsuo_umezawa.txt -text svneol=native#text/plain res/cardsfolder/teysa_orzhov_scion.txt -text svneol=native#text/plain res/cardsfolder/tezzeret_agent_of_bolas.txt svneol=native#text/plain res/cardsfolder/tezzeret_the_seeker.txt -text svneol=native#text/plain +res/cardsfolder/tezzerets_gambit.txt -text svneol=native#text/plain res/cardsfolder/thalakos_deceiver.txt svneol=native#text/plain res/cardsfolder/thalakos_drifters.txt -text svneol=native#text/plain res/cardsfolder/thalakos_lowlands.txt -text svneol=native#text/plain @@ -6878,6 +6896,7 @@ res/cardsfolder/thunderbolt.txt svneol=native#text/plain res/cardsfolder/thunderclap.txt -text svneol=native#text/plain res/cardsfolder/thundercloud_shaman.txt svneol=native#text/plain res/cardsfolder/thundering_giant.txt -text svneol=native#text/plain +res/cardsfolder/thundering_tanadon.txt -text svneol=native#text/plain res/cardsfolder/thundermare.txt -text svneol=native#text/plain res/cardsfolder/thunderscape_apprentice.txt -text svneol=native#text/plain res/cardsfolder/thunderscape_familiar.txt -text svneol=native#text/plain @@ -7036,6 +7055,7 @@ res/cardsfolder/tremble.txt -text svneol=native#text/plain res/cardsfolder/tremor.txt -text svneol=native#text/plain res/cardsfolder/trench_wurm.txt -text svneol=native#text/plain res/cardsfolder/trenching_steed.txt svneol=native#text/plain +res/cardsfolder/trespassing_souleater.txt -text svneol=native#text/plain res/cardsfolder/tresserhorn_sinks.txt -text svneol=native#text/plain res/cardsfolder/tresserhorn_skyknight.txt -text svneol=native#text/plain res/cardsfolder/treva_the_renewer.txt -text svneol=native#text/plain @@ -7221,6 +7241,7 @@ res/cardsfolder/varchilds_crusader.txt -text svneol=native#text/plain res/cardsfolder/vastwood_animist.txt -text svneol=native#text/plain res/cardsfolder/vastwood_gorger.txt -text svneol=native#text/plain res/cardsfolder/vault_of_whispers.txt -text svneol=native#text/plain +res/cardsfolder/vault_skirge.txt -text svneol=native#text/plain res/cardsfolder/vault_skyward.txt -text svneol=native#text/plain res/cardsfolder/vec_townships.txt -text svneol=native#text/plain res/cardsfolder/vectis_agents.txt -text svneol=native#text/plain diff --git a/res/cardsfolder/act_of_aggression.txt b/res/cardsfolder/act_of_aggression.txt new file mode 100644 index 00000000000..93e59acb6b8 --- /dev/null +++ b/res/cardsfolder/act_of_aggression.txt @@ -0,0 +1,8 @@ +Name:Act of Aggression +ManaCost:3 PR PR +Types:Instant +Text:no text +A:SP$GainControl | Cost$ 3 PR PR | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature an opponent controls. | LoseControl$ EOT | Untap$ True | AddKWs$ Haste | SpellDescription$ Gain control of target creature an opponent controls until end of turn.Untap that creature.It gains haste until end of turn. +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/act_of_aggression.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/blinding_souleater.txt b/res/cardsfolder/blinding_souleater.txt new file mode 100644 index 00000000000..d453a4a2340 --- /dev/null +++ b/res/cardsfolder/blinding_souleater.txt @@ -0,0 +1,9 @@ +Name:Blinding Souleater +ManaCost:3 +Types:Artifact Creature Cleric +Text:no text +PT:1/3 +A:AB$Tap | Cost$ PW T | Tgt$ TgtC | SpellDescription$ Tap target creature. +Svar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/blinding_souleater.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/corrosive_gale.txt b/res/cardsfolder/corrosive_gale.txt new file mode 100644 index 00000000000..6a614ea4f5b --- /dev/null +++ b/res/cardsfolder/corrosive_gale.txt @@ -0,0 +1,9 @@ +Name:Corrosive Gale +ManaCost:X PG +Types:Sorcery +Text:no text +A:SP$DamageAll | Cost$ X PG | ValidCards$ Creature.withFlying | ValidDescription$ each creature with flying. | NumDmg$ X | SpellDescription$ CARDNAME deals X damage to each creature with flying. +SVar:X:Count$xPaid +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/corrosive_gale.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/dismember.txt b/res/cardsfolder/dismember.txt new file mode 100644 index 00000000000..c8b60753775 --- /dev/null +++ b/res/cardsfolder/dismember.txt @@ -0,0 +1,8 @@ +Name:Dismember +ManaCost:1 PB PB +Types:Instant +Text:no text +A:SP$Pump | Cost$ 1 PB PB | IsCurse$ True | Tgt$ TgtC | NumAtt$ -5 | NumDef$ -5 | SpellDescription$ Target creature gets -5/-5 until end of turn. +Svar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/dismember.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/gut_shot.txt b/res/cardsfolder/gut_shot.txt new file mode 100644 index 00000000000..f472d993832 --- /dev/null +++ b/res/cardsfolder/gut_shot.txt @@ -0,0 +1,8 @@ +Name:Gut Shot +ManaCost:PR +Types:Instant +Text:no text +A:SP$DealDamage | Cost$ PR | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player. +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/gut_shot.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/immolating_souleater.txt b/res/cardsfolder/immolating_souleater.txt new file mode 100644 index 00000000000..e7efb3f562c --- /dev/null +++ b/res/cardsfolder/immolating_souleater.txt @@ -0,0 +1,9 @@ +Name:Immolating Souleater +ManaCost:2 +Types:Artifact Creature Hound +Text:no text +PT:1/1 +A:AB$Pump | Cost$ PR | Defined$ Self | NumAtt$ 1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn. +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/immolating_souleater.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/insatiable_souleater.txt b/res/cardsfolder/insatiable_souleater.txt new file mode 100644 index 00000000000..d7c72ac8de2 --- /dev/null +++ b/res/cardsfolder/insatiable_souleater.txt @@ -0,0 +1,9 @@ +Name:Insatiable Souleater +ManaCost:4 +Types:Artifact Creature Beast +Text:no text +PT:5/1 +A:AB$Pump | Cost$ PG | Defined$ Self | KW$ Trample | SpellDescription$ CARDNAME gains trample until end of turn. +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/insatiable_souleater.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/lashwrithe.txt b/res/cardsfolder/lashwrithe.txt new file mode 100644 index 00000000000..e1a3253a8fc --- /dev/null +++ b/res/cardsfolder/lashwrithe.txt @@ -0,0 +1,11 @@ +Name:Lashwrithe +ManaCost:4 +Types:Artifact Equipment +Text:no text +K:Living Weapon +K:eqPump PB PB:0/0 +K:stPumpEquipped:Creature:X/X:no Condition:Equipped creature gets +1/+1 for each Swamp you control. +SVar:X:Count$Valid Swamp.YouCtrl +SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/lashwrithe.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/marrow_shards.txt b/res/cardsfolder/marrow_shards.txt new file mode 100644 index 00000000000..becf47275d0 --- /dev/null +++ b/res/cardsfolder/marrow_shards.txt @@ -0,0 +1,8 @@ +Name:Marrow Shards +ManaCost:PW +Types:Instant +Text:no text +A:SP$DamageAll | Cost$ PW | ValidCards$ Creature.attacking | ValidDescription$ each attacking creature. | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to each attacking creature. +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/marrow_shards.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/mutagenic_growth.txt b/res/cardsfolder/mutagenic_growth.txt new file mode 100644 index 00000000000..c13939db0b5 --- /dev/null +++ b/res/cardsfolder/mutagenic_growth.txt @@ -0,0 +1,8 @@ +Name:Mutagenic Growth +ManaCost:PG +Types:Instant +Text:no text +A:SP$Pump | Cost$ PG | Tgt$ TgtC | NumAtt$ 2 | NumDef$ 2 | SpellDescription$ Target creature gets +2/+2 until end of turn. +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/mutagenic_growth.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/pestilent_souleater.txt b/res/cardsfolder/pestilent_souleater.txt new file mode 100644 index 00000000000..10b51286ac7 --- /dev/null +++ b/res/cardsfolder/pestilent_souleater.txt @@ -0,0 +1,9 @@ +Name:Pestilent Souleater +ManaCost:5 +Types:Artifact Creature Insect +Text:no text +PT:3/3 +A:AB$Pump | Cost$ PB | Defined$ Self | KW$ Infect | SpellDescription$ CARDNAME gains infect until end of turn. +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/pestilent_souleater.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/pith_driller.txt b/res/cardsfolder/pith_driller.txt new file mode 100644 index 00000000000..7bb72d3da2e --- /dev/null +++ b/res/cardsfolder/pith_driller.txt @@ -0,0 +1,10 @@ +Name:Pith Driller +ManaCost:4 PB +Types:Artifact Creature Horror +Text:no text +PT:2/4 +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execcute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters the battlefield, put a -1/-1 counter on target creature. +SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Tgt$ TgtC | CounterType$ M1M1 | CounterNum$ 1 | +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/pith_driller.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/postmortem_lunge.txt b/res/cardsfolder/postmortem_lunge.txt new file mode 100644 index 00000000000..3294c0c940d --- /dev/null +++ b/res/cardsfolder/postmortem_lunge.txt @@ -0,0 +1,10 @@ +Name:Postmortem Lunge +ManaCost:X PB +Types:Sorcery +Text:no text +A:SP$ChangeZone | Cost$ X PB | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.CMCEQX | TgtPromp$ Choose target creature with CMC equal to X. | SubAbility$SVar=DBPump | SpellDescription$ Return target creature card with converted mana cost X from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step. +SVar:DBPump:DB$Pump | Defined$ Targeted | KW$ Haste & At the beginning of the end step, exile CARDNAME. +SVar:X:Count$xPaid +SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/postmortem_lunge.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/rage_extractor.txt b/res/cardsfolder/rage_extractor.txt new file mode 100644 index 00000000000..be244e98d55 --- /dev/null +++ b/res/cardsfolder/rage_extractor.txt @@ -0,0 +1,10 @@ +Name:Rage Extractor +ManaCost:4 PR +Types:Artifact +Text:no text +T:Mode$ SpellCast | ValidCard$ Card.CostsPhyrexianMana | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ Whenever you cast a spell with P in its mana cost, CARDNAME deals damage equal to that spell's converted mana cost to target creature or player. +SVar:TrigDealDamage:AB$DealDamage | Cost$ 0 | Tgt$ TgtCP | NumDmg$ X +SVar:X:TriggeredCard$CardManaCost +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/rage_extractor.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/ruthless_invasion.txt b/res/cardsfolder/ruthless_invasion.txt new file mode 100644 index 00000000000..d4626536f9f --- /dev/null +++ b/res/cardsfolder/ruthless_invasion.txt @@ -0,0 +1,9 @@ +Name:Ruthless Invasion +ManaCost:3 PR +Types:Sorcery +Text:no text +A:SP$Effect | Cost$ 3 PR | Name$ Ruthless Invasion Effect | Keywords$ KWPump +SVar:KWPump:stPumpAll:Creature.nonArtifact:0/0/CARDNAME can't block.:no Condition:Nonartifact creatures can't block this turn. +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/ruthless_invasion.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/slash_panther.txt b/res/cardsfolder/slash_panther.txt new file mode 100644 index 00000000000..e0a394ab252 --- /dev/null +++ b/res/cardsfolder/slash_panther.txt @@ -0,0 +1,9 @@ +Name:Slash Panther +ManaCost:4 PR +Types:Artifact Creature Cat +Text:no text +PT:4/2 +K:Haste +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/slash_panther.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/spined_thopter.txt b/res/cardsfolder/spined_thopter.txt new file mode 100644 index 00000000000..6fef527c353 --- /dev/null +++ b/res/cardsfolder/spined_thopter.txt @@ -0,0 +1,9 @@ +Name:Spined Thopter +ManaCost:2 PU +Types:Artifact Creature Thopter +Text:no text +PT:2/1 +K:Flying +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/spined_thopter.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/tezzerets_gambit.txt b/res/cardsfolder/tezzerets_gambit.txt new file mode 100644 index 00000000000..288460613a3 --- /dev/null +++ b/res/cardsfolder/tezzerets_gambit.txt @@ -0,0 +1,9 @@ +Name:Tezzeret's Gambit +ManaCost:3 PU +Types:Sorcery +Text:no text +A:SP$Draw | Cost$ 3 PU | Defined$ You | NumCards$ 2 | SubAbility$SVar=DBProlif | SpellDescription$ Draw two cards, then proliferate. +SVar:DBProlif:DB$Proliferate +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/tezzerets_gambit.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/thundering_tanadon.txt b/res/cardsfolder/thundering_tanadon.txt new file mode 100644 index 00000000000..1189f61665a --- /dev/null +++ b/res/cardsfolder/thundering_tanadon.txt @@ -0,0 +1,9 @@ +Name:Thundering Tanadon +ManaCost:4 PG PG +Types:Artifact Creature Beast +Text:no text +PT:5/4 +K:Trample +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/thundering_tanadon.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/trespassing_souleater.txt b/res/cardsfolder/trespassing_souleater.txt new file mode 100644 index 00000000000..02ceb3a629b --- /dev/null +++ b/res/cardsfolder/trespassing_souleater.txt @@ -0,0 +1,9 @@ +Name:Trespassing Souleater +ManaCost:3 +Types:Artifact Creature Construct +Text:no text +PT:2/2 +A:AB$Pump | Cost$ PU | Defined$ Self | KW$ Unblockable | SpellDescription$ CARDNAME is unblockable this turn. +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/trespassing_souleater.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/vault_skirge.txt b/res/cardsfolder/vault_skirge.txt new file mode 100644 index 00000000000..5dc8eb3647a --- /dev/null +++ b/res/cardsfolder/vault_skirge.txt @@ -0,0 +1,10 @@ +Name:Vault Skirge +ManaCost:1 PB +Types:Artifact Creature Imp +Text:no text +PT:1/1 +K:Flying +K:Lifelink +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/vault_skirge.jpg +End \ No newline at end of file diff --git a/src/forge/Card.java b/src/forge/Card.java index 01087f752f7..d3db3614798 100644 --- a/src/forge/Card.java +++ b/src/forge/Card.java @@ -2825,7 +2825,13 @@ public class Card extends MyObservable { else if (Property.startsWith("evoked")) { if(!isEvoked()) return false; } else if(Property.startsWith("non")) // ... Other Card types - { if(isType(Property.substring(3))) return false;} + { + if(isType(Property.substring(3))) return false; + } + else if(Property.equals("CostsPhyrexianMana")) + { + if(!manaCost.contains("P")) return false; + } else { if(Property.equals("ChosenType")) { if(!isType(source.getChosenType())) return false; diff --git a/src/forge/card/mana/ManaCost.java b/src/forge/card/mana/ManaCost.java index 1c2b104f6c5..ca51616c7ef 100644 --- a/src/forge/card/mana/ManaCost.java +++ b/src/forge/card/mana/ManaCost.java @@ -57,6 +57,19 @@ public class ManaCost { return res; } + public boolean containsPhyrexianMana() + { + for(Object o : manaPart) + { + if(o instanceof Mana_PartPhyrexian) + { + return true; + } + } + + return false; + } + public boolean payPhyrexian() { ArrayList Phy = getUnpaidPhyrexianMana(); diff --git a/src/forge/card/mana/Mana_PartPhyrexian.java b/src/forge/card/mana/Mana_PartPhyrexian.java index 5a25ba76ba0..fc08245d513 100644 --- a/src/forge/card/mana/Mana_PartPhyrexian.java +++ b/src/forge/card/mana/Mana_PartPhyrexian.java @@ -64,4 +64,4 @@ public class Mana_PartPhyrexian extends Mana_Part { { wrappedColor.reduce(color); } -} +} \ No newline at end of file diff --git a/src/forge/card/spellability/Cost_Payment.java b/src/forge/card/spellability/Cost_Payment.java index e4db946adc4..300b4ce9a66 100644 --- a/src/forge/card/spellability/Cost_Payment.java +++ b/src/forge/card/spellability/Cost_Payment.java @@ -743,7 +743,6 @@ public class Cost_Payment { @Override public void selectPlayer(Player player) { - showMessage(); if(player.equals(AllZone.HumanPlayer)) { if(manaCost.payPhyrexian()) @@ -751,9 +750,8 @@ public class Cost_Payment { phyLifeToLose += 2; } - if(manaCost.isPaid()) { - done(); - } + showMessage(); + } } @@ -790,6 +788,11 @@ public class Cost_Payment { msg.append(" life paid for phyrexian mana)"); } + if(mana.containsPhyrexianMana()) + { + msg.append("\n(Click on your life total to pay life for phyrexian mana.)"); + } + AllZone.Display.showMessage(msg.toString()); if(mana.isPaid()) done(); diff --git a/src/forge/gui/input/Input_PayManaCost.java b/src/forge/gui/input/Input_PayManaCost.java index 70e8e6e991b..f67e99fe792 100644 --- a/src/forge/gui/input/Input_PayManaCost.java +++ b/src/forge/gui/input/Input_PayManaCost.java @@ -103,7 +103,7 @@ public class Input_PayManaCost extends Input { @Override public void selectPlayer(Player player) { - showMessage(); + if(player.equals(AllZone.HumanPlayer)) { if(manaCost.payPhyrexian()) @@ -111,12 +111,7 @@ public class Input_PayManaCost extends Input { phyLifeToLose += 2; } - if(manaCost.isPaid()) { - System.out.println("Phyrexian Mana: Pay " + phyLifeToLose); - resetManaCost(); - - done(); - } + showMessage(); } } @@ -181,6 +176,11 @@ public class Input_PayManaCost extends Input { msg.append(" life paid for phyrexian mana)"); } + if(manaCost.containsPhyrexianMana()) + { + msg.append("\n(Click on your life total to pay life for phyrexian mana.)"); + } + AllZone.Display.showMessage(msg.toString()); if(manaCost.isPaid() && !new ManaCost(originalManaCost).isPaid()) { originalCard.setSunburstValue(manaCost.getSunburst());