tA/evac
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

betterish card stack stuff

Browse Source
This commit is contained in:
Shaun Kerr 2019-05-21 12:12:23 +12:00
parent 474696d9bd
commit c856496ffc
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Connect.hs
View File

@ -24,7 +24,7 @@ import Players
-- | otherwise = oldBoardState -- | otherwise = oldBoardState
-- { bsGameLog = (bsGameLog oldBoardState) -- { bsGameLog = (bsGameLog oldBoardState)
-- ++ [ Left (playerName p oldBoardState) ++ " announced " ++ (getCardLine l) ++ ", moved to active" ] -- ++ [ Left (playerName p oldBoardState) ++ " announced " ++ (getCardLine l) ++ ", moved to active" ]
-- , -- , bsCardStack
-- TODO -- TODO
-- * manipulate the card stack after writing it -- * manipulate the card stack after writing it

2
Init.hs
View File

@ -30,7 +30,7 @@ initBS = BoardState
] ]
, bsActivePlayers = [1,2] , bsActivePlayers = [1,2]
, bsPriorityPlayer = 1 , bsPriorityPlayer = 1
, bsCardStack = [] , bsActiveLine = Nothing
, bsCardLib = gCardLib , bsCardLib = gCardLib
, bsGameLog = [] , bsGameLog = []
} }

10
Types.hs
View File

@ -12,7 +12,13 @@ data CardSym = S01_Shinji | S02_Asuka | S03_Rei | S04_Misato | S05_Ritsuko | S06
type CardLib = [(CardSym, CardInfo)] type CardLib = [(CardSym, CardInfo)]
type Downed = [MainCharacter] type Downed = [MainCharacter]
type PutCards = [(Either MainCharacter MainEva, CardSym)] type PutCards = [(Either MainCharacter MainEva, CardSym)]
type CardStack = [(PlayerId, CardSym)] type ActiveLine = Maybe LineMeta
data LineMeta = LineMeta
{ cmCardSym :: CardSym
, cmOwner :: PlayerId
, cmTarget :: MainCharacter
, cmLineMark :: LineMark
}
data NeoTokyo = NeoTokyo data NeoTokyo = NeoTokyo
{ ntGroups :: Groups { ntGroups :: Groups
, ntEvas :: Evas , ntEvas :: Evas
@ -29,7 +35,7 @@ data BoardState = BoardState
, bsPlayerLib :: PlayerLib , bsPlayerLib :: PlayerLib
, bsActivePlayers :: ActivePlayers , bsActivePlayers :: ActivePlayers
, bsPriorityPlayer :: PriorityPlayer , bsPriorityPlayer :: PriorityPlayer
, bsCardStack :: CardStack , bsActiveLine :: ActiveLine
, bsCardLib :: CardLib , bsCardLib :: CardLib
, bsGameLog :: GameLog , bsGameLog :: GameLog
} }