Cleanup

src/Dodge/Data.hs

@@ -20,7 +20,6 @@ import Dodge.Config.Data
 import Dodge.Config.KeyConfig
 import Dodge.Item.Attachment.Data
 import Dodge.Item.Data
-import Dodge.World.Trigger.Data
 import Dodge.Bounds
 import Data.Preload
 import Picture.Data
@@ -82,7 +81,7 @@ data World = World
     , _storedLevel          :: Maybe World
     , _quicksaveLevel       :: Maybe World
     , _menuLayers           :: [ScreenLayer]
-    , _worldState           :: M.Map WorldState Bool
+--    , _worldState           :: M.Map WorldState Bool
     , _worldTriggers        :: S.Set WorldTrigger
     , _carteDisplay         :: !Bool
     , _carteCenter          :: !Point2
@@ -236,10 +235,9 @@ data CrMvType
         , _mvTurnJit    :: Float
         , _mvAimSpeed   :: Float -> Float
         }
-data WorldState 
-    = DoorNumOpen Int 
-    | DoorNumOpening Int
-    | CrNumAlive Int
+data WorldTrigger
+    = ResetLevel Int
+    | GameOver
   deriving (Eq,Ord)
 data Button = Button 
     { _btPict :: Button -> SPic