ajani steadfast

ajani steadfast emblem

projects/mtg/src/AllAbilities.cpp

@@ -1386,15 +1386,18 @@ AAFakeAbility * AAFakeAbility::clone() const
 }
 
 //EPIC
- AAEPIC::AAEPIC(GameObserver* observer, int id, MTGCardInstance * source, MTGCardInstance * _target, string _named,ManaCost * cost):
-    ActivatedAbility(observer, id, source, cost, 0),named(_named)
+ AAEPIC::AAEPIC(GameObserver* observer, int id, MTGCardInstance * source, MTGCardInstance * _target, string _named,ManaCost * cost, bool _ffield):
+    ActivatedAbility(observer, id, source, cost, 0),named(_named),FField(_ffield)
 {
     this->target = _target;
 }
 int AAEPIC::resolve()
 {  
     MTGCardInstance * _target =  (MTGCardInstance *)target;
-    _target->controller()->epic = 1;
+    if(FField)
+        _target->controller()->forcefield = 1;
+	else
+        _target->controller()->epic = 1;
     return 1;
 }
 

projects/mtg/src/Damage.cpp

@@ -71,6 +71,9 @@ int Damage::resolve()
     }
 
     //-------------------------------------------------
+    //Ajani Steadfast ---
+    if(target->type_as_damageable == Damageable::DAMAGEABLE_MTGCARDINSTANCE && ((MTGCardInstance*)target)->controller()->forcefield)
+        damage = 1;
     if (target->type_as_damageable == Damageable::DAMAGEABLE_MTGCARDINSTANCE)
     {
         MTGCardInstance * _target = (MTGCardInstance *) target;
@@ -127,7 +130,9 @@ int Damage::resolve()
         _target->doDamageTest = 1;
     }
     if (target->type_as_damageable == Damageable::DAMAGEABLE_PLAYER)
-    {
+    {//Ajani Steadfast
+        if(((Player*)target)->forcefield)
+            damage = 1;
         if(source->has(Constants::LIBRARYEATER) && typeOfDamage == 1)
         {
             for (int j = damage; j > 0; j--)

projects/mtg/src/MTGAbility.cpp

@@ -2561,6 +2561,16 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
         return a;
     }
 
+        //Forcefield
+    found = s.find("forcefield");
+    if (found != string::npos)
+    {
+        
+        MTGAbility * a = NEW AAEPIC(observer, id, card, target,"Forcefield",NULL,true);
+        a->oneShot = 1;
+        return a;
+    }
+
     //Damage
     vector<string> splitDamage = parseBetween(s, "damage:", " ", false);
     if (splitDamage.size())

projects/mtg/src/Player.cpp

@@ -34,6 +34,7 @@ Player::Player(GameObserver *observer, string file, string fileSmall, MTGDeck *
     extraTurn = 0;
     drawCounter = 0;
     epic = 0;
+    forcefield = 0;
     raidcount = 0;
     handmodifier = 0;
     prowledTypes.clear();