From a8d2a603be7e6faf10d970be7dc8264936f95634 Mon Sep 17 00:00:00 2001 From: Jesse McDonald Date: Sat, 26 Jul 2014 17:07:47 -0500 Subject: [PATCH] simplify imports in Waterdeep.Types --- src/Waterdeep/Types.hs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/Waterdeep/Types.hs b/src/Waterdeep/Types.hs index b92937a..887b31c 100644 --- a/src/Waterdeep/Types.hs +++ b/src/Waterdeep/Types.hs @@ -111,8 +111,6 @@ import Control.Monad.State.Class import Control.Monad.Trans import Control.Monad.Trans.Maybe (MaybeT, runMaybeT) import Control.Monad.Trans.State (StateT, runStateT) -import Data.IntMap (IntMap) -import Data.Map (Map) import Data.Maybe import Data.Monoid import Lens.Family2 @@ -123,7 +121,6 @@ import Lens.Family2.Unchecked (lens) import System.Random (StdGen) import qualified Data.IntMap as IM -import qualified Data.Map as M import qualified Data.MultiSet as MS import qualified System.Random as R @@ -200,7 +197,7 @@ data BuildingState = data WaterdeepState = WaterdeepState - { _gamePlayerStates :: IntMap PlayerState + { _gamePlayerStates :: IM.IntMap PlayerState , _gameNumberOfPlayers :: Int , _gameFirstPlayer :: PlayerID , _gameCurrentRound :: Int @@ -214,9 +211,9 @@ data WaterdeepState = , _gameIntrigueDiscard :: [IntrigueCard] , _gameBuildingDeck :: [Building] , _gameBuildingDiscard :: [Building] - , _gameBuildersHall :: IntMap BuildingState - , _gameBuildings :: IntMap BuildingState - , _gameWaterdeepHarbor :: IntMap BuildingState + , _gameBuildersHall :: IM.IntMap BuildingState + , _gameBuildings :: IM.IntMap BuildingState + , _gameWaterdeepHarbor :: IM.IntMap BuildingState , _gameReassigningAgents :: Bool , _gameStdGen :: StdGen }