Reify modifications

2022-07-23 20:53:00 +01:00
parent f0f9751afe
commit 5de837c8cf
8 changed files with 56 additions and 22 deletions
@@ -75,7 +75,9 @@ module Dodge.Data
    , module Dodge.Data.PathGraph
    , module Dodge.Data.Gust
    , module Dodge.Data.Projectile
+    , module Dodge.Data.Modification
    ) where
+import Dodge.Data.Modification
 import Dodge.Data.Projectile
 import Dodge.Data.Gust
 import Dodge.Data.CrGroupParams
@@ -427,21 +429,6 @@ type HitEffect' = Flame
    -> World 
    -> (World,Maybe Flame)

-data Modification
-    = ModIDTimerPoint3Bool
-        { _mdID     :: Int
-        , _mdExternalID :: Int
-        , _mdUpdate :: Modification -> World -> World
-        , _mdTimer  :: Int
-        , _mdPoint3 :: Point3
-        , _mdBool   :: Bool
-        }
-    | ModIDID
-        { _mdID     :: Int
-        , _mdExternalID1 :: Int
-        , _mdExternalID2 :: Int
-        , _mdUpdate :: Modification -> World -> World
-        }
 data Prop 
    = PropZ
        { _prPos :: Point2
@@ -700,7 +687,6 @@ data InPlacement = InPlacement
 makeLenses ''World
 makeLenses ''FloorItem
 makeLenses ''Prop
-makeLenses ''Modification
 makeLenses ''Particle
 makeLenses ''PressPlate
 makeLenses ''Door