Cleanup

src/Dodge/Creature.hs.orig

@@ -37,7 +37,7 @@ import qualified Data.Map as M
 import Foreign.ForeignPtr
 import Control.Concurrent
 
-colouredEnemy col = pictures [color col $ circleSolid 10, circLine 10]
+colouredEnemy col = color col $ circleSolid 10, circLine 10
 
 spawnerCrit :: Creature
 spawnerCrit = defaultCreature
@@ -155,22 +155,15 @@ addArmour = over crInv insarmour
             where i = newKey xs
 
 equipOnTop :: (Creature -> Picture) -> Creature -> Picture
---equipOnTop f cr = onLayer CrLayer $ pictures $ fst (drawEquipment cr) ++ [f cr] ++ snd (drawEquipment cr)
-equipOnTop f cr = pictures [onLayer CrLayer (f cr) , drawEquipment cr]
+equipOnTop f cr = onLayer CrLayer (f cr) <> drawEquipment cr
 
 drawEquipment :: Creature -> Picture
-drawEquipment cr = pictures $ map f $ IM.toList (_crInv cr)
+drawEquipment cr = foldMap f $ IM.toList (_crInv cr)
     where f (i,it) = case it ^? itEquipPict of
                         Just g -> g cr i
                         _      -> blank
 
---drawEquipment :: Creature -> ([Picture],[Picture])
---drawEquipment cr = (map fst p1, map fst p2)
---     where f (k,it) = join $ (it ^? itEquipPict) <*> (pure cr) <*> (pure k)
---           picts = sortBy (compare `on` snd) $ mapMaybe f $ IM.toList (_crInv cr)
---           (p1,p2) = partition (\ x -> snd x < 0) picts
-
-frontArmouredPict = const $ pictures [ color (greyN 0.8) $ circleSolid 20
+frontArmouredPict = const $ fold [ color (greyN 0.8) $ circleSolid 20
                              , color red $ circLine 20
                              ]