Commit before potential Door refactor

src/Dodge/Save.hs

@@ -3,44 +3,42 @@ module Dodge.Save (
     loadSaveSlot,
     doQuicksave,
     doQuickload,
---    saveLevelStartSlot,
+    --    saveLevelStartSlot,
     writeSaveSlot,
     readSaveSlot,
     reloadLevelStart,
 ) where
 
-import Dodge.Zoning.Pathing
-import qualified Data.Vector.Unboxed as UV
-import Control.Monad
-import Data.Maybe
-import Dodge.WorldLoad
 --import Dodge.Path.Translate
 --import Data.Graph.Inductive (labEdges, labNodes)
 --import Dodge.Zoning.Pathing
-import Data.Foldable
-import Dodge.Wall.Zone
-import Dodge.Concurrent
+
 import Control.Lens
-import Dodge.Data.SaveSlot
+import Control.Monad
 import Data.Aeson
 --import qualified Data.Aeson.Encode.Pretty as AEP
 import qualified Data.ByteString.Lazy as BS
+import Data.Foldable
+import Data.Maybe
+import qualified Data.Vector.Unboxed as UV
+import Dodge.Concurrent
+import Dodge.Data.SaveSlot
 --import qualified Data.ByteString as BSS
 import Dodge.Data.Universe
+import Dodge.Wall.Zone
+import Dodge.WorldLoad
+import Dodge.Zoning.Pathing
 --import qualified Data.Set as S
 import System.Directory
---import Data.Sequence ((|>))
 
+--import Data.Sequence ((|>))
 
 writeSaveSlot :: SaveSlot -> Universe -> IO (Universe -> Maybe Universe)
 writeSaveSlot ss u = do
     putStrLn $ "Saving " ++ saveSlotPath ss
     createDirectoryIfMissing True "generated/saves"
-    BS.writeFile (saveSlotPath ss) $
-        --AEP.encodePretty'
-        --    (AEP.Config (AEP.Spaces 2) compare AEP.Generic False)
-        encode
-            (u ^. uvWorld . cWorld)
+    BS.writeFile (saveSlotPath ss) $ encode (u ^. uvWorld . cWorld)
+    --AEP.encodePretty' (AEP.Config (AEP.Spaces 2) compare AEP.Generic False)
     return Just
 
 readSaveSlot :: SaveSlot -> IO (Universe -> Maybe Universe)
@@ -49,23 +47,17 @@ readSaveSlot ss = do
     unless fExists $ error "Tried to read non-existant save file"
     mcw <- decodeFileStrict $ saveSlotPath ss
     flip (maybe (error "Tried to read incorrectly encoded save file")) mcw $ \cw -> do
-        let inodes =  cw ^. incNode
-        return $ \uv -> Just 
-            $ uv & uvWorld . cWorld .~ cw
+        let inodes = cw ^. incNode
+        return $ \uv ->
+            Just $
+                uv & uvWorld . cWorld .~ cw
                     & uvWorld %~ initWallZoning
-                    & uvWorld . incNodeZoning 
-                        .~ UV.ifoldl' (\m i p -> zonePn (i,p) m) mempty inodes
-                    & uvWorld . incEdgeZoning 
-                        .~ foldl' (flip (zoneIncPe inodes)) mempty 
-                            (cw ^. incEdges)
---                    & uvWorld . pnZoning .~ foldl' (flip zonePn) mempty 
---                        (labNodes $ path uv)
---                    & uvWorld . peZoning .~ foldl' (flip zonePe) mempty 
---                        (map fromEdgeTuple $ labEdges $ path uv)
+                    & uvWorld . incNodeZoning
+                        .~ UV.ifoldl' (\m i p -> zonePn (i, p) m) mempty inodes
+                    & uvWorld . incEdgeZoning
+                        .~ foldl' (flip (zoneIncPe inodes)) mempty (cw ^. incEdges)
                     & uvScreenLayers .~ []
                     & postUniverseLoadSideEffect
---  where
---    path uv = uv ^. uvWorld . cWorld . pathGraph
 
 saveSlotPath :: SaveSlot -> String
 saveSlotPath (SaveSlotNum i) = "generated/saves/" ++ show i
@@ -74,17 +66,18 @@ saveSlotPath (LevelStartSlot i) = "generated/saves/LevelStart" ++ show i
 
 saveWorldInSlot :: SaveSlot -> Universe -> Universe
 saveWorldInSlot slot u = u & addSideEffect (writeSaveSlot slot u) "SAVING"
-    
+
 reloadLevelStart :: Universe -> Universe
 reloadLevelStart = loadSaveSlot (LevelStartSlot 0)
 
 loadSaveSlot :: SaveSlot -> Universe -> Universe
-loadSaveSlot slot = blockingLoad ("DESERIALISING "++ show slot) $ readSaveSlot slot
+loadSaveSlot slot = blockingLoad ("DESERIALISING " ++ show slot) $ readSaveSlot slot
 
 doQuicksave :: Universe -> Universe
-doQuicksave u = u
-    & uvRAMSave ?~ _uvWorld u
-    & saveWorldInSlot QuicksaveSlot
+doQuicksave u =
+    u
+        & uvRAMSave ?~ _uvWorld u
+        & saveWorldInSlot QuicksaveSlot
 
 doQuickload :: Universe -> Universe
 doQuickload u = fromMaybe (loadSaveSlot QuicksaveSlot u) $ do