Export some more data

Backends/GenericHub.hs

@@ -120,7 +120,7 @@ _GamePlayers f s = case s of
 convertMCom :: Maybe Com -> Todo
 convertMCom mc = case mc of
                      Nothing -> TodoNothing
-                     Just (CAP (AP age turn pid cards _) _) -> TodoAction age turn pid (toList cards)
+                     Just (CAP (AP age turn pid cards gs) _) -> TodoAction age turn pid (toList cards) (toList (allowableActions age pid cards (gs ^. playermap)))
                      Just (CAC (AC age pid cards _ msg) _)  -> TodoCard   age pid (toList cards) msg
 
 extractGameSummary :: GameS -> GameSummary

Startups/Cards.hs

@@ -137,6 +137,7 @@ instance FromJSON Cost where
     parseJSON = withObject "cost" $ \o -> Cost <$> (fmap MS.fromOccurList (o .: "resources"))
                                                <*> o .: "funding"
 
+$(deriveElmDef defaultOptions ''Exchange)
 $(deriveBoth defaultOptions ''CardType)
 $(deriveBoth defaultOptions ''Effect)
 $(deriveBoth defaultOptions ''Condition)

Startups/Exported.hs

@@ -34,7 +34,7 @@ data PlayerStatus = Inactive
                   | InGame GameId GameSummary Todo [Message]
                   deriving (Show, Eq)
 
-data Todo = TodoAction Age Turn PlayerId [Card]
+data Todo = TodoAction Age Turn PlayerId [Card] [(PlayerAction, Exchange, Maybe SpecialInformation)]
           | TodoCard   Age PlayerId [Card] Message
           | TodoNothing
           deriving (Show, Eq)

Startups/GameTypes.hs

@@ -24,7 +24,7 @@ import Control.Monad.Except
 import Data.List.NonEmpty
 import System.Random
 import Data.Aeson
-import Data.Aeson.TH
+import Elm.Derive
 
 type PlayerId = T.Text
 
@@ -62,9 +62,14 @@ neighbor NRight = pNeighborhood . _2
 type Message = PrettyDoc
 
 data PlayerAction = PlayerAction ActionType Card
-                  deriving Eq
+                  deriving (Show, Eq)
 data ActionType = Play | Drop | BuildCompany
-                deriving Eq
+                deriving (Show, Eq)
+
+-- | A data structure that represents special capabilities that are used
+-- -- when playing a card.
+data SpecialInformation = UseOpportunity
+                        deriving (Show, Eq)
 
 _NonEmpty :: Prism' [a] (NonEmpty a)
 _NonEmpty = prism' toList nonEmpty
@@ -137,9 +142,10 @@ instance PrettyE PlayerAction where
                      Drop         -> "dropped"
                      BuildCompany -> "increase the company stage"
 
-$(deriveJSON baseOptions ''PlayerState)
-$(deriveJSON baseOptions ''PlayerAction)
-$(deriveJSON baseOptions ''ActionType)
+$(deriveBoth baseOptions ''PlayerState)
+$(deriveBoth baseOptions ''PlayerAction)
+$(deriveBoth baseOptions ''ActionType)
+$(deriveBoth baseOptions ''SpecialInformation)
 
 instance ToJSON GameState where
     toJSON (GameState pm dp _) = object [ "playermap" .= pm

Startups/Utils.hs

@@ -156,11 +156,6 @@ getCardVictory pid card stt = card ^.. cEffect . traverse . _AddVictory . to com
     where
         computeVictory (vtype, vpoints, vcond) = (vtype, countConditionTrigger pid vcond stt * vpoints)
 
--- | A data structure that represents special capabilities that are used
--- when playing a card.
-data SpecialInformation = UseOpportunity
-                        deriving Eq
-
 -- | Gets the list of cheap resources, for each neighbor
 getCheapExchanges :: PlayerState -> M.Map Neighbor (S.Set Resource)
 getCheapExchanges ps = M.fromListWith (<>) $ do