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

Erwan

Browse Source 
- Magic 2010: Combat Damages don't go on the stack anymore
- Comp rules: "goes to graveyard" effects don't go on the stack anymore
- Regenerate "fixed" (untested)
- Basic "ReplacementEffect" mechanism for damage prevention. Can be extended to other replacement effects with some limits.
- TODO: Damages don't go on the stack, the abilities that create them do.
This commit is contained in:
wagic.the.homebrew@gmail.com
2009-06-23 14:22:00 +00:00
parent 5dc98359c1
commit ca3c2d30ab
17 changed files with 266 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
projects/mtg/Makefile
View File

@@ -1,4 +1,4 @@
OBJS = objs/ActionElement.o objs/ActionLayer.o objs/ActionStack.o objs/AIMomirPlayer.o objs/AIPlayer.o objs/AIStats.o objs/Blocker.o objs/CardGui.o objs/CardDescriptor.o objs/CardDisplay.o objs/CardEffect.o objs/ConstraintResolver.o objs/Counters.o objs/Credits.o objs/Damage.o objs/DamagerDamaged.o objs/DamageResolverLayer.o objs/DeckDataWrapper.o objs/DeckStats.o objs/DuelLayers.o objs/Effects.o objs/ExtraCost.o objs/GameApp.o objs/GameLauncher.o objs/GameObserver.o objs/GameOptions.o objs/GameStateDuel.o objs/GameStateMenu.o objs/GameStateOptions.o objs/GameStateShop.o objs/GuiCardsController.o objs/GuiLayers.o objs/GuiPhaseBar.o objs/Logger.o objs/ManaCost.o objs/ManaCostHybrid.o objs/MenuItem.o objs/MTGAbility.o objs/MTGCardInstance.o objs/MTGCard.o objs/MTGDeck.o objs/MTGDefinitions.o objs/MTGGamePhase.o objs/MTGGameZones.o objs/MTGGuiHand.o objs/MTGGuiPlay.o objs/MTGRules.o objs/OptionItem.o objs/PhaseRing.o objs/Player.o objs/PlayerData.o objs/PlayGuiObjectController.o objs/PlayGuiObject.o objs/PriceList.o objs/ShopItem.o objs/SimpleMenu.o objs/SimpleMenuItem.o objs/Subtypes.o objs/TargetChooser.o objs/TargetsList.o objs/TextScroller.o objs/TexturesCache.o objs/Token.o objs/Translate.o objs/utils.o objs/WEvent.o
OBJS = objs/ActionElement.o objs/ActionLayer.o objs/ActionStack.o objs/AIMomirPlayer.o objs/AIPlayer.o objs/AIStats.o objs/Blocker.o objs/CardGui.o objs/CardDescriptor.o objs/CardDisplay.o objs/CardEffect.o objs/ConstraintResolver.o objs/Counters.o objs/Credits.o objs/Damage.o objs/DamagerDamaged.o objs/DamageResolverLayer.o objs/DeckDataWrapper.o objs/DeckStats.o objs/DuelLayers.o objs/Effects.o objs/ExtraCost.o objs/GameApp.o objs/GameLauncher.o objs/GameObserver.o objs/GameOptions.o objs/GameStateDuel.o objs/GameStateMenu.o objs/GameStateOptions.o objs/GameStateShop.o objs/GuiCardsController.o objs/GuiLayers.o objs/GuiPhaseBar.o objs/Logger.o objs/ManaCost.o objs/ManaCostHybrid.o objs/MenuItem.o objs/MTGAbility.o objs/MTGCardInstance.o objs/MTGCard.o objs/MTGDeck.o objs/MTGDefinitions.o objs/MTGGamePhase.o objs/MTGGameZones.o objs/MTGGuiHand.o objs/MTGGuiPlay.o objs/MTGRules.o objs/OptionItem.o objs/PhaseRing.o objs/Player.o objs/PlayerData.o objs/PlayGuiObjectController.o objs/PlayGuiObject.o objs/PriceList.o objs/ReplacementEffects.o objs/ShopItem.o objs/SimpleMenu.o objs/SimpleMenuItem.o objs/Subtypes.o objs/TargetChooser.o objs/TargetsList.o objs/TextScroller.o objs/TexturesCache.o objs/Token.o objs/Translate.o objs/utils.o objs/WEvent.o
DEPS = $(patsubst objs/%.o, deps/%.d, $(OBJS))
RESULT = $(shell psp-config --psp-prefix 2> Makefile.cache)

