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

Erwan

Browse Source 
- fixed a bug introduced in Momir with previous revision
- Added som french translations
This commit is contained in:
wagic.the.homebrew@gmail.com
2009-06-06 05:57:48 +00:00
parent ab42e5db06
commit c5d13e7cac
5 changed files with 40 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/Damage.cpp
+2 -1
View File
@@ -3,6 +3,7 @@
#include "../include/MTGCardInstance.h"
#include "../include/Counters.h"
#include "../include/WEvent.h"
#include "../include/Translate.h"
Damage::Damage(int id, MTGCardInstance * _source, Damageable * _target): Interruptible(id){
init(_source, _target, _source->getPower());
@@ -59,7 +60,7 @@ void Damage::Render(){
mFont->SetBase(0);
mFont->SetScale(DEFAULT_MAIN_FONT_SCALE);
char buffer[200];
sprintf(buffer, "Deals %i damage to", damage);
sprintf(buffer, _("Deals %i damage to").c_str(), damage);
mFont->DrawString(buffer, x + 20 , y, JGETEXT_LEFT);
JRenderer * renderer = JRenderer::GetInstance();
JQuad * quad = source->getThumb();
projects/mtg/src/GameStateMenu.cpp
+12 -12
View File
@@ -11,7 +11,7 @@
#include "../include/utils.h"
#include "../include/DeckDataWrapper.h"
static const char* GAME_VERSION = "WTH?! 0.6.2 - by WilLoW";
static const char* GAME_VERSION = "WTH?! 0.7.0 - by WilLoW";
#define ALPHA_WARNING 0
#define DEFAULT_ANGLE_MULTIPLIER 0.4
@@ -187,50 +187,50 @@ void GameStateMenu::fillScroller(){
stats->load(buffer);
int percentVictories = stats->percentVictories();
sprintf(buff2, "You have a %i%% victory ratio with Deck%i",percentVictories,j);
sprintf(buff2, _("You have a %i%% victory ratio with Deck%i").c_str(),percentVictories,j);
scroller->Add(buff2);
int nbGames = stats->nbGames();
totalGames+= nbGames;
sprintf(buff2, "You have played %i games with Deck%i",nbGames,j);
sprintf(buff2, _("You have played %i games with Deck%i").c_str(),nbGames,j);
scroller->Add(buff2);
}
}
if (totalGames){
sprintf(buff2, "You have played a total of %i games",totalGames);
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()){
scroller->Add("Unlock the difficult mode for more challenging duels!");
scroller->Add(_("Unlock the difficult mode for more challenging duels!"));
}
if (!go->values[OPTIONS_MOMIR_MODE_UNLOCKED].getIntValue()){
scroller->Add("Interested in playing Momir Basic? You'll have to unlock it first :)");
scroller->Add(_("Interested in playing Momir Basic? You'll have to unlock it first :)"));
}
DeckDataWrapper* ddw = NEW DeckDataWrapper(NEW MTGDeck(RESPATH"/player/collection.dat", mParent->cache,mParent->collection));
int totalCards = ddw->getCount();
if (totalCards){
sprintf(buff2, "You have a total of %i cards in your collection",totalCards);
sprintf(buff2, _("You have a total of %i cards in your collection").c_str(),totalCards);
scroller->Add(buff2);
int estimatedValue = ddw->totalPrice();
sprintf(buff2, "The shopkeeper would buy your entire collection for around %i credits",estimatedValue/2);
sprintf(buff2, _("The shopkeeper would buy your entire collection for around %i credits").c_str(),estimatedValue/2);
scroller->Add(buff2);
sprintf(buff2, "The cards in your collection have an average value of %i credits",estimatedValue/totalCards);
sprintf(buff2, _("The cards in your collection have an average value of %i credits").c_str(),estimatedValue/totalCards);
scroller->Add(buff2);
}
delete ddw;
PlayerData * playerdata = NEW PlayerData(mParent->collection);
sprintf(buff2, "You currently have %i credits",playerdata->credits);
sprintf(buff2, _("You currently have %i credits").c_str(),playerdata->credits);
delete playerdata;
scroller->Add(buff2);
scroller->Add("Need more cards? Go to http://wololo.net/wagic");
scroller->Add(_("Need more cards? Go to http://wololo.net/wagic"));
scroller->Add("These stats will be updated next time you run Wagic");
scroller->Add(_("These stats will be updated next time you run Wagic"));
scrollerSet = 1;
scroller->setRandom();
projects/mtg/src/MTGRules.cpp
+2 -3
View File
@@ -176,9 +176,8 @@ vector<int> MTGMomirRule::pool[20];
MTGMomirRule::MTGMomirRule(int _id, MTGAllCards * _collection):MTGAbility(_id, NULL){
collection = _collection;
if (!initialized){
int total_cards = collection->totalCards();
for (int i = 0; i < total_cards; i++){
MTGCard * card = collection->collection[i];
for (int i = 0; i < collection->ids.size(); i++){
MTGCard * card = collection->collection[collection->ids[i]];
if (card->isACreature()){
int convertedCost = card->getManaCost()->getConvertedCost();
if (convertedCost>20) continue;