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

reverted latest change

Browse Source
This commit is contained in:
techdragon.nguyen@gmail.com
2011-02-14 09:35:43 +00:00
parent d9efb408e5
commit f4d1154cd6
6 changed files with 56 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/MTGDeck.cpp
+43 -31
View File
@@ -676,18 +676,16 @@ MTGCard * MTGAllCards::getCardByName(string name)
if (!name.size()) return NULL;
if (name[0] == '#') return NULL;
map<string, MTGCard * >::iterator cached = mtgCardByNameCache.end();
if ( mtgCardByNameCache.size() > 0 )
cached = mtgCardByNameCache.find(name);
map<string, MTGCard * >::iterator cached = mtgCardByNameCache.find(name);
if (cached!= mtgCardByNameCache.end())
{
return cached->second;
}
int cardId = atoi(name.c_str());
if (cardId)
int cardnb = atoi(name.c_str());
if (cardnb)
{
MTGCard * result = getCardById(cardId);
MTGCard * result = getCardById(cardnb);
mtgCardByNameCache[name] = result;
return result;
}
@@ -744,7 +742,7 @@ int MTGDeck::totalPrice()
return total;
}
MTGDeck::MTGDeck(const char * config_file, MTGAllCards * _allcards, int meta_only)
MTGDeck::MTGDeck(const char * config_file, MTGAllCards * _allcards, int meta_only,int difficultyRating)
{
total_cards = 0;
database = _allcards;
@@ -777,44 +775,58 @@ MTGDeck::MTGDeck(const char * config_file, MTGAllCards * _allcards, int meta_onl
meta_desc.append(s.substr(found + 5));
continue;
}
found = s.find("toggledifficulty:");
if (found != string::npos)
{
string cards = s.substr(found + 17);
size_t separator = cards.find("|");
string cardeasy = cards.substr(0,separator);
string cardhard = cards.substr(separator + 1);
MTGCard *sourceCard = MTGCollection()->getCardByName( cardeasy );
MTGCard *alternateCard = MTGCollection()->getCardByName( cardhard );
if ( alternateCard && sourceCard )
alternates.insert( make_pair( sourceCard->getMTGId(), alternateCard->getMTGId()));
else
DebugTrace("Failed to map card Alternates: [" << cardeasy << "] and [" << cardhard << "]");
continue;
}
continue;
}
if (meta_only) break;
int numberOfCopies = 1;
int nb = 1;
size_t found = s.find(" *");
if (found != string::npos)
{
numberOfCopies = atoi(s.substr(found + 2).c_str());
nb = atoi(s.substr(found + 2).c_str());
s = s.substr(0, found);
}
MTGCard *card = database->getCardByName( s );
if ( card )
size_t diff = s.find("toggledifficulty:");
if(diff != string::npos)
{
for (int i = 0; i < numberOfCopies; i++)
string cards = s.substr(diff + 17);
size_t separator = cards.find("|");
string cardeasy = cards.substr(0,separator);
string cardhard = cards.substr(separator + 1);
if(difficultyRating == HARD)
{
add(card);
s = cardhard;
}
else
{
s = cardeasy;
}
}
int cardnb = atoi(s.c_str());
if (cardnb)
{
add(cardnb);
}
else
{
DebugTrace("could not find Card matching name: " << s);
size_t found = s.find(" *");
if (found != string::npos)
{
nb = atoi(s.substr(found + 2).c_str());
s = s.substr(0, found);
}
MTGCard * card = database->getCardByName(s);
if (card)
{
for (int i = 0; i < nb; i++)
{
add(card);
}
}
else
{
DebugTrace("could not find Card matching name: " << s);
}
}
}
file.close();