Erwan

- Added "Evil twin" Mode to unlock

projects/mtg/include/AIMomirPlayer.h

@@ -6,7 +6,7 @@
 
 class AIMomirPlayer:public AIPlayerBaka{
 public:
-  AIMomirPlayer(MTGPlayerCards * _deck, char * file, char * avatarFile);
+  AIMomirPlayer(MTGPlayerCards * _deck, char * file, char * fileSmall, char * avatarFile);
   int getEfficiency(AIAction * action);
   int momir();
   int computeActions();

projects/mtg/include/AIPlayer.h

@@ -65,7 +65,7 @@ class AIPlayer: public Player{
   virtual int displayStack(){return 0;};
   AIStats * stats;
   ManaCost * getPotentialMana();
-  AIPlayer(MTGPlayerCards * _deck, string deckFile);
+  AIPlayer(MTGPlayerCards * _deck, string deckFile, string deckFileSmall);
   virtual ~AIPlayer();
   virtual MTGCardInstance * chooseCard(TargetChooser * tc, MTGCardInstance * source, int random = 0);
   virtual int chooseTarget(TargetChooser * tc = NULL);
@@ -85,7 +85,7 @@ class AIPlayerBaka: public AIPlayer{
   float timer;
   MTGCardInstance * FindCardToPlay(ManaCost * potentialMana, const char * type);
  public:
-  AIPlayerBaka(MTGPlayerCards * _deck, char * deckFile, char * avatarFile);
+  AIPlayerBaka(MTGPlayerCards * _deck, char * deckFile, char * deckfileSmall, char * avatarFile);
   virtual int Act(float dt);
   void initTimer();
   virtual int computeActions();
@@ -93,7 +93,7 @@ class AIPlayerBaka: public AIPlayer{
 
 class AIPlayerFactory{
  public:
-  AIPlayer * createAIPlayer(MTGAllCards * collection, MTGPlayerCards * oponents_deck, int deckid = 0);
+  AIPlayer * createAIPlayer(MTGAllCards * collection, Player * opponent, int deckid = 0);
 };
 
 

projects/mtg/include/Credits.h

@@ -24,6 +24,7 @@ class Credits{
 private:
   int isDifficultyUnlocked();
   int isMomirUnlocked();
+  int isEvilTwinUnlocked();
 public:
   int value;
   Player * p1, *p2;

projects/mtg/include/GameOptions.h

@@ -8,8 +8,12 @@ using std::string;
 
 #define OPTIONS_MUSICVOLUME "musicVolume"
 #define OPTIONS_SFXVOLUME "sfxVolume"
+
 #define OPTIONS_DIFFICULTY_MODE_UNLOCKED "prx_handler" //huhu
 #define OPTIONS_MOMIR_MODE_UNLOCKED "prx_rimom" //haha
+#define OPTIONS_EVILTWIN_MODE_UNLOCKED "prx_eviltwin"
+#define OPTIONS_RANDOMDECK_MODE_UNLOCKED "prx_rnddeck"
+
 #define OPTIONS_DIFFICULTY "difficulty"
 #define OPTIONS_CACHESIZE "cacheSize"
 #define OPTIONS_PLASMAEFFECT "plasmaEffect"

projects/mtg/include/Player.h

@@ -25,7 +25,7 @@ class Player: public Damageable{
   MTGPlayerCards * game;
   int testLife();
   int afterDamage();
-  Player(MTGPlayerCards * _deck, string deckFile);
+  Player(MTGPlayerCards * _deck, string deckFile, string deckFileSmall);
   virtual ~Player();
   void unTapPhase();
   MTGInPlay * inPlay();
@@ -37,11 +37,12 @@ class Player: public Damageable{
   int getId();
   JQuad * getIcon();
   string deckFile;
+  string deckFileSmall;
 };
 
 class HumanPlayer: public Player{
  public:
-  HumanPlayer(MTGPlayerCards * _deck, char * _deckFile);
+  HumanPlayer(MTGPlayerCards * _deck, char * _deckFile, string _deckFileSmall);
 
 };