9
projects/mtg/bin/Res/test/circle_of_protection.txt
View File

@@ -9,16 +9,11 @@ inplay:1335,plains
1166
next
#blockers
next
no
#damage phase
no
#interrupt the actual damage
yes
plains
1335
1166
endinterrupt
next
#damage
next
#combatend
[ASSERT]

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

@@ -434,12 +434,8 @@ class ADestroyer:public TargetAbility{
int resolve(){
MTGCardInstance * _target = tc->getNextCardTarget();
if(_target){
if (bury){
_target->controller()->game->putInGraveyard(_target);
}else{
game->mLayers->stackLayer()->addPutInGraveyard(_target);
}
return 1;
if (bury) return _target->bury();
else return _target->destroy();
}
return 0;
}
@@ -976,17 +972,46 @@ class ASpellCounterEnchantment:public TargetAbility{
//Circle of Protections
class ACircleOfProtection: public TargetAbility{
protected:
map<ReplacementEffect*, int> current;
public:
ACircleOfProtection(int _id, MTGCardInstance * source, int _color):TargetAbility(_id,source,NEW DamageTargetChooser(source,_color),NEW ManaCost(),0,0){
ACircleOfProtection(int _id, MTGCardInstance * source, int _color):TargetAbility(_id,source,NEW SpellOrPermanentTargetChooser(source,_color),NEW ManaCost(),0,0){
cost->add(Constants::MTG_COLOR_ARTIFACT,1);
}
int resolve(){
Damage * damage = tc->getNextDamageTarget();
if (!damage) return 0;
game->mLayers->stackLayer()->Fizzle(damage);
MTGCardInstance * _target = NULL;
if (! (_target = tc->getNextCardTarget())){
Spell * starget = tc->getNextSpellTarget();
_target = starget->source;
}
if (!_target) return 0;
REDamagePrevention * re = NEW REDamagePrevention (
NEW CardTargetChooser(_target,NULL),
NEW PlayerTargetChooser(0,1,source->controller()));
current[re] = 1;
game->replacementEffects->add(re);
return 1;
}
void clear(){
for (map<ReplacementEffect*, int>::iterator it = current.begin(); it!=current.end(); it++){
ReplacementEffect* re = (*it).first;
game->replacementEffects->remove(re);
delete re;
}
current.clear();
}
void Update(float dt){
if (newPhase != currentPhase && newPhase == Constants::MTG_PHASE_UNTAP) clear();
TargetAbility::Update(dt);
}
~ACircleOfProtection(){
clear();
}
virtual ostream& toString(ostream& out) const
{
out << "ACircleOfProtection ::: (";
@@ -1005,16 +1030,6 @@ class AStandardRegenerate:public ActivatedAbility{
int resolve(){
MTGCardInstance * _target = (MTGCardInstance *)target;
_target->regenerate();
PutInGraveyard * action = ((PutInGraveyard *) game->mLayers->stackLayer()->getNext(NULL,ACTION_PUTINGRAVEYARD,NOT_RESOLVED));
while(action){
#if defined (WIN32) || defined (LINUX)
OutputDebugString("Fizzling due to regenerate! \n");
#endif
if (action->card == _target){
game->mLayers->stackLayer()->Fizzle(action);
}
action = ((PutInGraveyard *) game->mLayers->stackLayer()->getNext(action,ACTION_PUTINGRAVEYARD,NOT_RESOLVED));
}
return 1;
}

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

@@ -13,7 +13,7 @@ class GameObserver;
#define DAMAGEABLE_MTGCARDINSTANCE 0
#define DAMAGEABLE_PLAYER 1
class Damageable {
class Damageable:public Targetable {
protected:
public:

3
projects/mtg/include/GameObserver.h
View File

@@ -9,7 +9,7 @@
#include "DuelLayers.h"
#include "TargetChooser.h"
#include "PhaseRing.h"
#include "ReplacementEffects.h"
class MTGGamePhase;
class MTGAbility;
@@ -43,6 +43,7 @@ class GameObserver{
int oldGamePhase;
TargetChooser * targetChooser;
DuelLayers * mLayers;
ReplacementEffects *replacementEffects;
Player * gameOver;
Player * players[2]; //created outside
MTGGamePhase * gamePhaseManager; //Created Outside ?

8
projects/mtg/include/MTGCardInstance.h
View File

@@ -23,7 +23,7 @@ class Counters;
class MTGCardInstance: public MTGCard, public Damageable, public Targetable {
class MTGCardInstance: public MTGCard, public Damageable {
protected:
int untapping;
int nb_damages;
@@ -37,6 +37,7 @@ class MTGCardInstance: public MTGCard, public Damageable, public Targetable {
MTGCardInstance * getNextPartner();
void initMTGCI();
public:
int regenerateTokens;
bool isToken;
int stillInUse();
Player * lastController;
@@ -76,13 +77,16 @@ class MTGCardInstance: public MTGCard, public Damageable, public Targetable {
MTGCardInstance();
MTGCardInstance(MTGCard * card, MTGPlayerCards * _belongs_to);
Blockers * getBlockers();
void regenerate();
int regenerate();
int triggerRegenerate();
Player * controller();
JQuad * getIcon();
int initAttackersDefensers();
MTGCardInstance * getNextOpponent(MTGCardInstance * previous=NULL);
int nbOpponents();
~MTGCardInstance();
int bury();
int destroy();
int addToToughness(int value);

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

@@ -10,7 +10,7 @@
class MTGPlayerCards;
class MTGInPlay;
class Player: public Damageable, public Targetable{
class Player: public Damageable{
protected:
ManaCost * manaPool;

39
projects/mtg/include/ReplacementEffects.h Normal file
View File

@@ -0,0 +1,39 @@
#ifndef _REPLACEMENT_EFFECTS_H_
#define _REPLACEMENT_EFFECTS_H_
#include <list>
using namespace std;
#include "WEvent.h"
class TargetChooser;
class ReplacementEffect {
public:
virtual WEvent * replace (WEvent * e) {return e;};
virtual ~ReplacementEffect(){};
};
class REDamagePrevention: public ReplacementEffect {
protected:
TargetChooser * tcSource;
TargetChooser * tcTarget;
int damage;
bool oneShot;
public:
REDamagePrevention(TargetChooser *_tcSource = NULL,TargetChooser *_tcTarget = NULL, int _damage = -1, bool _oneShot = true);
WEvent * replace (WEvent *e);
~REDamagePrevention();
};
class ReplacementEffects {
protected:
list<ReplacementEffect *>modifiers;
public:
ReplacementEffects();
WEvent * replace(WEvent *e);
int add(ReplacementEffect * re);
int remove (ReplacementEffect * re);
~ReplacementEffects();
};
#endif

16
projects/mtg/include/TargetChooser.h
View File

@@ -52,9 +52,19 @@ class TargetChooserFactory{
};
class CardTargetChooser:public TargetChooser {
protected:
MTGCardInstance * validTarget;
public:
CardTargetChooser(MTGCardInstance * _card, MTGCardInstance * source);
virtual int canTarget(Targetable * target );
};
class TargetZoneChooser:public TargetChooser{
public:
MTGGameZone * zones[6];
MTGGameZone * zones[10];
int nbzones;
int init(MTGGameZone ** _zones, int _nbzones);
int targetsZone(MTGGameZone * z);
@@ -83,8 +93,10 @@ class DamageableTargetChooser:public CreatureTargetChooser{
class PlayerTargetChooser:public TargetChooser{
protected:
Player * p; //In Case we can only target a specific player
public:
PlayerTargetChooser(MTGCardInstance * card = NULL, int _maxtargets = 1):TargetChooser(card, _maxtargets){};
PlayerTargetChooser(MTGCardInstance * card = NULL, int _maxtargets = 1, Player *_p = NULL);
virtual int canTarget(Targetable * target);
};

15
projects/mtg/src/Damage.cpp
View File

@@ -45,12 +45,17 @@ int Damage::resolve(){
_target->doDamageTest = 1;
}
int a = target->dealDamage(damage);
GameObserver * g = GameObserver::GetInstance();
WEvent * e = NEW WEventDamage(this);
e = g->replacementEffects->replace(e);
//Send Damage event to listeners
WEventDamage * e = NEW WEventDamage(this);
GameObserver::GetInstance()->receiveEvent(e);
delete e;
int a = 0;
if (damage) a = target->dealDamage(damage);
//Send (Damage/Replaced effect) event to listeners
g->receiveEvent(e);
SAFE_DELETE(e);
return a;
}

2
projects/mtg/src/DamageResolverLayer.cpp
View File

@@ -169,6 +169,7 @@ int DamageResolverLayer::initResolve(){
if (empty()){
if (!damageStack->empty()){
game->mLayers->stackLayer()->addAction(damageStack);
game->mLayers->stackLayer()->resolve(); //Wagic 2010
}else{
SAFE_DELETE(damageStack);
}
@@ -246,6 +247,7 @@ int DamageResolverLayer::resolveDamages(){
}
}
game->mLayers->stackLayer()->addAction(damageStack);
game->mLayers->stackLayer()->resolve(); //Wagic 2010
remainingDamageSteps--;
resetObjects();
damageStack = NULL;

3
projects/mtg/src/GameObserver.cpp
View File

@@ -51,6 +51,7 @@ GameObserver::GameObserver(Player * _players[], int _nb_players){
reaction = 0;
gameOver = NULL;
phaseRing = NEW PhaseRing(_players,_nb_players);
replacementEffects = NEW ReplacementEffects();
}
void GameObserver::setGamePhaseManager(MTGGamePhase * _phases){
@@ -229,6 +230,7 @@ GameObserver::~GameObserver(){
SAFE_DELETE(targetChooser);
SAFE_DELETE(mLayers);
SAFE_DELETE(phaseRing);
SAFE_DELETE(replacementEffects);
LOG("==GameObserver Destroyed==");
}
@@ -442,6 +444,7 @@ void GameObserver::untapPhase(){
}
int GameObserver::receiveEvent(WEvent * e){
if (!e) return 0;
return mLayers->receiveEvent(e);
}

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

@@ -37,14 +37,12 @@ int AbilityFactory::destroyAllInPlay(TargetChooser * tc, int bury){
tc->source = NULL; // This is to prevent protection from... as objects that destroy all do not actually target
GameObserver * game = GameObserver::GetInstance();
for (int i = 0; i < 2 ; i++){
for (int j = game->players[i]->game->inPlay->nb_cards-1; j >=0 ; j--){
MTGCardInstance * current = game->players[i]->game->inPlay->cards[j];
Player * p = game->players[i];
for (int j = p->game->inPlay->nb_cards-1; j >=0 ; j--){
MTGCardInstance * current = p->game->inPlay->cards[j];
if (tc->canTarget(current)){
if (bury){
game->players[i]->game->putInGraveyard(current);
}else{
game->mLayers->stackLayer()->addPutInGraveyard(current);
}
if (bury) current->bury();
else current->destroy();
}
}
}
@@ -546,7 +544,7 @@ int AbilityFactory::magicText(int id, Spell * spell, MTGCardInstance * card){
if (tc){
game->addObserver(NEW ABurier(id, card,tc));
}else{
target->controller()->game->putInGraveyard(target);
target->bury();
}
}
}
@@ -584,7 +582,7 @@ int AbilityFactory::magicText(int id, Spell * spell, MTGCardInstance * card){
if (tc){
game->addObserver(NEW ADestroyer(id, card,tc,0,cost));
}else{
game->mLayers->stackLayer()->addPutInGraveyard(target);
target->destroy();
}
}
result++;
@@ -1605,19 +1603,19 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){
int _x = x;
MTGCardInstance * target = spell->getNextCardTarget();
while(target && _x){
game->mLayers->stackLayer()->addPutInGraveyard(target);
_x--;
target = spell->getNextCardTarget(target);
target->destroy();
_x--;
target = spell->getNextCardTarget(target);
}
x-=_x;
for (int i = 0; i < 2 ; i++){
game->mLayers->stackLayer()->addDamage(card, game->players[i], x);
for (int j = 0; j < game->players[i]->game->inPlay->nb_cards; j++){
MTGCardInstance * current = game->players[i]->game->inPlay->cards[j];
if (current->isACreature()){
game->mLayers->stackLayer()->addDamage(card, current, x);
}
}
game->mLayers->stackLayer()->addDamage(card, game->players[i], x);
for (int j = 0; j < game->players[i]->game->inPlay->nb_cards; j++){
MTGCardInstance * current = game->players[i]->game->inPlay->cards[j];
if (current->isACreature()){
game->mLayers->stackLayer()->addDamage(card, current, x);
}
}
}
break;
}

24
projects/mtg/src/MTGCardInstance.cpp
View File

@@ -101,6 +101,7 @@ void MTGCardInstance::initMTGCI(){
previous = NULL;
next = NULL;
lastController = NULL;
regenerateTokens = 0;
}
@@ -128,13 +129,20 @@ int MTGCardInstance::afterDamage(){
doDamageTest = 0;
if (!isACreature()) return 0;
if (life <=0 && isInPlay()){
GameObserver * game = GameObserver::GetInstance();
game->mLayers->stackLayer()->addPutInGraveyard(this);
return 1;
return destroy();
}
return 0;
}
int MTGCardInstance::bury(){
Player * p = controller();
p->game->putInZone(this,p->game->inPlay,owner->game->graveyard);
return 1;
}
int MTGCardInstance::destroy(){
if (!triggerRegenerate()) return bury();
return 0;
}
MTGGameZone * MTGCardInstance::getCurrentZone(){
GameObserver * game = GameObserver::GetInstance();
@@ -194,10 +202,17 @@ void MTGCardInstance::resetAllDamage(){
nb_damages = 0;
}
void MTGCardInstance::regenerate(){
int MTGCardInstance::regenerate(){
return ++regenerateTokens;
}
int MTGCardInstance::triggerRegenerate(){
if (! regenerateTokens) return 0;
regenerateTokens--;
tapped = 1;
life = toughness;
initAttackersDefensers();
return 1;
}
@@ -217,6 +232,7 @@ int MTGCardInstance::cleanup(){
if (previous && !previous->stillInUse()){
SAFE_DELETE(previous);
}
regenerateTokens = 0;
return 1;
}

76
projects/mtg/src/ReplacementEffects.cpp Normal file
View File

@@ -0,0 +1,76 @@
#include "../include/config.h"
#include "../include/ReplacementEffects.h"
#include "../include/MTGCardInstance.h"
#include "../include/TargetChooser.h"
#include "../include/Damage.h"
REDamagePrevention::REDamagePrevention(TargetChooser *_tcSource, TargetChooser *_tcTarget,int _damage, bool _oneShot):damage(_damage), tcSource(_tcSource), tcTarget(_tcTarget), oneShot(_oneShot){
}
WEvent * REDamagePrevention::replace (WEvent *event){
if (!event) return event;
if (!damage) return event;
WEventDamage * e = dynamic_cast<WEventDamage*>(event);
if (!e) return event;
Damage *d = e->damage;
if ((!tcSource || tcSource->canTarget(d->source)) &&
(!tcTarget || tcTarget->canTarget(d->target))
){
if (damage == -1){
d->damage = 0;
delete event;
if (oneShot) damage = 0;
return NULL;
}
if (damage >= d->damage){
damage-= d->damage;
d->damage = 0;
delete event;
return NULL;
}
d->damage -= damage;
damage = 0;
delete event;
WEventDamage* newEvent = NEW WEventDamage(d);
return newEvent;
}
return event;
}
REDamagePrevention::~REDamagePrevention(){
SAFE_DELETE(tcSource);
SAFE_DELETE(tcTarget);
}
ReplacementEffects::ReplacementEffects(){}
WEvent * ReplacementEffects::replace(WEvent *e){
list<ReplacementEffect *>::iterator it;
for ( it=modifiers.begin() ; it != modifiers.end(); it++ ){
ReplacementEffect *re = *it;
WEvent * newEvent = re->replace(e);
if (!newEvent) return NULL;
if (newEvent != e) return replace(newEvent);
}
return e;
}
int ReplacementEffects::add(ReplacementEffect * re){
modifiers.push_back(re);
return 1;
}
int ReplacementEffects::remove (ReplacementEffect *re){
modifiers.remove(re);
return 1;
}
ReplacementEffects::~ReplacementEffects(){
list<ReplacementEffect *>::iterator it;
for ( it=modifiers.begin() ; it != modifiers.end(); it++ ){
ReplacementEffect *re = *it;
delete(re);
}
modifiers.clear();
}

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

@@ -330,7 +330,21 @@ int TargetChooser::targetListSet(){
return 0;
}
/**
a specific Card
**/
CardTargetChooser::CardTargetChooser(MTGCardInstance * _card, MTGCardInstance * source):TargetChooser(source){
validTarget = _card;
}
int CardTargetChooser::canTarget(Targetable * target ){
if (!TargetChooser::canTarget(target)) return 0;
if (target->typeAsTarget() == TARGET_CARD){
MTGCardInstance * card = (MTGCardInstance *) target;
if (card == validTarget) return 1;
}
return 0;
}
/**
Choose anything that has a given list of types
@@ -522,9 +536,15 @@ int TargetZoneChooser::targetsZone(MTGGameZone * z){
}
/* Player Target */
PlayerTargetChooser::PlayerTargetChooser(MTGCardInstance * card, int _maxtargets, Player *_p):TargetChooser(card, _maxtargets){
p = _p;
}
int PlayerTargetChooser::canTarget(Targetable * target){
if (target->typeAsTarget() == TARGET_PLAYER){
return 1;
Player * _target = (Player *) target;
if (!p || p == _target) return 1;
}
return 0;
}

16
projects/mtg/template.vcproj
View File

@@ -372,6 +372,10 @@
RelativePath=".\src\GuiLayers.cpp"
>
</File>
<File
RelativePath=".\src\GuiPhaseBar.cpp"
>
</File>
<File
RelativePath=".\src\Logger.cpp"
>
@@ -456,6 +460,10 @@
RelativePath=".\src\PriceList.cpp"
>
</File>
<File
RelativePath=".\src\ReplacementEffects.cpp"
>
</File>
<File
RelativePath=".\src\ShopItem.cpp"
>
@@ -673,6 +681,10 @@
RelativePath=".\include\GuiLayers.h"
>
</File>
<File
RelativePath=".\include\GuiPhaseBar.h"
>
</File>
<File
RelativePath=".\include\Logger.h"
>
@@ -761,6 +773,10 @@
RelativePath=".\include\PriceList.h"
>
</File>
<File
RelativePath=".\include\ReplacementEffects.h"
>
</File>
<File
RelativePath=".\include\ShopItem.h"
>