World.players now uses an IdList instead of IdMap

Engine.hs

@@ -141,9 +141,9 @@ compileEffect :: OneShotEffect -> Engine ()
 compileEffect (UntapPermanent ro) =
   battlefield .^ listEl ro .^ tapStatus =: Just Untapped
 compileEffect (DrawCard rp) = do
-  lib <- gets (players .^ mapEl rp .^ library)
+  lib <- gets (players .^ listEl rp .^ library)
   case IdList.toList lib of
-    []          -> players .^ mapEl rp .^ failedCardDraw =: True
+    []          -> players .^ listEl rp .^ failedCardDraw =: True
     (ro, _) : _ -> executeEffect (MoveObject (Library rp, ro) (Hand rp))
 compileEffect (MoveObject rObject@(rFromZone, i) rToZone) = do
   mObject <- lookupObject rObject
@@ -153,7 +153,7 @@ compileEffect (MoveObject rObject@(rFromZone, i) rToZone) = do
       compileZoneRef rFromZone ~: IdList.remove i
       compileZoneRef rToZone   ~: IdList.cons object
 compileEffect (ShuffleLibrary rPlayer) = do
-  let libraryLabel = players .^ mapEl rPlayer .^ library
+  let libraryLabel = players .^ listEl rPlayer .^ library
   lib <- gets libraryLabel
   lib' <- lift (IdList.shuffle lib)
   puts libraryLabel lib'

IdList.hs

@@ -6,13 +6,17 @@ module IdList
 import Prelude hiding (filter)
 import qualified Prelude
 
+import Control.Arrow (second)
 import Control.Monad.Random (MonadRandom)
 import System.Random.Shuffle (shuffleM)
 
 type Id = Int
 
 data IdList a = IdList [(Id, a)] Id
 
+instance Functor IdList where
+  fmap = contents . fmap . second
+
 empty :: IdList a
 empty = IdList [] 0
 
@@ -32,7 +36,7 @@ remove i = contents (Prelude.filter (\(i', _) -> i /= i'))
 cons :: a -> IdList a -> IdList a
 cons x (IdList ixs i) = IdList ((i, x) : ixs) (succ i)
 
-contents :: ([(Id, a)] -> [(Id, a)]) -> IdList a -> IdList a
+contents :: ([(Id, a)] -> [(Id, b)]) -> IdList a -> IdList b
 contents f (IdList ixs i) = IdList (f ixs) i
 
 toList :: IdList a -> [(Id, a)]

Labels.hs

@@ -4,23 +4,18 @@ module Labels where
 
 import IdList (Id, IdList)
 import qualified IdList
-import Types
 
 import Prelude hiding ((.), id)
 import Control.Category (Category(..), (>>>))
 import Control.Monad.State (MonadState)
 import Data.Label.Pure ((:->), lens)
 import Data.Label.PureM
-import qualified Data.IntMap as IntMap
 import Data.Maybe (fromJust)
 
 
 listEl :: Id -> IdList a :-> a
 listEl i = lens (fromJust . IdList.get i) (IdList.set i)
 
-mapEl :: Id -> IdMap a :-> a
-mapEl i = lens (IntMap.! i) (IntMap.insert i)
-
 (.^) :: Category (~>) => a ~> b -> b ~> c -> a ~> c
 (.^) = (>>>)
 

Types.hs

@@ -16,23 +16,20 @@ import Control.Monad.Identity
 import Control.Monad.Operational
 import Data.Label (mkLabels)
 import Data.Label.Pure ((:->))
-import Data.IntMap (IntMap)
 import Data.Monoid
 import Data.Set (Set)
 import Data.Text (Text)
 
 
 type Bag = []
 
-type IdMap = IntMap
-
 type PlayerRef = Id
 type ObjectRef = (ZoneRef, Id)
 
 
 -- | Current game situation.
 data World = World
-  { _players       :: IdMap Player
+  { _players       :: IdList Player
   , _activePlayer  :: PlayerRef
   , _activeStep    :: Step
   , _time          :: Timestamp