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

Erwan

Browse Source 
- Fixed a bug with "must" abilities and the AI, such as Noggle Bridgebreaker
This commit is contained in:
wagic.the.homebrew@gmail.com
2010-02-06 04:34:09 +00:00
parent 8847681b4a
commit 77769c5e37
3 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/include/AIPlayer.h
+1 -1
View File
@@ -74,7 +74,7 @@ class AIPlayer: public Player{
AIPlayer(MTGPlayerCards * deck, string deckFile, string deckFileSmall); AIPlayer(MTGPlayerCards * deck, string deckFile, string deckFileSmall);
virtual ~AIPlayer(); virtual ~AIPlayer();
virtual MTGCardInstance * chooseCard(TargetChooser * tc, MTGCardInstance * source, int random = 0); virtual MTGCardInstance * chooseCard(TargetChooser * tc, MTGCardInstance * source, int random = 0);
virtual int chooseTarget(TargetChooser * tc = NULL); virtual int chooseTarget(TargetChooser * tc = NULL, Player * forceTarget =NULL);
virtual int Act(float dt); virtual int Act(float dt);
virtual int affectCombatDamages(CombatStep); virtual int affectCombatDamages(CombatStep);
int isAI(){return 1;}; int isAI(){return 1;};
projects/mtg/src/AIPlayer.cpp
+17 -7
View File
@@ -313,8 +313,9 @@ int AIPlayer::effectBadOrGood(MTGCardInstance * card, int mode, TargetChooser *
int AIPlayer::chooseTarget(TargetChooser * tc){ int AIPlayer::chooseTarget(TargetChooser * _tc, Player * forceTarget){
vector<Targetable *>potentialTargets; vector<Targetable *>potentialTargets;
TargetChooser * tc = _tc;
int nbtargets = 0; int nbtargets = 0;
GameObserver * gameObs = GameObserver::GetInstance(); GameObserver * gameObs = GameObserver::GetInstance();
int checkOnly = 0; int checkOnly = 0;
@@ -325,10 +326,14 @@ int AIPlayer::chooseTarget(TargetChooser * tc){
} }
if (!tc) return 0; if (!tc) return 0;
if (!(gameObs->currentlyActing() == this)) return 0; if (!(gameObs->currentlyActing() == this)) return 0;
Player * target = this; Player * target = forceTarget;
int cardEffect = effectBadOrGood(tc->source, MODE_TARGET, tc);
if (cardEffect != BAKA_EFFECT_GOOD){ if (!target){
target = this->opponent(); target = this;
int cardEffect = effectBadOrGood(tc->source, MODE_TARGET, tc);
if (cardEffect != BAKA_EFFECT_GOOD){
target = this->opponent();
}
} }
if (!tc->alreadyHasTarget(target) && tc->canTarget(target) && nbtargets < 50){ if (!tc->alreadyHasTarget(target) && tc->canTarget(target) && nbtargets < 50){
@@ -383,8 +388,13 @@ int AIPlayer::chooseTarget(TargetChooser * tc){
} }
} }
} }
//Couldn't find any valid target (why did we play that in the first place ?) //Couldn't find any valid target,
gameObs->cancelCurrentAction(); //usually that's because we played a card that has bad side effects (ex: when X comes into play, return target land you own to your hand)
//so we try again to choose a target in the other player's field...
int cancel = gameObs->cancelCurrentAction();
if (!cancel && !forceTarget) return chooseTarget(_tc,target->opponent());
//ERROR!!!
return 0; return 0;
} }
projects/mtg/src/GameObserver.cpp
+1 -2
View File
@@ -135,8 +135,7 @@ void GameObserver::nextGamePhase(){
int GameObserver::cancelCurrentAction(){ int GameObserver::cancelCurrentAction(){
SAFE_DELETE(targetChooser); SAFE_DELETE(targetChooser);
mLayers->actionLayer()->cancelCurrentAction(); return mLayers->actionLayer()->cancelCurrentAction();
return 1;
} }
void GameObserver::nextCombatStep() void GameObserver::nextCombatStep()