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

Fixed primitives, avoided a crash when destroying "transforms" ability for cards in library, added random deck selection to Stone Hewer Basic mode, fixed random deck selection from Commander mode, improved exclusive color filter to include monocolored artifacts, added PSP_LARGE_MEMORY define to Makefile to allow more RAM for PSP version.

Browse Source
This commit is contained in:
Vittorio Alfieri
2021-12-02 18:55:53 +01:00
parent d969b6ce7a
commit 6c0740c78c
8 changed files with 72 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/AllAbilities.cpp
+1 -1
View File
@@ -7847,7 +7847,7 @@ int ATransformer::destroy()
for (unsigned int i = 0;i < newAbilities[_target].size(); i++)
{
// The mutated cards probably cause a double free error and a crash in Wagic, so for now they have been exluded...
if(newAbilities[_target].at(i) && !_target->mutation)
if(newAbilities[_target].at(i) && !_target->mutation && _target->currentZone != _target->owner->game->library)
{
newAbilities[_target].at(i)->forceDestroy = 1;
newAbilities[_target].at(i)->removeFromGame();
projects/mtg/src/GameStateDuel.cpp
+30 -14
View File
@@ -428,6 +428,10 @@ void GameStateDuel::ConstructOpponentMenu()
}
}
} else if (mParent->gameType == GAME_TYPE_STONEHEWER && mParent->players[1] == PLAYER_TYPE_CPU){
opponentMenu->Add(MENUITEM_RANDOM_AI, "Random");
if (mParent->players[0] == PLAYER_TYPE_HUMAN)
opponentMenu->Add(MENUITEM_RANDOM_AI_HARD, "Random (Not easy)",_("Selects a random AI deck with hard or normal difficulty.").c_str());
}
if (options[Options::EVILTWIN_MODE_UNLOCKED].number && !tournamentSelection)
opponentMenu->Add(MENUITEM_EVIL_TWIN, "Evil Twin", _("Can you defeat yourself?").c_str());
@@ -1421,8 +1425,14 @@ void GameStateDuel::ButtonPressed(int controllerId, int controlId)
switch (controlId)
{
case MENUITEM_RANDOM_AI:
game->loadPlayer(1, mParent->players[1]);
tournament->addDeck(1,game->players.at(1)->deckId,mParent->players[1]);
{
int deck = tournament->getRandomDeck(false, mParent->gameType);
if (deck>0)
{
game->loadPlayer(1, mParent->players[1], deck);
tournament->addDeck(1,game->players.at(1)->deckId,mParent->players[1]);
}
}
setAISpeed();
if (opponentMenu) opponentMenu->Close();
if (tournamentSelection)
@@ -1432,7 +1442,7 @@ void GameStateDuel::ButtonPressed(int controllerId, int controlId)
break;
case MENUITEM_RANDOM_AI_HARD:
{
int deck=tournament->getRandomDeck(true);
int deck = tournament->getRandomDeck(true, mParent->gameType);
if (deck>0)
{
game->loadPlayer(1, mParent->players[1], deck, premadeDeck);
@@ -1453,7 +1463,7 @@ void GameStateDuel::ButtonPressed(int controllerId, int controlId)
int deck=0;
do
{
deck=tournament->getRandomDeck(controlId==MENUITEM_FILL_NEXT_STAGE_HARD);
deck = tournament->getRandomDeck(controlId==MENUITEM_FILL_NEXT_STAGE_HARD, mParent->gameType);
if (deck>0)
{
game->loadPlayer(1, mParent->players[1], deck, premadeDeck);
@@ -1977,7 +1987,7 @@ void Tournament::initTournamentResults()
int Tournament::getRandomDeck(bool noEasyDecks)
int Tournament::getRandomDeck(bool noEasyDecks, GameType type)
{
DeckManager *deckManager = DeckManager::GetInstance();
vector<DeckMetaData *> *deckList = deckManager->getAIDeckOrderList();
@@ -1987,15 +1997,21 @@ int Tournament::getRandomDeck(bool noEasyDecks)
int k=0;
bool isDouble=true;
vector<unsigned int> decks;
for (unsigned int i=0;i<deckList->size();i++)
if (noEasyDecks && (deckList->at(i)->getDifficulty()==HARD || deckList->at(i)->getDifficulty()==NORMAL))
{
decks.push_back(i);
//printf("hard deck%i/%i\n",i,deckList->size());
} else
decks.push_back(i);
for (unsigned int i=0;i<deckList->size();i++){
if(type == GAME_TYPE_COMMANDER && deckList->at(i)->isCommanderDeck()){
if (noEasyDecks && (deckList->at(i)->getDifficulty()==HARD || deckList->at(i)->getDifficulty()==NORMAL)){
decks.push_back(i);
} else {
decks.push_back(i);
}
} else if(type != GAME_TYPE_COMMANDER){
if (noEasyDecks && (deckList->at(i)->getDifficulty()==HARD || deckList->at(i)->getDifficulty()==NORMAL)){
decks.push_back(i);
} else {
decks.push_back(i);
}
}
}
while(isDouble && decks.size()>0)
{
isDouble=false;
projects/mtg/src/WFilter.cpp
+1 -1
View File
@@ -302,7 +302,7 @@ WCFilterNotColor::WCFilterNotColor(string arg)
bool WCFilterOnlyColor::isMatch(MTGCard * c)
{
if (!c || !c->data) return false;
for (int i = 0; i < Constants::NB_Colors; i++)
for (int i = 1; i < Constants::NB_Colors; i++)
{
if (i == color) continue;
if (c->data->hasColor(i)) return false;