Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #825 from kevlahnota/master

Browse Source 
corrections
This commit is contained in:
Anthony Calosa
2016-08-03 23:06:45 +08:00
committed by GitHub
parent 1aac2b8e75 be899159f3
commit c65fd1d7ae
3 changed files with 53 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
CHANGELOG.md
View File

@@ -1,6 +1,37 @@
# Changelog
## [latest-master] (https://github.com/WagicProject/wagic/tree/latest-master)
#### 8/3/16
- *Merged pull-request:* andAbility on ATokenCreator, Extend AAFlip [#\824] (https://github.com/WagicProject/wagic/pull/824) ([kevlahnota](https://github.com/kevlahnota))
#### 7/31/16
- *Merged pull-request:* Fix Chandra, Flamecaller & Cryptolith Rite [#\818] (https://github.com/WagicProject/wagic/pull/818) ([kevlahnota](https://github.com/kevlahnota))
#### 7/28/16
- *Merged pull-request:* changing some of the logic to the previous fixes, we want to avoid using code that looks for specific card names. [#\800] (https://github.com/WagicProject/wagic/pull/800) ([zethfoxster](https://github.com/zethfoxster))
#### 7/26/16
- *Merged pull-request:* granted flashback [#\791] (https://github.com/WagicProject/wagic/pull/791) ([kevlahnota](https://github.com/kevlahnota))
#### 7/23/16
- *Merged pull-request:* Fix Flying vs Moat (multiples of them). Fixes issue #526 [#\783] (https://github.com/WagicProject/wagic/pull/783) ([kevlahnota](https://github.com/kevlahnota))
#### 7/19/16
- *Merged pull-request:* pushing to master [#\770] (https://github.com/WagicProject/wagic/pull/770) ([zethfoxster](https://github.com/zethfoxster))
#### 7/18/16
- *Merged pull-request:* Fix Deck Menu layer, Change Main Menu Layout, Fix Crash cdaactive on tokens [#\765] (https://github.com/WagicProject/wagic/pull/765) ([kevlahnota](https://github.com/kevlahnota))
#### 7/12/16
- *Merged pull-request:* Pushing fixes [#\750] (https://github.com/WagicProject/wagic/pull/750) ([zethfoxster](https://github.com/zethfoxster))
- *Merged pull-request:* try to fix failed logic here [#\747] (https://github.com/WagicProject/wagic/pull/747) ([kevlahnota](https://github.com/kevlahnota))
#### 7/9/16
- *Merged pull-request:* pushing to master [#\738] (https://github.com/WagicProject/wagic/pull/738) ([zethfoxster](https://github.com/zethfoxster))
- *Merged pull-request:* Sorted Primitives and Cleanup Tabs [#\736] (https://github.com/WagicProject/wagic/pull/736) ([kevlahnota](https://github.com/kevlahnota))
#### 7/7/16
- *Merged pull-request:* Sorted Primitives and Cleanup Tabs [#\727] (https://github.com/WagicProject/wagic/pull/719) ([kevlahnota](https://github.com/kevlahnota))

42
projects/mtg/bin/Res/sets/primitives/mtg.txt
View File

@@ -234,7 +234,7 @@ name=Abstruse Interference
abilities=devoid
target=*|stack
auto=transforms((,newability[pay[[{1}]] name(pay 1 mana) donothing?fizzle])) forever
auto=token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{1}])) forever )! controller
auto=token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{C}])) forever )! controller
text=Devoid (This card has no color.) -- Counter target spell unless its controller pays {1}. You put a 1/1 colorless Eldrazi Scion creature token onto the battlefield. It has "Sacrifice this creature: Add {C} to your mana pool." ({C} represents colorless mana.)
mana={2}{U}
type=Instant
@@ -866,7 +866,7 @@ name=Adverse Conditions
target=<upto:2>creature|battlefield
auto=tap
auto=frozen
auto=token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{1}])) forever )! controller
auto=token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{C}])) forever )! controller
text=Devoid (This card has no color.) -- Tap up to two target creatures. Those creatures don't untap during their controller's next untap step. Put a 1/1 colorless Eldrazi Scion creature token onto the battlefield. It has "Sacrifice this creature: Add {1} to your mana pool."
mana={3}{U}
abilities=devoid
@@ -9957,7 +9957,7 @@ toughness=1
[card]
name=Birthing Hulk
auto={1}{C}:regenerate
auto=token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{1}])) forever )!*2
auto=token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{C}])) forever )!*2
text=Devoid (This card has no color.) -- When Birthing Hulk enters the battlefield, put two 1/1 colorless Eldrazi Scion creature tokens onto the battlefield. They have "Sacrifice this creature: Add {C} to your mana pool." ({C} represents colorless mana.) -- {1}{C}: Regenerate Birthing Hulk.
mana={6}{G}
abilities=devoid
@@ -10584,7 +10584,7 @@ type=Sorcery
[card]
name=Blight Herder
kicker={discard(*|opponentexile)}{discard(*|opponentexile)}
auto=kicker token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{1}])) forever )!*3
auto=kicker token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{C}])) forever )!*3
text=When you cast Blight Herder, you may put two cards your opponents own from exile into their owners' graveyards. If you do, put three 1/1 colorless Eldrazi Scion creature tokens onto the battlefield. They have "Sacrifice this creature: Add {C} to your mana pool."
mana={5}
type=Creature
@@ -10980,7 +10980,7 @@ toughness=1
[/card]
[card]
name=Blisterpod
auto=@movedTo(this|graveyard) from(battlefield):token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{1}])) forever )! controller
auto=@movedTo(this|graveyard) from(battlefield):token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{C}])) forever )! controller
text=Devoid (This card has no color.) -- When Blisterpod dies, put a 1/1 colorless Eldrazi Scion creature token onto the battlefield. It has "Sacrifice this creature: Add {1} to your mana pool."
mana={G}
abilities=devoid
@@ -14080,7 +14080,7 @@ type=Sorcery
[/card]
[card]
name=Brood Butcher
auto=choice token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{1}])) forever )! controller
auto=choice token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{C}])) forever )! controller
auto={B}{G}{S(creature|mybattlefield):target(creature) -2/-2 ueot
text=Devoid (This card has no color.) -- When Brood Butcher enters the battlefield, put a 1/1 colorless Eldrazi Scion creature token onto the battlefield. It has "Sacrifice this creature: Add {1} to your mana pool." -- {B}{G}, Sacrifice a creature: Target creature gets -2/-2 until end of turn.
mana={3}{B}{G}
@@ -14113,7 +14113,7 @@ toughness=3
[/card]
[card]
name=Brood Monitor
auto=choice token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{1}])) forever )!*3 controller
auto=choice token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{C}])) forever )!*3 controller
text=Devoid (This card has no color.) -- When Brood Monitor enters the battlefield, put three 1/1 colorless Eldrazi Scion creature tokens onto the battlefield. They have "Sacrifice this creature: Add {1} to your mana pool."
mana={4}{G}{G}
abilities=devoid
@@ -15196,7 +15196,7 @@ type=Sorcery
[/card]
[card]
name=Call the Scions
auto=token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{1}])) forever )!*2 controller
auto=token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{C}])) forever )!*2 controller
text=Devoid (This card has no color.) -- Put two 1/1 colorless Eldrazi Scion creature tokens onto the battlefield. They have "Sacrifice this creature: Add {1} to your mana pool."
mana={2}{G}
abilities=devoid
@@ -15918,7 +15918,7 @@ toughness=1
[/card]
[card]
name=Carrier Thrall
auto=@movedTo(this|graveyard) from(battlefield):token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{1}])) forever )! controller
auto=@movedTo(this|graveyard) from(battlefield):token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{C}])) forever )! controller
text=When Carrier Thrall dies, put a 1/1 colorless Eldrazi Scion creature token onto the battlefield. It has "Sacrifice this creature: Add {1} to your mana pool."
mana={1}{B}
type=Creature
@@ -16147,7 +16147,7 @@ toughness=4
[card]
name=Catacomb Sifter
abilities=devoid
auto=choice token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{1}])) forever )! controller
auto=choice token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{C}])) forever )! controller
auto=@movedTo(other creature|graveyard) from(myBattlefield):name(Scry) reveal:1 optionone name(Put On Top) target(*|reveal) moveto(mylibrary) optiononeend optiontwo name(put on bottom) target(<1>*|reveal) bottomoflibrary optiontwoend revealend
text=Devoid (This card has no color.) -- When Catacomb Sifter enters the battlefield, put a 1/1 colorless Eldrazi Scion creature token onto the battlefield. It has "Sacrifice this creature: Add {C} to your mana pool." -- Whenever another creature you control dies, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
mana={1}{B}{G}
@@ -29979,7 +29979,7 @@ toughness=1
[/card]
[card]
name=Drowner of Hope
auto=choice token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{1}])) forever )! *2 controller
auto=choice token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{C}])) forever )! *2 controller
auto={S(Eldrazi Scion|mybattlefield)}:tap target(creature)
text=Devoid (This card has no color.) -- When Drowner of Hope enters the battlefield, put two 1/1 colorless Eldrazi Scion creature tokens onto the battlefield. They have "Sacrifice this creature: Add {1} to your mana pool." -- Sacrifice an Eldrazi Scion: Tap target creature.
mana={5}{U}
@@ -31683,7 +31683,7 @@ toughness=1
[card]
name=Eldrazi Skyspawner
abilities=flying
auto=choice token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{1}])) forever )! controller
auto=choice token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{C}])) forever )! controller
text=Devoid (This card has no color.) -- Flying -- When Eldrazi Skyspawner enters the battlefield, put a 1/1 colorless Eldrazi Scion creature token onto the battlefield. It has "Sacrifice this creature: Add {1} to your mana pool."
mana={2}{U}
abilities=devoid
@@ -35253,7 +35253,7 @@ subtype=Elf
[/card]
[card]
name=Eyeless Watcher
auto=choice token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{1}])) forever )!*2 controller
auto=choice token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{C}])) forever )!*2 controller
text=Devoid (This card has no color.) -- When Eyeless Watcher enters the battlefield, put two 1/1 colorless Eldrazi Scion creature tokens onto the battlefield. They have "Sacrifice this creature: Add {1} to your mana pool."
mana={3}{G}
abilities=devoid
@@ -40120,7 +40120,7 @@ toughness=1
[/card]
[card]
name=From Beyond
auto=@each my upkeep:token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{1}])) forever )! controller
auto=@each my upkeep:token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{C}])) forever )! controller
auto={1}{G}{S}:moveto(myhand) notatarget(*[eldrazi]|mylibrary)
text=Devoid (This card has no color.) -- At the beginning of your upkeep, put a 1/1 colorless Eldrazi Scion creature token onto the battlefield. It has "Sacrifice this creature: Add {1} to your mana pool." -- {1}{G}, Sacrifice From Beyond: Search your library for an Eldrazi card, reveal it, put it into your hand, then shuffle your library.
mana={3}{G}
@@ -45545,7 +45545,7 @@ type=Land
name=Grave Birthing
target=opponent
auto=ability$!moveto(exile) notatarget(*|mygraveyard)!$ targetedplayer
auto=token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{1}])) forever )! controller
auto=token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{C}])) forever )! controller
auto=draw:1 controller
text=Devoid (This card has no color.) -- Target opponent exiles a card from his or her graveyard. You put a 1/1 colorless Eldrazi Scion creature token onto the battlefield. It has "Sacrifice this creature: Add {1} to your mana pool." -- Draw a card.
mana={2}{B}
@@ -53184,7 +53184,7 @@ type=Sorcery
[/card]
[card]
name=Incubator Drone
auto=choice token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{1}])) forever )! controller
auto=choice token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{C}])) forever )! controller
text=Devoid (This card has no color.) -- When Incubator Drone enters the battlefield, put a 1/1 colorless Eldrazi Scion creature token onto the battlefield. It has "Sacrifice this creature: Add {1} to your mana pool."
mana={3}{U}
abilities=devoid
@@ -92680,7 +92680,7 @@ toughness=4
[/card]
[card]
name=Scion Summoner
auto=token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{1}])) forever )!
auto=token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{C}])) forever )!
text=Devoid (This card has no color.) -- When Scion Summoner enters the battlefield, put a 1/1 colorless Eldrazi Scion creature token onto the battlefield. It has "Sacrifice this creature: Add {C} to your mana pool." ({C} represents colorless mana.)
mana={2}{G}
abilities=devoid
@@ -97332,7 +97332,7 @@ subtype=Arcane
[/card]
[card]
name=Sifter of Skulls
auto=@movedto(other creature[-token]|graveyard) from(mybattlefield):token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{1}])) forever )! controller
auto=@movedto(other creature[-token]|graveyard) from(mybattlefield):token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{C}])) forever )! controller
text=Devoid (This card has no color.) -- Whenever another nontoken creature you control dies, put a 1/1 colorless Eldrazi Scion creature token onto the battlefield. It has "Sacrifice this creature: Add {C} to your mana pool." ({C} represents colorless mana.)
mana={3}{B}
abilities=devoid
@@ -102285,7 +102285,7 @@ toughness=4
[card]
name=Spawning Bed
auto={T}:add{1}
auto={6}{T}{S}:token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{1}])) forever )!*3
auto={6}{T}{S}:token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{C}])) forever )!*3
text={T}: Add {1} to your mana pool. -- {6}, {T}, Sacrifice Spawning Bed: Put three 1/1 colorless Eldrazi Scion creature tokens onto the battlefield. They have "Sacrifice this creature: Add {1} to your mana pool."
type=Land
[/card]
@@ -119766,7 +119766,7 @@ type=Instant
[card]
name=Vile Redeemer
abilities=flash
auto=pay({c}) foreach(creature[fresh]|mygraveyard) token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{1}])) forever )!
auto=pay({c}) foreach(creature[fresh]|mygraveyard) token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{C}])) forever )!
text=Devoid (This card has no color.) -- Flash -- When you cast Vile Redeemer, you may pay {C}. If you do, put a 1/1 colorless Eldrazi Scion creature token onto the battlefield for each nontoken creature that died under your control this turn. Those tokens have "Sacrifice this creature: Add {C} to your mana pool."
mana={2}{G}
abilities=devoid
@@ -120710,7 +120710,7 @@ type=Sorcery
[card]
name=Void Attendant
abilities=devoid
auto={1}{G}{s2g(*|opponentexile)}:token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{1}])) forever )!
auto={1}{G}{s2g(*|opponentexile)}:token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{C}])) forever )!
text=Devoid (This card has no color.) -- {1}{G}, Put a card an opponent owns from exile into that player's graveyard: Put a 1/1 colorless Eldrazi Scion creature token onto the battlefield. It has "Sacrifice this creature: Add {C} to your mana pool."
mana={2}{G}
type=Creature

2
projects/mtg/src/AllAbilities.cpp
View File

@@ -1482,7 +1482,7 @@ int AACopier::resolve()
* AAFlip with forcedcopy to true *
*********************************************/
AAFlip * af = NEW AAFlip(game, game->mLayers->actionLayer()->getMaxId(), source, source, clone->data->name, false, true);
//af->oneShot;
af->oneShot = 1;
af->canBeInterrupted = false;
af->resolve();
SAFE_DELETE(af);