diff options
author | Griffin Smith <root@gws.fyi> | 2019-11-29T19·33-0500 |
---|---|---|
committer | Griffin Smith <root@gws.fyi> | 2019-11-29T19·33-0500 |
commit | f37d0f75c0b4a77c8e35192c24c6fdb6f2bc4619 (patch) | |
tree | 0af3e636f1a2dcb0a0e179895e4a41f2fab45f69 /src/Xanthous/Entities.hs | |
parent | 2f2e5a0b684f886a7585161d30e8cda962c7eefb (diff) |
Implement saving+loading the game
Implement ToJSON and FromJSON for all of the various pieces of the game state, and add a pair of functions saveGame/loadGame implementing a prism to save the game as zlib-compressed JSON. To test this, there's now Arbitrary, CoArbitrary, and Function instances for all the parts of the game state - to get around circular imports with the concrete entities this unfortunately is happening via orphan instances, plus an hs-boot file to break a circular import that was just a little too hard to remove by moving things around. Ugh.
Diffstat (limited to 'src/Xanthous/Entities.hs')
-rw-r--r-- | src/Xanthous/Entities.hs | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/Xanthous/Entities.hs b/src/Xanthous/Entities.hs index ccd3ae42bfc3..7f4efb71d17e 100644 --- a/src/Xanthous/Entities.hs +++ b/src/Xanthous/Entities.hs @@ -130,14 +130,7 @@ instance FromJSON EntityChar where parseJSON (String (chr :< Empty)) = pure $ EntityChar chr Vty.defAttr parseJSON (Object o) = do (EntityChar _char _) <- o .: "char" - _style <- o .:? "style" >>= \case - Just styleO -> do - let attrStyle = Vty.Default -- TODO - attrURL = Vty.Default - attrForeColor <- styleO .:? "foreground" .!= Vty.Default - attrBackColor <- styleO .:? "background" .!= Vty.Default - pure Vty.Attr {..} - Nothing -> pure Vty.defAttr + _style <- o .:? "style" .!= Vty.defAttr pure EntityChar {..} parseJSON _ = fail "Invalid type, expected string or object" @@ -146,10 +139,7 @@ instance ToJSON EntityChar where | styl == Vty.defAttr = String $ chr <| Empty | otherwise = object [ "char" .= chr - , "style" .= object - [ "foreground" .= Vty.attrForeColor styl - , "background" .= Vty.attrBackColor styl - ] + , "style" .= styl ] instance Draw EntityChar where |