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

Erwan

Browse Source 
- removed viridian shaman
- small bug fixes
This commit is contained in:
wagic.the.homebrew@gmail.com
2009-08-11 13:23:14 +00:00
parent b822d841a0
commit c757a791c2
6 changed files with 47 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/GameStateMenu.cpp
+20 -1
View File
@@ -11,7 +11,7 @@
#include "../include/utils.h"
#include "../include/DeckDataWrapper.h"
static const char* GAME_VERSION = "WTH?! 0.8.0 - by wololo";
static const char* GAME_VERSION = "WTH?! 0.8.1 - by wololo";
#define DEFAULT_ANGLE_MULTIPLIER 0.4
#define MAX_ANGLE_MULTIPLIER (3*M_PI)
@@ -175,6 +175,7 @@ void GameStateMenu::fillScroller(){
DeckStats * stats = DeckStats::GetInstance();
int totalGames = 0;
for (int j=1; j<6; j++){
sprintf(buffer, RESPATH"/player/stats/player_deck%i.txt",j);
if(fileExists(buffer)){
@@ -193,6 +194,7 @@ void GameStateMenu::fillScroller(){
sprintf(buff2, _("You have played a total of %i games").c_str(),totalGames);
scroller->Add(buff2);
}
GameOptions * go = GameOptions::GetInstance();
if (!go->values[OPTIONS_DIFFICULTY_MODE_UNLOCKED].getIntValue()){
@@ -201,6 +203,23 @@ void GameStateMenu::fillScroller(){
if (!go->values[OPTIONS_MOMIR_MODE_UNLOCKED].getIntValue()){
scroller->Add(_("Interested in playing Momir Basic? You'll have to unlock it first :)"));
}
if (!go->values[OPTIONS_RANDOMDECK_MODE_UNLOCKED].getIntValue()){
scroller->Add(_("You haven't locked the random deck mode yet"));
}
if (!go->values[OPTIONS_EVILTWIN_MODE_UNLOCKED].getIntValue()){
scroller->Add(_("You haven't unlocked the evil twin mode yet"));
}
//Unlocked sets
int nbunlocked = 0;
for (int i = 0; i < MtgSets::SetsList->nb_items; i++){
string s = MtgSets::SetsList->values[i];
sprintf(buffer,"unlocked_%s", s.c_str());
if (GameOptions::GetInstance()->values[buffer].getIntValue() == 1 ) nbunlocked++;
}
sprintf(buff2, _("You have unlocked %i expansions out of %i").c_str(),nbunlocked, MtgSets::SetsList->nb_items);
scroller->Add(buff2);
DeckDataWrapper* ddw = NEW DeckDataWrapper(NEW MTGDeck(RESPATH"/player/collection.dat", mParent->cache,mParent->collection));
int totalCards = ddw->getCount();
projects/mtg/src/ShopItem.cpp
+2 -7
View File
@@ -264,9 +264,7 @@ void ShopItems::ButtonPressed(int controllerId, int controlId){
int rnd = rand() % 8;
if (rnd == 0) rare_or_mythic = Constants::RARITY_M;
int sets[] = {setIds[showPriceDialog]};
//for (int i= 0; i <15; i++){
// tempDeck->add(136218);
//}
tempDeck->addRandomCards(1, sets,1,rare_or_mythic);
tempDeck->addRandomCards(3, sets,1,Constants::RARITY_U);
tempDeck->addRandomCards(11, sets,1,Constants::RARITY_C);
@@ -278,8 +276,7 @@ void ShopItems::ButtonPressed(int controllerId, int controlId){
ShopItem * si = ((ShopItem *)mObjects[j]);
si->updateCount(myCollection);
}
int i = 0;
for (map<int,int>::iterator it = tempDeck->cards.begin(); it!=tempDeck->cards.end(); it++){
MTGCard * c = tempDeck->getCardById(it->first);
@@ -292,7 +289,6 @@ void ShopItems::ButtonPressed(int controllerId, int controlId){
}
delete tempDeck;
}
//Remove(showPriceDialog);
showPriceDialog = -1;
}else{
//error not enough money
@@ -303,7 +299,6 @@ void ShopItems::ButtonPressed(int controllerId, int controlId){
int rnd = (rand() % 25);
price = price - (rnd * price)/100;
pricelist->setPrice(item->card->getMTGId(),price);
item->price = price;
}
showPriceDialog = -1;
break;