Commit before placement refactor

2021-09-28 14:55:22 +01:00
parent 751000636e
commit b8af2ce9d8
16 changed files with 134 additions and 331 deletions
@@ -27,7 +27,6 @@ import Picture.Data
 import ShapePicture
 import Geometry.Data
 import Sound.Data
-import qualified DoubleStack as DS
 import Dodge.GameRoom
 import Color
 import Shape
@@ -374,8 +373,6 @@ data Item
        , _itEffect     :: ItEffect
        , _itHammer     :: HammerPosition
        , _itScroll     :: Float -> Creature -> Item -> Item
--        , _itScrollUp   :: Int -> World -> World
--        , _itScrollDown :: Int -> World -> World
        , _itAimStance  :: AimStance
        }
     | NoItem
@@ -482,6 +479,13 @@ data Prop
        , _pjID :: Int
        , _pjUpdate :: Prop -> World -> World
        }
+    | RecursiveProp
+        { _pjPos    :: Point2
+        , _pjID     :: Int
+        , _pjDraw   :: Prop -> SPic
+        , _pjUpdate :: Prop -> World -> World
+        , _pjProp   :: Prop
+        }
    | ProjectileTimed
        { _pjPos :: Point2
        , _pjStartPos :: Point2
@@ -497,6 +501,7 @@ data Prop
        , _pjRot :: Float
        , _pjUpdate :: Prop -> World -> World
        , _prDraw :: Prop -> SPic
+        , _prToggle :: Bool
        }
    | Shell 
        { _pjPos :: Point2
@@ -559,16 +564,6 @@ data Wall
        , _blHP :: Int
        , _wlIsSeeThrough :: Bool
        }
-    | Door 
-        { _wlLine :: (Point2,Point2) 
-        , _wlID :: Int 
-        , _doorMech :: World -> World
-        , _wlColor :: Color
-        , _wlSeen :: Bool
-        , _wlIsSeeThrough :: Bool
-        , _doorPathable :: Bool
-        , _drPositions :: DS.DS (Point2,Point2)
-        }
    | Block 
        { _wlLine :: (Point2,Point2)
        , _wlID :: Int