Move button data

src/Dodge/Data.hs

@@ -10,6 +10,8 @@ circular imports are probably not a good idea.
 {-# LANGUAGE DerivingStrategies #-}
 module Dodge.Data 
     ( module Dodge.Data
+    , module Dodge.Data.WorldEffect
+    , module Dodge.Data.Button
     , module Dodge.Data.Item.Params
     , module Dodge.Data.Beam
     , module Dodge.Data.Targeting
@@ -68,7 +70,9 @@ module Dodge.Data
     , module Dodge.Data.RadarBlip
     , module Dodge.Data.PathGraph
     ) where
-import  Dodge.Data.Item.Params
+import Dodge.Data.WorldEffect
+import Dodge.Data.Button
+import Dodge.Data.Item.Params
 import Dodge.Data.Beam
 import Dodge.Data.Targeting
 import Dodge.Data.ItEffect
@@ -382,18 +386,6 @@ data Intention = Intention
     , _mvToPoint    :: Maybe Point2
     , _viewPoint    :: Maybe Point2
     }
-data Button = Button 
-    { _btPict   :: Button -> SPic
-    , _btPos    :: Point2
-    , _btRot    :: Float
-    , _btEvent  :: Button -> World -> World
-    , _btID     :: Int
-    , _btText   :: String
-    , _btState  :: ButtonState
-    , _btTermMID :: Maybe Int
-    , _btName   :: String
-    , _btColor  :: Color
-    }
 data TerminalLine
     = TerminalLineDisplay
         {_tlPause :: Int
@@ -407,8 +399,6 @@ data TerminalLine
         {_tlPause :: Int
         ,_tlEffect :: Terminal -> World -> World
         }
-data ButtonState = BtOn | BtOff | BtNoLabel
-  deriving (Eq, Show)
 data PressPlate = PressPlate 
     { _ppPict :: Picture
     , _ppPos :: Point2
@@ -1083,7 +1073,6 @@ makeLenses ''Proj
 makeLenses ''Modification
 makeLenses ''Particle
 makeLenses ''PressPlate
-makeLenses ''Button
 makeLenses ''ActionPlan
 makeLenses ''Impulse
 makeLenses ''Action