From dcecbd4e378f395801d3111223b6da2d9ab40336 Mon Sep 17 00:00:00 2001 From: Misha Colbourne Date: Wed, 14 Mar 2018 22:43:40 +0000 Subject: [PATCH 1/7] Update DeckFormat.java --- forge-core/src/main/java/forge/deck/DeckFormat.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-core/src/main/java/forge/deck/DeckFormat.java b/forge-core/src/main/java/forge/deck/DeckFormat.java index 1678f36025f..a95b9ead2a8 100644 --- a/forge-core/src/main/java/forge/deck/DeckFormat.java +++ b/forge-core/src/main/java/forge/deck/DeckFormat.java @@ -297,7 +297,7 @@ public enum DeckFormat { if (maxCopies < Integer.MAX_VALUE) { //Must contain no more than 4 of the same card //shared among the main deck and sideboard, except - //basic lands, Shadowborn Apostle and Relentless Rats + //basic lands, Shadowborn Apostle, Relentless Rats and Rat Colony final CardPool allCards = deck.getAllCardsInASinglePool(hasCommander()); final ImmutableSet limitExceptions = ImmutableSet.of("Relentless Rats", "Shadowborn Apostle", "Rat Colony"); From d5872df7ed6205b08149c1011c8118bfdd0cecdf Mon Sep 17 00:00:00 2001 From: Misha Colbourne Date: Wed, 14 Mar 2018 22:48:28 +0000 Subject: [PATCH 2/7] Fixed trigger description in vraskas_conquistador.txt --- forge-gui/res/cardsfolder/v/vraskas_conquistador.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui/res/cardsfolder/v/vraskas_conquistador.txt b/forge-gui/res/cardsfolder/v/vraskas_conquistador.txt index 5f1d69706e1..6a7ca9216a5 100644 --- a/forge-gui/res/cardsfolder/v/vraskas_conquistador.txt +++ b/forge-gui/res/cardsfolder/v/vraskas_conquistador.txt @@ -3,7 +3,7 @@ ManaCost:1 B Types:Creature Vampire Soldier PT:2/1 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDrain | TriggerZones$ Battlefield | IsPresent$ Planeswalker.Vraska+YouCtrl | PresentCompare$ GE1 | TriggerDescription$ Whenever CARDNAME attacks or blocks, if you control a Vraska planeswalker, target opponent loses 2 life and you gain 2 life. -T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ TrigDrain | Secondary$ True | TriggerZones$ Battlefield | IsPresent$ Planeswalker.Vraska+YouCtrl | PresentCompare$ GE1 | TriggerDescription$ Whenever CARDNAME if you control a Vraska planeswalker, target opponent loses 2 life and you gain 2 life. +T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ TrigDrain | Secondary$ True | TriggerZones$ Battlefield | IsPresent$ Planeswalker.Vraska+YouCtrl | PresentCompare$ GE1 | TriggerDescription$ Whenever CARDNAME attacks or blocks, if you control a Vraska planeswalker, target opponent loses 2 life and you gain 2 life. SVar:TrigDrain:DB$LoseLife | ValidTgts$ Opponent | LifeAmount$ 2 | SubAbility$ DBGainLife SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ 2 SVar:Picture:http://www.wizards.com/global/images/magic/general/vraskas_conquistador.jpg From 7a4aa94b8bd5e5a8d94411388260115cfaf42508 Mon Sep 17 00:00:00 2001 From: Misha Colbourne Date: Thu, 15 Mar 2018 00:14:19 +0000 Subject: [PATCH 3/7] DOM: Added some more Dominaria cards --- forge-gui/res/cardsfolder/upcoming/howling_golem.txt | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 forge-gui/res/cardsfolder/upcoming/howling_golem.txt diff --git a/forge-gui/res/cardsfolder/upcoming/howling_golem.txt b/forge-gui/res/cardsfolder/upcoming/howling_golem.txt new file mode 100644 index 00000000000..8c3c65d18a4 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/howling_golem.txt @@ -0,0 +1,8 @@ +Name:Howling Golem +ManaCost:3 +Types:Artifact Creature Golem +PT:2/3 +T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever Howling Golem attacks or blocks, each player draws a card. +T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ TrigDraw | Secondary$ True | TriggerZones$ Battlefield | TriggerDescription$ Whenever Howling Golem attacks or blocks, each player draws a card. +SVar:TrigDraw:DB$Draw | Defined$ Player | NumCards$ 1 | SpellDescription$ Each player draws a card. +Oracle:Whenever Howling Golem attacks or blocks, each player draws a card. \ No newline at end of file From a144096ed3e9be4b5ee0d9cd31992ab44888b8e8 Mon Sep 17 00:00:00 2001 From: Misha Colbourne Date: Thu, 15 Mar 2018 01:48:18 +0000 Subject: [PATCH 4/7] DOM: Added some more Dominaria cards --- forge-gui/res/cardsfolder/upcoming/keldon_overseer.txt | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 forge-gui/res/cardsfolder/upcoming/keldon_overseer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/keldon_overseer.txt b/forge-gui/res/cardsfolder/upcoming/keldon_overseer.txt new file mode 100644 index 00000000000..b72b86373cf --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/keldon_overseer.txt @@ -0,0 +1,9 @@ +Name:Keldon Overseer +ManaCost:2 R +Types:Creature Human Warrior +PT:3/1 +K:Kicker:3 R +K:Haste +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+kicked | Execute$ TrigKicker | TriggerDescription$ When CARDNAME enters the battlefield, if it was kicked, gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn. +SVar:TrigKicker:DB$ GainControl | TgtPrompt$ Choose target creature. | ValidTgts$ Creature | LoseControl$ EOT | Untap$ True | AddKWs$ Haste | SpellDescription$ Gain control of target creature until end of turn, untap that creature, and it gains haste until end of turn. +Oracle:Kicker {3}{R} (You may pay an additional {3}{R} as you cast this spell.)\nHaste\nWhen Keldon Overseer enters the battlefield, if it was kicked, gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn. \ No newline at end of file From ceaf19b9a1d205707801ff593c91d2aae6a422a0 Mon Sep 17 00:00:00 2001 From: Misha Colbourne Date: Thu, 15 Mar 2018 01:48:42 +0000 Subject: [PATCH 5/7] DOM: Added some more Dominaria cards --- forge-gui/res/cardsfolder/upcoming/rampaging_cyclops.txt | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 forge-gui/res/cardsfolder/upcoming/rampaging_cyclops.txt diff --git a/forge-gui/res/cardsfolder/upcoming/rampaging_cyclops.txt b/forge-gui/res/cardsfolder/upcoming/rampaging_cyclops.txt new file mode 100644 index 00000000000..07a40cf8429 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/rampaging_cyclops.txt @@ -0,0 +1,7 @@ +Name:Rampaging Cyclops +ManaCost:3 R +Types:Creature Cyclops +PT:4/4 +S:Mode$ Continuous | Affected$ Card.Self | AddPower$ -2| CheckSVar$ X | SVarCompare$ GE2 | Description$ CARDNAME gets -2/-0 as long as two or more creatures are blocking it. +SVar:X:Count$Valid Creature.blockingSource +Oracle:Rampaging Cyclops gets -2/-0 as long as two or more creatures are blocking it. From 23a5377e259fda82b0b1d4bfde17ae856f9d1f0a Mon Sep 17 00:00:00 2001 From: Misha Colbourne Date: Thu, 15 Mar 2018 02:19:55 +0000 Subject: [PATCH 6/7] DOM: Added some more Dominaria cards --- forge-gui/res/cardsfolder/upcoming/merfolk_trickster.txt | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 forge-gui/res/cardsfolder/upcoming/merfolk_trickster.txt diff --git a/forge-gui/res/cardsfolder/upcoming/merfolk_trickster.txt b/forge-gui/res/cardsfolder/upcoming/merfolk_trickster.txt new file mode 100644 index 00000000000..7e8db9de927 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/merfolk_trickster.txt @@ -0,0 +1,9 @@ +Name:Merfolk Trickster +ManaCost:U U +Types:Creature Merfolk Wizard +PT:2/2 +K:Flash +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters the battlefield, tap target creature an opponent controls. It loses all abilities until end of turn. +SVar:TrigTap:DB$ Tap | ValidTgts$ Creature.OppCtrl | SubAbility$ DBAnimate | TgtPrompt$ Select target creature +SVar:DBAnimate:DB$ Animate | Defined$ Targeted | RemoveAllAbilities$ True | IsCurse$ True +Oracle:Flash\nWhen Merfolk Trickster enters the battlefield, tap target creature an opponent controls. It loses all abilities until end of turn. From e300bba4de98d977a81abb81253591c736207d52 Mon Sep 17 00:00:00 2001 From: Misha Colbourne Date: Thu, 15 Mar 2018 02:29:35 +0000 Subject: [PATCH 7/7] Update rampaging_cyclops.txt --- forge-gui/res/cardsfolder/upcoming/rampaging_cyclops.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui/res/cardsfolder/upcoming/rampaging_cyclops.txt b/forge-gui/res/cardsfolder/upcoming/rampaging_cyclops.txt index 07a40cf8429..6e90014d02a 100644 --- a/forge-gui/res/cardsfolder/upcoming/rampaging_cyclops.txt +++ b/forge-gui/res/cardsfolder/upcoming/rampaging_cyclops.txt @@ -2,6 +2,6 @@ Name:Rampaging Cyclops ManaCost:3 R Types:Creature Cyclops PT:4/4 -S:Mode$ Continuous | Affected$ Card.Self | AddPower$ -2| CheckSVar$ X | SVarCompare$ GE2 | Description$ CARDNAME gets -2/-0 as long as two or more creatures are blocking it. +S:Mode$ Continuous | Affected$ Card.Self | AddPower$ -2 | CheckSVar$ X | SVarCompare$ GE2 | Description$ CARDNAME gets -2/-0 as long as two or more creatures are blocking it. SVar:X:Count$Valid Creature.blockingSource Oracle:Rampaging Cyclops gets -2/-0 as long as two or more creatures are blocking it.