From 935849142cc1fda26b1dd147eac83b3d2fdbf8c8 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Wed, 6 Jul 2016 06:37:27 +0800
Subject: [PATCH] replaced alias with shackler

---
 projects/mtg/bin/Res/sets/primitives/mtg.txt | 12 ++++++------
 projects/mtg/include/MTGDefinitions.h        |  3 ++-
 projects/mtg/src/MTGDefinitions.cpp          |  3 ++-
 projects/mtg/src/MTGGameZones.cpp            |  3 +--
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index ca5fbb9c8..5a8969ebb 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -49639,7 +49639,7 @@ subtype=Equipment
 [/card]
 [card]
 name=Helm of Possession
-alias=50120
+abilities=shackler
 auto={2}{T}{S(creature|mybattlefield)}:shackle target(creature)
 auto=@each my untap restriction{canuntap}:may untap
 text=You may choose not to untap Helm of Possession during your untap step. -- {2}, {T}, Sacrifice a creature: Gain control of target creature for as long as you control Helm of Possession and Helm of Possession remains tapped.
@@ -50435,7 +50435,7 @@ type=Artifact
 [/card]
 [card]
 name=Hivis of the Scale
-alias=50120
+abilities=shackler
 auto={T}:shackle target(dragon)
 auto=@each my untap restriction{canuntap}:may untap
 text=You may choose not to untap Hivis of the Scale during your untap step. -- {T}: Gain control of target Dragon for as long as you control Hivis and Hivis remains tapped.
@@ -75773,7 +75773,7 @@ toughness=6
 [/card]
 [card]
 name=Old Man of the Sea
-alias=50120
+abilities=shackler
 auto={T}:shackle target(creature[power<=storedpower])
 auto=@each my untap restriction{canuntap}:may untap
 text=You may choose not to untap Old Man of the Sea during your untap step. -- {T}: Gain control of target creature with power less than or equal to Old Man of the Sea's power for as long as Old Man of the Sea remains tapped and that creature's power remains less than or equal to Old Man of the Sea's power.
@@ -89664,7 +89664,7 @@ toughness=*
 [/card]
 [card]
 name=Rubinia Soulsinger
-alias=50120
+abilities=shackler
 auto={T}:shackle target(creature)
 auto=@each my untap restriction{canuntap}:may untap
 text=You may choose not to untap Rubinia Soulsinger during your untap step. -- {T}: Gain control of target creature for as long as you control Rubinia and Rubinia remains tapped.
@@ -118392,7 +118392,7 @@ toughness=2
 [/card]
 [card]
 name=Vedalken Shackles
-alias=50120
+abilities=shackler
 auto={2}{T}:shackle target(creature[power<=type:island:mybattlefield])
 auto=@each my untap restriction{canuntap}:may untap
 text=You may choose not to untap Vedalken Shackles during your untap step. -- {2}, {T}: Gain control of target creature with power less than or equal to the number of Islands you control for as long as Vedalken Shackles remains tapped.
@@ -124331,7 +124331,7 @@ toughness=2
 [/card]
 [card]
 name=Willow Satyr
-alias=50120
+abilities=shackler
 auto={T}:shackle target(creature[legendary])
 auto=@each my untap restriction{canuntap}:may untap
 text=You may choose not to untap Willow Satyr during your untap step. -- {T}: Gain control of target legendary creature for as long as you control Willow Satyr and Willow Satyr remains tapped.
diff --git a/projects/mtg/include/MTGDefinitions.h b/projects/mtg/include/MTGDefinitions.h
index ef8859eaa..caea4b9d5 100644
--- a/projects/mtg/include/MTGDefinitions.h
+++ b/projects/mtg/include/MTGDefinitions.h
@@ -253,7 +253,8 @@ class Constants
       MUSTBLOCK = 131,//blocks each turn
       DETHRONE = 132,
       OVERLOAD = 133,
-      NB_BASIC_ABILITIES = 134,
+      SHACKLER = 134,
+      NB_BASIC_ABILITIES = 135,
 
     RARITY_S = 'S',   //Special Rarity
     RARITY_M = 'M',   //Mythics
diff --git a/projects/mtg/src/MTGDefinitions.cpp b/projects/mtg/src/MTGDefinitions.cpp
index 3b6c6f0d5..16aa9eebf 100644
--- a/projects/mtg/src/MTGDefinitions.cpp
+++ b/projects/mtg/src/MTGDefinitions.cpp
@@ -164,7 +164,8 @@ const char* Constants::MTGBasicAbilities[] = {
     "nosolo",
     "mustblock",
     "dethrone",
-    "overload"
+    "overload",
+    "shackler"
 };
 
 map<string,int> Constants::MTGBasicAbilitiesMap;
diff --git a/projects/mtg/src/MTGGameZones.cpp b/projects/mtg/src/MTGGameZones.cpp
index cdbb8aed2..d8b4940d1 100644
--- a/projects/mtg/src/MTGGameZones.cpp
+++ b/projects/mtg/src/MTGGameZones.cpp
@@ -951,7 +951,7 @@ void MTGInPlay::untapAll()
     {
         MTGCardInstance * card = cards[i];
         card->setUntapping();
-        if (!card->basicAbilities[(int)Constants::DOESNOTUNTAP] && card->alias != 50120)
+        if (!card->basicAbilities[(int)Constants::DOESNOTUNTAP] && !card->basicAbilities[(int)Constants::SHACKLER])
         {
             if (card->frozen < 1)
             {
@@ -961,7 +961,6 @@ void MTGInPlay::untapAll()
             {
                 card->frozen = 0;
             }
-
         }
     }
 }