edge case fix, the issue arises from castcard but I'm fixing it at a higher level since init to zone should always have a valid "player 1" in its first constructor.

This commit is contained in:
zethfoxster
2016-07-09 17:55:08 -04:00
parent a8cbdafe6e
commit d247c53136
4 changed files with 14 additions and 26 deletions
+3 -15
View File
@@ -1,19 +1,7 @@
#NAME:Premade G/R #NAME:Premade G/R
#DESC:A Red/Green deck with simple mechanics to get you started. We recommend you create your own decks to get the full Wagic experience! #DESC:A Red/Green deck with simple mechanics to get you started. We recommend you create your own decks to get the full Wagic experience!
Forest (10E) *11 arbor elf *25
Mountain (10E) *12
Aggressive Urge (10E) *4
Wall of Wood (10E) *4
Llanowar Elves (10E) *4
Mirri, Cat Warrior (10E)
Scion of the Wild (10E) *4
Primal Rage (10E) *2
Lightning Elemental (10E) *4
Shock (10E) *4
Firebreathing (10E) *2
Raging Goblin (10E) *4
Anaba Bodyguard (10E) *4
Arbiter of Knollridge *13
Arbor Colossus *13
+5 -10
View File
@@ -4288,20 +4288,15 @@ toughness=5
[/card] [/card]
[card] [card]
name=Arbor Colossus name=Arbor Colossus
abilities=reach auto=draw:2
auto=this(cantargetcard(*[-monstrous]) {3}{G}{G}{G}:becomes(monstrous) forever && counter(1/1,3) && transforms((,newAbility[destroy target(creature[flying]|opponentbattlefield)])) forever type=instant
text=Reach -- {3}{G}{G}{G}: Monstrosity 3. (If this creature isn't monstrous, put three +1/+1 counters on it and it becomes monstrous.) -- When Arbor Colossus becomes monstrous, destroy target creature with flying an opponent controls
mana={2}{G}{G}{G}
type=Creature
subtype=Giant
power=6
toughness=6
[/card] [/card]
[card] [card]
name=Arbor Elf name=Arbor Elf
auto={t}:untap target(forest) autohand={0}:name(Control Magic) activate castcard(normal named!:Control Magic:!)
text={T}: Untap target Forest. text={T}: Untap target Forest.
mana={G} mana={g}
dredge=dredge(2)
type=Creature type=Creature
subtype=Elf Druid subtype=Elf Druid
power=1 power=1
+1
View File
@@ -1,3 +1,4 @@
savor the moment.txt
######################## ########################
#Internal tests #Internal tests
######################## ########################
+5 -1
View File
@@ -980,7 +980,11 @@ void MTGInPlay::untapAll()
MTGGameZone * MTGGameZone::intToZone(int zoneId, Player * p, Player * p2) MTGGameZone * MTGGameZone::intToZone(int zoneId, Player * p, Player * p2)
{ {
if (p2 != p && p2 && (p != p2->opponent()))
{
p = p2->opponent();
//these cases are generally handled this is a edge case fix.
}
switch (zoneId) switch (zoneId)
{ {
case MY_GRAVEYARD: case MY_GRAVEYARD: