Pretty huge patch here(sorry old habits never die :( )

lots of changes, many bug fixes,
first
added auto=count(targetchooser)
and countedamount wparsed int
they work together for cards where it is difficult to get working without knowing in advance how many we had ie: exile blah creatures, for each creature you exiled do effect.
auto=count(creature|mybattlefield)
auto=moveto(exile)
auto=draw:countedamount
it takes into account token creatures, which our old methods did not.

second, added "freeze" which is a "frozen" that automatically taps your target for you, for use when nesting or whenever needed where it was difficult to nest the ability with tap included.

added devotion for "iroas"

added reveal:x and scry x
reveal contains optionone/optiononeend ; optiontwo/optiontwoend ; repeat; afterrevealed/afterrevealed end.

this ability has heavy use of targetListIsSet(<amount>) and upto:amount, you MUST be certain that all cards being revealed have an action that removes them from reveal either in the first, second, or 3rd ability.
there are over 300 examples in the new card code, the ability is VERY easy to understand.

scry contains automatic put on top, put on bottom, then scrycore/scrycoreend which is an ability to fire.
it also contains keywords, dontshow which is nested in scrycore, scry reveals, puts on top or bottom, then reveal AGAIN, and does an effect, dontshow eliminates the 2nd revealing.
is also contains "delayed" keyword, which delays the ability until AFTER the core fires.

added bestow. update rules mtg.txt!!!!
examples are in primitives, every bestow card was supported.

added a new lord based on varibles and restrictions
while(restriction{morbid})
while(varible:blah)
this simplifies and expands on this(, allowing you to even use while(cantarget together and check if a card is targetable by the variable. examples are in primitives

added token(by card name)
auto=token(Eldrazi Scion) 
will search primitives and card dats for this card and give it to you as a token.
valid card dat info is still required.

added variable delirium
added restriction madnessplayed to allow checking if the card was played with madness.

added restriction "geared" for checking if a card has equipment on it.

added abilities words
skulk

menace <--cant be blocked except by 2 or more, if you dont block it with 2 or more we automatically unassign the single blocker and the creature is considered not blocked.

nosolo <--cant attack alone

mustblock <---if you dont assign as a blocker, we assign automatically the first thing it can block legally.

changed iscolorless back to "colorless"

enjoy, cards coming soon, theyre coded but im debating on not alpha sorting, cards being added this patch 965 uniques.

there is a section of the commit which was just VS2016 normalizing line ends, sorry if it makes it a cluster mess.

projects/mtg/include/AllAbilities.h

@@ -38,6 +38,117 @@ public:
     virtual MTGEventText * clone() const;
 };
 
+class MTGRevealingCards : public MTGAbility, public CardDisplay
+{
+public:
+	vector<CardView*> cards;
+	Player * playerForZone;
+	MTGGameZone * RevealZone;
+	MTGGameZone * RevealFromZone;
+	string revealCertainTypes;
+	string revealUntil;
+
+	CardDisplay * revealDisplay;
+	vector<CardDisplay*>trashDisplays;//used for repeat
+	int nbCard;
+	string abilityString;
+	string number;
+	string abilityOne;
+	string abilityTwo;
+	string afterReveal;
+	bool afterEffectActivated;
+	MTGAbility * abilityToCast;
+	MTGAbility * abilityFirst;
+	MTGAbility * abilitySecond;
+	MTGAbility * abilityAfter;
+	vector<MTGAbility*>abilities;
+	bool repeat;//only the first ability can be repeated, and it must be targeted.
+	bool initCD;
+
+	void Update(float dt);
+	int testDestroy();
+	int toResolve();
+	void CardViewBackup(MTGCardInstance * backup);
+	void Render();
+	bool CheckUserInput(JButton key);
+	MTGAbility * contructAbility(string abilityToMake = "");
+	MTGRevealingCards(GameObserver* observer, int _id, MTGCardInstance * card, string text);
+	virtual MTGRevealingCards * clone() const;
+	~MTGRevealingCards();
+	int receiveEvent(WEvent*);
+};
+
+class RevealDisplay : public CardDisplay
+{
+public:
+	RevealDisplay(int id, GameObserver* game, int x, int y, JGuiListener * listener = NULL, TargetChooser * tc = NULL,
+		int nb_displayed_items = 7);
+	void AddCard(MTGCardInstance * _card);
+	bool CheckUserInput(JButton key);
+};
+
+class GenericRevealAbility : public ActivatedAbility
+{
+public:
+	string howMany;
+	MTGRevealingCards * ability;
+	GenericRevealAbility(GameObserver* observer, int id, MTGCardInstance * source, Targetable * target, string _howMany);
+	int resolve();
+	const string getMenuText();
+	GenericRevealAbility * clone() const;
+	~GenericRevealAbility();
+
+};
+
+class MTGScryCards : public MTGAbility, public CardDisplay
+{
+public:
+	vector<CardView*> cards;
+	MTGGameZone * RevealZone;
+	MTGGameZone * RevealFromZone;
+
+	CardDisplay * revealDisplay;
+	vector<CardDisplay*>trashDisplays;//used for repeat
+	int nbCard;
+	bool delayed;
+	bool dontRevealAfter;
+	int revealTopAmount;
+	string delayedAbilityString;
+	string abilityString;
+	string number;
+	string abilityOne;
+	string abilityTwo;
+	MTGAbility * abilityToCast;
+	MTGAbility * abilityFirst;
+	MTGAbility * abilitySecond;
+	vector<MTGAbility*>abilities;
+	bool initCD;
+	void Update(float dt);
+	int testDestroy();
+	void initDisplay(int value = 0);
+	int toResolve();
+	void Render();
+	bool CheckUserInput(JButton key);
+	MTGAbility * contructAbility(string abilityToMake = "");
+	MTGScryCards(GameObserver* observer, int _id, MTGCardInstance * card, string text);
+	virtual MTGScryCards * clone() const;
+	~MTGScryCards();
+	int receiveEvent(WEvent*);
+};
+
+class GenericScryAbility : public ActivatedAbility
+{
+public:
+	string howMany;
+	MTGScryCards * ability;
+	GenericScryAbility(GameObserver* observer, int id, MTGCardInstance * source, Targetable * target, string _howMany);
+	int resolve();
+	const string getMenuText();
+	GenericScryAbility * clone() const;
+	~GenericScryAbility();
+
+};
+
 class WParsedInt
 {
 public:
@@ -240,6 +351,10 @@ private:
         {
             intValue = countDevotionTo(card,card->controller()->inPlay(),Constants::MTG_COLOR_BLUE,Constants::MTG_COLOR_GREEN);
         }
+		else if (s == "Iroas")//devotion to red white
+		{
+			intValue = countDevotionTo(card, card->controller()->inPlay(), Constants::MTG_COLOR_RED, Constants::MTG_COLOR_WHITE);
+		}
         else if (s.find("type:") != string::npos)
         {
             size_t begins = s.find("type:");
@@ -556,6 +671,10 @@ private:
         {
             intValue = target->getCurrentToughness();
         }
+		else if (s == "countedamount")
+		{
+			intValue = target->CountedObjects;
+		}
         else if (s == "kicked")
         {
             intValue = target->kicked;
@@ -745,6 +864,21 @@ private:
                     intValue += card->controller()->game->inPlay->cards[j]->power;
             }
         }
+		else if (s == "revealedp")
+		{
+			if (card->revealedLast)
+				intValue = card->revealedLast->power;
+		}
+		else if (s == "revealedt")
+		{
+			if (card->revealedLast)
+				intValue = card->revealedLast->toughness;
+		}
+		else if (s == "revealedmana")
+		{
+			if (card->revealedLast)
+				intValue = card->revealedLast->getManaCost()->getConvertedCost();
+		}
         else
         {
             intValue = atoi(s.c_str());
@@ -2855,7 +2989,6 @@ public:
         return NEW ARegularLifeModifierAura(*this);
     }
 };
-
 //Generic Kird Ape
 class AAsLongAs: public ListMaintainerAbility, public NestedAbility
 {
@@ -3334,6 +3467,7 @@ public:
     list<int> colors;
     int power, toughness;
     int tokenId;
+	string _cardName;
     string name;
     string sabilities;
     string starfound;
@@ -3345,6 +3479,7 @@ public:
     MTGCardInstance * myToken;
     vector<MTGAbility *> currentAbilities;
     Player * tokenReciever;
+	//by id
     ATokenCreator(GameObserver* observer, int _id, MTGCardInstance * _source, Targetable *, ManaCost * _cost, int tokenId,string starfound, WParsedInt * multiplier = NULL,
         int who = 0,bool aLivingWeapon = false) :
     ActivatedAbility(observer, _id, _source, _cost, 0), tokenId(tokenId), starfound(starfound),multiplier(multiplier), who(who),aLivingWeapon(aLivingWeapon)
@@ -3354,7 +3489,18 @@ public:
         if (card) name = card->data->getName();
         battleReady = false;
     }
-
+	//by name, card still require valid card.dat info, this just makes the primitive code far more readable. token(Eldrazi scion) instead of token(-1234234)...
+	ATokenCreator(GameObserver* observer, int _id, MTGCardInstance * _source, Targetable *, ManaCost * _cost, string cardName, string starfound, WParsedInt * multiplier = NULL,
+		int who = 0, bool aLivingWeapon = false) :
+		ActivatedAbility(observer, _id, _source, _cost, 0), _cardName(cardName), starfound(starfound), multiplier(multiplier), who(who), aLivingWeapon(aLivingWeapon)
+	{
+		if (!multiplier) this->multiplier = NEW WParsedInt(1);
+		MTGCard * card = MTGCollection()->getCardByName(_cardName);
+		tokenId = card->getId();
+		if (card) name = card->data->getName();
+		battleReady = false;
+	}
+	//by construction
     ATokenCreator(GameObserver* observer, int _id, MTGCardInstance * _source, Targetable *, ManaCost * _cost, string sname, string stypes, int _power, int _toughness,
         string sabilities, string starfound,WParsedInt * multiplier = NULL, int _who = 0,bool aLivingWeapon = false,string spt = "") :
     ActivatedAbility(observer, _id, _source, _cost, 0),sabilities(sabilities),starfound(starfound), multiplier(multiplier), who(_who),aLivingWeapon(aLivingWeapon),spt(spt)
@@ -3877,10 +4023,12 @@ class AThis: public MTGAbility, public NestedAbility
 public:
     MTGAbility * a;
     ThisDescriptor * td;
-    AThis(GameObserver* observer, int _id, MTGCardInstance * _source, Damageable * _target, ThisDescriptor * _td, MTGAbility * ability) :
+	string restrictionCheck;
+    AThis(GameObserver* observer, int _id, MTGCardInstance * _source, Damageable * _target, ThisDescriptor * _td, MTGAbility * ability, string restriction = "") :
         MTGAbility(observer, _id, _source, _target), NestedAbility(ability)
     {
         td = _td;
+		restrictionCheck = restriction;
         ability->source = source;
         ability->target = target;
         a = NULL;
@@ -3904,9 +4052,18 @@ public:
 
     int resolve()
     {
-        //TODO check if ability is oneShot ?
-        int match;
-        match = td->match(source);
+		int match = 0;
+		if (td)
+		{
+			match = td->match(source);
+		}
+		else
+		{//restriction check instead of Targetchooser
+			AbilityFactory abf(target->getObserver());
+			int checkCond = abf.parseCastRestrictions(source, source->controller(), restrictionCheck);
+			if (checkCond)
+				match = 1;
+		}
         if (match > 0)
         {
             addAbilityToGame();
@@ -3953,6 +4110,7 @@ public:
     {
         AThis * a =  NEW AThis(*this);
         a->ability = ability->clone();
+		if(a->td)
         a->td = td->clone();
         return a;
     }
@@ -4166,6 +4324,16 @@ public:
         return NEW TADamager(*this);
     }
 };
+//bestow
+class ABestow : public ActivatedAbility
+{
+public:
+	MTGCardInstance * _card;
+	ABestow(GameObserver* observer, int id, MTGCardInstance * card, MTGCardInstance * _target, ManaCost * _cost = NULL);
+	int resolve();
+	const string getMenuText();
+	ABestow * clone() const;
+};
 
 /* Can tap a target for a cost */
 class AATapper: public ActivatedAbility
@@ -4197,12 +4365,22 @@ public:
     int resolve();
     AAWhatsMax * clone() const;
 };
+//counts a targetchooser for use later by other effects
+class AACountObject : public ActivatedAbility
+{
+public:
+	string value;
 
+	AACountObject(GameObserver* observer, int id, MTGCardInstance * card, MTGCardInstance * source, ManaCost * _cost = NULL, string value ="");
+	int resolve();
+	AACountObject * clone() const;
+};
 /* Can prevent a card from untapping next untap */
 class AAFrozen: public ActivatedAbility
 {
 public:
-    AAFrozen(GameObserver* observer, int id, MTGCardInstance * card, MTGCardInstance * _target, ManaCost * _cost = NULL);
+	bool freeze;
+    AAFrozen(GameObserver* observer, int id, MTGCardInstance * card, MTGCardInstance * _target, bool tap, ManaCost * _cost = NULL);
     int resolve();
     const string getMenuText();
     AAFrozen * clone() const;
@@ -6205,7 +6383,8 @@ public:
     MTGCardInstance * theNamedCard;
     bool noEvent;
     bool putinplay;
-    AACastCard(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target,bool restricted,bool copied,bool _asNormal,string nameCard,string abilityName,bool _noEvent, bool putinplay);
+	bool asNormalMadness;
+    AACastCard(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target,bool restricted,bool copied,bool _asNormal,string nameCard,string abilityName,bool _noEvent, bool putinplay,bool asNormalMadness = false);
 
     int testDestroy(){return 0;};
     void Update(float dt);

projects/mtg/include/GameObserver.h

@@ -80,6 +80,7 @@ class GameObserver{
   ExtraCosts * mExtraPayment;
   int oldGamePhase;
   TargetChooser * targetChooser;
+  CardDisplay * OpenedDisplay;
   DuelLayers * mLayers;
   ReplacementEffects *replacementEffects;
   vector<Player *> players; //created outside

projects/mtg/include/MTGAbility.h

@@ -121,6 +121,7 @@ public:
     ManaCost* BuyBack;
     ManaCost* FlashBack;
     ManaCost* Retrace;
+	ManaCost* Bestow;
     ManaCost* morph;
     ManaCost* suspend;
 

projects/mtg/include/MTGCardInstance.h

@@ -95,6 +95,7 @@ public:
     bool exileEffects;
     bool suspended;
     bool miracle;
+	bool isBestowed;
     int chooseacolor;
     string chooseasubtype;
     int coinSide;//1 = tails
@@ -105,6 +106,7 @@ public:
     int notblocked;
     int fresh;
     int MaxLevelUp;
+	int CountedObjects;
     int kicked;
     int dredge;
     bool isDualWielding;
@@ -272,6 +274,8 @@ public:
     string currentimprintName;
     vector<string>imprintedNames;
 
+	MTGCardInstance * revealedLast;//last card revealed by a ability this card owns.
+	bool MadnessPlay;
     void eventattacked();
     void eventattackedAlone();
     void eventattackednotblocked();

projects/mtg/include/MTGDefinitions.h

@@ -82,6 +82,7 @@ class Constants
   static const string kRetraceKeyword;
   static const string kKickerKeyword;
   static const string kMorphKeyword;
+  static const string kBestowKeyword;
 
   // used for deck statistics
   static const int STATS_FOR_TURNS = 8;
@@ -246,8 +247,11 @@ class Constants
       COMBATTOUGHNESS = 125,
       CANTPAYLIFE = 126,
       CANTBESACRIFIED = 127,
-      NB_BASIC_ABILITIES = 128,
-
+      SKULK = 128,
+	  MENACE = 129,
+	  NOSOLO = 130,//cant attack alone
+	  MUSTBLOCK = 131,//blocks each turn
+	  NB_BASIC_ABILITIES = 132,
 
     RARITY_S = 'S',   //Special Rarity
     RARITY_M = 'M',   //Mythics
@@ -308,6 +312,7 @@ class Constants
         CAST_WITH_RETRACE = 6,
         CAST_WITH_MORPH = 7,
         CAST_WITH_SUSPEND = 8,
+		CAST_WITH_BESTOW = 9,
 
         CAST_ALTERNATE = -1, //matches all alternate costs, including itself
         CAST_ALL = -2, // matches everything except NOT_CAST

projects/mtg/include/MTGGameZones.h

@@ -72,6 +72,14 @@ class MTGGameZone {
     OWNER_STACK = 66,
     TARGETED_PLAYER_STACK = 67,
 
+	MY_REVEAL = 71,
+	OPPONENT_REVEAL = 72,
+	TARGET_OWNER_REVEAL = 73,
+	TARGET_CONTROLLER_REVEAL = 74,
+	REVEAL = 75,
+	OWNER_REVEAL = 76,
+	TARGETED_PLAYER_REVEAL = 77,
+
    };
 
    Player * owner;
@@ -194,6 +202,7 @@ public:
     MTGRemovedFromGame * exile; //alias to removedFromZone
     MTGGameZone * garbage;
     MTGGameZone * garbageLastTurn;
+	MTGGameZone * reveal;
     MTGGameZone * temp;
 
     MTGPlayerCards();

projects/mtg/include/MTGRules.h

@@ -206,6 +206,21 @@ public:
     virtual MTGOverloadRule * clone() const;
 };
 
+class MTGBestowRule : public MTGAlternativeCostRule
+{
+public:
+	int isReactingToClick(MTGCardInstance * card, ManaCost * mana = NULL);
+	int reactToClick(MTGCardInstance * card);
+	virtual ostream& toString(ostream& out) const;
+	MTGBestowRule(GameObserver* observer, int _id);
+	const string getMenuText()
+	{
+		return "Bestow";
+	}
+	virtual MTGBestowRule * clone() const;
+};
+
+
 class MTGSuspendRule: public MTGAlternativeCostRule
 {
 public:

projects/mtg/include/ManaCost.h

@@ -31,6 +31,7 @@ protected:
     ManaCost * manaUsedToCast;
     ManaCost * morph;
     ManaCost * Retrace;
+	ManaCost * Bestow;
     ManaCost * FlashBack;
     ManaCost * BuyBack;
     ManaCost * kicker;
@@ -75,6 +76,9 @@ public:
     ManaCost * getSuspend(){ return suspend; };
     void setSuspend(ManaCost * aMana){ SAFE_DELETE(suspend); suspend = aMana;};
 
+	ManaCost * getBestow() { return Bestow; };
+	void setBestow(ManaCost * aMana) { SAFE_DELETE(Bestow); Bestow = aMana; };
+
     ManaCost * getManaUsedToCast(){ return manaUsedToCast; };
     void setManaUsedToCast(ManaCost * aMana){ SAFE_DELETE(manaUsedToCast); manaUsedToCast = aMana;};
 

projects/mtg/include/TargetChooser.h

@@ -25,6 +25,7 @@ class TargetChooser: public TargetsList
 protected:
     int forceTargetListReady;
 public:
+	int forceTargetListReadyByPlayer;
     const static int UNLITMITED_TARGETS = 1000;
     enum
     {