nybble
/
waterdeep
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

create BuilderState for in-play buildings and Builder's Hall

This commit is contained in:
Jesse D. McDonald 2014-04-02 19:34:09 -05:00
parent a3b6810e0e
commit fdca9de867
3 changed files with 48 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Test.hs
View File

@ -53,35 +53,35 @@ b1 = Building { _buildingCost = 6
, _buildingTitle = "Monastary"
, _buildingAction = Group [TakeResource [Cleric], TakeResource [Cleric]]
, _buildingOwnerAction = TakeResource [Cleric]
, _buildingAccumulation = NoAccumulation
, _buildingAccumType = NoAccumulation
}
b2 = Building { _buildingCost = 4
, _buildingTitle = "Training Hall"
, _buildingAction = Group [TakeResource [Fighter], TakeResource [Fighter]]
, _buildingOwnerAction = TakeResource [Fighter]
, _buildingAccumulation = NoAccumulation
, _buildingAccumType = NoAccumulation
}
b3 = Building { _buildingCost = 4
, _buildingTitle = "Prison Yard"
, _buildingAction = Group [TakeResource [Rogue], TakeResource [Rogue]]
, _buildingOwnerAction = TakeResource [Rogue]
, _buildingAccumulation = NoAccumulation
, _buildingAccumType = NoAccumulation
}
b4 = Building { _buildingCost = 6
, _buildingTitle = "Wizard School"
, _buildingAction = Group [TakeResource [Wizard], TakeResource [Wizard]]
, _buildingOwnerAction = TakeResource [Wizard]
, _buildingAccumulation = NoAccumulation
, _buildingAccumType = NoAccumulation
}
b5 = Building { _buildingCost = 4
, _buildingTitle = "Gold Mine"
, _buildingAction = Group $ replicate 4 $ TakeResource [Gold]
, _buildingOwnerAction = Group $ replicate 2 $ TakeResource [Gold]
, _buildingAccumulation = NoAccumulation
, _buildingAccumType = NoAccumulation
}
printWaterdeep :: WaterdeepState -> IO ()
@ -99,8 +99,11 @@ printWaterdeep w = do
putStrLn (" " ++ (q ^. questTitle))
putStrLn ""
putStrLn "Builder's Hall:"
forM_ (w ^. gameBuildersHall) $ \(b,agents,pts) -> do
printf " %s (%d gold -> %d points)\n" (b ^. buildingTitle) (b ^. buildingCost) pts
forM_ (w ^. gameBuildersHall) $ \b -> do
printf " %s (%d gold -> %d points)\n"
(b ^. building . buildingTitle)
(b ^. building . buildingCost)
(b ^. buildingAccumulation)
putStrLn ""
forM_ ps $ \p -> do
putStrLn ((p ^. playerName) ++ "'s State:")

21
src/Waterdeep/Logic.hs
View File

@ -51,7 +51,7 @@ newGame players quests intrigues buildings
, _gameIntrigueDiscard = []
, _gameBuildingDeck = buildings'
, _gameBuildingDiscard = []
, _gameBasicBuildings = map (\b -> (b, [])) basicBuildings
, _gameBasicBuildings = map (newBuildingState noPlayerID) basicBuildings
, _gameBuildersHall = []
, _gameAdvancedBuildings = []
, _gameWaterdeepHarbor = ([], [], [])
@ -92,6 +92,15 @@ newPlayerState i name faction lord =
, _playerHasAmbassador = False
}
newBuildingState :: PlayerID -> Building -> BuildingState
newBuildingState p b =
BuildingState
{ _building = b
, _buildingOwner = p
, _buildingAgents = []
, _buildingAccumulation = 0
}
basicBuildings :: [Building]
basicBuildings = []
@ -108,10 +117,10 @@ beginRound :: Int -> Waterdeep ()
beginRound round = do
gameCurrentRound .= round
gameCurrentPlayer <~ use gameFirstPlayer
gameBasicBuildings . traverse . _2 .= []
gameAdvancedBuildings . traverse . _2 .= []
gameBuildersHall . traverse . _2 .= []
gameBuildersHall . traverse . _3 += 1
gameBasicBuildings . traverse . buildingAgents .= []
gameAdvancedBuildings . traverse . buildingAgents .= []
gameBuildersHall . traverse . buildingAgents .= []
gameBuildersHall . traverse . buildingAccumulation += 1
players <- IM.size <$> use gamePlayers
forM_ [1..players] $ \p -> do
qs <- gamePlayer p . playerUsedPlotQuests <<.= []
@ -214,5 +223,5 @@ restockBuildersHall = do
case mb of
Nothing -> return ()
Just b -> do
gameBuildersHall %= (++ [(b, [], 0)])
gameBuildersHall %= (++ [newBuildingState noPlayerID b])
restockBuildersHall

