Cleanup creature picture

src/Dodge/Data.hs

@@ -19,7 +19,6 @@ import Dodge.Creature.State.Data
 import Dodge.Creature.Stance.Data
 import Dodge.Creature.AlertLevel.Data
 import Dodge.Debug.Flag.Data
-import Dodge.Data.Menu
 import Dodge.Data.SoundOrigin
 import Dodge.Data.DamageType
 import Dodge.Config.Data
@@ -88,7 +87,7 @@ data World = World
     , _pathPoints           :: ~(IM.IntMap (IM.IntMap [(Int,Point2)]))
     , _pathInc              :: ~(M.Map Point2 [Point2])
     , _storedLevel          :: Maybe World
-    , _menuLayers           :: [MenuLayer]
+    , _menuLayers           :: [ScreenLayer]
     , _worldState           :: M.Map WorldState Bool
     , _worldTriggers        :: S.Set WorldTrigger
     , _carteDisplay         :: !Bool
@@ -110,6 +109,40 @@ data World = World
     , _radDistortion        :: [(Point2,Point2,Point2,Float)]
     , _gameRooms            :: [GameRoom]
     }
+data OptionScreenFlag = NormalOptions | GameOverOptions
+data ScreenLayer
+    = OptionScreen
+        { _scTitle   :: World -> String
+        , _scOptions :: [MenuOption]
+        , _scDefaultEff :: World -> Maybe World
+        , _scOptionFlag :: OptionScreenFlag
+        }
+    | InputScreen String
+    | TerminalScreen Int [(Int,String)]
+    | WaitScreen
+        { _scWaitMessage :: World -> String
+        , _scWaitTime    :: Int
+        }
+    | DisplayScreen
+        { _scDisplay :: World -> Picture
+        }
+data MenuOption 
+    = Toggle
+        { _moKey    :: Scancode
+        , _moEff    :: World -> Maybe World
+        , _moString :: World -> String
+        }
+    | Toggle2
+        { _moKey1   :: Scancode
+        , _moEff1   :: World -> Maybe World
+        , _moKey2   :: Scancode
+        , _moEff2   :: World -> Maybe World
+        , _moString :: World -> String
+        }
+    | InvisibleToggle
+        { _moKey    :: Scancode
+        , _moEff    :: World -> Maybe World
+        }
 data InventoryMode
     = TopInventory
     | TweakInventory