Created helper record defaultActivation

MedeaMelana · May 10, 2014 · 3cc8150 · 3cc8150
1 parent aa44724
commit 3cc8150
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 22 deletions.
diff --git a/Magic-Cards/src/Magic/BasicLands.hs b/Magic-Cards/src/Magic/BasicLands.hs
@@ -28,15 +28,12 @@ mkBasicLandCard ty color = mkCard $ do
 
 tapToAddMana :: Maybe Color -> ActivatedAbility
 tapToAddMana mc = ActivatedAbility
-  { abilityActivation = Activation
-    { timing = instantSpeed
-    , available = availableFromBattlefield
-    , manaCost = mempty
-    , effect = \_rSource you ->
+  { abilityType = ManaAb
+  , tapCost = TapCost
+  , abilityActivation = defaultActivation
+    { effect = \_rSource you ->
         void (executeEffect (Will (AddToManaPool you [mc])))
     }
-  , abilityType = ManaAb
-  , tapCost = TapCost
   }
 
 checkObject :: SomeObjectRef -> (Object -> Bool) -> View Bool

diff --git a/Magic-Cards/src/Magic/M13.hs b/Magic-Cards/src/Magic/M13.hs
@@ -268,11 +268,8 @@ arborElf = mkCard $ do
     untapTargetForest = ActivatedAbility
       { abilityType = ActivatedAb
       , tapCost = TapCost
-      , abilityActivation = Activation
-        { timing = instantSpeed
-        , available = availableFromBattlefield
-        , manaCost = Just []
-        , effect = \_ you -> do
+      , abilityActivation = defaultActivation
+        { effect = \_ you -> do
             ts <- askTarget you $ checkPermanent
               (hasTypes (landTypes [Forest])) <?> targetPermanent
             mkTargetAbility you ts $ \rForest ->
@@ -343,11 +340,8 @@ chronomaton = mkCard $ do
     addCounter = ActivatedAbility
       { abilityType = ActivatedAb
       , tapCost = TapCost
-      , abilityActivation = Activation
-        { timing = instantSpeed
-        , available = availableFromBattlefield
-        , manaCost = Just []
-        , effect = \rSelf you ->
+      , abilityActivation = defaultActivation
+        { effect = \rSelf you ->
             mkTrigger you $ will (AddCounter rSelf Plus1Plus1)
         }
       }
@@ -362,11 +356,8 @@ tormod'sCrypt = mkCard $ do
     tapToExile = ActivatedAbility
       { abilityType = ActivatedAb
       , tapCost = TapCost
-      , abilityActivation = Activation
-        { timing = instantSpeed
-        , available = availableFromBattlefield
-        , manaCost = Just []
-        , effect = \(Some Battlefield, i) you -> do
+      , abilityActivation = defaultActivation
+        { effect = \(Some Battlefield, i) you -> do
             tp <- askTarget you targetPlayer
             will (Sacrifice (Battlefield, i))
             mkTargetTrigger you tp $ \p -> do

diff --git a/Magic/src/Magic/Abilities.hs b/Magic/src/Magic/Abilities.hs
@@ -24,6 +24,7 @@ module Magic.Abilities (
 
     -- * Activated abilities
     loyaltyAbility, mkTargetAbility, mkAbility,
+    defaultActivation,
 
     -- * Creating effects on the stack
     stackSelf, stackTargetSelf,
@@ -209,6 +210,15 @@ mkTargetAbility = mkTargetTrigger
 mkAbility :: PlayerRef -> Magic() -> Magic ()
 mkAbility = mkTrigger
 
+-- | Default activation of an activated ability, 'instantSpeed', 'availableFromBattlefield', a mana cost of 'Just' @[]@ and no effect.
+defaultActivation :: Activation
+defaultActivation = Activation
+  { timing = instantSpeed
+  , available = availableFromBattlefield
+  , manaCost = Just []
+  , effect = \_ _ -> return ()
+  }
+
 
 
 -- CREATING EFFECTS ON THE STACK