Erwan

- fix with Momir+ */* creatures

projects/mtg/include/ActionLayer.h

@@ -20,11 +20,12 @@ class ActionLayer: public GuiLayer, public JGuiListener{
  public:
   Targetable * menuObject;
   SimpleMenu * abilitiesMenu;
+  int stuffHappened;
   virtual void Render();
   virtual void Update(float dt);
   int unstopableRenderInProgress();
   bool CheckUserInput(u32 key);
-  ActionLayer(int id, GameObserver* _game):GuiLayer(id, _game){ menuObject = NULL; abilitiesMenu = NULL;};
+  ActionLayer(int id, GameObserver* _game):GuiLayer(id, _game){ menuObject = NULL; abilitiesMenu = NULL; stuffHappened = 0;};
   ~ActionLayer();
   int isWaitingForAnswer();
   int isReactingToTargetClick(Targetable * card);
@@ -32,6 +33,8 @@ class ActionLayer: public GuiLayer, public JGuiListener{
   int reactToTargetClick(Targetable * card);
   int isReactingToClick(MTGCardInstance  * card);
   int reactToClick(MTGCardInstance * card);
+  int reactToClick(ActionElement * ability,MTGCardInstance * card);
+  int reactToTargetClick(ActionElement * ability,Targetable * card);
   int stillInUse(MTGCardInstance * card);
   void setMenuObject(Targetable * object);
   void ButtonPressed(int controllerid, int controlid);

projects/mtg/include/GuiLayers.h

@@ -44,7 +44,7 @@ class GuiLayers{
   GuiLayer * objects[MAX_GUI_LAYERS];
  public:
   GuiLayers();
-  void Update(float dt, Player * player);
+  virtual void Update(float dt, Player * player);
   void Render();
   void Add(GuiLayer * layer);
   void Remove();

projects/mtg/include/MTGDefinitions.h

@@ -99,8 +99,9 @@ class Constants
     CLOUD = 38,
     CANTATTACK = 39,
     MUSTATTACK = 40,
+    CANTBLOCK = 41,
 
-    NB_BASIC_ABILITIES = 41,
+    NB_BASIC_ABILITIES = 42,
 
 
     RARITY_M = 'M',

projects/mtg/include/MTGRules.h

@@ -123,15 +123,18 @@ class MTGLegendRule:public ListMaintainerAbility{
 
 
 class MTGMomirRule:public MTGAbility{
+private:
+  int genRandomCreatureId(int convertedCost);
 public:
   int alreadyplayed;
   MTGAllCards * collection;
-  MTGCardInstance * genRandomCreature(int convertedCost);
+  MTGCardInstance * genCreature(int id);
   int testDestroy();
   void Update(float dt);
   MTGMomirRule(int _id, MTGAllCards * _collection);
   int isReactingToClick(MTGCardInstance * card, ManaCost * mana = NULL);
   int reactToClick(MTGCardInstance * card);
+  int reactToClick(MTGCardInstance * card, int id);
   const char * getMenuText(){return "Momir";}
 };
 

projects/mtg/include/TestSuiteAI.h

@@ -51,6 +51,7 @@ class TestSuite{
  public:
   MTGAllCards* collection;
   int summoningSickness;
+  int gameType;
   float timerLimit;
   int currentAction;
   TestSuiteState initState;