Added missing graphics for game modes unlock, fixed italian lang, fixed awards dat file, fixed a bug on Game Award section, refactoring for AllAbilities.h file.

projects/mtg/bin/Res/lang/it.txt

@@ -41,7 +41,7 @@ More cards and mods at http://wololo.net/wagic=Altre carte e modalita' su http:/
 The cards in your collection have an average value of %i credits=Le carte nella tua collezione hanno un valore medio di %i crediti.
 The shopkeeper would buy your entire collection for around %i credits=Il commerciante acquistera' l'intera collezione per circa %i crediti
 These stats will be updated next time you run Wagic=Queste statistiche verranno aggiornate al prossimo riavvio di Wagic.
-Unlock the difficult mode for more challenging duels!=Sblocca i livelli di difficoltà per duelli piu' impegnativi!
+Unlock the difficult mode for more challenging duels!=Sblocca i livelli di difficolta' per duelli piu' impegnativi!
 You currently have %i credits=Al momento hai %i crediti.
 You have a %i%% victory ratio with "%s"=Hai vinto il %i%% di partite con il mazzo: "%s".
 You have a total of %i cards in your collection=Hai un totale di %i carte nella tua collezione.
@@ -50,7 +50,7 @@ You have played a total of %i games=Hai giocato un totale di %i partite.
 You have unlocked %i expansions out of %i=Hai sbloccato %i edizioni di %i.
 You haven't unlocked the evil twin mode yet=Non hai ancora sbloccato la modalita Gemello Cattivo...
 You haven't unlocked the random deck mode yet=Non hai ancora sbloccato la modalita con Mazzo Casuale...
-Like to play fast? Unlock Blitzkrieg Mode :)=Ti piace giocare veloce? Sblocca la modalità Assalto Fulmineo :)
+Like to play fast? Unlock Blitzkrieg Mode :)=Ti piace giocare veloce? Sblocca la modalita' Assalto Fulmineo :)
 Utopia! Bring me down to the Paradise City.=Utopia! Portami a Paradise City.
 "I looked into its eyes, and its soul was so empty I saw no reflection, no light there." <97> Crovax="Ho guardato nei suoi occhi, e la sua anima era cosi' vuota da non permettermi di vedere alcun riflesso, non c'era luce." <97> Crovax
 "From shards and splinters I call forth my living horde." -Molimo, maro-sorcerer="Dai detriti e dalla polvere io invoco la mia orda vivente." -Molimo, stregone supremo
@@ -147,7 +147,7 @@ Round Robin Tournament=Torneo Round Robin
 Starts an all vs all tournament!. Firstly, in a selection process participating AI-Decks can be chosen. The tournament state is saved after each game and can be continued!.=Inizia un torneo tutti contro tutti! Prima di iniziare, nel processo di selezione, puoi scegliere i mazzi del computer. Lo stato del torneo verra' salvato dopo ogni partita e potrai continuarlo in qualsiasi momento!
 Random=Casuale
 Random (Not easy)=Casuale (Non Facile)
-Selects a random AI deck with hard or normal difficulty.=Il mazzo del computer viene scelto casualmente con la difficoltà normale o difficile.
+Selects a random AI deck with hard or normal difficulty.=Il mazzo del computer viene scelto casualmente con la difficolta' normale o difficile.
 Evil Twin=Gemello Cattivo
 Can you defeat yourself?=Riesci a battere te stesso?
 
@@ -522,7 +522,7 @@ Duel Decks: Izzet vs. Golgari=Mazzi da duello: Izzet vs. Golgari
 Duel Decks: Sorin vs. Tibalt=Mazzi da duello: Sorin vs. Tibalt
 Duel Decks: Heroes vs. Monsters=Mazzi da duello: Eroi vs. Mostri
 Duel Decks: Jace vs. Vraska=Mazzi da duello: Jace vs. Vraska
-Duel Decks: Speed vs. Cunning=Mazzi da duello: Velocità vs. Abililta'
+Duel Decks: Speed vs. Cunning=Mazzi da duello: Velocita' vs. Abililta'
 Duel Decks: Elspeth vs. Kiora=Mazzi da duello: Elspeth vs. Kiora
 Duel Decks: Zendikar vs. Eldrazi=Mazzi da duello: Zendikar vs. Eldrazi
 Duel Decks: Blessed vs. Cursed=Mazzi da duello: Beati vs. Maledetti
@@ -904,7 +904,7 @@ Light=Luce
 Stone=Pietra
 Water=Acqua
 Use this Style=Utilizza questo stile
-Enable Cheat Mode=Abilita la modalità segreta
+Enable Cheat Mode=Abilita la modalita' segreta
 Optimize Starting Hand=Ottimizza la mano con cui inizi
 Unlock All Ai Decks=Sblocca tutti i mazzi computer
 
@@ -948,7 +948,7 @@ Sound=Suono
 Fullscreen=A schermo intero
 Keypad Enter=Tasto Invio
 VolumeUp=Volume su
-VolumeDown=Volume giù
+VolumeDown=Volume giu'
 Left Ctrl=Controllo sinistro
 Right Ctrl=Controllo destro
 Delete this binding=Elimina questa associazione
@@ -1005,9 +1005,9 @@ Won with exactly 8 lands.=Vinci con esattamente 8 terre in gioco.
 Evil Twin Mode=Modalita' Gemello Cattivo
 Won with same army size.=Vinci con un esercito della stessa dimensione di quello del tuo nemico.
 Random Deck Mode=Modalita' Mazzo Casuale
-Won against a higher difficulty.=Vinci contro un avversario al livello di difficoltà più alto.
+Won against a higher difficulty.=Vinci contro un avversario al livello di difficolta' piu' alto.
 Stone Hewer Mode=Modalita' Fabbro
-Won with more than 10 equipments.=Vinci con più di 10 equipaggiamenti.
+Won with more than 10 equipments.=Vinci con piu' di 10 equipaggiamenti.
 Hermit Druid Mode=Modalita' Druido Eremita
 Won with less than 10 lands.=Vinci con meno di 10 terre in gioco.
 Valuable Collection=Il valore della collezione
@@ -1017,10 +1017,10 @@ Collection Stats=Statistiche della collezione
 Total Value: %ic=Valore totale: %i crediti.
 Total Cards (including duplicates): %i=Totale carte (inlcusi i doppioni): %i
 Unique Cards: %i=Carte uniche: %i
-Most Duplicates: %i (%s)=Con più doppioni: %i (%s)
+Most Duplicates: %i (%s)=Con piu' doppioni: %i (%s)
 Favorite Set: %s=Set preferito: %s
-Highest Mana Cost: %i (%s)=Costo di mana più alto: %i (%s)
-Most Powerful: %i (%s)=Con la più grande potenza: %i (%s)
+Highest Mana Cost: %i (%s)=Costo di mana piu' alto: %i (%s)
+Most Powerful: %i (%s)=Con la piu' grande potenza: %i (%s)
 Toughest: %i (%s)=Con la massima resistenza: %i (%s)
 %i locked sets remain.=Ci sono %i ancora da sbloccare.
 Unlocked all %i sets.=Sono state sbloccate %i edizioni.
@@ -1030,7 +1030,7 @@ Back to Main Menu=Indietro al menu' principale
 Cancel=Annulla
 Do you think you can dominate over other commanders? Take a big challenge in the commander format.=Pensi di poter dominare gli altri comandanti? Raccogli la sfida con la modalilta' Comandante.
 Commander Format Unlocked=Modalita' Comandante sbloccata
