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

fixed a bug where cards with vanishing (new vanishing) were given "vanishing as a menu item during combat.

Browse Source
This commit is contained in:
omegablast2002@yahoo.com
2011-03-22 03:41:45 +00:00
parent cb1b1d3054
commit 65f2706f1e
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/include/AllAbilities.h
+2 -2
View File
@@ -4001,8 +4001,8 @@ public:
~APreventDamageTypesUEOT(); ~APreventDamageTypesUEOT();
}; };
//Upkeep Cost //vanishing
class AVanishing: public ActivatedAbility class AVanishing: public MTGAbility
{ {
public: public:
int timeLeft; int timeLeft;
projects/mtg/src/ActionStack.cpp
-1
View File
@@ -556,7 +556,6 @@ int ActionStack::addDamage(MTGCardInstance * _source, Damageable * _target, int
addAction(damage); addAction(damage);
_source->thatmuch = _damage; _source->thatmuch = _damage;
_target->thatmuch = _damage; _target->thatmuch = _damage;
//_target->lifeLostThisTurn += _damage;
return 1; return 1;
} }
projects/mtg/src/AllAbilities.cpp
+4 -2
View File
@@ -2792,8 +2792,10 @@ APreventDamageTypesUEOT::~APreventDamageTypesUEOT()
//AVanishing creature also fading //AVanishing creature also fading
AVanishing::AVanishing(int _id, MTGCardInstance * card, ManaCost * _cost, int _tap, int restrictions, int amount, string counterName) : AVanishing::AVanishing(int _id, MTGCardInstance * card, ManaCost * _cost, int _tap, int restrictions, int amount, string counterName) :
ActivatedAbility(_id, card, _cost, restrictions, _tap),amount(amount),counterName(counterName) MTGAbility(_id, source, target),amount(amount),counterName(counterName)
{ {
target = card;
source = card;
next = 0; next = 0;
for(int i = 0;i< amount;i++) for(int i = 0;i< amount;i++)
source->counters->addCounter(counterName.c_str(),0,0); source->counters->addCounter(counterName.c_str(),0,0);
@@ -2835,7 +2837,7 @@ void AVanishing::Update(float dt)
} }
} }
} }
ActivatedAbility::Update(dt); MTGAbility::Update(dt);
} }
int AVanishing::resolve() int AVanishing::resolve()