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

Erwan

Browse Source 
-Fix issue 107 as well as another issue with doesnotuntap mentioned by leungcl
-Changed wording for Paralyzing Graps (to match oracle), please verify
This commit is contained in:
wagic.the.homebrew@gmail.com
2009-10-25 14:01:25 +00:00
parent eab2086160
commit dd7c307c7a
7 changed files with 90 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
projects/mtg/bin/Res/sets/ZEN/_cards.dat
View File

@@ -940,8 +940,8 @@ power=1
toughness=1
[/card]
[card]
text=Enchant tapped creature Enchanted creature doesn't untap during its controller's untap step.
target=creature[tapped]
text=Enchant creature Enchanted creature doesn't untap during its controller's untap step.
target=creature
auto=doesnotuntap
id=178109
name=Paralyzing Grasp

2
projects/mtg/bin/Res/test/_tests.txt
View File

@@ -3,6 +3,8 @@
########################
generic/attacks_each_turn.txt
generic/deathtouch.txt
generic/doesnotuntap.txt
generic/doesnotuntap2.txt
generic/fear.txt
generic/first_strike.txt
generic/first_strike2.txt

39
projects/mtg/bin/Res/test/generic/doesnotuntap.txt Normal file
View File

@@ -0,0 +1,39 @@
#Bug doesnotuntap
#issue http://code.google.com/p/wagic/issues/detail?id=107
[INIT]
SECONDMAIN
[PLAYER1]
inplay:icy manipulator
hand:paralyzing grasp
manapool:{3}{U}
[PLAYER2]
inplay:grizzly bears
[DO]
icy manipulator
grizzly bears
paralyzing grasp
grizzly bears
eot
next
#upkeep
next
#draw
next
#main
grizzly bears
next
#begins
next
#attackers
grizzly bears
next
#end of combat
next
#main phase 2
[ASSERT]
SECONDMAIN
[PLAYER1]
inplay:paralyzing grasp,icy manipulator
[PLAYER2]
inplay:grizzly bears
[END]

37
projects/mtg/bin/Res/test/generic/doesnotuntap2.txt Normal file
View File

@@ -0,0 +1,37 @@
#Bug doesnotuntap
[INIT]
SECONDMAIN
[PLAYER1]
inplay:icy manipulator
hand:paralyzing grasp
manapool:{3}{U}
[PLAYER2]
inplay:grizzly bears
[DO]
icy manipulator
grizzly bears
paralyzing grasp
grizzly bears
eot
next
#upkeep
next
#draw
next
#main
next
#begins
next
#attackers
grizzly bears
next
#end of combat
next
#main phase 2
[ASSERT]
SECONDMAIN
[PLAYER1]
inplay:paralyzing grasp,icy manipulator
[PLAYER2]
inplay:grizzly bears
[END]

1
projects/mtg/src/ConstraintResolver.cpp
View File

@@ -6,6 +6,7 @@ int ConstraintResolver::untap(GameObserver * game, MTGCardInstance * card){
if (!card->isUntapping()){
return 0;
}
if (card->has(Constants::DOESNOTUNTAP)) return 0;
int ok = 1;
ManaCost * untapManaCost = NEW ManaCost();
UntapBlockers * blockers = card->getUntapBlockers();

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

@@ -11,7 +11,7 @@
#include "../include/utils.h"
#include "../include/DeckDataWrapper.h"
static const char* GAME_VERSION = "WTH?! 0.9.0 - by wololo";
static const char* GAME_VERSION = "WTH?! 0.9.1 - by wololo";
#define DEFAULT_ANGLE_MULTIPLIER 0.4
#define MAX_ANGLE_MULTIPLIER (3*M_PI)

17
projects/mtg/src/MTGAbility.cpp
View File

@@ -363,15 +363,6 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
}
//Untapper (Ley Druid...)
found = s.find("untap");
if (found != string::npos){
MTGAbility * a = NEW AAUntapper(id,card,target);
a->oneShot = 1;
return a;
}
//Regeneration
found = s.find("regenerate");
if (found != string::npos){
@@ -679,6 +670,14 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
}
}
//Untapper (Ley Druid...)
found = s.find("untap");
if (found != string::npos){
MTGAbility * a = NEW AAUntapper(id,card,target);
a->oneShot = 1;
return a;
}
//Tapper (icy manipulator)
found = s.find("tap");
if (found != string::npos){