-Win a game with 40 or more life and with less cards in your graveyard than your opponent.=Vinci una partita con 40 o più punti vita e con meno carte nel cimitero rispetto al tuo avversario.
+Win a game with 40 or more life and with less cards in your graveyard than your opponent.=Vinci una partita con 40 o piu' punti vita e con meno carte nel cimitero rispetto al tuo avversario.
 
 Wagic Team (%s%%): %i%% : %s%%/%s%% cards=Team Wagic (%s%%): %i%% : %s%%/%s%% carte
 %i cards=%i carte.

projects/mtg/bin/Res/rules/awards.dat

@@ -39,7 +39,7 @@ unlock_condition=type(land|myBattlefield)~morethan~18
 [award]
 name=Paradise
 id=prx_paradise
-unlock_img=
+unlock_img=paradise_unlocked.png
 unlock_text=Birds of Paradise Mode Unlocked
 teaser=Utopia! Bring me down to the Paradise City. 
 Lands you control have "{T}: Add one mana of any color."
@@ -50,7 +50,7 @@ unlock_condition=type(Birds of Paradise|mybattlefield)~morethan~0
 [award]
 name=Morinfen Mode
 id=prx_morinfen
-unlock_img=
+unlock_img=morinfen_unlocked.png
 unlock_text=Morinfen Mode Unlocked
 teaser="I looked into its eyes, and its soul was so empty I saw no reflection, no light there." — Crovax
 At the beginning of your upkeep, you lose 1 life for each permanent you control.
@@ -61,7 +61,7 @@ unlock_condition=this(controllerlife < 5)
 [award]
 name=Horde
 id=prx_horde
-unlock_img=
+unlock_img=horde_unlocked.png
 unlock_text=Tribal Horde Mode Unlocked
 teaser="From shards and splinters I call forth my living horde." -Molimo, maro-sorcerer
 trophyroom_text=Won with more than 25 life.
@@ -71,7 +71,7 @@ unlock_condition=this(controllerlife > 25)
 [award]
 name=False God
 id=prx_karona
-unlock_img=
+unlock_img=falsegod_unlocked.png
 unlock_text=False God Mode Unlocked
 teaser=At the beginning of your upkeep, exchange control of a permanent you control chosen at random and a permanent target opponent controls chosen at random.
 trophyroom_text=Devotion to red more than 7.
@@ -81,7 +81,7 @@ unlock_condition=this(variable{type:manar}>7)
 [award]
 name=Titania Mode
 id=prx_titania
-unlock_img=
+unlock_img=titania_unlocked.png
 unlock_text=Titania Mode Unlocked
 teaser=Voice of the Argoth forest, defender of its creatures, and enforcer of its laws, Titania is literally an aspect of the forest itself. 
 You may play an additional land on each of your turns.
@@ -92,7 +92,7 @@ unlock_condition=this(variable{type:manag}>7)
 [award]
 name=Commander Format
 id=prx_commander
-unlock_img=commander_unlocked.jpg
+unlock_img=commander_unlocked.png
 unlock_text=Commander Format Unlocked
 teaser=Do you think you can dominate over other commanders? Take a big challenge in the commander format.
 trophyroom_text=Win a game with 40 or more life and with less cards in your graveyard than your opponent.

projects/mtg/bin/Res/sets/primitives/borderline.txt

@@ -15343,7 +15343,7 @@ type=Instant
 [card]
 name=Exquisite Archangel
 abilities=flying,cantlifelose
-auto=this(variable{lifetotal}<1) all(this) moveTo(exile) && lifeset:startinglife controller
+auto=@damageof(player):if compare(lifetotal)~lessthan~1 then all(this) moveTo(exile) && lifeset:startinglife controller
 text=Flying -- If you would lose the game, instead exile Exquisite Archangel and your life total becomes equal to your starting life total.
 mana={5}{W}{W}
 type=Creature

projects/mtg/include/AllAbilities.h

@@ -322,7 +322,7 @@ private:
                 delete cX;
             }
         }
