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

few things here,

Browse Source 
first, tweaked some ai checks a bit.
small changes.

2nd, i removed the following classes,
APowerToughnessModifierUntilEndOfTurn
APowerToughnessModifierUntilEOT
ADragonWhelp
i replaced these with soft coded support for dragon whelps "sideffects" of using a ability more then a certain number of times...
syntax limit^the effect you want^the use it triggers on.
replaced both powertoughnessueot classes with a class which falls more along the lines of how we handle ueot abilitys...PTInstant, creates the wrapper with the ability and adds it to the game, rather then that jumbled mess that was previous version.

added support for "phaseaction[" phase words "my" and "opponent" so you can denote which players phases it will happen on. by default it automatically happens on both players turns when the phase matches.

modified a few things in phaseaction class...which correct a memory leak which could be created if the source of the phaseaction is destroyed before the phase action resolved. rather then storing an ability which is left floating in memory if phaseaction is destroy...i took a much safer route of passing the string of the ability directly to the phaseaction class...and i build the ability right when it is being used instead. makes much more sense.

angry mob is now fully supported. yay to removing nasty ugly workarounds!!!! and i mean UGLY.

dragon whelp is now fully soft coded. added the 5 or six other cards which do similar effects.
This commit is contained in:
omegablast2002@yahoo.com
2011-04-14 15:02:17 +00:00
parent 502bd280d8
commit 0fe7a46676
6 changed files with 280 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/include/AllAbilities.h
+41 -174
View File
@@ -954,7 +954,7 @@ public:
MTGGameZone * activeZone;
string newName;
GenericActivatedAbility(string newName,int _id, MTGCardInstance * card, MTGAbility * a, ManaCost * _cost, int _tap = 0, string limit = "",
GenericActivatedAbility(string newName,int _id, MTGCardInstance * card, MTGAbility * a, ManaCost * _cost, int _tap = 0, string limit = "",MTGAbility * sideEffects = NULL,string usesBeforeSideEffects = "",
int restrictions = 0, MTGGameZone * dest = NULL);
int resolve();
const char * getMenuText();
@@ -1083,7 +1083,7 @@ public:
string newName;
GenericTargetAbility(string newName,int _id, MTGCardInstance * _source, TargetChooser * _tc, MTGAbility * a, ManaCost * _cost = NULL,
int _tap = 0, string limit = "", int restrictions = 0, MTGGameZone * dest = NULL);
int _tap = 0, string limit = "",MTGAbility * sideEffects = NULL,string usesBeforeSideEffects = "", int restrictions = 0, MTGGameZone * dest = NULL);
const char * getMenuText();
~GenericTargetAbility();
GenericTargetAbility * clone() const;
@@ -1802,7 +1802,7 @@ public:
if(PT.size())
{
SAFE_DELETE(wppt);
wppt = NEW WParsedPT(PT,NULL,(MTGCardInstance *) target);
wppt = NEW WParsedPT(PT,NULL,(MTGCardInstance *) source);
}
MTGCardInstance * _target = (MTGCardInstance *) target;
_target->power += wppt->power.getValue();
@@ -1827,7 +1827,16 @@ public:
((MTGCardInstance *) target)->addToToughness(-wppt->toughness.getValue());
return 1;
}
const char * getMenuText()
{
if(PT.size())
{
SAFE_DELETE(wppt);
wppt = NEW WParsedPT(PT,NULL,(MTGCardInstance *) source);
}
sprintf(menuText, "%i/%i", wppt->power.getValue(), wppt->toughness.getValue());
return menuText;
}
APowerToughnessModifier * clone() const
{
APowerToughnessModifier * a = NEW APowerToughnessModifier(*this);
@@ -1843,132 +1852,6 @@ public:
};
//Alteration of Power and toughness until end of turn (instant)
class AInstantPowerToughnessModifierUntilEOT: public InstantAbility
{
public:
WParsedPT * wppt;
string s;
AInstantPowerToughnessModifierUntilEOT(int _id, MTGCardInstance * _source, MTGCardInstance * _target, WParsedPT * wppt) :
InstantAbility(_id, _source, _target), wppt(wppt)
{
aType = MTGAbility::STANDARD_PUMP;
}
int resolve()
{
((MTGCardInstance *) target)->power += wppt->power.getValue();
((MTGCardInstance *) target)->addToToughness(wppt->toughness.getValue());
if(((MTGCardInstance *) target)->has(Constants::INDESTRUCTIBLE) && wppt->toughness.getValue() < 0 && ((MTGCardInstance *) target)->toughness <= 0)
{
((MTGCardInstance *) target)->controller()->game->putInGraveyard(((MTGCardInstance *) target));
}
return 1;
}
int destroy()
{
((MTGCardInstance *) target)->power -= wppt->power.getValue();
((MTGCardInstance *) target)->addToToughness(-wppt->toughness.getValue());
return 1;
}
const char * getMenuText()
{
sprintf(menuText, "%i/%i", wppt->power.getValue(), wppt->toughness.getValue());
return menuText;
}
AInstantPowerToughnessModifierUntilEOT * clone() const
{
AInstantPowerToughnessModifierUntilEOT * a = NEW AInstantPowerToughnessModifierUntilEOT(*this);
a->wppt = NEW WParsedPT(*(a->wppt));
a->isClone = 1;
return a;
}
~AInstantPowerToughnessModifierUntilEOT()
{
delete wppt;
}
};
//Alteration of Power and Toughness until end of turn (Aura)
class APowerToughnessModifierUntilEndOfTurn: public ActivatedAbility
{
public:
AInstantPowerToughnessModifierUntilEOT * ability;
int counters;
int maxcounters;
APowerToughnessModifierUntilEndOfTurn(int id, MTGCardInstance * _source, MTGCardInstance * _target, WParsedPT * wppt,
ManaCost * _cost = NULL, int _maxcounters = 0) :
ActivatedAbility(id, _source, _cost, 0, 0), maxcounters(_maxcounters)
{
counters = 0;
target = _target;
ability = NEW AInstantPowerToughnessModifierUntilEOT(id, _source, _target, wppt);
aType = MTGAbility::STANDARD_PUMP;
}
int isReactingToClick(MTGCardInstance * card, ManaCost * cost = NULL)
{
//The upper level "GenericTargetAbility" takes care of the click so we always return 0 here
return 0;
}
void Update(float dt)
{
if (newPhase != currentPhase && newPhase == Constants::MTG_PHASE_AFTER_EOT)
{
counters = 0;
}
ActivatedAbility::Update(dt);
}
int fireAbility()
{
return resolve();
}
const char * getMenuText()
{
return ability->getMenuText();
}
/* int isReactingToClick(MTGCardInstance * card, ManaCost * mana = NULL){
if (!ActivatedAbility::isReactingToClick(card,mana)) return 0;
return (!maxcounters || (counters < maxcounters));
}*/
int resolve()
{
MTGAbility * a = ability->clone();
a->target = target;
a->addToGame();
counters++;
return 1;
}
int addToGame()
{
resolve();
return ActivatedAbility::addToGame();
}
APowerToughnessModifierUntilEndOfTurn * clone() const
{
APowerToughnessModifierUntilEndOfTurn * a = NEW APowerToughnessModifierUntilEndOfTurn(*this);
a->isClone = 1;
return a;
}
~APowerToughnessModifierUntilEndOfTurn()
{
if (!isClone)
SAFE_DELETE(ability);
}
};
class GenericInstantAbility: public InstantAbility, public NestedAbility
{
public:
@@ -3879,6 +3762,22 @@ public:
~ATransformerInstant();
};
//Adds types/abilities/changes color to a card (generally until end of turn)
class PTInstant: public InstantAbility
{
public:
APowerToughnessModifier * ability;
WParsedPT * wppt;
string s;
bool nonstatic;
WParsedPT * newWppt;
PTInstant(int id, MTGCardInstance * source, MTGCardInstance * target, WParsedPT * wppt,string s = "",bool nonstatic = false);
int resolve();
const char * getMenuText();
PTInstant * clone() const;
~PTInstant();
};
//switch p/t ueot
class ASwapPTUEOT: public InstantAbility
{
@@ -3960,19 +3859,24 @@ public:
};
//phase based actions
class APhaseAction: public MTGAbility, public NestedAbility
class APhaseAction: public MTGAbility
{
public:
string psMenuText;
int abilityId;
string sAbility;
int phase;
MTGAbility * ability;
bool forcedestroy;
bool next;
bool myturn;
bool opponentturn;
Player * abilityOwner;
APhaseAction(int _id, MTGCardInstance * card, MTGCardInstance * target, MTGAbility * a, int _tap = 0, int restrictions = 0, int _phase =
Constants::MTG_PHASE_UPKEEP,bool forcedestroy = false,bool next = true);
APhaseAction(int _id, MTGCardInstance * card, MTGCardInstance * target, string sAbility, int _tap = 0, int restrictions = 0, int _phase =
Constants::MTG_PHASE_UPKEEP,bool forcedestroy = false,bool next = true,bool myturn = true,bool opponentturn = true);
void Update(float dt);
int resolve();
int removeAbility();
const char * getMenuText();
APhaseAction * clone() const;
~APhaseAction();
@@ -3982,9 +3886,10 @@ public:
class APhaseActionGeneric: public InstantAbility
{
public:
string sAbility;
APhaseAction * ability;
APhaseActionGeneric(int _id, MTGCardInstance * card, MTGCardInstance * target, MTGAbility * a, int _tap = 0, int restrictions = 0, int _phase =
Constants::MTG_PHASE_UPKEEP,bool forcedestroy = false,bool next = true);
APhaseActionGeneric(int _id, MTGCardInstance * card, MTGCardInstance * target, string sAbility, int _tap = 0, int restrictions = 0, int _phase =
Constants::MTG_PHASE_UPKEEP,bool forcedestroy = false,bool next = true,bool myturn = false,bool opponentturn = false);
int resolve();
const char * getMenuText();
APhaseActionGeneric * clone() const;
@@ -4831,44 +4736,6 @@ public:
}
};
//1284 Dragon Whelp
class ADragonWhelp: public APowerToughnessModifierUntilEndOfTurn
{
public:
ADragonWhelp(int id, MTGCardInstance * card) :
APowerToughnessModifierUntilEndOfTurn(id, card, card, NEW WParsedPT(1, 0), NEW ManaCost())
{
cost->add(Constants::MTG_COLOR_RED, 1);
}
int isReactingToClick(MTGCardInstance * card, ManaCost * mana = NULL)
{
if (!ActivatedAbility::isReactingToClick(card, mana)) return 0;
return (!maxcounters || (counters < maxcounters));
}
void Update(float dt)
{
if (newPhase != currentPhase && newPhase == Constants::MTG_PHASE_AFTER_EOT && counters > 3)
{
source->controller()->game->putInGraveyard(source);
}
APowerToughnessModifierUntilEndOfTurn::Update(dt);
}
virtual ostream& toString(ostream& out) const
{
out << "ADragonWhelp ::: (";
return APowerToughnessModifierUntilEndOfTurn::toString(out) << ")";
}
ADragonWhelp * clone() const
{
ADragonWhelp * a = NEW ADragonWhelp(*this);
a->isClone = 1;
return a;
}
};
//1288 EarthBind
class AEarthbind: public ABasicAbilityModifier
{
projects/mtg/include/MTGAbility.h
+5 -1
View File
@@ -257,7 +257,11 @@ class ActivatedAbility:public MTGAbility{
int counters;
int needsTapping;
string limit;
ActivatedAbility(int id, MTGCardInstance * card,ManaCost * _cost = NULL, int _restrictions = NO_RESTRICTION,int tap = 1,string limit = "");
MTGAbility * sideEffect;
MTGAbility * sa;
string usesBeforeSideEffects;
int uses;
ActivatedAbility(int id, MTGCardInstance * card,ManaCost * _cost = NULL, int _restrictions = NO_RESTRICTION,int tap = 1,string limit = "",MTGAbility * sideEffect = NULL,string usesBeforeSideEffects = "");
virtual ~ActivatedAbility();
virtual void Update(float dt)
{