Commit on return after gap

src/Dodge/Data/LWorld.hs

@@ -30,7 +30,7 @@ module Dodge.Data.LWorld (
     module Dodge.Data.Machine,
     module Dodge.Data.Magnet,
     module Dodge.Data.Modification,
---    module Dodge.Data.PathGraph,
+    --    module Dodge.Data.PathGraph,
     module Dodge.Data.PosEvent,
     module Dodge.Data.PressPlate,
     module Dodge.Data.Projectile,
@@ -46,10 +46,12 @@ module Dodge.Data.LWorld (
     module Dodge.Data.WorldEffect,
 ) where
 
-import NewInt
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
+--import Dodge.Data.PathGraph
+
+import qualified Data.Map.Strict as M
 import Dodge.Data.Beam
 import Dodge.Data.Block
 import Dodge.Data.Bounds
@@ -75,7 +77,6 @@ import Dodge.Data.LinearShockwave
 import Dodge.Data.Machine
 import Dodge.Data.Magnet
 import Dodge.Data.Modification
---import Dodge.Data.PathGraph
 import Dodge.Data.PosEvent
 import Dodge.Data.PressPlate
 import Dodge.Data.Projectile
@@ -91,8 +92,8 @@ import Dodge.Data.Wall
 import Dodge.Data.WorldEffect
 import Geometry.Data
 import qualified IntMapHelp as IM
+import NewInt
 import Picture.Data
-import qualified Data.Map.Strict as M
 
 data LWorld = LWorld
     { _creatures :: IM.IntMap Creature
@@ -102,20 +103,21 @@ data LWorld = LWorld
     , _gusts :: IM.IntMap Gust
     , _props :: IM.IntMap Prop
     , _projectiles :: IM.IntMap Projectile
---    , _instantBullets :: [Bullet]
-    , _bullets :: [Bullet]
+    , --    , _instantBullets :: [Bullet]
+      _bullets :: [Bullet]
     , _radarSweeps :: [RadarSweep]
     , _energyBalls :: [EnergyBall]
     , _posEvents :: [PosEvent]
     , _flames :: [Flame]
     , _sparks :: [Spark]
     , _radarBlips :: [RadarBlip]
-    , _flares :: Picture  -- picture drawn for one frame
+    , _flares :: Picture -- picture drawn for one frame
     , _teslaArcs :: [TeslaArc]
+    , _arcNode :: M.Map ArcNodeType Int
     , _shockwaves :: [Shockwave]
     , _lasers :: [Laser]
---    , _lasersToDraw :: [Laser]
-    , _linearShockwaves :: IM.IntMap LinearShockwave
+    , --    , _lasersToDraw :: [Laser]
+      _linearShockwaves :: IM.IntMap LinearShockwave
     , _tractorBeams :: [TractorBeam]
     , _walls :: IM.IntMap Wall
     , _wallDamages :: IM.IntMap [Damage]
@@ -146,6 +148,7 @@ data LWorld = LWorld
     , _hotkeys :: M.Map Hotkey (NewInt ItmInt)
     , _imHotkeys :: NewIntMap ItmInt Hotkey
     }
+
 --data WorldBeams = WorldBeams
 --    { _blockingBeams :: [Beam]
 --    , _lightBeams :: [Beam]
@@ -153,11 +156,28 @@ data LWorld = LWorld
 --    , _electronBeams :: [Beam]
 --    }
 
+data ArcNodeType
+    = WallArcNode
+        { _wanPos :: Point2
+        , _wanID :: Int
+        }
+    | CrArcNode
+        { _canID :: Int
+        }
+    deriving (Eq, Show, Read, Ord) --Generic, Flat)
+
+makeLenses ''ArcNodeType
 makeLenses ''LWorld
+deriveJSON defaultOptions ''ArcNodeType
+
+instance ToJSONKey ArcNodeType
+
+instance FromJSONKey ArcNodeType
+
 --makeLenses ''WorldBeams
 concat
     <$> mapM
         (deriveJSON defaultOptions)
-        [-- ''WorldBeams
-         ''LWorld
+        [ -- ''WorldBeams
+          ''LWorld
         ]