-        else if (s == "x" || s == "X")
+        else if (s == "x" || s == "X" || s == "fullpaid")
         {
             intValue = computeX(spell, card);
             if(intValue < 0)
@@ -334,25 +334,37 @@ private:
             if(intValue < 0)
                 intValue = 0;
         }
-        else if (s == "castx")
+        else if (s == "castx" || s == "Iroas")//calculate castx - devotion to red white
         {
-            intValue = card->castX;
+            intValue = (s == "castx")?card->castX:countDevotionTo(card, card->controller()->inPlay(), Constants::MTG_COLOR_RED, Constants::MTG_COLOR_WHITE);
         }
-        else if (s == "gear")
+        else if (s == "azorius" || s == "boros")//devotion blue white - devotion red white
         {
-            intValue = target->equipment;
+            intValue = (s == "azorius")?countDevotionTo(card,card->controller()->inPlay(),Constants::MTG_COLOR_BLUE,Constants::MTG_COLOR_WHITE):countDevotionTo(card,card->controller()->inPlay(),Constants::MTG_COLOR_WHITE,Constants::MTG_COLOR_RED);
         }
-        else if (s == "mutations")
+        else if (s == "dimir" || s == "golgari")//devotion blue black - devotion to green black
         {
-            intValue = target->mutation;
+            intValue = (s == "dimir")?countDevotionTo(card,card->controller()->inPlay(),Constants::MTG_COLOR_BLACK,Constants::MTG_COLOR_BLUE):countDevotionTo(card,card->controller()->inPlay(),Constants::MTG_COLOR_BLACK,Constants::MTG_COLOR_GREEN);
         }
-        else if (s == "colors")
+        else if (s == "gruul" || s == "izzet")//devotion to green red - devotion to red blue
         {
-            intValue = target->countColors();
+            intValue = (s == "gruul")?countDevotionTo(card,card->controller()->inPlay(),Constants::MTG_COLOR_GREEN,Constants::MTG_COLOR_RED):countDevotionTo(card,card->controller()->inPlay(),Constants::MTG_COLOR_BLUE,Constants::MTG_COLOR_RED);
         }
-        else if (s == "auras")
+        else if (s == "orzhov" || s == "rakdos")//devotion to white black - devotion to red black
         {
-            intValue = target->auras;
+            intValue = (s == "orzhov")?countDevotionTo(card,card->controller()->inPlay(),Constants::MTG_COLOR_BLACK,Constants::MTG_COLOR_WHITE):countDevotionTo(card,card->controller()->inPlay(),Constants::MTG_COLOR_BLACK,Constants::MTG_COLOR_RED);
+        }
+        else if (s == "selesnya" || s == "simic")//devotion to green white - devotion to green blue
+        {
+            intValue = (s == "selesnya")?countDevotionTo(card,card->controller()->inPlay(),Constants::MTG_COLOR_GREEN,Constants::MTG_COLOR_WHITE):countDevotionTo(card,card->controller()->inPlay(),Constants::MTG_COLOR_BLUE,Constants::MTG_COLOR_GREEN);
+        }
+        else if (s == "gear" || s == "auras")
+        {
+            intValue = (s == "gear")?target->equipment:target->auras;
+        }
+        else if (s == "mutations" || s == "colors")
+        {
+            intValue = (s == "mutations")?target->mutation:target->countColors();
         }
         else if (s == "manacost")
         {
@@ -361,50 +373,6 @@ private:
             else
                 intValue = target->myconvertedcost;
         }
