diff --git a/.gitattributes b/.gitattributes index 6471d399751..a5564e2354d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5784,6 +5784,7 @@ forge-gui/res/cardsfolder/f/fierce_empath.txt svneol=native#text/plain forge-gui/res/cardsfolder/f/fierce_invocation.txt -text forge-gui/res/cardsfolder/f/fiery_bombardment.txt -text forge-gui/res/cardsfolder/f/fiery_conclusion.txt svneol=native#text/plain +forge-gui/res/cardsfolder/f/fiery_confluence.txt -text forge-gui/res/cardsfolder/f/fiery_fall.txt svneol=native#text/plain forge-gui/res/cardsfolder/f/fiery_gambit.txt -text forge-gui/res/cardsfolder/f/fiery_hellhound.txt svneol=native#text/plain @@ -9922,6 +9923,7 @@ forge-gui/res/cardsfolder/m/myrsmith.txt svneol=native#text/plain forge-gui/res/cardsfolder/m/mysteries_of_the_deep.txt svneol=native#text/plain forge-gui/res/cardsfolder/m/mystic_barrier.txt -text forge-gui/res/cardsfolder/m/mystic_compass.txt -text +forge-gui/res/cardsfolder/m/mystic_confluence.txt -text forge-gui/res/cardsfolder/m/mystic_crusader.txt svneol=native#text/plain forge-gui/res/cardsfolder/m/mystic_decree.txt -text forge-gui/res/cardsfolder/m/mystic_denial.txt svneol=native#text/plain @@ -11934,6 +11936,7 @@ forge-gui/res/cardsfolder/r/righteous_avengers.txt svneol=native#text/plain forge-gui/res/cardsfolder/r/righteous_blow.txt -text forge-gui/res/cardsfolder/r/righteous_cause.txt svneol=native#text/plain forge-gui/res/cardsfolder/r/righteous_charge.txt svneol=native#text/plain +forge-gui/res/cardsfolder/r/righteous_confluence.txt -text forge-gui/res/cardsfolder/r/righteous_fury.txt svneol=native#text/plain forge-gui/res/cardsfolder/r/righteous_indignation.txt -text forge-gui/res/cardsfolder/r/righteous_war.txt svneol=native#text/plain @@ -15591,6 +15594,7 @@ forge-gui/res/cardsfolder/v/vensers_sliver.txt svneol=native#text/plain forge-gui/res/cardsfolder/v/vent_sentinel.txt svneol=native#text/plain forge-gui/res/cardsfolder/v/ventifact_bottle.txt -text forge-gui/res/cardsfolder/v/verdant_catacombs.txt svneol=native#text/plain +forge-gui/res/cardsfolder/v/verdant_confluence.txt -text forge-gui/res/cardsfolder/v/verdant_eidolon.txt svneol=native#text/plain forge-gui/res/cardsfolder/v/verdant_embrace.txt -text forge-gui/res/cardsfolder/v/verdant_field.txt svneol=native#text/plain @@ -16424,6 +16428,7 @@ forge-gui/res/cardsfolder/w/wrens_run_packmaster.txt svneol=native#text/plain forge-gui/res/cardsfolder/w/wrens_run_vanquisher.txt -text forge-gui/res/cardsfolder/w/wretched_anurid.txt svneol=native#text/plain forge-gui/res/cardsfolder/w/wretched_banquet.txt -text +forge-gui/res/cardsfolder/w/wretched_confluence.txt -text forge-gui/res/cardsfolder/w/wrexial_the_risen_deep.txt -text forge-gui/res/cardsfolder/w/wring_flesh.txt svneol=native#text/plain forge-gui/res/cardsfolder/w/writ_of_passage.txt -text diff --git a/forge-gui/res/cardsfolder/f/fiery_confluence.txt b/forge-gui/res/cardsfolder/f/fiery_confluence.txt new file mode 100644 index 00000000000..35ec98b3bb2 --- /dev/null +++ b/forge-gui/res/cardsfolder/f/fiery_confluence.txt @@ -0,0 +1,9 @@ +Name:Fiery Confluence +ManaCost:2 R R +Types:Sorcery +A:SP$ Charm | Cost$ 2 R R | Choices$ DBDamageCreatures,DBDamageOpponents,DBDestroy | CharmNum$ 3 | CanRepeatModes$ True | SpellDescription$ Choose three. You may choose the same mode more than once. - CARDNAME deals 1 damage to each creature; CARDNAME deals 2 damage to each opponent.; Destroy target artifact. +SVar:DBDamageCreatures:DB$ DamageAll | NumDmg$ 1 | ValidCards$ Creature | SpellDescription$ CARDNAME deals 1 damage to each creature. +SVar:DBDamageOpponents:DB$ DealDamage | Defined$ Player.Opponent | NumDmg$ 2 | AILogic$ Good | SpellDescription$ CARDNAME deals 2 damage to each opponent. +SVar:DBDestroy:DB$ Destroy | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | SpellDescription$ Destroy target artifact. +SVar:Picture:http://www.wizards.com/global/images/magic/general/fiery_confluence.jpg +Oracle:Choose three. You may choose the same mode more than once.\n• Fiery Confluence deals 1 damage to each creature.\n• Fiery Confluence deals 2 damage to each opponent.\n• Destroy target artifact. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/m/mystic_confluence.txt b/forge-gui/res/cardsfolder/m/mystic_confluence.txt new file mode 100644 index 00000000000..0122aa49ba6 --- /dev/null +++ b/forge-gui/res/cardsfolder/m/mystic_confluence.txt @@ -0,0 +1,10 @@ +Name:Mystic Confluence +ManaCost:3 U U +Types:Instant +A:SP$ Charm | Cost$ 3 U U | Choices$ DBCounter,DBReturn,DBDraw | CharmNum$ 3 | CanRepeatModes$ True | SpellDescription$ Choose three. You may choose the same mode more than once. - Counter target spell unless its controller pays 3; Return target creature to its owner's hand; Draw a card. +SVar:DBCounter:DB$ Counter | TargetType$ Spell | ValidTgts$ Card | UnlessCost$ 3 | SpellDescription$ Counter target spell unless its controller pays 3. +SVar:DBReturn:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Return target creature to its owner's hand. +SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1 | SpellDescription$ Draw a card. +SVar:RemAIDeck:True +SVar:Picture:http://www.wizards.com/global/images/magic/general/mystic_confluence.jpg +Oracle:Choose three. You may choose the same mode more than once.\n• Counter target spell unless its controller pays 3.\n• Return target creature to its owner's hand.\n• Draw a card. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/r/righteous_confluence.txt b/forge-gui/res/cardsfolder/r/righteous_confluence.txt new file mode 100644 index 00000000000..2920cf94237 --- /dev/null +++ b/forge-gui/res/cardsfolder/r/righteous_confluence.txt @@ -0,0 +1,9 @@ +Name:Righteous Confluence +ManaCost:3 W W +Types:Sorcery +A:SP$ Charm | Cost$ 3 W W | Choices$ DBToken,DBChangeZone,DBGainLife | CharmNum$ 3 | CanRepeatModes$ True | SpellDescription$ Choose three. You may choose the same mode more than once. - Put a 2/2 white Knight creature token with vigilance onto the battlefield; Exile target enchantment; You gain 5 life. +SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenName$ Knight | TokenTypes$ Creature,Knight | TokenOwner$ You | TokenColors$ White | TokenPower$ 2 | TokenToughness$ 2 | TokenKeywords$ Vigilance | TokenImage$ w 2 2 knight c15 |SpellDescription$ Put a 2/2 white Knight creature token with vigilance onto the battlefield. +SVar:DBChangeZone:DB$ ChangeZone | ValidTgts$ Enchantment | TgtPrompt$ Choose target enchantment | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target enchantment. +SVar:DBGainLife:DB$ GainLife | LifeAmount$ 5 | SpellDescription$ You gain 5 life. +SVar:Picture:http://www.wizards.com/global/images/magic/general/righteous_confluence.jpg +Oracle:Choose three. You may choose the same mode more than once.\n• Put a 2/2 white Knight creature token with vigilance onto the battlefield.\n• Exile target enchantment.\n• You gain 5 life. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/v/verdant_confluence.txt b/forge-gui/res/cardsfolder/v/verdant_confluence.txt new file mode 100644 index 00000000000..6287df0ff48 --- /dev/null +++ b/forge-gui/res/cardsfolder/v/verdant_confluence.txt @@ -0,0 +1,9 @@ +Name:Verdant Confluence +ManaCost:4 G G +Types:Sorcery +A:SP$ Charm | Cost$ 4 G G | Choices$ DBPutCounter,DBChangeZone1,DBChangeZone2 | CharmNum$ 3 | CanRepeatModes$ True | SpellDescription$ Choose three. You may choose the same mode more than once. - Put two +1/+1 counters on target creature; Return target permanent card from your graveyard to your hand; Search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library. +SVar:DBPutCounter:DB$ PutCounter | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1 | CounterNum$ 2 | SpellDescription$ Put two +1/+1 counters on target creature. +SVar:DBChangeZone1:DB$ ChangeZone | TgtPrompt$ Choose target permanent card in your graveyard | ValidTgts$ Permanent.YouOwn | Origin$ Graveyard | Destination$ Hand | SpellDescription$ Return target permanent card from your graveyard to your hand. +SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | Tapped$ True | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library. +SVar:Picture:http://www.wizards.com/global/images/magic/general/verdant_confluence.jpg +Oracle:Choose three. You may choose the same mode more than once.\n• Put two +1/+1 counters on target creature.\n• Return target permanent card from your graveyard to your hand.\n• Search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/w/wretched_confluence.txt b/forge-gui/res/cardsfolder/w/wretched_confluence.txt new file mode 100644 index 00000000000..26bc2553410 --- /dev/null +++ b/forge-gui/res/cardsfolder/w/wretched_confluence.txt @@ -0,0 +1,10 @@ +Name:Wretched Confluence +ManaCost:3 B B +Types:Instant +A:SP$ Charm | Cost$ 3 B B | Choices$ DBDraw,DBPump,DBChangeZone | CharmNum$ 3 | CanRepeatModes$ True | SpellDescription$ Choose three. You may choose the same mode more than once. - Target player draws a card and loses 1 life; Target creature gets -2/-2 until end of turn; Return target creature card from your graveyard to your hand. +SVar:DBDraw:DB$ Draw | ValidTgts$ Player | NumCards$ 1 | SubAbility$ DBLoseLife | SpellDescription$ Target player draws a card and loses 1 life. +SVar:DBLoseLife:DB$LoseLife | LifeAmount$ 1 | Defined$ Targeted +SVar:DBPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -2 | NumDef$ -2 | IsCurse$ True | SpellDescription$ Target creature gets -2/-2 until end of turn. +SVar:DBChangeZone:DB$ ChangeZone | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouOwn | Origin$ Graveyard | Destination$ Hand | SpellDescription$ Return target creature card from your graveyard to your hand. +SVar:Picture:http://www.wizards.com/global/images/magic/general/wretched_confluence.jpg +Oracle:Choose three. You may choose the same mode more than once.\n• Target player draws a card and loses 1 life.\n• Target creature gets -2/-2 until end of turn.\n• Return target creature card from your graveyard to your hand. \ No newline at end of file