diff --git a/.gitattributes b/.gitattributes index 5370e7053f5..4181bac0477 100644 --- a/.gitattributes +++ b/.gitattributes @@ -17150,9 +17150,18 @@ forge-gui/res/cardsfolder/u/utter_end.txt -text forge-gui/res/cardsfolder/u/utvara_hellkite.txt -text forge-gui/res/cardsfolder/u/utvara_scalper.txt svneol=native#text/plain forge-gui/res/cardsfolder/u/uyo_silent_prophet.txt svneol=native#text/plain +forge-gui/res/cardsfolder/upcoming/arahbo_roar_of_the_world.txt -text +forge-gui/res/cardsfolder/upcoming/balan_wandering_knight.txt -text +forge-gui/res/cardsfolder/upcoming/bloodforged_battle_axe.txt -text +forge-gui/res/cardsfolder/upcoming/bloodline_necromancer.txt -text +forge-gui/res/cardsfolder/upcoming/hammer_of_nazahn.txt -text +forge-gui/res/cardsfolder/upcoming/heralds_horn.txt -text +forge-gui/res/cardsfolder/upcoming/hungry_lynx.txt -text +forge-gui/res/cardsfolder/upcoming/nazahn_revered_bladesmith.txt -text forge-gui/res/cardsfolder/upcoming/ramos_dragon_engine.txt -text forge-gui/res/cardsfolder/upcoming/taigam_ojutai_master.txt -text forge-gui/res/cardsfolder/upcoming/the_ur_dragon.txt -text +forge-gui/res/cardsfolder/upcoming/traverse_the_outlands.txt -text forge-gui/res/cardsfolder/upcoming/wasitora_nekoru_queen.txt -text forge-gui/res/cardsfolder/v/vacuumelt.txt svneol=native#text/plain forge-gui/res/cardsfolder/v/vaevictis_asmadi.txt svneol=native#text/plain diff --git a/forge-game/src/main/java/forge/game/card/CardUtil.java b/forge-game/src/main/java/forge/game/card/CardUtil.java index 7eacf8d5d9e..5aaa60388f9 100644 --- a/forge-game/src/main/java/forge/game/card/CardUtil.java +++ b/forge-game/src/main/java/forge/game/card/CardUtil.java @@ -88,6 +88,7 @@ public final class CardUtil { .put("Elves", "Elf") .put("Goblins", "Goblin") .put("Gorgons", "Gorgon") + .put("Rats", "Rat") .put("Vampires", "Vampire") .put("Werewolves", "Werewolf") .put("Zombies", "Zombie") diff --git a/forge-gui/res/cardsfolder/upcoming/arahbo_roar_of_the_world.txt b/forge-gui/res/cardsfolder/upcoming/arahbo_roar_of_the_world.txt new file mode 100644 index 00000000000..7d1a1870ace --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/arahbo_roar_of_the_world.txt @@ -0,0 +1,14 @@ +Name:Arahbo, Roar of the World +ManaCost:3 G W +Types:Legendary Creature Cat Avatar +PT:5/5 +T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield,Command | Execute$ TrigPump1 | TriggerDescription$ Eminence - At the beginning of combat on your turn, if CARDNAME is in the command zone or on the battlefield, another target Cat you control gets +3/+3 until end of turn. +SVar:TrigPump1:DB$ Pump | ValidTgts$ Creature.Cat+YouCtrl+Other | TgtPrompt$ Select another target Cat you control | NumAtt$ 3 | NumDef$ 3 +T:Mode$ Attacks | ValidCard$ Creature.Cat+Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump2 | TriggerDescription$ Whenever another Cat you control attacks, you may pay {1}{G}{W}. If you do, it gains trample and gets +X/+X until end of turn, where X is its power. +SVar:TrigPump2:AB$ Pump | Cost$ 1 G W | Defined$ TriggeredAttacker | KW$ Trample | NumAtt$ X | NumDef$ X | References$ X +SVar:X:TriggeredAttacker$CardPower +SVar:BuffedBy:Cat +SVar:PlayMain1:TRUE +DeckHints:Type$Cat +SVar:Picture:http://www.wizards.com/global/images/magic/general/arahbo_roar_of_the_world.jpg +Oracle:Eminence - At the beginning of combat on your turn, if Arahbo, Roar of the World is in the command zone or on the battlefield, another target Cat you control gets +3/+3 until end of turn.\nWhenever another Cat you control attacks, you may pay {1}{G}{W}. If you do, it gains trample and gets +X/+X until end of turn, where X is its power. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/upcoming/balan_wandering_knight.txt b/forge-gui/res/cardsfolder/upcoming/balan_wandering_knight.txt new file mode 100644 index 00000000000..e8400314c1f --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/balan_wandering_knight.txt @@ -0,0 +1,14 @@ +Name:Balan, Wandering Knight +ManaCost:2 W W +Types:Legendary Creature Cat Knight +PT:3/3 +K:First Strike +S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Double Strike | CheckSVar$ X | SVarCompare$ GE2 | Description$ CARDNAME has double strike as long as two or more Equipment are attached to it. +A:AB$ RepeatEach | Cost$ 1 W | RepeatSubAbility$ DBAttach | RepeatCards$ Equipment.YouCtrl | SpellDescription$ Attach all Equipment you control to CARDNAME. + +SVar:DBAttach:DB$ Attach | Object$ Remembered | Defined$ Self +SVar:X:Count$Valid Equipment.Attached + +SVar:EquipMe:Multiple +SVar:Picture:http://www.wizards.com/global/images/magic/general/balan_wandering_knight.jpg +Oracle:First strike\nBalan, Wandering Knight has double strike as long as two or more Equipment are attached to it.\n{1}{W}: Attach all Equipment you control to Balan. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/upcoming/bloodforged_battle_axe.txt b/forge-gui/res/cardsfolder/upcoming/bloodforged_battle_axe.txt new file mode 100644 index 00000000000..e90c50be343 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/bloodforged_battle_axe.txt @@ -0,0 +1,9 @@ +Name:Bloodforged Battle-Axe +ManaCost:1 +Types:Artifact Equipment +S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | Description$ Equipped creature gets +2/+0. +T:Mode$ DamageDone | ValidSource$ Creature.EquippedBy | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigCopy | TriggerZones$ Battlefield | TriggerDescription$ Whenever equipped creature deals combat damage to a player, create a token that's a copy of Bloodforged Battle-Axe. +SVar:TrigCopy:DB$CopyPermanent | Defined$ Self | NumCopies$ 1 +K:Equip 2 +SVar:Picture:http://www.wizards.com/global/images/magic/general/bloodforged_battle_axe.jpg +Oracle:Equipped creature gets +2/+0.\nWhenever equipped creature deals combat damage to a player, create a token that's a copy of Bloodforged Battle-Axe.\nEquip {2} \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/upcoming/bloodline_necromancer.txt b/forge-gui/res/cardsfolder/upcoming/bloodline_necromancer.txt new file mode 100644 index 00000000000..cc633e26d49 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/bloodline_necromancer.txt @@ -0,0 +1,9 @@ +Name:Bloodline Necromancer +ManaCost:4 B +Types:Creature Vampire Wizard +PT:3/2 +K:Lifelink +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may return target Vampire or Wizard creature card from your graveyard to the battlefield. +SVar:TrigChangeZone:DB$ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.Vampire+YouCtrl,Creature.Wizard+YouCtrl | TgtPrompt$ Select target Vampire or Wizard creature card in your graveyard +SVar:Picture:http://www.wizards.com/global/images/magic/general/bloodline_necromancer.jpg +Oracle:Lifelink\nWhen Bloodline Necromancer enters the battlefield, you may return target Vampire or Wizard creature card from your graveyard to the battlefield. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/upcoming/hammer_of_nazahn.txt b/forge-gui/res/cardsfolder/upcoming/hammer_of_nazahn.txt new file mode 100644 index 00000000000..a456b6998e1 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/hammer_of_nazahn.txt @@ -0,0 +1,11 @@ +Name:Hammer of Nazahn +ManaCost:4 +Types:Legendary Artifact Equipment +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigAttach | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME or another Equipment enters the battlefield under your control, that Equipment to target creature you control. +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Equipment+Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigAttach | OptionalDecider$ You | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another Equipment enters the battlefield under your control, that Equipment to target creature you control. +SVar:TrigAttach:DB$ Attach | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Target creature you control | Object$ TriggeredCard +S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | AddKeyword$ Indestructible | Description$ Equipped creature gets +2/+0 and has indestructible. +K:Equip 4 +DeckHints:Type$Equipment +SVar:Picture:http://www.wizards.com/global/images/magic/general/hammer_of_nazahn.jpg +Oracle:Whenever Hammer of Nazahn or another Equipment enters the battlefield under your control, you may attach that Equipment to target creature you control.\nEquipped creature gets +2/+0 and has indestructible.\nEquip {4} \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/upcoming/heralds_horn.txt b/forge-gui/res/cardsfolder/upcoming/heralds_horn.txt new file mode 100644 index 00000000000..96ed31df6dd --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/heralds_horn.txt @@ -0,0 +1,14 @@ +Name:Herald's Horn +ManaCost:3 +Types:Artifact +K:ETBReplacement:Other:ChooseCT +SVar:ChooseCT:DB$ ChooseType | Defined$ You | Type$ Creature | SpellDescription$ As CARDNAME enters the battlefield, choose a creature type. | AILogic$ MostProminentInComputerDeck +S:Mode$ ReduceCost | ValidCard$ Creature.ChosenType | Type$ Spell | Activator$ You | Amount$ 1 | Description$ Creature spells of the chosen type you cast cost {1} less to cast. +T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigPeek | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, look at the top card of your library. If it's a creature card of the chosen type, you may reveal it and put it into your hand. +SVar:TrigPeek:DB$ PeekAndReveal | PeekAmount$ 1 | RevealValid$ Creature.ChosenType | RevealOptional$ True | RememberRevealed$ True | SubAbility$ DBChangeZone + +SVar:DBChangeZone:DB$ ChangeZone | Defined$ TopOfLibrary | Origin$ Library | Destination$ Hand | ConditionDefined$ Remembered | ConditionPresent$ Creature.ChosenType | ConditionCompare$ EQ1 | SubAbility$ DBCleanup +SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True +A:AB$ ChangeZone | Cost$ 3 T | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature.ChosenType | ChangeNum$ 1 | SpellDescription$ You may put a creature card of the chosen type from your hand onto the battlefield. +SVar:Picture:http://www.wizards.com/global/images/magic/general/heralds_horn.jpg +Oracle:As Herald's Horn enters the battlefield, choose a creature type.\nCreature spells of the chosen type you cast cost {1} less to cast.\nAt the beginning of your upkeep, look at the top card of your library. If it's a creature card of the chosen type, you may reveal it and put it into your hand. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/upcoming/hungry_lynx.txt b/forge-gui/res/cardsfolder/upcoming/hungry_lynx.txt new file mode 100644 index 00000000000..ec7c18fae0f --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/hungry_lynx.txt @@ -0,0 +1,12 @@ +Name:Hungry Lynx +ManaCost:1 G +Types:Creature Cat +PT:2/2 +S:Mode$ Continuous | Affected$ Creature.Cat+YouCtrl | AddKeyword$ Protection from Rats | Description$ Cats you control have protection from Rats. (They can't be blocked, targeted or dealt damage by Rats.) +T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ At the beginning of your end step, target opponent creates a 1/1 black Rat creature token with deathtouch. +SVar:TrigToken:DB$ Token | ValidTgts$ Opponent | TokenAmount$ 1 | TokenName$ Rat | TokenTypes$ Creature,Rat | TokenColors$ Black | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Deathtouch | TokenOwner$ Targeted | TokenImage$ b 1 1 rat C17 +T:Mode$ ChangesZone | ValidCard$ Rat | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigPutCounters | TriggerDescription$ Whenever a Rat dies, put a +1/+1 counter on each Cat you control. +SVar:TrigPutCounters:DB$ PutCounterAll | ValidCards$ Cat.YouCtrl | CounterType$ P1P1 | CounterNum$ 1 +SVar:PlayMain1:TRUE +SVar:Picture:http://www.wizards.com/global/images/magic/general/hungry_lynx.jpg +Oracle:Cats you control have protection from Rats. (They can't be blocked, targeted or dealt damage by Rats.)\nAt the beginning of your end step, target opponent creates a 1/1 black Rat creature token with deathtouch.\nWhenever a Rat dies, put a +1/+1 counter on each Cat you control. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/upcoming/nazahn_revered_bladesmith.txt b/forge-gui/res/cardsfolder/upcoming/nazahn_revered_bladesmith.txt new file mode 100644 index 00000000000..12e387ff0d6 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/nazahn_revered_bladesmith.txt @@ -0,0 +1,13 @@ +Name:Nazahn, Revered Bladesmith +ManaCost:4 G W +Types:Legendary Creature Cat Artificer +PT:5/4 +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, search your library for an Equipment card and reveal it. If you reveal a card named Hammer of Nazahn this way, put it onto the battlefield. Otherwise, put that card into your hand. Then shuffle your library. +SVar:TrigChange:DB$ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Equipment | ChangeNum$ 1 | Reveal$ True | Shuffle$ False | RememberChanged$ True | SubAbility$ DBChangeZone +SVar:DBChangeZone:DB$ ChangeZone | Defined$ Remembered | Origin$ Library | Destination$ Battlefield | ConditionDefined$ Remembered | ConditionPresent$ Card.namedHammer of Nazahn | ForgetChanged$ True | SubAbility$ DBChangeZone2 +SVar:DBChangeZone2:DB$ ChangeZone | Defined$ Remembered | Origin$ Library | Destination$ Hand | SubAbility$ DBShuffle +SVar:DBShuffle:DB$ Shuffle | Defined$ You | SubAbility$ DBCleanup +SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True +DeckHints:Name$Hammer of Nazahn +SVar:Picture:http://www.wizards.com/global/images/magic/general/nazahn_revered_bladesmith.jpg +Oracle:When Nazahn, Revered Bladesmith enters the battlefield, search your library for an Equipment card and reveal it. If you reveal a card named Hammer of Nazahn this way, put it onto the battlefield. Otherwise, put that card into your hand. Then shuffle your library. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/upcoming/traverse_the_outlands.txt b/forge-gui/res/cardsfolder/upcoming/traverse_the_outlands.txt new file mode 100644 index 00000000000..e21cba7c3ec --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/traverse_the_outlands.txt @@ -0,0 +1,7 @@ +Name:Traverse the Outlands +ManaCost:6 G +Types:Sorcery +A:SP$ ChangeZone | Cost$ 6 G | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ X | References$ X | Tapped$ True | SpellDescription$ Search your library for up to X basic land cards, where X is the greatest power among creatures you control. Put those cards onto the battlefield tapped, then shuffle your library. +SVar:X:Count$GreatestPower_Creature.YouCtrl +SVar:Picture:http://www.wizards.com/global/images/magic/general/traverse_the_outlands.jpg +Oracle:Search your library for up to X basic land cards, where X is the greatest power among creatures you control. Put those cards onto the battlefield tapped, then shuffle your library.