-        else if (s == "azorius")//devotion blue white
-        {
-            intValue = countDevotionTo(card,card->controller()->inPlay(),Constants::MTG_COLOR_BLUE,Constants::MTG_COLOR_WHITE);
-        }
-        else if (s == "boros")//devotion red white
-        {
-            intValue = countDevotionTo(card,card->controller()->inPlay(),Constants::MTG_COLOR_WHITE,Constants::MTG_COLOR_RED);
-        }
-        else if (s == "dimir")//devotion blue black
-        {
-            intValue = countDevotionTo(card,card->controller()->inPlay(),Constants::MTG_COLOR_BLACK,Constants::MTG_COLOR_BLUE);
-        }
-        else if (s == "golgari")//devotion to green black
-        {
-            intValue = countDevotionTo(card,card->controller()->inPlay(),Constants::MTG_COLOR_BLACK,Constants::MTG_COLOR_GREEN);
-        }
-        else if (s == "gruul")//devotion to green red
-        {
-            intValue = countDevotionTo(card,card->controller()->inPlay(),Constants::MTG_COLOR_GREEN,Constants::MTG_COLOR_RED);
-        }
-        else if (s == "izzet")//devotion to red blue
-        {
-            intValue = countDevotionTo(card,card->controller()->inPlay(),Constants::MTG_COLOR_BLUE,Constants::MTG_COLOR_RED);
-        }
-        else if (s == "orzhov")//devotion to white black
-        {
-            intValue = countDevotionTo(card,card->controller()->inPlay(),Constants::MTG_COLOR_BLACK,Constants::MTG_COLOR_WHITE);
-        }
-        else if (s == "rakdos")//devotion to red black
-        {
-            intValue = countDevotionTo(card,card->controller()->inPlay(),Constants::MTG_COLOR_BLACK,Constants::MTG_COLOR_RED);
-        }
-        else if (s == "selesnya")//devotion to green white
-        {
-            intValue = countDevotionTo(card,card->controller()->inPlay(),Constants::MTG_COLOR_GREEN,Constants::MTG_COLOR_WHITE);
-        }
-        else if (s == "simic")//devotion to green blue
-        {
-            intValue = countDevotionTo(card,card->controller()->inPlay(),Constants::MTG_COLOR_BLUE,Constants::MTG_COLOR_GREEN);
-        }
-        else if (s == "Iroas")//devotion to red white
-        {
-            intValue = countDevotionTo(card, card->controller()->inPlay(), Constants::MTG_COLOR_RED, Constants::MTG_COLOR_WHITE);
-        }
         else if (s.find("type:") != string::npos)
         {
             size_t begins = s.find("type:");
@@ -620,57 +588,33 @@ private:
         {
             intValue = card->controller()->game->stack->seenThisTurn("*", Constants::CAST_ALL) + card->controller()->opponent()->game->stack->seenThisTurn("*", Constants::CAST_ALL);
         }
-        else if (s == "countmycrespell")
+        else if (s == "countmycrespell" || s == "countmynoncrespell")
         {
-            intValue = card->controller()->game->stack->seenThisTurn("creature", Constants::CAST_ALL);
-        }
-        else if (s == "countmynoncrespell")
-        {
-            intValue = card->controller()->game->stack->seenThisTurn("*[-creature]", Constants::CAST_ALL);
+            intValue = (s == "countmycrespell")?card->controller()->game->stack->seenThisTurn("creature", Constants::CAST_ALL):card->controller()->game->stack->seenThisTurn("*[-creature]", Constants::CAST_ALL);
         }
         else if(s == "pnumofcommandcast" || s == "onumofcommandcast")
         {
             intValue = (s == "pnumofcommandcast")?card->controller()->numOfCommandCast:card->controller()->opponent()->numOfCommandCast;
         }
-        else if (s == "evictg")
+        else if (s == "evictg" || s == "evictu")
         {
-            intValue = card->imprintG;
+            intValue = (s == "evictg")?card->imprintG:card->imprintU;
         }
-        else if (s == "evictu")
+        else if (s == "evictr" || s == "evictb")
         {
-            intValue = card->imprintU;
+            intValue = (s == "evictr")?card->imprintR:card->imprintB;
         }
-        else if (s == "evictr")
+        else if (s == "evictw" || s == "commongreen")
         {
-            intValue = card->imprintR;
+            intValue = (s == "evictw")?card->imprintW:mostCommonColor(Constants::MTG_COLOR_GREEN, card);
         }
-        else if (s == "evictb")
+        else if (s == "commonblue" || s == "commonred")
         {
-            intValue = card->imprintB;
+            intValue = (s == "commonblue")?mostCommonColor(Constants::MTG_COLOR_BLUE, card):mostCommonColor(Constants::MTG_COLOR_RED, card);
         }
-        else if (s == "evictw")
+        else if (s == "commonblack" || s == "commonwhite")
         {
-            intValue = card->imprintW;
-        }
-        else if (s == "commongreen")
-        {
-            intValue = mostCommonColor(Constants::MTG_COLOR_GREEN, card);
-        }
-        else if (s == "commonblue")
-        {
-            intValue = mostCommonColor(Constants::MTG_COLOR_BLUE, card);
-        }
-        else if (s == "commonred")
-        {
-            intValue = mostCommonColor(Constants::MTG_COLOR_RED, card);
-        }
-        else if (s == "commonblack")
-        {
-            intValue = mostCommonColor(Constants::MTG_COLOR_BLACK, card);
-        }
-        else if (s == "commonwhite")
-        {
-            intValue = mostCommonColor(Constants::MTG_COLOR_WHITE, card);
+            intValue = (s == "commonblack")?mostCommonColor(Constants::MTG_COLOR_BLACK, card):mostCommonColor(Constants::MTG_COLOR_WHITE, card);
         }
         else if (s == "targetedcurses")
         {
@@ -827,67 +771,37 @@ private:
         {
             intValue = (s == "kicked")?target->kicked:target->controller()->handsize;
         }
-        else if (s == "olandg")
+        else if (s == "olandg" || s == "olandu")
         {
-            intValue = countManaProducedby(Constants::MTG_COLOR_GREEN, target, target->controller()->opponent());
+            intValue = (s == "olandg")?countManaProducedby(Constants::MTG_COLOR_GREEN, target, target->controller()->opponent()):countManaProducedby(Constants::MTG_COLOR_BLUE, target, target->controller()->opponent());
         }
-        else if (s == "olandu")
+        else if (s == "olandr" || s == "olandb")
         {
-            intValue = countManaProducedby(Constants::MTG_COLOR_BLUE, target, target->controller()->opponent());
+            intValue = (s == "olandr")?countManaProducedby(Constants::MTG_COLOR_RED, target, target->controller()->opponent()):countManaProducedby(Constants::MTG_COLOR_BLACK, target, target->controller()->opponent());
         }
-        else if (s == "olandr")
+        else if (s == "olandw" || s == "olandc")
         {
-            intValue = countManaProducedby(Constants::MTG_COLOR_RED, target, target->controller()->opponent());
+            intValue = (s == "olandw")?countManaProducedby(Constants::MTG_COLOR_WHITE, target, target->controller()->opponent()):(countManaProducedby(Constants::MTG_COLOR_ARTIFACT, target, target->controller()->opponent()) + countManaProducedby(Constants::MTG_COLOR_WASTE, target, target->controller()->opponent()));
         }
-        else if (s == "olandb")
+        else if (s == "plandg" || s == "plandu")
         {
-            intValue = countManaProducedby(Constants::MTG_COLOR_BLACK, target, target->controller()->opponent());
+            intValue = (s == "plandg")?countManaProducedby(Constants::MTG_COLOR_GREEN, target, target->controller()):countManaProducedby(Constants::MTG_COLOR_BLUE, target, target->controller());
         }
-        else if (s == "olandw")
+        else if (s == "plandr" || s == "plandb")
         {
-            intValue = countManaProducedby(Constants::MTG_COLOR_WHITE, target, target->controller()->opponent());
+            intValue = (s == "plandr")?countManaProducedby(Constants::MTG_COLOR_RED, target, target->controller()):countManaProducedby(Constants::MTG_COLOR_BLACK, target, target->controller());
         }
-        else if (s == "olandc")
+        else if (s == "plandw" || s == "plandc")
         {
-            intValue = countManaProducedby(Constants::MTG_COLOR_ARTIFACT, target, target->controller()->opponent()) +
-                countManaProducedby(Constants::MTG_COLOR_WASTE, target, target->controller()->opponent());
+            intValue = (s == "plandw")?countManaProducedby(Constants::MTG_COLOR_WHITE, target, target->controller()):(countManaProducedby(Constants::MTG_COLOR_ARTIFACT, target, target->controller()) + countManaProducedby(Constants::MTG_COLOR_WASTE, target, target->controller()));
         }
-        else if (s == "plandg")
+        else if (s == "cantargetmycre" || s == "cantargetoppocre")// can target my creature - can target opponent creature
         {
-            intValue = countManaProducedby(Constants::MTG_COLOR_GREEN, target, target->controller());
+            intValue = (s == "cantargetmycre")?countCanTargetby("creature", card, card->controller()):countCanTargetby("creature", card, card->controller()->opponent());
         }
-        else if (s == "plandu")
+        else if (s == "cantargetcre" || s == "myname")// can target any creature - name of the card you control
         {
-            intValue = countManaProducedby(Constants::MTG_COLOR_BLUE, target, target->controller());
-        }
-        else if (s == "plandr")
-        {
-            intValue = countManaProducedby(Constants::MTG_COLOR_RED, target, target->controller());
-        }
-        else if (s == "plandb")
-        {
-            intValue = countManaProducedby(Constants::MTG_COLOR_BLACK, target, target->controller());
-        }
-        else if (s == "plandw")
-        {
-            intValue = countManaProducedby(Constants::MTG_COLOR_WHITE, target, target->controller());
-        }
-        else if (s == "plandc")
-        {
-            intValue = countManaProducedby(Constants::MTG_COLOR_ARTIFACT, target, target->controller()) +
-                countManaProducedby(Constants::MTG_COLOR_WASTE, target, target->controller());
-        }
-        else if (s == "cantargetmycre")// can target my creature
-        {
-            intValue = countCanTargetby("creature", card, card->controller());
-        }
-        else if (s == "cantargetoppocre")// can target opponent creature
-        {
-            intValue = countCanTargetby("creature", card, card->controller()->opponent());
-        }
-        else if (s == "cantargetcre")// can target any creature
-        {
-            intValue = countCanTargetby("creature", card, card->controller()) + countCanTargetby("creature", card, card->controller()->opponent());
+            intValue = (s == "cantargetcre")?countCanTargetby("creature", card, card->controller()) + countCanTargetby("creature", card, card->controller()->opponent()):countCardNameinZone(card->name,card->controller()->inPlay());
         }
         else if (s == "controllerturn")//intvalue = 1 if its your turn this(variable{controllerturn})
         {
@@ -977,10 +891,6 @@ private:
                 cardHasTypeinZone("island", checkZone) +
                 cardHasTypeinZone("mountain", checkZone);
         }
-        else if (s == "myname")//Name of the card you control
-        {
-            intValue = countCardNameinZone(card->name,card->controller()->inPlay());
-        }
         else if (s == "allmyname")//Plague Rats and others
         {
             intValue = 0;

projects/mtg/src/GameStateAwards.cpp

@@ -91,10 +91,6 @@ void GameStateAwards::Start()
     btn = NEW WGuiButton(aw, GUI_AWARD_BUTTON, Options::AWARD_COLLECTOR, this);
     listview->Add(btn);
 
-    aw = NEW WGuiAward(Options::COMMANDER_MODE_UNLOCKED, "Commander Format", "Play a Commander Format game.");
-    btn = NEW WGuiButton(aw, GUI_AWARD_BUTTON, Options::COMMANDER_MODE_UNLOCKED, this);
-    listview->Add(btn);
-
     wgh = NEW WGuiHeader("");
     listview->Add(wgh);