Permalink
Browse files

Updated BasicLands to new types; module Core now exports module Types

  • Loading branch information...
1 parent 13d9e50 commit 874ba13d25bd6782f646edd8bb8a3ebdadf52b5d @MedeaMelana committed Sep 12, 2012
Showing with 11 additions and 6 deletions.
  1. +5 −4 BasicLands.hs
  2. +5 −1 Core.hs
  3. +0 −1 Engine.hs
  4. +1 −0 Types.hs
View
@@ -2,9 +2,9 @@
module BasicLands where
+import Core
import Labels
import Predicates
-import Types
import Utils
import Control.Applicative
@@ -20,7 +20,7 @@ swamp = mkBasicLandCard Swamp Black
mountain = mkBasicLandCard Mountain Red
forest = mkBasicLandCard Forest Green
-mkBasicLandCard :: LandType -> Color -> Card
+mkBasicLandCard :: LandSubtype -> Color -> Card
mkBasicLandCard ty color = mkCard $ do
name =: Just (fromString (show ty))
types =: basicType <> objectType ty
@@ -35,7 +35,7 @@ playLand rSource rActivator = ClosedAbility
_ -> return False
, _manaCost = mempty
, _additionalCosts = []
- , _effect = SpecialAction (return [MoveObject rSource Battlefield])
+ , _effect = SpecialAction (return [WillSimpleEffect (PlayLand rSource)])
}
tapToAddMana :: Maybe Color -> Ability
@@ -46,7 +46,8 @@ tapToAddMana mc rSource rActivator = ClosedAbility
_ -> return False
, _manaCost = mempty
, _additionalCosts = []
- , _effect = SpecialAction (return [AddToManaPool rActivator mc])
+ -- TODO require cost: tap self
+ , _effect = SpecialAction (return [WillSimpleEffect (AddToManaPool rActivator mc)])
}
checkObject :: ObjectRef -> (Object -> Bool) -> View Bool
View
@@ -1,7 +1,11 @@
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE TypeOperators #-}
-module Core where
+module Core
+ ( compileZoneRef
+ , evaluate, singleTarget, (<?>), askMagicTargets, allTargets
+ , module Types
+ ) where
import IdList (IdList)
import qualified IdList
View
@@ -7,7 +7,6 @@ import IdList (Id)
import qualified IdList
import Labels
import Predicates
-import Types
import Utils hiding (object)
import Control.Applicative ((<$>))
View
@@ -308,6 +308,7 @@ data SimpleOneShotEffect
| AddToManaPool PlayerRef (Maybe Color)
| AttachPermanent ObjectRef (Maybe ObjectRef) (Maybe ObjectRef) -- aura/equipment, old target, new target
| RemoveFromCombat ObjectRef
+ | PlayLand ObjectRef
data PriorityAction = PlayCard ObjectRef

0 comments on commit 874ba13

Please sign in to comment.