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

Small fixes (misstype, formatting, target p2)

Browse Source
This commit is contained in:
pankdm
2013-10-18 06:38:15 +00:00
parent 38b4213f9c
commit b5794ad328
6 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41358,7 +41358,7 @@ type=Legendary Enchantment
###The 2 cards above should stay together (Flip Card)### ###The 2 cards above should stay together (Flip Card)###
[card] [card]
name=Honden of Cleansing Fire name=Honden of Cleansing Fire
auto=@each my upkeep:life:type:shrine && life:type:shrine auto=@each my upkeep:life:twicetype:shrine
text=At the beginning of your upkeep, you gain 2 life for each Shrine you control. text=At the beginning of your upkeep, you gain 2 life for each Shrine you control.
mana={3}{W} mana={3}{W}
type=Legendary Enchantment type=Legendary Enchantment
@@ -50519,7 +50519,7 @@ toughness=4
[/card] [/card]
[card] [card]
name=Lightmine Field name=Lightmine Field
auto=@each blockers:damage:type:creature[attacking]:battlefield all(creature[attacking]|Battlefield) auto=@each blockers:foreach(creature[attacking]|Battlefield) damage:1 all(creature[attacking]|Battlefield)
text=Whenever one or more creatures attack, Lightmine Field deals damage to each of those creatures equal to the number of attacking creatures. text=Whenever one or more creatures attack, Lightmine Field deals damage to each of those creatures equal to the number of attacking creatures.
mana={2}{W}{W} mana={2}{W}{W}
type=Enchantment type=Enchantment
@@ -70900,8 +70900,8 @@ toughness=2
[card] [card]
name=Rending Vines name=Rending Vines
target=artifact,enchantment target=artifact,enchantment
auto=teach(artifact[manacost<=type:*:opponenthand]) destroy auto=teach(artifact[manacost<=type:*:myhand]) destroy
auto=teach(enchantment[manacost<=type:*:opponenthand]) destroy auto=teach(enchantment[manacost<=type:*:myhand]) destroy
auto=draw:1 controller auto=draw:1 controller
text=Destroy target artifact or enchantment if its converted mana cost is less than or equal to the number of cards in your hand. -- Draw a card. text=Destroy target artifact or enchantment if its converted mana cost is less than or equal to the number of cards in your hand. -- Draw a card.
mana={1}{G}{G} mana={1}{G}{G}

1
projects/mtg/bin/Res/test/spoils_of_evil.txt
View File

@@ -9,6 +9,7 @@ manapool:{2}{B}
graveyard:swamp,grizzly bears,dragon engine graveyard:swamp,grizzly bears,dragon engine
[DO] [DO]
Spoils Of Evil Spoils Of Evil
p2
[ASSERT] [ASSERT]
FIRSTMAIN FIRSTMAIN
[PLAYER1] [PLAYER1]

2
projects/mtg/include/AllAbilities.h
View File

@@ -199,7 +199,7 @@ private:
for (int k = 0; k < 4; k++) for (int k = 0; k < 4; k++)
{ {
MTGGameZone * zone = zones[k]; MTGGameZone * zone = zones[k];
if (tc->targetsZone(zone, target)) if (tc->targetsZone(zone, card))
{ {
if (color) if (color)
{ {

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

@@ -1777,7 +1777,7 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
found = s.find("compare"); found = s.find("compare");
if (found != string::npos) if (found != string::npos)
{ {
compareZone = true; compareZone = true;
} }
switch (i) switch (i)
@@ -1810,7 +1810,7 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
{ {
result->oneShot = oneShot; result->oneShot = oneShot;
a->forcedAlive = forcedalive; a->forcedAlive = forcedalive;
if(neverRemove) if (neverRemove)
{ {
result->oneShot = false; result->oneShot = false;
result->forceDestroy = -1; result->forceDestroy = -1;

6
projects/mtg/src/MTGGameZones.cpp
View File

@@ -554,7 +554,7 @@ unsigned int MTGGameZone::countByCanTarget(TargetChooser * tc)
int result = 0; int result = 0;
for (int i = 0; i < (nb_cards); i++) for (int i = 0; i < (nb_cards); i++)
{ {
if (tc->canTarget(cards[i]), withoutProtections) if (tc->canTarget(cards[i], withoutProtections))
{ {
result++; result++;
} }
@@ -572,7 +572,7 @@ unsigned int MTGGameZone::countTotalManaSymbols(TargetChooser * tc, int color)
int result = 0; int result = 0;
for (int i = 0; i < nb_cards; i++) for (int i = 0; i < nb_cards; i++)
{ {
if (tc->canTarget(cards[i]), withoutProtections) if (tc->canTarget(cards[i], withoutProtections))
{ {
result += cards[i]->getManaCost()->getManaSymbols(color); result += cards[i]->getManaCost()->getManaSymbols(color);
} }
@@ -947,7 +947,7 @@ MTGGameZone * MTGGameZone::intToZone(GameObserver *g, int zoneId, MTGCardInstanc
{ {
//bug or bug case default to //bug or bug case default to
p2 = source->controller(); p2 = source->controller();
target = source; target = source;
} }
} }
else else

5
projects/mtg/src/TargetChooser.cpp
View File

@@ -1258,10 +1258,11 @@ bool TargetZoneChooser::targetsZone(MTGGameZone * z)
if (MTGGameZone::intToZone(Owner->getObserver(), zones[i], source) == z) return true; if (MTGGameZone::intToZone(Owner->getObserver(), zones[i], source) == z) return true;
return false; return false;
} }
bool TargetZoneChooser::targetsZone(MTGGameZone * z,MTGCardInstance * mSource) bool TargetZoneChooser::targetsZone(MTGGameZone * z,MTGCardInstance * mSource)
{ {
if(mSource) if (mSource)
source = mSource; source = mSource;
for (int i = 0; i < nbzones; i++) for (int i = 0; i < nbzones; i++)
if (MTGGameZone::intToZone(source->owner->getObserver(), zones[i], source) == z) return true; if (MTGGameZone::intToZone(source->owner->getObserver(), zones[i], source) == z) return true;
return false; return false;