New record field loyalty

Magic-Cards/src/Magic/M13.hs

@@ -255,6 +255,8 @@ garrukPrimalHunter = mkCard $ do
     types =: planeswalkerWithType Garruk
     play =: Just (playPermanent [Nothing, Nothing, Just Green, Just Green, Just Green])
     activatedAbilities =: [plusOne, minusThree, minusSix]
+    loyalty =: Just 3
+    replacementEffects =: [etbWithLoyaltyCounters]
   where
     plusOne = loyaltyAbility 1 $ \_ you -> do
       mkTargetlessTriggerObject you $ \_ -> do

Magic/src/Magic/Abilities.hs

@@ -19,6 +19,9 @@ module Magic.Abilities (
     -- * Constructing triggers
     mkTriggerObject, mkTargetlessTriggerObject, onSelfETB,
     ifSelfWasOrIsOnBattlefield,
+
+    -- * Constructing replacement effects
+    etbWithLoyaltyCounters
   ) where
 
 import Magic.Core
@@ -35,7 +38,7 @@ import Control.Applicative ((<$>), pure)
 import Control.Monad (void)
 
 import Data.Boolean ((&&*))
-import Data.Label.Pure (get)
+import Data.Label.Pure (get, modify)
 import Data.Label.PureM (asks)
 import Data.Monoid (mempty)
 
@@ -160,3 +163,15 @@ ifSelfWasOrIsOnBattlefield f events rSelf you =
   where
     ok = fst rSelf == Some Battlefield
       || not (null ([ () | DidMoveObject (Just (Some Battlefield, _)) newRef <- events, newRef == rSelf ] :: [()]))
+
+
+
+-- CONSTRUCTING REPLACEMENT EFFECTS
+
+etbWithLoyaltyCounters :: ReplacementEffect
+etbWithLoyaltyCounters (WillMoveObject (Just fromRef) Battlefield perm) rSelf you
+  | fromRef == rSelf =
+      case get (objectPart .^ loyalty) perm of
+        Just n -> Just $ return [WillMoveObject (Just fromRef) Battlefield (modify (objectPart .^ counters) (++ replicate n Loyalty) perm)]
+        Nothing -> Nothing
+etbWithLoyaltyCounters _ _ _ = Nothing

Magic/src/Magic/Object.hs

@@ -5,7 +5,7 @@ module Magic.Object (
       name, colors, types, owner, controller, timestamp, counters,
       tapStatus,
       stackItem,
-      pt, damage, deathtouched,
+      pt, loyalty, damage, deathtouched,
       play, staticKeywordAbilities, layeredEffects, activatedAbilities, triggeredAbilities, replacementEffects,
       temporaryEffects, attachedTo,
     ObjectOfType(..),

Magic/src/Magic/Types.hs

@@ -32,7 +32,7 @@ module Magic.Types (
     Card(..), Deck,
     Object(..),
       name, colors, types, owner, controller, timestamp, counters,
-      pt,
+      pt, loyalty,
       play, staticKeywordAbilities, layeredEffects, activatedAbilities, triggeredAbilities, replacementEffects,
       temporaryEffects, attachedTo,
     ObjectOfType(..),
@@ -228,6 +228,9 @@ data Object = Object
   -- for creatures
   , _pt         :: Maybe PT
 
+  -- for planeswalkers
+  , _loyalty    :: Maybe Int
+
   --, _mustBeBlocked :: Maybe Bool
   --, _mustAttack    :: Maybe Bool
 
@@ -497,9 +500,9 @@ data Duration
   | UntilEndOfTurn
   deriving (Eq, Ord, Show, Read, Enum, Bounded)
 
-type ReplacementEffect = OneShotEffect -> Maybe (Magic [OneShotEffect])
+type ReplacementEffect =
+  OneShotEffect -> Contextual (Maybe (Magic [OneShotEffect]))
 
--- | Arguments: source, controller, event
 type TriggeredAbilities = [Event] -> Contextual (View [Magic ()])
 
 data PriorityAction

Magic/src/Magic/Utils.hs

@@ -27,6 +27,7 @@ emptyObject t rOwner = Object
   , _counters = mempty
 
   , _pt = Nothing
+  , _loyalty = Nothing
 
   , _play = Nothing
   , _staticKeywordAbilities = []