Split Dodge.Base

src/Dodge/Item/Equipment/Booster.hs

@@ -9,6 +9,7 @@ import Geometry
 import qualified IntMapHelp as IM
 import Picture
 import ShapePicture
+import ListHelp (safeHead)
 --import Shape
 
 import Data.Maybe

src/Dodge/Item/Weapon/BatteryGuns.hs

@@ -445,9 +445,9 @@ dualRayAt bt itid w col dam phasev pos dir = basicBeamAt itid w col dam phasev p
     & bmType .~ bt
 
 aTractorBeam :: Item -> Creature -> World -> World
-aTractorBeam _ cr w = w & props . at i ?~ tractorBeamAt i spos outpos dir power
+--aTractorBeam _ cr w = w & props %~  tractorBeamAt i spos outpos dir power
+aTractorBeam _ cr w = w & plNew props pjID (tractorBeamAt spos outpos dir power)
   where 
-    i = newProjectileKey w
     cpos = _crPos cr
     spos = cpos +.+ (_crRad cr + 10) *.* unitVectorAtAngle dir
     xpos = cpos +.+ 400 *.* unitVectorAtAngle dir
@@ -456,13 +456,13 @@ aTractorBeam _ cr w = w & props . at i ?~ tractorBeamAt i spos outpos dir power
         $ wallsAlongLine cpos xpos w
     power = _attractionPower . _itParams $ _crInv cr IM.! _crInvSel cr
 
-tractorBeamAt :: Int -> Point2 -> Point2 -> Float -> Point2 -> Prop
-tractorBeamAt i pos outpos dir power = ProjectileTimed
+tractorBeamAt :: Point2 -> Point2 -> Float -> Point2 -> Prop
+tractorBeamAt pos outpos dir power = ProjectileTimed
     { _prPos = pos
     , _pjStartPos = outpos
     , _pjVel = d
     , _prDraw = tractorSPic
-    , _pjID = i
+    , _pjID = 0
     , _pjUpdate = updateTractor
     , _pjTime = 10
     }

src/Dodge/Item/Weapon/Grenade.hs

@@ -101,7 +101,7 @@ throwGrenade thePayload cr w = setWp $ removePict $ over props addG w
         }
     j = _crInvSel cr
     removePict = set (creatures . ix n . crInv . ix j . itEquipPict) $ \ _ _ -> (,) emptySH blank
-    i = newProjectileKey w
+    i = IM.newKey $ _props w
     v' = 1 / (fromIntegral fuseTime * _cameraZoom w) *.* rotateV (_cameraRot w) ( _mousePos w)
     v | magV v' > 6 = 6 *.* normalizeV v'
       | otherwise   = v'
@@ -229,7 +229,7 @@ throwRemoteBomb cr w = setLocation
         , _pjID = i
         , _pjUpdate = \_ -> moveRemoteBomb itid 50 i
         }
-    i = newProjectileKey w
+    i = IM.newKey $ _props w
     v' = 0.02 / _cameraZoom w *.* rotateV (_cameraRot w) ( _mousePos w)
     v   | magV v' > 6 = 6 *.* normalizeV v'
         | otherwise   = v'