diff --git a/projects/mtg/bin/Res/sets/10E/_cards.dat b/projects/mtg/bin/Res/sets/10E/_cards.dat index fc4948196..3de75face 100644 --- a/projects/mtg/bin/Res/sets/10E/_cards.dat +++ b/projects/mtg/bin/Res/sets/10E/_cards.dat @@ -337,19 +337,6 @@ subtype=Wraith toughness=3 [/card] [card] -text=When Bogardan Firefiend is put into a graveyard from play, it deals 2 damage to target creature. -auto=@movedTo(this|graveyard):damage:2 target(creature) -id=130534 -name=Bogardan Firefiend -rarity=C -color=Red -type=Creature -mana={2}{R} -power=2 -subtype=Elemental Spirit -toughness=1 -[/card] -[card] text=Return target permanent to its owner's hand. target=* auto=moveTo(ownerHand) @@ -850,19 +837,6 @@ subtype=Human Archer toughness=2 [/card] [card] -text=When Festering Goblin is put into a graveyard from play, target creature gets -1/-1 until end of turn. -auto=@movedTo(this|graveyard):-1/-1 target(creature) -id=129546 -name=Festering Goblin -rarity=C -color=Black -type=Creature -mana={B} -power=1 -subtype=Zombie Goblin -toughness=1 -[/card] -[card] text=Other Soldier creatures get +1/+1 and have first strike. (They deal combat damage before creatures without first strike.) id=135258 auto=lord(soldier) 1/1 other @@ -2534,7 +2508,7 @@ toughness=2 [card] text=Whenever another creature comes into play, you gain 1 life. id=129740 -auto=@movedTo(*|battlefield): life:1 +auto=@movedTo(creature|battlefield): life:1 name=Soul Warden rarity=U color=White diff --git a/projects/mtg/bin/Res/sets/10E/todo.dat b/projects/mtg/bin/Res/sets/10E/todo.dat index 3777fb540..3490c499e 100644 --- a/projects/mtg/bin/Res/sets/10E/todo.dat +++ b/projects/mtg/bin/Res/sets/10E/todo.dat @@ -114,6 +114,20 @@ type=Instant mana={W} [/card] [card] +text=When Bogardan Firefiend is put into a graveyard from play, it deals 2 damage to target creature. +auto=@movedTo(this|graveyard):damage:2 target(creature) +#can't be coded in 0.8, because you can't use "target" after "@movedTo" unless there is a "may" condition +id=130534 +name=Bogardan Firefiend +rarity=C +color=Red +type=Creature +mana={2}{R} +power=2 +subtype=Elemental Spirit +toughness=1 +[/card] +[card] text=Whenever Cephalid Constable deals combat damage to a player, return up to that many target permanents that player controls to their owners' hands. id=135261 name=Cephalid Constable @@ -292,6 +306,20 @@ color=Land type=Land [/card] [card] +text=When Festering Goblin is put into a graveyard from play, target creature gets -1/-1 until end of turn. +auto=@movedTo(this|graveyard):-1/-1 target(creature) +#can't be coded in 0.8, because you can't use "target" after "@movedTo" unless there is a "may" condition +id=129546 +name=Festering Goblin +rarity=C +color=Black +type=Creature +mana={B} +power=1 +subtype=Zombie Goblin +toughness=1 +[/card] +[card] text=Flying (This creature can't be blocked except by creatures with flying or reach.) When Fog Elemental attacks or blocks, sacrifice it at end of combat. id=132073 name=Fog Elemental diff --git a/projects/mtg/bin/Res/sets/ALA/_cards.dat b/projects/mtg/bin/Res/sets/ALA/_cards.dat index c2240e784..2f3f2850b 100644 --- a/projects/mtg/bin/Res/sets/ALA/_cards.dat +++ b/projects/mtg/bin/Res/sets/ALA/_cards.dat @@ -478,18 +478,6 @@ subtype=Dragon toughness=8 [/card] [card] -text=Whenever another creature is put into a graveyard from play, you may have Hissing Iguanar deal 1 damage to target player. -auto=@movedTo(this|graveyard):damage:1 target(player) -id=174873 -name=Hissing Iguanar -rarity=C -type=Creature -mana={2}{R} -power=3 -subtype=Lizard -toughness=1 -[/card] -[card] text= id=174806 name=Incurable Ogre diff --git a/projects/mtg/bin/Res/sets/ALA/todo.dat b/projects/mtg/bin/Res/sets/ALA/todo.dat index f7aada5f1..5787cf2ba 100644 --- a/projects/mtg/bin/Res/sets/ALA/todo.dat +++ b/projects/mtg/bin/Res/sets/ALA/todo.dat @@ -520,6 +520,19 @@ type=Instant mana={W}{U} [/card] [card] +text=Whenever another creature is put into a graveyard from play, you may have Hissing Iguanar deal 1 damage to target player. +auto=@movedTo(this|graveyard):damage:1 target(player) +#can't be coded in 0.8 because "@" can't be followed by "target" unless there is a "may" ability +id=174873 +name=Hissing Iguanar +rarity=C +type=Creature +mana={2}{R} +power=3 +subtype=Lizard +toughness=1 +[/card] +[card] text={T}, Remove two cards in your graveyard from the game: Draw a card. If damage would be dealt to you, prevent that damage. Remove a card in your graveyard from the game for each 1 damage prevented this way. When there are no cards in your graveyard, you lose the game. id=175125 name=Immortal Coil diff --git a/projects/mtg/bin/Res/sets/ARB/_cards.dat b/projects/mtg/bin/Res/sets/ARB/_cards.dat index 6855edfed..9a18737fb 100644 --- a/projects/mtg/bin/Res/sets/ARB/_cards.dat +++ b/projects/mtg/bin/Res/sets/ARB/_cards.dat @@ -224,18 +224,6 @@ toughness=2 abilities=flying [/card] [card] -id=179612 -name=Putrid Leech -mana={B}{G} -type=Creature -subtype=Zombie Leech -power=2 -toughness=2 -text=Pay 2 life: Putrid Leech gets +2/+2 until end of turn. Play this ability only once each turn. -auto={0}:2/2 && life:-2 limit:1 -rarity=C -[/card] -[card] text=Exalted (Whenever a creature you control attacks alone, that creature gets +1/+1 until end of turn.) {1}, Sacrifice Qasali Pridemage: Destroy target artifact or enchantment. id=179556 name=Qasali Pridemage diff --git a/projects/mtg/bin/Res/sets/ARB/todo.dat b/projects/mtg/bin/Res/sets/ARB/todo.dat index 29fa2bd95..25dad970a 100644 --- a/projects/mtg/bin/Res/sets/ARB/todo.dat +++ b/projects/mtg/bin/Res/sets/ARB/todo.dat @@ -765,6 +765,18 @@ text=At the end of each opponent's turn, if that player didn't play a creature s rarity=R [/card] [card] +id=179612 +name=Putrid Leech +mana={B}{G} +type=Creature +subtype=Zombie Leech +power=2 +toughness=2 +text=Pay 2 life: Putrid Leech gets +2/+2 until end of turn. Play this ability only once each turn. +auto={0}:2/2 && life:-2 limit:1 #{0} activation costs don't work +rarity=C +[/card] +[card] id=175256 name=Reborn Hope mana={G}{W} diff --git a/projects/mtg/bin/Res/sets/CHK/_cards.dat b/projects/mtg/bin/Res/sets/CHK/_cards.dat index 26f2da5de..cc3cdc15e 100644 --- a/projects/mtg/bin/Res/sets/CHK/_cards.dat +++ b/projects/mtg/bin/Res/sets/CHK/_cards.dat @@ -37,19 +37,6 @@ auto=Add{R} rarity=C [/card] [card] -id=78697 -name=Azami, Lady of Scrolls -mana={2}{U}{U}{U} -type=Creature -subtype=Human Wizard -power=0 -toughness=2 -text=Tap an untapped Wizard you control: Draw a card. -auto={0}:tap target(wizard[-tapped]|myinplay) && draw:1 -abilities=legendary -rarity=R -[/card] -[card] text=Destroy target land or nonblack creature. It can't be regenerated. target=creature[-black],land auto=bury @@ -521,7 +508,7 @@ auto={1}:moveTo(ownerhand) target(land|mybattlefield) && token(Illusion,Creature rarity=R [/card] [card] -text=Enchanted Creature has "{B}: This Creature gets +1/+1 until end of turn. +text=Enchanted Creature has "{B}: This Creature gets +1/+1 until end of turn.E auto={B}:1/1 id=50449 name=Midnight Covenant diff --git a/projects/mtg/bin/Res/sets/CHK/todo.dat b/projects/mtg/bin/Res/sets/CHK/todo.dat index a86bbe5c1..066a3f53d 100644 --- a/projects/mtg/bin/Res/sets/CHK/todo.dat +++ b/projects/mtg/bin/Res/sets/CHK/todo.dat @@ -1,4 +1,4 @@ -[card] +[card] id=78694 name=Akki Lavarunner mana={3}{R} @@ -52,6 +52,19 @@ text={1}: Attach target Aura attached to a creature to another creature. rarity=R [/card] [card] +id=78697 +name=Azami, Lady of Scrolls +mana={2}{U}{U}{U} +type=Creature +subtype=Human Wizard +power=0 +toughness=2 +text=Tap an untapped Wizard you control: Draw a card. +auto={0}:tap target(wizard[-tapped]|myinplay) && draw:1 #{0}activation costs don't work +abilities=legendary +rarity=R +[/card] +[card] id=80283 name=Azusa, Lost but Seeking mana={2}{G} @@ -349,7 +362,7 @@ rarity=C id=78687 name=Budoka Gardener (Dokai, Weaver of Life) mana={1}{G} -type=Legendary Creature  EHuman Monk +type=Legendary Creature ?EHuman Monk power=3 toughness=3 text={4}{G}{G}, {T}: Put an X/X green Elemental creature token into play, where X is the number of lands you control. @@ -555,7 +568,7 @@ rarity=R id=78688 name=Initiate of Blood (Goka the Unjust) mana={3}{R} -type=Legendary Creature  EOgre Shaman +type=Legendary Creature ?EOgre Shaman power=4 toughness=4 text={T}: Goka the Unjust deals 4 damage to target creature that was dealt damage this turn. @@ -958,7 +971,7 @@ rarity=R id=78600 name=Bushi Tenderfoot (Kenzo the Hardhearted) mana={W} -type=Legendary Creature  EHuman Samurai +type=Legendary Creature ?EHuman Samurai power=3 toughness=4 text=Double strike; bushido 2 (When this blocks or becomes blocked, it gets +2/+2 until end of turn.) @@ -1406,7 +1419,7 @@ rarity=U id=78975 name=Orochi Eggwatcher (Shidako, Broodmistress) mana={2}{G} -type=Legendary Creature  ESnake Shaman +type=Legendary Creature ?ESnake Shaman power=3 toughness=3 text={G}, Sacrifice a creature: Target creature gets +3/+3 until end of turn. @@ -1867,7 +1880,7 @@ rarity=U id=78679 name=Nezumi Shortfang (Stabwhisker the Odious) mana={1}{B} -type=Legendary Creature  ERat Shaman +type=Legendary Creature ?ERat Shaman power=3 toughness=3 text=At the beginning of each opponent's upkeep, that player loses 1 life for each card fewer than three in his or her hand. @@ -2041,7 +2054,7 @@ rarity=R id=78691 name=Student of Elements (Tobita, Master of Winds) mana={1}{U} -type=Legendary Creature  EHuman Wizard +type=Legendary Creature ?EHuman Wizard power=3 toughness=3 text=Creatures you control have flying. @@ -2051,7 +2064,7 @@ rarity=U id=78694 name=Akki Lavarunner (Tok-Tok, Volcano Born) mana={3}{R} -type=Legendary Creature  EGoblin Shaman +type=Legendary Creature ?EGoblin Shaman power=2 toughness=2 text=Protection from red If a red source would deal damage to a player, it deals that much damage plus 1 to that player instead. @@ -2061,7 +2074,7 @@ rarity=R id=78686 name=Jushi Apprentice (Tomoya the Revealer) mana={1}{U} -type=Legendary Creature  EHuman Wizard +type=Legendary Creature ?EHuman Wizard power=2 toughness=3 text={3}{U}{U}, {T}: Target player draws X cards, where X is the number of cards in your hand. diff --git a/projects/mtg/bin/Res/sets/EVE/_cards.dat b/projects/mtg/bin/Res/sets/EVE/_cards.dat index ec294a70f..ca9323a44 100644 --- a/projects/mtg/bin/Res/sets/EVE/_cards.dat +++ b/projects/mtg/bin/Res/sets/EVE/_cards.dat @@ -11,34 +11,6 @@ subtype=Scarecrow toughness=3 [/card] [card] -text=Flying. When Archon of Justice is put into a graveyard from play, remove target permanent from the game. -abilities=flying -auto=@movedTo(this|graveyard):moveTo(removedfromgame) target(*|inplay) -id=146006 -name=Archon of Justice -rarity=R -type=Creature -mana={3}{W}{W} -power=4 -subtype=Archon -toughness=4 -[/card] -[card] -text=Other red creatures you control get +1/+1. Other white creatures you control get +1/+1. Whenever you play a red spell, Balefire Liege deals 3 damage to target player. Whenever you play a white spell, you gain 3 life. -id=158104 -auto=lord(creature[red]|myinplay) 1/1 other -auto=lord(creature[white]|myinplay) 1/1 other -auto=@movedto(*[red]|mystack):damage:3 target(player) -auto=@movedto(*[white]|mystack):life:3 -name=Balefire Liege -rarity=R -type=Creature -mana={2}{RW}{RW}{RW} -power=2 -subtype=Spirit Horror -toughness=4 -[/card] -[card] text={T}: Tap target creature. Whenever you play a white spell, you may untap Ballynock Trapper. auto={T}:tap target(creature) auto=@movedTo(*[white]|mystack):may untap diff --git a/projects/mtg/bin/Res/sets/EVE/todo.dat b/projects/mtg/bin/Res/sets/EVE/todo.dat index 6261e88ab..d8da08988 100644 --- a/projects/mtg/bin/Res/sets/EVE/todo.dat +++ b/projects/mtg/bin/Res/sets/EVE/todo.dat @@ -23,6 +23,20 @@ subtype=Golem toughness=* [/card] [card] +text=Flying. When Archon of Justice is put into a graveyard from play, remove target permanent from the game. +abilities=flying +auto=@movedTo(this|graveyard):moveTo(removedfromgame) target(*|inplay) +#can't be coded in 0.8: movedTo doe not work with target unless there is a "may" +id=146006 +name=Archon of Justice +rarity=R +type=Creature +mana={3}{W}{W} +power=4 +subtype=Archon +toughness=4 +[/card] +[card] text=Whenever Ashling, the Extinguisher deals combat damage to a player, choose target creature that player controls. He or she sacrifices that creature. id=151137 name=Ashling, the Extinguisher @@ -34,6 +48,22 @@ subtype=Elemental Shaman toughness=4 [/card] [card] +text=Other red creatures you control get +1/+1. Other white creatures you control get +1/+1. Whenever you play a red spell, Balefire Liege deals 3 damage to target player. Whenever you play a white spell, you gain 3 life. +id=158104 +auto=lord(creature[red]|myinplay) 1/1 other +auto=lord(creature[white]|myinplay) 1/1 other +auto=@movedto(*[red]|mystack):damage:3 target(player) +#can't be coded in 0.8: movedTo doe not work with target unless there is a "may" +auto=@movedto(*[white]|mystack):life:3 +name=Balefire Liege +rarity=R +type=Creature +mana={2}{RW}{RW}{RW} +power=2 +subtype=Spirit Horror +toughness=4 +[/card] +[card] text=Until end of turn, target creature gains "{T}: Return target nonland permanent to its owner's hand." id=154350 name=Banishing Knack diff --git a/projects/mtg/bin/Res/sets/LRW/_cards.dat b/projects/mtg/bin/Res/sets/LRW/_cards.dat index a0386020d..ee1d82a96 100644 --- a/projects/mtg/bin/Res/sets/LRW/_cards.dat +++ b/projects/mtg/bin/Res/sets/LRW/_cards.dat @@ -1,5 +1,4 @@ [card] -text= id=145976 name=Axegrinder Giant rarity=C @@ -410,18 +409,6 @@ subtype=Elemental toughness=5 [/card] [card] -text=When Hornet Harasser is put into a graveyard from play, target creature gets -2/-2 until end of turn. -auto=@movedTo(this|graveyard):-2/-2 target(creature) -id=142355 -name=Hornet Harasser -rarity=C -type=Creature -mana={2}{B}{B} -power=2 -subtype=Goblin Shaman -toughness=2 -[/card] -[card] text={T}: Put a +1/+1 counter on target creature for each Elf you control. auto={T}:foreach(elf|mybattlefield) counter(1/1) target(creature) id=139721 @@ -665,18 +652,6 @@ type=Basic Land subtype=Mountain [/card] [card] -text=When Mudbutton Torchrunner is put into a graveyard from play, it deals 3 damage to target creature or player. -auto=@movedTo(this|graveyard):damage:3 target(creature,player) -id=139742 -name=Mudbutton Torchrunner -rarity=C -type=Creature -mana={2}{R} -power=1 -subtype=Goblin Warrior -toughness=1 -[/card] -[card] text=Destroy target attacking or blocking creature. target=creature[attacking;blocking] auto=destroy diff --git a/projects/mtg/bin/Res/sets/LRW/todo.dat b/projects/mtg/bin/Res/sets/LRW/todo.dat index 8f0add8e4..8d6275bc9 100644 --- a/projects/mtg/bin/Res/sets/LRW/todo.dat +++ b/projects/mtg/bin/Res/sets/LRW/todo.dat @@ -881,6 +881,18 @@ mana={1}{W} subtype=Elemental [/card] [card] +text=When Hornet Harasser is put into a graveyard from play, target creature gets -2/-2 until end of turn. +auto=@movedTo(this|graveyard):-2/-2 target(creature) +id=142355 +name=Hornet Harasser +rarity=C +type=Creature +mana={2}{B}{B} +power=2 +subtype=Goblin Shaman +toughness=2 +[/card] +[card] text=Haste If a spell you control would deal damage to an opponent, prevent that damage. Put a 3/1 red Elemental Shaman creature token with haste into play for each 1 damage prevented this way. When Hostility is put into a graveyard from anywhere, shuffle it into its owner's library. id=140164 name=Hostility @@ -1239,6 +1251,19 @@ subtype=Elemental toughness=3 [/card] [card] +text=When Mudbutton Torchrunner is put into a graveyard from play, it deals 3 damage to target creature or player. +auto=@movedTo(this|graveyard):damage:3 target(creature,player) +#@movedTo does not work with target unless there is a "may" +id=139742 +name=Mudbutton Torchrunner +rarity=C +type=Creature +mana={2}{R} +power=1 +subtype=Goblin Warrior +toughness=1 +[/card] +[card] text=Flying When Mulldrifter comes into play, draw two cards. Evoke {2}{U} (You may play this spell for its evoke cost. If you do, it's sacrificed when it comes into play.) id=145811 name=Mulldrifter diff --git a/projects/mtg/bin/Res/sets/M10/_cards.dat b/projects/mtg/bin/Res/sets/M10/_cards.dat index c021370b6..9e4a5a7b8 100644 --- a/projects/mtg/bin/Res/sets/M10/_cards.dat +++ b/projects/mtg/bin/Res/sets/M10/_cards.dat @@ -1442,7 +1442,7 @@ subtype=Human Cleric power=1 toughness=1 text=Whenever another creature enters the battlefield, you gain 1 life. -auto=@movedTo(*|battlefield): life:1 +auto=@movedTo(creature|battlefield): life:1 rarity=U [/card] [card] diff --git a/projects/mtg/bin/Res/sets/RAV/_cards.dat b/projects/mtg/bin/Res/sets/RAV/_cards.dat index 37df023c8..0eef6a646 100644 --- a/projects/mtg/bin/Res/sets/RAV/_cards.dat +++ b/projects/mtg/bin/Res/sets/RAV/_cards.dat @@ -94,18 +94,6 @@ toughness=2 abilities=double strike [/card] [card] -text=Pay 1 life: Carrion Howler gets +2/-1 until end of turn. -id=88974 -auto={0}:2/1 && life:-1 -name=Carrion Howler -rarity=U -type=Creature -mana={3}{B} -power=2 -subtype=Zombie Wolf -toughness=2 -[/card] -[card] text=Defender (This creature can't attack.) When Carven Caryatid comes into play, draw a card. id=89048 auto=draw:1 @@ -502,18 +490,6 @@ power=3 toughness=4 [/card] [card] -text=When Infectious Host is put into a graveyard from play, target player loses 2 life. -id=87966 -auto=@movedto(this|graveyard):damage:2 target(player) -name=Infectious Host -rarity=C -type=Creature -mana={2}{B} -power=1 -subtype=Zombie -toughness=1 -[/card] -[card] text={T}: Add {U} to your mana pool. auto={T}:add {U} id=95113 diff --git a/projects/mtg/bin/Res/sets/RAV/todo.dat b/projects/mtg/bin/Res/sets/RAV/todo.dat index fe17eb35f..02c9de345 100644 --- a/projects/mtg/bin/Res/sets/RAV/todo.dat +++ b/projects/mtg/bin/Res/sets/RAV/todo.dat @@ -167,6 +167,18 @@ subtype=Human Cleric toughness=1 [/card] [card] +text=Pay 1 life: Carrion Howler gets +2/-1 until end of turn. +id=88974 +auto={0}:2/1 && life:-1 #{0}activation costs don't work in 0.8 +name=Carrion Howler +rarity=U +type=Creature +mana={3}{B} +power=2 +subtype=Zombie Wolf +toughness=2 +[/card] +[card] text=Flying {U}: Cerulean Sphinx's owner shuffles it into his or her library. id=89095 name=Cerulean Sphinx @@ -956,6 +968,18 @@ type=Instant mana={2}{U}{U} [/card] [card] +text=When Infectious Host is put into a graveyard from play, target player loses 2 life. +id=87966 +auto=@movedto(this|graveyard):damage:2 target(player) #does not work yet +name=Infectious Host +rarity=C +type=Creature +mana={2}{B} +power=1 +subtype=Zombie +toughness=1 +[/card] +[card] text=Enchant creature Enchanted creature has "At the end of your turn, sacrifice this creature unless it attacked this turn." id=88997 name=Instill Furor diff --git a/projects/mtg/bin/Res/sets/TMP/_cards.dat b/projects/mtg/bin/Res/sets/TMP/_cards.dat index 4c907ac32..bba2c3115 100644 --- a/projects/mtg/bin/Res/sets/TMP/_cards.dat +++ b/projects/mtg/bin/Res/sets/TMP/_cards.dat @@ -1550,20 +1550,6 @@ power=2 toughness=1 [/card] [card] -text=Flying Pay 2 life: Return Selenia, Dark Angel to its owner's hand. -id=4916 -name=Selenia, Dark Angel -color=White,Black -rarity=R -type=Creature -abilities=legendary,flying -auto={0}:moveTo(ownerhand) && life:-2 -mana={3}{W}{B} -power=3 -subtype=Angel -toughness=3 -[/card] -[card] text=Destroy target enchantment. You gain life equal to its converted mana cost. id=4898 target=enchantment diff --git a/projects/mtg/bin/Res/sets/TMP/todo.dat b/projects/mtg/bin/Res/sets/TMP/todo.dat index e34940d39..46a7b24e0 100644 --- a/projects/mtg/bin/Res/sets/TMP/todo.dat +++ b/projects/mtg/bin/Res/sets/TMP/todo.dat @@ -1243,12 +1243,14 @@ subtype=Wurm toughness=5 [/card] [card] -text=Flying Pay 2 life: Return Selenia, Dark Angel to its owner's hand. -abilites=flying +text=Flying Pay 2 life: Return Selenia, Dark Angel to its owner's hand. id=4916 name=Selenia, Dark Angel +color=White,Black rarity=R -type=Legendary Creature +type=Creature +abilities=legendary,flying +auto={0}:moveTo(ownerhand) && life:-2 #{0} activation costs don't work mana={3}{W}{B} power=3 subtype=Angel diff --git a/projects/mtg/bin/Res/sets/TSP/_cards.dat b/projects/mtg/bin/Res/sets/TSP/_cards.dat index 15773dc77..5d0403307 100644 --- a/projects/mtg/bin/Res/sets/TSP/_cards.dat +++ b/projects/mtg/bin/Res/sets/TSP/_cards.dat @@ -820,18 +820,6 @@ auto=first strike target(creature) rarity=C [/card] [card] -id=111082 -name=Viscid Lemures -mana={4}{B} -type=Creature -subtype=Spirit -power=4 -toughness=3 -text={0}: Viscid Lemures gets -1/-0 and gains swampwalk until end of turn. -auto={0}: -1/-0 && swampwalk -rarity=C -[/card] -[card] id=106648 name=Watcher Sliver mana={3}{W} diff --git a/projects/mtg/bin/Res/sets/TSP/todo.dat b/projects/mtg/bin/Res/sets/TSP/todo.dat index 0db8f301e..22a667c4d 100644 --- a/projects/mtg/bin/Res/sets/TSP/todo.dat +++ b/projects/mtg/bin/Res/sets/TSP/todo.dat @@ -2117,6 +2117,18 @@ text={U}: Viscerid Deepwalker gets +1/+0 until end of turn. Suspend 4—{U} (Rat rarity=C [/card] [card] +id=111082 +name=Viscid Lemures +mana={4}{B} +type=Creature +subtype=Spirit +power=4 +toughness=3 +text={0}: Viscid Lemures gets -1/-0 and gains swampwalk until end of turn. +auto={0}: -1/-0 && swampwalk #{0}activation costs don't work +rarity=C +[/card] +[card] id=111076 name=Voidmage Husher mana={3}{U} diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt index 2eba434e8..fcbd038bc 100644 --- a/projects/mtg/bin/Res/test/_tests.txt +++ b/projects/mtg/bin/Res/test/_tests.txt @@ -51,6 +51,7 @@ brass_man.txt castle.txt cathodion.txt celestial_purge.txt +chainbreaker.txt circle_of_protection.txt civic_wayfinder.txt clone.txt diff --git a/projects/mtg/bin/Res/test/chainbreaker.txt b/projects/mtg/bin/Res/test/chainbreaker.txt new file mode 100644 index 000000000..6fc97f285 --- /dev/null +++ b/projects/mtg/bin/Res/test/chainbreaker.txt @@ -0,0 +1,21 @@ +#Bug: chainbreaker does not get his counters +[INIT] +COMBATATTACKERS +[PLAYER1] +inplay:chainbreaker +[PLAYER2] +[DO] +chainbreaker +next +#blockers +next +#damage +next +#end +[ASSERT] +COMBATEND +[PLAYER1] +inplay:chainbreaker +[PLAYER2] +life:19 +[END] \ No newline at end of file diff --git a/projects/mtg/src/GameStateMenu.cpp b/projects/mtg/src/GameStateMenu.cpp index 0594392ec..18060b0de 100644 --- a/projects/mtg/src/GameStateMenu.cpp +++ b/projects/mtg/src/GameStateMenu.cpp @@ -11,7 +11,7 @@ #include "../include/utils.h" #include "../include/DeckDataWrapper.h" -static const char* GAME_VERSION = "WTH?! 0.7.1 - by WilLoW"; +static const char* GAME_VERSION = "WTH?! 0.8.0 - by wololo"; #define DEFAULT_ANGLE_MULTIPLIER 0.4 #define MAX_ANGLE_MULTIPLIER (3*M_PI) diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp index 4e5b9a9b2..790625fe8 100644 --- a/projects/mtg/src/MTGAbility.cpp +++ b/projects/mtg/src/MTGAbility.cpp @@ -517,14 +517,15 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG size_t end = s.find(")", found); size_t separator = s.find(",", found); if (separator != string::npos){ - nb = atoi(s.substr(found,separator-found).c_str()); + string nbstr = s.substr(separator+1,end-separator-1); + nb = atoi(nbstr.c_str()); end = separator; } string spt = s.substr(found,end-found); int power, toughness; if ( parsePowerToughness(spt,&power, &toughness)){ MTGAbility * a = NEW AACounter(id,card,target,power,toughness,nb); - a->oneShot = 1; + a->oneShot = 1; return a; } return NULL; diff --git a/projects/mtg/src/MTGCardInstance.cpp b/projects/mtg/src/MTGCardInstance.cpp index 20637c8df..25107a442 100644 --- a/projects/mtg/src/MTGCardInstance.cpp +++ b/projects/mtg/src/MTGCardInstance.cpp @@ -319,6 +319,7 @@ int MTGCardInstance::canAttack(){ if (hasSummoningSickness()) return 0; if (basicAbilities[Constants::DEFENSER] || basicAbilities[Constants::CANTATTACK]) return 0; if (!isACreature()) return 0; + if (!isInPlay()) return 0; return 1; }