28
src/Waterdeep/Types.hs
View File

@ -9,6 +9,7 @@ module Waterdeep.Types
, Quest(..)
, IntrigueCard(..)
, PlayerState(..)
, BuildingState(..)
, WaterdeepState(..)
, Resource(..)
, QuestType(..)
@ -28,7 +29,7 @@ module Waterdeep.Types
, buildingTitle
, buildingAction
, buildingOwnerAction
, buildingAccumulation
, buildingAccumType
, questType
, questTitle
, questQuote
@ -52,6 +53,10 @@ module Waterdeep.Types
, playerAgentsInPool
, playerHasLieutenant
, playerHasAmbassador
, building
, buildingAgents
, buildingOwner
, buildingAccumulation
, gamePlayers
, gameFirstPlayer
, gameCurrentRound
@ -70,6 +75,7 @@ module Waterdeep.Types
, gameWaterdeepHarbor
, gameStdGen
, gamePlayer
, noPlayerID
) where
import Control.Lens
@ -98,7 +104,7 @@ data Building =
, _buildingTitle :: String
, _buildingAction :: GameAction
, _buildingOwnerAction :: GameAction
, _buildingAccumulation :: AccumulationType
, _buildingAccumType :: AccumulationType
} deriving (Show)
data Quest =
@ -136,6 +142,14 @@ data PlayerState =
, _playerHasAmbassador :: Bool
} deriving (Show)
data BuildingState =
BuildingState
{ _building :: Building
, _buildingAgents :: [PlayerID]
, _buildingOwner :: PlayerID
, _buildingAccumulation :: Int
} deriving (Show)
data WaterdeepState =
WaterdeepState
{ _gamePlayers :: IntMap PlayerState
@ -150,9 +164,9 @@ data WaterdeepState =
, _gameIntrigueDiscard :: [IntrigueCard]
, _gameBuildingDeck :: [Building]
, _gameBuildingDiscard :: [Building]
, _gameBasicBuildings :: [(Building, [PlayerID])]
, _gameBuildersHall :: [(Building, [PlayerID], Int)]
, _gameAdvancedBuildings :: [(Building, [PlayerID], Int, Int)]
, _gameBasicBuildings :: [BuildingState]
, _gameBuildersHall :: [BuildingState]
, _gameAdvancedBuildings :: [BuildingState]
, _gameWaterdeepHarbor :: ([PlayerID], [PlayerID], [PlayerID])
, _gameStdGen :: StdGen
} deriving (Show)
@ -237,12 +251,16 @@ makeLenses ''Building
makeLenses ''Quest
makeLenses ''IntrigueCard
makeLenses ''PlayerState
makeLenses ''BuildingState
makeLenses ''WaterdeepState
gamePlayer :: PlayerID -> Lens' WaterdeepState PlayerState
gamePlayer n = lens (\w -> w ^. gamePlayers.singular (ix n))
(\w p -> w & gamePlayers.singular (ix n) .~ p)
noPlayerID :: PlayerID
noPlayerID = 0
instance Eq Faction where
a == b = a^.factionColor == b^.factionColor