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

3 things here, found my targets returns for @vampired we're screwy, which explained why doc didnt add 3 of the possible cards for it...corrected that but i need to rename the varibles which i will do at a later time, not in this patch..

Browse Source 
2 fix for token creator livingweapons...this was actually a preexisting bug, but not noticed becuase these are the first equipments that use token gen...when equipping it would readd the oneshot tok gen as an activated ability with no cost...generally we dont want to pass oneshot token generation to another card by equipping...

and 3rd...
got rid of the disgusting vanishing workaround.
it was riddled with bugs, got exsample if the creatures would gain indestructible the -99/-99 they were reciving did nothing to rid the battlefield of the creature...

new vanishing is 
auto=vanishing:number
thats it, no crazy 2 trigger lines with lords ect...
This commit is contained in:
omegablast2002@yahoo.com
2011-02-03 14:17:25 +00:00
parent 22adbe4ab7
commit 75a9d7840d
4 changed files with 114 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2704,7 +2704,7 @@ public:
for (size_t i = 0; i < currentAbilities.size(); ++i)
{
MTGAbility * a = currentAbilities[i];
if (dynamic_cast<AEquip *> (a) || dynamic_cast<ATeach *> (a))
if (dynamic_cast<AEquip *> (a) || dynamic_cast<ATeach *> (a) || a->aType == MTGAbility::STANDARD_TOKENCREATOR && a->oneShot)
{
SAFE_DELETE(a);
continue;
@@ -2726,6 +2726,13 @@ public:
MTGAbility * a = currentAbilities[i];
if (dynamic_cast<AEquip *> (a)) continue;
if (dynamic_cast<ATeach *> (a)) continue;
if (a->aType == MTGAbility::STANDARD_TOKENCREATOR && a->oneShot)
{
a->forceDestroy = 1;
continue;
}
//we generally dont want to pass oneShot tokencreators to the cards
//we equip...
a->addToGame();
}
return 1;
@@ -2962,7 +2969,7 @@ public:
{
AEquip* ae = dynamic_cast<AEquip*>(a);
ae->unequip();
ae->equip(card);
ae->equip(card);
}
}
}
@@ -3951,6 +3958,21 @@ public:
~APreventDamageTypesUEOT();
};
//Upkeep Cost
class AVanishing: public ActivatedAbility
{
public:
int timeLeft;
int amount;
AVanishing(int _id, MTGCardInstance * card, ManaCost * _cost, int _tap = 0, int restrictions = 0,int amount = 0);
void Update(float dt);
int resolve();
const char * getMenuText();
AVanishing * clone() const;
~AVanishing();
};
//Upkeep Cost
class AUpkeep: public ActivatedAbility, public NestedAbility
{