diff --git a/projects/mtg/bin/Res/sets/10E/_cards.dat b/projects/mtg/bin/Res/sets/10E/_cards.dat index 22c77dc5c..b79adbc5a 100644 --- a/projects/mtg/bin/Res/sets/10E/_cards.dat +++ b/projects/mtg/bin/Res/sets/10E/_cards.dat @@ -3076,19 +3076,6 @@ subtype=Viashino Scout toughness=1 [/card] [card] -text=When Viridian Shaman comes into play, destroy target artifact. -id=129792 -name=Viridian Shaman -auto=may moveTo(ownergraveyard) target(artifact) -rarity=U -color=Green -type=Creature -mana={2}{G} -power=2 -subtype=Elf Shaman -toughness=2 -[/card] -[card] text=Defender, flying (This creature can't attack, and it can block creatures with flying.) abilities=defender,flying id=135274 diff --git a/projects/mtg/bin/Res/sets/10E/todo.dat b/projects/mtg/bin/Res/sets/10E/todo.dat index 44b516483..ab1e2e551 100644 --- a/projects/mtg/bin/Res/sets/10E/todo.dat +++ b/projects/mtg/bin/Res/sets/10E/todo.dat @@ -1160,6 +1160,19 @@ subtype=Viashino toughness=2 [/card] [card] +text=When Viridian Shaman comes into play, destroy target artifact. +id=129792 +name=Viridian Shaman +auto=destroy target(artifact) #does not work in 0.8 +rarity=U +color=Green +type=Creature +mana={2}{G} +power=2 +subtype=Elf Shaman +toughness=2 +[/card] +[card] text=Flying (This creature can't be blocked except by creatures with flying or reach.) As Voice of All comes into play, choose a color. Voice of All has protection from the chosen color. (It can't be blocked, targeted, dealt damage, or enchanted by anything of the chosen color.) id=136290 name=Voice of All diff --git a/projects/mtg/bin/Res/sets/MRD/_cards.dat b/projects/mtg/bin/Res/sets/MRD/_cards.dat index 1256d4446..7e9bc6c57 100644 --- a/projects/mtg/bin/Res/sets/MRD/_cards.dat +++ b/projects/mtg/bin/Res/sets/MRD/_cards.dat @@ -1385,18 +1385,6 @@ subtype=Horror toughness=1 [/card] [card] -text=When Viridian Shaman comes into play, destroy target artifact. -auto=destroy target(creature) -id=46119 -name=Viridian Shaman -rarity=U -type=Creature -mana={2}{G} -power=2 -subtype=Elf Shaman -toughness=2 -[/card] -[card] text=Haste id=5585 abilities=haste diff --git a/projects/mtg/bin/Res/sets/MRD/todo.dat b/projects/mtg/bin/Res/sets/MRD/todo.dat index 0678c2585..9a9bf117e 100644 --- a/projects/mtg/bin/Res/sets/MRD/todo.dat +++ b/projects/mtg/bin/Res/sets/MRD/todo.dat @@ -1573,6 +1573,18 @@ mana={1} subtype=Equipment [/card] [card] +text=When Viridian Shaman comes into play, destroy target artifact. +auto=destroy target(artifact) #does not work in 0.8 +id=46119 +name=Viridian Shaman +rarity=U +type=Creature +mana={2}{G} +power=2 +subtype=Elf Shaman +toughness=2 +[/card] +[card] text=Equipped creature has trample and can't be blocked by more than one creature. Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery. This card comes into play unattached and stays in play if the creature leaves play.) id=46053 name=Vorrac Battlehorns diff --git a/projects/mtg/src/GameStateMenu.cpp b/projects/mtg/src/GameStateMenu.cpp index 18060b0de..c8cf8b37d 100644 --- a/projects/mtg/src/GameStateMenu.cpp +++ b/projects/mtg/src/GameStateMenu.cpp @@ -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(); diff --git a/projects/mtg/src/ShopItem.cpp b/projects/mtg/src/ShopItem.cpp index 33422a2de..f68c3a3e5 100644 --- a/projects/mtg/src/ShopItem.cpp +++ b/projects/mtg/src/ShopItem.cpp @@ -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::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;