Complete Overhaul of the cantcast abilities, changes in first comment.

2010-09-04 15:16:57 +00:00
parent 972e7d7207
commit e65b3f223f
10 changed files with 347 additions and 89 deletions
@@ -4323,7 +4323,7 @@ class AAOnlyOne:public ActivatedAbilityTP{
      }else{
        player = (Player *) _target;
      }
-	  player->onlyonecast = 1;
+	  player->onlyoneinstant = 1;
    }
    return 1;
  }
@@ -4352,7 +4352,7 @@ class AANoSpells:public ActivatedAbilityTP{
      }else{
        player = (Player *) _target;
      }
-     player->castrestrictedspell = 1;
+     player->nospellinstant = 1;
    }
    return 1;
  }
@@ -4381,7 +4381,7 @@ class AANoCreatures:public ActivatedAbilityTP{
      }else{
        player = (Player *) _target;
      }
-     player->castrestrictedcreature = 1;
+     player->nocreatureinstant = 1;
    }
    return 1;
  }
@@ -119,11 +119,12 @@ class Constants
 		 CANTMILLLOSE = 61,
    CANTCASTCREATURE = 62,
 	    CANTCAST = 63,
-		CANTCASTINSTANTSORCERY = 64,
+		CANTCASTTWO = 64,
 	STORM = 65,
 	BOTHCANTCAST = 66,
 	BOTHNOCREATURE = 67,
-	BOTHONESPELL = 68,
+	ONLYONEBOTH = 68,
+

    NB_BASIC_ABILITIES = 69,

@@ -64,6 +64,23 @@ class MTGPersistRule:public MTGAbility{
  virtual MTGPersistRule * clone() const;
 };

+class MTGCantCasterstart:public MTGAbility{
+ public:
+  MTGCantCasterstart(int _id);
+  int receiveEvent(WEvent * event);
+  virtual ostream& toString(ostream& out) const;
+  int testDestroy();
+  virtual MTGCantCasterstart * clone() const;
+};
+class MTGCantCastercheck:public MTGAbility{
+ public:
+  MTGCantCastercheck(int _id);
+  int receiveEvent(WEvent * event);
+  virtual ostream& toString(ostream& out) const;
+  int testDestroy();
+  virtual MTGCantCastercheck * clone() const;
+};
+
 class MTGUnearthRule:public MTGAbility{
 public:
  MTGUnearthRule(int _id);
@@ -24,11 +24,12 @@ class Player: public Damageable{
  int canPutLandsIntoPlay;
  int castedspellsthisturn;
  int onlyonecast;
+  int castcount;
+  int nocreatureinstant;
+  int nospellinstant;
+  int onlyoneinstant;
  int castrestrictedcreature;
  int castrestrictedspell;
-  int cantcastspell;
-  int cantcastcreature;
-  int cantcastinso;
  MTGPlayerCards * game;
  int afterDamage();
  int poisoned();