Erwan

- add Mercadian Masques, Mirrodin, Odyssey -> let's do some cleanup!
- Attempt at solving a bug with AI+psychic venom (manaburn), not tested
- Added Abrasax's monocolor AI decks
- Momir better randomizer
- Removed 64 Abilities limitation, I hope...

projects/mtg/include/GuiLayers.h

@@ -14,10 +14,17 @@
 class GameObserver;
 class Player;
 
-class GuiLayer: public JGuiController{
+class GuiLayer{
  protected:
   GameObserver * game;
+  int mId;
+  u32	mActionButton;
  public:
+  int mCount;
+  int mCurr;
+  vector<JGuiObject *>mObjects;
+  void Add(JGuiObject * object);
+  void Remove(JGuiObject * object);
   int modal;
   bool hasFocus;
   virtual void resetObjects();
@@ -31,7 +38,7 @@ class GuiLayer: public JGuiController{
   virtual int unstopableRenderInProgress(){return 0;};
   int getIndexOf(JGuiObject * object);
   JGuiObject * getByIndex (int index);
-  virtual void Render(){JGuiController::Render();};
+  virtual void Render();
   int empty(){
     if (mCount) return 0;
     return 1;

projects/mtg/include/MTGRules.h

@@ -125,7 +125,10 @@ class MTGLegendRule:public ListMaintainerAbility{
 class MTGMomirRule:public MTGAbility{
 private:
   int genRandomCreatureId(int convertedCost);
+  static vector<int> pool[20];
+  static int initialized;
 public:
+
   int alreadyplayed;
   MTGAllCards * collection;
   MTGCardInstance * genCreature(int id);