From 06ca82929bfc0ceda53938a89fe2fa270a43c7b3 Mon Sep 17 00:00:00 2001 From: "omegablast2002@yahoo.com" Date: Tue, 22 Mar 2011 03:44:54 +0000 Subject: [PATCH] removed clockwork beast alias and hard code. it is no longer needed as i added a soft coding method that was far more generic and leaving this is was causing conflicts with the new code. players reported that using the 4th edition clockworks beast was loading the card with the alias even tho i removed the alais in the primitives. --- projects/mtg/include/AllAbilities.h | 62 ----------------------------- projects/mtg/src/MTGAbility.cpp | 5 --- 2 files changed, 67 deletions(-) diff --git a/projects/mtg/include/AllAbilities.h b/projects/mtg/include/AllAbilities.h index 7f4f1f5d1..9dd4e744c 100644 --- a/projects/mtg/include/AllAbilities.h +++ b/projects/mtg/include/AllAbilities.h @@ -4260,68 +4260,6 @@ public: } }; -// Clockwork Beast -class AClockworkBeast: public MTGAbility -{ -public: - int counters; - ManaCost cost; - AClockworkBeast(int id, MTGCardInstance * _source) : - MTGAbility(id, _source) - { - counters = 7; - ((MTGCardInstance *) target)->power += 7; - int _cost[] = { Constants::MTG_COLOR_ARTIFACT, 1 }; - cost = ManaCost(_cost, 1); - } - - void Update(float dt) - { - if (newPhase != currentPhase && newPhase == Constants::MTG_PHASE_COMBATEND) - { - if (((MTGCardInstance *) source)->isAttacker() || ((MTGCardInstance *) source)->isDefenser()) - { - counters--; - ((MTGCardInstance *) target)->power -= 1; - } - } - } - int isReactingToClick(MTGCardInstance * _card, ManaCost * mana = NULL) - { - if (counters < 7 && _card == source && currentPhase == Constants::MTG_PHASE_UPKEEP - && game->currentPlayer->game->inPlay->hasCard(source)) - { - if (game->currentlyActing()->getManaPool()->canAfford(&cost)) - { - return 1; - } - } - return 0; - } - - int reactToClick(MTGCardInstance * _card) - { - if (!isReactingToClick(_card)) return 0; - game->currentlyActing()->getManaPool()->pay(&cost); - counters++; - ((MTGCardInstance *) target)->power++; - ((MTGCardInstance *) target)->tap(); - return 1; - } - - virtual ostream& toString(ostream& out) const - { - out << "AClockworkBeast ::: counters : " << counters << " ; cost : " << cost << " ("; - return MTGAbility::toString(out) << ")"; - } - AClockworkBeast * clone() const - { - AClockworkBeast * a = NEW AClockworkBeast(*this); - a->isClone = 1; - return a; - } -}; - //1102: Conservator class AConservator: public MTGAbility { diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp index f2eda4e60..bd2e37bd4 100644 --- a/projects/mtg/src/MTGAbility.cpp +++ b/projects/mtg/src/MTGAbility.cpp @@ -3179,11 +3179,6 @@ void AbilityFactory::addAbilities(int _id, Spell * spell) game->addObserver(NEW ACircleOfProtection(_id, card, Constants::MTG_COLOR_WHITE)); break; } - case 1101: //clockwork Beast - { - game->addObserver(NEW AClockworkBeast(_id, card)); - break; - } case 1102: //Conservator { game->addObserver(NEW AConservator(_id, card));