Merge pull request #596 from bjornsnoen/master

Fix a rarity mistake and a grammatical error

projects/mtg/bin/Res/sets/M14/_cards.dat

@@ -666,7 +666,7 @@ rarity=C
 [card]
 primitive=Millstone
 id=370737
-rarity=R
+rarity=U
 [/card]
 [card]
 primitive=Mind Rot
@@ -1256,4 +1256,4 @@ rarity=U
 primitive=Zephyr Charge
 id=370672
 rarity=C
-[/card]
+[/card]

projects/mtg/src/AIHints.cpp

@@ -314,7 +314,7 @@ bool AIHints::canWeCombo(GameObserver* observer,MTGCardInstance * card,AIPlayerB
         int comboPartsRestriction = 0;
 
         if(gotCombo)
-            return gotCombo;//because more then one might be possible at any time.
+            return gotCombo;//because more than one might be possible at any time.
         if (hints[i]->hold.size())
         {
             for(unsigned int hPart = 0; hPart < hints[i]->hold.size(); hPart++)

projects/mtg/src/AIPlayerBaka.cpp

@@ -445,7 +445,7 @@ int OrderedAIAction::getEfficiency()
             }
             if ((drawer->getNumCards() >= p->game->library->nb_cards && (Targetable*)p == drawer->getTarget()) || (p->game->hand->nb_cards > 10 && (Targetable*)p == drawer->getTarget()))
             {
-                //if the amount im drawing will mill me to death or i have more then 10 cards in hand, eff is 0;
+                //if the amount im drawing will mill me to death or i have more than 10 cards in hand, eff is 0;
                 efficiency = 0;
             }
             break;
@@ -853,7 +853,7 @@ ManaCost * AIPlayerBaka::getPotentialMana(MTGCardInstance * target)
             if (card == target)
                 used[card] = true; //http://code.google.com/p/wagic/issues/detail?id=76
             if (!used[card] && amp->isReactingToClick(card) && amp->output->getConvertedCost() == 1)
-            {//ai can't use cards which produce more then 1 converted while using the old pMana method.
+            {//ai can't use cards which produce more than 1 converted while using the old pMana method.
                 result->add(amp->output);
                 used[card] = true;
             }

projects/mtg/src/Credits.cpp

@@ -386,7 +386,7 @@ void Credits::computeTournament(GameObserver* g, GameApp * _app,bool tournament,
         }
         if (mGamesWon>mGamesPlayed*0.80 && mGamesWon<mGamesPlayed)
         {
-            CreditBonus * b = NEW CreditBonus(250, _("Won more then 80 percentage of games"));
+            CreditBonus * b = NEW CreditBonus(250, _("Won more than 80 percentage of games"));
             bonus.push_back(b);
         }
 

projects/mtg/src/GameStateDuel.cpp

@@ -796,7 +796,7 @@ void GameStateDuel::Update(float dt)
 
         if (game->didWin())
         {
-            //the following section will be called only in a classic or demo gamemode and if a tournament or match with more then one game is activ
+            //the following section will be called only in a classic or demo gamemode and if a tournament or match with more than one game is activ
             if ( (mParent->gameType == GAME_TYPE_CLASSIC || mParent->gameType == GAME_TYPE_DEMO)&& mParent->players[1] == PLAYER_TYPE_CPU && (tournament->isTournament() || tournament->getGamesToPlay()>1 ))
             {
                 setGamePhase(DUEL_STATE_SHOW_SCORE);

projects/mtg/src/MTGRules.cpp

@@ -146,7 +146,7 @@ int MTGEventBonus::receiveEvent(WEvent * event)
             }
             //////bonus for having a LOT of specific type.
             //not else'd becuase it is possible for a card to contain
-            //more then one of the types, and for more then one to trigger.
+            //more than one of the types, and for more than one to trigger.
             if(e->card->hasType(Subtypes::TYPE_ARTIFACT))
                 toys[currentPlayer->getId()]++;
             if(e->card->isCreature())