diff --git a/.gitattributes b/.gitattributes index 5c301b87712..0d86ea96acf 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5389,6 +5389,7 @@ res/cardsfolder/i/imagecrafter.txt -text res/cardsfolder/i/imaginary_pet.txt svneol=native#text/plain res/cardsfolder/i/imi_statue.txt svneol=native#text/plain res/cardsfolder/i/immaculate_magistrate.txt svneol=native#text/plain +res/cardsfolder/i/immersturm.txt -text res/cardsfolder/i/immerwolf.txt -text res/cardsfolder/i/immobilizing_ink.txt svneol=native#text/plain res/cardsfolder/i/immolating_souleater.txt svneol=native#text/plain @@ -7480,6 +7481,7 @@ res/cardsfolder/n/necropouncer.txt svneol=native#text/plain res/cardsfolder/n/necrosavant.txt svneol=native#text/plain res/cardsfolder/n/necroskitter.txt svneol=native#text/plain res/cardsfolder/n/necrotic_ooze.txt -text +res/cardsfolder/n/necrotic_plague.txt -text res/cardsfolder/n/necrotic_sliver.txt svneol=native#text/plain res/cardsfolder/n/nectar_faerie.txt -text res/cardsfolder/n/need_for_speed.txt svneol=native#text/plain @@ -8610,6 +8612,7 @@ res/cardsfolder/q/quicksand.txt svneol=native#text/plain res/cardsfolder/q/quicksilver_amulet.txt svneol=native#text/plain res/cardsfolder/q/quicksilver_behemoth.txt svneol=native#text/plain res/cardsfolder/q/quicksilver_dagger.txt svneol=native#text/plain +res/cardsfolder/q/quicksilver_fountain.txt -text res/cardsfolder/q/quicksilver_gargantuan.txt svneol=native#text/plain res/cardsfolder/q/quicksilver_geyser.txt svneol=native#text/plain res/cardsfolder/q/quicksilver_sea.txt -text diff --git a/res/cardsfolder/i/immersturm.txt b/res/cardsfolder/i/immersturm.txt new file mode 100644 index 00000000000..9786b39d545 --- /dev/null +++ b/res/cardsfolder/i/immersturm.txt @@ -0,0 +1,13 @@ +Name:Immersturm +ManaCost:no cost +Types:Plane Valla +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature | TriggerZones$ Command | Execute$ TrigDamage | OptionalDecider$ TriggeredCardController | TriggerDescription$ Whenever a creature enters the battlefield, that creature's controller may have it deal damage equal to its power to target creature or player of his or her choice. +SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ Y | References$ Y | DamageSource$ TriggeredCard | TargetingPlayer$ TriggeredCardController +SVar:Y:TriggeredCard$CardPower +T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll Chaos, exile target creature, then return it to the battlefield under its owner's control. +SVar:RolledChaos:AB$ ChangeZone | Cost$ 0 | ValidTgts$ Creature | Origin$ Battlefield | Destination$ Exile | RememberTargets$ True | SubAbility$ RestorationReturn +SVar:RestorationReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | SubAbility$ DBCleanup +SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True +SVar:AIRollPlanarDieParams:Mode$ Always | HasCreatureInPlay$ True +SVar:Picture:http://www.wizards.com/global/images/magic/general/immersturm.jpg +Oracle:Whenever a creature enters the battlefield, that creature's controller may have it deal damage equal to its power to target creature or player of his or her choice.\nWhenever you roll {C}, exile target creature, then return it to the battlefield under its owner's control. diff --git a/res/cardsfolder/n/necrotic_plague.txt b/res/cardsfolder/n/necrotic_plague.txt new file mode 100644 index 00000000000..b000caca912 --- /dev/null +++ b/res/cardsfolder/n/necrotic_plague.txt @@ -0,0 +1,13 @@ +Name:Necrotic Plague +ManaCost:2 B B +Types:Enchantment Aura +K:Enchant creature +A:SP$ Attach | Cost$ 2 B B | ValidTgts$ Creature | AILogic$ Curse +S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddTrigger$ NecroticPlagueTrig | AddSVar$ NecroticPlagueSac | Description$ Enchanted creature has "At the beginning of your upkeep, sacrifice this creature." +SVar:NecroticPlagueTrig:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ NecroticPlagueSac | TriggerDescription$ At the beginning of your upkeep, sacrifice CARDNAME. +SVar:NecroticPlagueSac:AB$ Sacrifice | Cost$ 0 | SacValid$ Self +T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.AttachedBy | Execute$ TrigChoose | TriggerDescription$ When enchanted creature dies, its controller chooses target creature one of his or her opponents controls. Return CARDNAME from its owner's graveyard to the battlefield attached to that creature. +SVar:TrigChoose:AB$ Pump | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Choose a creature your opponents control | TargetsWithDefinedController$ TriggeredCardOpponent | IsCurse$ True | TargetingPlayer$ TriggeredCardController | SubAbility$ DBChange +SVar:DBChange:DB$ ChangeZone | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield | AttachedTo$ ParentTarget +SVar:Picture:http://www.wizards.com/global/images/magic/general/necrotic_plague.jpg +Oracle:Enchant creature\nEnchanted creature has "At the beginning of your upkeep, sacrifice this creature."\nWhen enchanted creature dies, its controller chooses target creature one of his or her opponents controls. Return Necrotic Plague from its owner's graveyard to the battlefield attached to that creature. diff --git a/res/cardsfolder/q/quicksilver_fountain.txt b/res/cardsfolder/q/quicksilver_fountain.txt new file mode 100644 index 00000000000..8ddfe862a9e --- /dev/null +++ b/res/cardsfolder/q/quicksilver_fountain.txt @@ -0,0 +1,12 @@ +Name:Quicksilver Fountain +ManaCost:3 +Types:Artifact +T:Mode$ Phase | Phase$ Upkeep | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each player's upkeep, that player puts a flood counter on target non-Island land he or she controls of his or her choice. That land is an Island for as long as it has a flood counter on it. +SVar:TrigPutCounter:AB$ PutCounter | Cost$ 0 | TargetingPlayer$ TriggeredPlayer | ValidTgts$ Land.nonIsland+ActivePlayerCtrl | TgtPrompt$ Select target non-Island land you control | CounterType$ FLOOD | CounterNum$ 1 | SubAbility$ DBAnimate +SVar:DBAnimate:DB$ Animate | Defined$ Targeted | staticAbilities$ STFlood | Permanent$ True +SVar:STFlood:Mode$ Continuous | EffectZone$ Battlefield | Affected$ Card.Self+counters_GE1_FLOOD | AddType$ Island +T:Mode$ Phase | Phase$ End of Turn | CheckSVar$ X | SVarCompare$ EQ0 | TriggerZones$ Battlefield | Execute$ TrigRemoveAll | References$ X | TriggerDescription$ At the beginning of each end step, if all lands on the battlefield are Islands, remove all flood counters from them. +SVar:TrigRemoveAll:AB$ RemoveCounterAll | Cost$ 0 | ValidCards$ Land | CounterType$ FLOOD | AllCounters$ True +SVar:X:Count$Valid Land.nonIsland +SVar:Picture:http://www.wizards.com/global/images/magic/general/quicksilver_fountain.jpg +Oracle:At the beginning of each player's upkeep, that player puts a flood counter on target non-Island land he or she controls of his or her choice. That land is an Island for as long as it has a flood counter on it.\nAt the beginning of each end step, if all lands on the battlefield are Islands, remove all flood counters from them. diff --git a/src/main/java/forge/card/cost/Cost.java b/src/main/java/forge/card/cost/Cost.java index 2c1d72bc0d9..b8b08d14e80 100644 --- a/src/main/java/forge/card/cost/Cost.java +++ b/src/main/java/forge/card/cost/Cost.java @@ -256,7 +256,7 @@ public class Cost { } if (parse.startsWith("FlipCoin<")) { - // FlipCoin + // FlipCoin final String[] splitStr = abCostParse(parse, 1); return new CostFlipCoin(splitStr[0]); }