Tweak "magnets" that affect bullet movement

src/Dodge/Data/LWorld.hs

@@ -122,7 +122,8 @@ data LWorld = LWorld
     , _doors :: IM.IntMap Door
     , _machines :: IM.IntMap Machine
     , _terminals :: IM.IntMap Terminal
-    , _magnets :: IM.IntMap Magnet
+    , _oldMagnets :: [Magnet]
+    , _magnets :: [Magnet]
     , _blocks :: IM.IntMap Block
     , _coordinates :: IM.IntMap Point2
     , _triggers :: IM.IntMap Bool

src/Dodge/Data/Machine.hs

@@ -50,7 +50,7 @@ data MachineType
     = McStatic
     | McTerminal
     | McSensor Sensor
-    | McTurret Turret
+    | McTurret {_mctTurret :: Turret}
     --deriving (Eq, Show, Read) --, Generic)
     --hderiving (Eq, Show, Read) --Generic, Flat)
 
@@ -63,6 +63,7 @@ data Turret = Turret
     --deriving (Eq, Show, Read) --, Generic)
     --hderiving (Eq, Show, Read) --Generic, Flat)
 
+makeLenses ''MachineType
 makeLenses ''Machine
 makeLenses ''Turret
 makePrisms ''MachineType

src/Dodge/Data/Magnet.hs

@@ -14,14 +14,12 @@ newtype MagnetUpdate = MagnetUpdateTimer Int
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data MagnetBuBu
-    = MagnetBuId
-    | MagnetBuBuCurveAroundField Float Float
+    = MagnetAlign
+    | MagnetDeflect
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Magnet = Magnet
-    { _mgID :: Int
-    , _mgUpdate :: MagnetUpdate
-    , _mgPos :: Point2
+    { _mgPos :: Point2
     , _mgField :: MagnetBuBu
     }
     deriving (Eq, Ord, Show, Read) --Generic, Flat)