Commit before moving targeting

src/Dodge/Data/CWorld.hs

@@ -17,6 +17,7 @@ import Data.Aeson.TH
 import Dodge.GameRoom
 import Geometry.ConvexPoly
 import Dodge.Data.CamPos
+import qualified Data.IntSet as IS
 
 data CWorld = CWorld
     { _lWorld :: LWorld
@@ -25,6 +26,7 @@ data CWorld = CWorld
     , _cClock :: Int
     , _pastWorlds :: [LWorld]
     , _timeFlow :: TimeFlowStatus
+    , _seenWalls :: IS.IntSet
     }
 
 data TimeFlowStatus

src/Dodge/Data/Item.hs

@@ -46,7 +46,6 @@ data Item = Item
     , _itCurseStatus :: CurseStatus
     , _itTweaks :: ItemTweaks
     , _itScope :: Scope
-    --, _itValue :: ItemValue
     , _itParams :: ItemParams
     }
     --deriving (Eq, Show, Read) --Generic, Flat)

src/Dodge/Data/Item/HeldUse.hs

@@ -9,6 +9,7 @@ import Data.Aeson
 import Data.Aeson.TH
 import Dodge.Data.CamouflageStatus
 import Dodge.Data.Item.Combine
+import Control.Lens
 
 data Huse
     = HeldDoNothing
@@ -35,13 +36,14 @@ data Cuse
 
 data Euse
     = EDoNothing
-    | EDetector Detector
+    | EDetector {_euseDetector :: Detector}
     | EMagShield
     | EWristShield
     | EHeadLamp
-    | ECamouflage CamouflageStatus
+    | ECamouflage {_euseCamouflageStatus :: CamouflageStatus}
     | EonWristShield
     | EoffWristShield
+    | EFuelSource {_euseFuelAmount :: Int, _euseFuelMax :: Int}
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Luse
@@ -93,6 +95,7 @@ data HeldMod
     | BangConeMod
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
+makeLenses ''Euse
 deriveJSON defaultOptions ''Cuse
 deriveJSON defaultOptions ''HeldMod
 deriveJSON defaultOptions ''Euse

src/Dodge/Data/LWorld.hs

@@ -126,7 +126,6 @@ data LWorld = LWorld
     , _linearShockwaves :: IM.IntMap LinearShockwave
     , _tractorBeams :: [TractorBeam]
     , _walls :: IM.IntMap Wall
-    , _seenWalls :: IS.IntSet
     , _wallDamages :: IM.IntMap [Damage]
     , _doors :: IM.IntMap Door
     , _machines :: IM.IntMap Machine

src/Dodge/Data/Laser.hs

@@ -26,9 +26,9 @@ data LaserStart = LaserStart
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Laser = Laser
-    { _laColor :: Color
-    , _laPoints :: [Point2]
-    , _laType :: LaserType
+    { _lzColor :: Color
+    , _lzPoints :: [Point2]
+    , _lzType :: LaserType
     }
     deriving (Eq, Ord, Show, Read) --Generic, Flat)