Work on cleaning up item effects/attachments etc

src/Dodge/Beam.hs

@@ -40,7 +40,7 @@ splitBeamCombine (p,(a,b,_),(x,y,_))
 teslaBeamCombine :: (Point2,(Point2,Point2,Beam),(Point2,Point2,Beam))
     -> World -> World
 teslaBeamCombine (p,(a,b,bm),(x,y,_)) w
-    = w' & pointerToItem (_itemPositions (_cWorld w) IM.! itid) . itParams . subParams ?~ ip
+    = w' & pointerToItemLocation (_itemLocations (_cWorld w) IM.! itid) . itParams . subParams ?~ ip
   where
     itid = fromJust $ _bmOrigin bm
     dir = argV (normalizeV (b-.-a)+.+normalizeV (y-.-x))

src/Dodge/Combine/Combinations.hs

@@ -1,118 +1,96 @@
 {-# LANGUAGE TupleSections #-}
+
 module Dodge.Combine.Combinations where
---import Geometry
+
-import Dodge.Data
+import Dodge.Data.Item
---import Dodge.WorldEvent.SpawnParticle
+import Dodge.Item
---import Dodge.Particle.HitEffect.ExpireAndDamage
---import Dodge.Particle.Damage
-import Dodge.Item.Equipment
-import Dodge.Item.Craftable
-import Dodge.Item.Weapon
---import Dodge.Combine.Module
---import Dodge.Base
 import LensHelp
 
---import Data.Maybe
+itemCombinations :: [([(ItAmount, ItemBaseType)], Item)]
-
-itemCombinations :: [([(ItAmount,ItemBaseType)],Item)]
 itemCombinations =
-    [ po [CRAFT PIPE, CRAFT HARDWARE]      (bangStick 1)
+    [ po [CRAFT PIPE, CRAFT HARDWARE] (bangStick 1)
-    , po [HELD (BANGSTICK 1), CRAFT TIN]         pistol
+    , po [HELD (BANGSTICK 1), CRAFT TIN] pistol
     , po [HELD PISTOL, CRAFT SPRING] autoPistol
     , po [HELD AUTOPISTOL, cr PLANK] smg
     , po [HELD AUTOPISTOL, cr SPRING] machinePistol
-    , po [HELD (BANGSTICK 1),cr CAN] revolver
+    , po [HELD (BANGSTICK 1), cr CAN] revolver
     , po [HELD REVOLVER, cr SPRING] $ revolverX 1
+    , po [cr CAN, cr HARDWARE] bangCone
+    , po [HELD BANGCONE, cr PLANK] blunderbuss
+    , po [HELD BLUNDERBUSS, cr DRUM] (grapeCannon 1)
+    , --    , po [BANGCONE,PUMP,HARDWARE] $ grenadeLauncher 1
+      --    , po [GRENADELAUNCHER 1,MOTOR,DRUM] $ grenadeLauncher 2
 
-    , po [cr CAN,cr HARDWARE] bangCone
+      --    , po [cr PIPE, cr HARDWARE] (volleyGun 1)
-    , po [HELD BANGCONE,cr PLANK] blunderbuss
+      po [HELD (BANGSTICK 1), cr PLANK] rifle
-    , po [HELD BLUNDERBUSS,cr DRUM] (grapeCannon 1)
+    , po [HELD (BANGSTICK 1), HELD (BANGSTICK 1), HELD (BANGSTICK 1)] (volleyGun 3)
---    , po [BANGCONE,PUMP,HARDWARE] $ grenadeLauncher 1
+    , po [HELD RIFLE, cr TIN] repeater
---    , po [GRENADELAUNCHER 1,MOTOR,DRUM] $ grenadeLauncher 2
+    , po [HELD REPEATER, cr SPRING] autoRifle
-
+    , po [HELD REPEATER, cr CAN] burstRifle
---    , po [cr PIPE, cr HARDWARE] (volleyGun 1)
+    --    , po [BURSTRIFLE,cr SPRING,cr HARDWARE] fastBurstRifle
-    , po [HELD (BANGSTICK 1),cr PLANK] rifle
+    --    , po [FASTBURSTRIFLE,cr SPRING,cr HARDWARE] completeBurstRifle
-    , po [HELD (BANGSTICK 1),HELD (BANGSTICK 1),HELD (BANGSTICK 1)] (volleyGun 3)
+    ]
-    , po [HELD RIFLE,cr TIN]  repeater
+        ++ [ po [cr MOTOR, HELD (VOLLEYGUN i)] $ miniGunX i | i <- [3 .. 10]
-    , po [HELD REPEATER,cr SPRING] autoRifle
+           ]
-    , po [HELD REPEATER,cr CAN] burstRifle
+        ++
---    , po [BURSTRIFLE,cr SPRING,cr HARDWARE] fastBurstRifle
+        --    , po [BANGSTICK 1,cr TUBE]  elephantGun
---    , po [FASTBURSTRIFLE,cr SPRING,cr HARDWARE] completeBurstRifle
+        [ po [HELD AMR, cr PIPE] sniperRifle
-    ] 
+        , po [HELD RIFLE, cr PIPE] amr
-    ++ [ po [cr MOTOR,HELD (VOLLEYGUN i)] $ miniGunX i | i <- [3..10]
+        , po [HELD AMR, cr SPRING] autoAmr
-    ] ++
+        , po [HELD AMR, cr MOTOR] machineGun
---    , po [BANGSTICK 1,cr TUBE]  elephantGun
+        , p [p 2 $ cr TUBE, o $ cr HARDWARE] launcher
-    [ po [HELD AMR,cr PIPE] sniperRifle
+        , p [p 2 $ cr TUBE, o $ HELD LAUNCHER] (launcherX 2)
-    , po [HELD RIFLE,cr PIPE] amr
-    , po [HELD AMR,cr SPRING] autoAmr
-    , po [HELD AMR,cr MOTOR] machineGun
-
-    , p [p 2 $ cr TUBE,o $ cr HARDWARE] launcher
-    , p [p 2 $ cr TUBE,o $ HELD LAUNCHER] (launcherX 2)
-    ] ++ [ p [p 2 $ cr TUBE,o $ HELD (LAUNCHERX i)] (launcherX (i+1)) | i <- [2..9]]
-    ++
-    [ po [cr LIGHTER,cr PUMP,cr CAN]  flameSpitter
-    , po [HELD FLAMESPITTER,cr CAN,cr PUMP] blowTorch
-    , po [HELD FLAMESPITTER,cr DRUM] flameThrower
-    , po [HELD FLAMETHROWER,cr DRUM] flameWall
-    , po [HELD FLAMETHROWER,cr PUMP] flameTorrent
-
-    , p [o $ cr PRISM,o $ cr TRANSFORMER,o $ cr PIPE] lasGun
---    , p [o LASGUN,o $ cr PRISM] lasSway
---    , p [o LASGUN,o $ cr HARDWARE] lasSwing
---    , p [o LASGUN,o PIPE] lasGunPulse
-    , po [HELD LASGUN,HELD LASGUN,cr HARDWARE] dualBeam
---    , p [o LASGUN,o $ cr PIPE, o $ cr PRISM] lasWidePulse
-    , po [HELD LASGUN, cr TRANSFORMER] (lasWide 2)
-    , po [HELD LASGUN,HELD LASGUN,HELD LASGUN,cr HARDWARE] lasCircle
-
-    , p [o $ cr TRANSFORMER,p 2 $ cr CAN] sparkGun
-    , p [o (HELD SPARKGUN),p 2 $ cr PIPE] teslaGun
-
-    , p [o $ cr TELEPORTMODULE,p 2 $ cr MICROCHIP] blinkGun
-    , p [o $ LEFT BLINKER, p 2 $ cr MICROCHIP] unsafeBlinkGun
-
-    , po [cr MAGNET,cr TIN] magShield
-
-    , p [p 2 $ cr PIPE,o $ cr PLATE,o $ cr MOTOR] powerLegs
-
-    , p [p 4 $ cr CAN] plateCraft
-    , p [p 3 $ cr TIN] plateCraft
-    , p [p 2 $ cr DRUM] plateCraft
-
-    , p [p 2 $ cr PLATE] flatShield
-    
-    , po [cr MICROCHIP, cr PRISM] (makeTypeCraft LIGHTSENSOR)
-    , po [cr MICROCHIP, cr MAGNET] (makeTypeCraft SOUNDSENSOR)
-    , po [cr MICROCHIP, cr THERMOMETER] (makeTypeCraft HEATSENSOR)
-
-    , po [cr MICROCHIP, cr TRANSMITTER, cr LIGHTSENSOR] (autoDetector ITEMDETECTOR)
-    , po [cr MICROCHIP, cr TRANSMITTER, cr SOUNDSENSOR] (autoDetector WALLDETECTOR)
-    , po [cr MICROCHIP, cr TRANSMITTER, cr HEATSENSOR]  (autoDetector CREATUREDETECTOR)
-    
-    , po [cr BATTERY, cr LED] torch
-
-    , po [hd TORCH, eq HAT] headLamp
-
-    , po [cr LIGHTER, cr THERMOMETER, cr MICROCHIP] (makeTypeCraft INCENDIARYMODULE)
-    , po [cr TRANSFORMER, cr BATTERY, cr MICROCHIP] (makeTypeCraft STATICMODULE)
-    ] 
-    ++ map (\i -> po [HELD (LASWIDE i),cr TRANSFORMER] $ lasWide (i+1)) [2..9]
---    ++ map (\i -> po [LASGUNWIDE i,cr HARDWARE] $ lasFocus i) [2..10]
-    ++ map (\i -> po [cr PIPE,HELD (BANGSTICK i)] $ bangStick (i+1)) [1..8]
-    ++ map (\i -> po [hd (REVOLVERX i),cr CAN]  $ revolverX (i+1)) [1..5]
-    ++ map (\i -> po [hd (VOLLEYGUN i),HELD (BANGSTICK 1)] $ volleyGun (i+1)) [3..5]
-    ++ map (\i -> po [hd (MINIGUNX i),HELD (BANGSTICK 1)] $ miniGunX (i+1)) [3..15]
-    ++ map (\i -> po [hd (GRAPECANNON i),cr DRUM] $ grapeCannon (i+1)) [1,2,3]
-
-    ++ [ po (_iyBase (_itType it):mtype) $ it & itType . iyModules . ix modtype .~ m
-            | (modtype,is,ms) <- moduleCombinations
-            , it <- is
-            , (mtype,m)  <- ms
         ]
+        ++ [p [p 2 $ cr TUBE, o $ HELD (LAUNCHERX i)] (launcherX (i + 1)) | i <- [2 .. 9]]
+        ++ [ po [cr LIGHTER, cr PUMP, cr CAN] flameSpitter
+           , po [HELD FLAMESPITTER, cr CAN, cr PUMP] blowTorch
+           , po [HELD FLAMESPITTER, cr DRUM] flameThrower
+           , po [HELD FLAMETHROWER, cr DRUM] flameWall
+           , po [HELD FLAMETHROWER, cr PUMP] flameTorrent
+           , p [o $ cr PRISM, o $ cr TRANSFORMER, o $ cr PIPE] lasGun
+           , --    , p [o LASGUN,o $ cr PRISM] lasSway
+             --    , p [o LASGUN,o $ cr HARDWARE] lasSwing
+             --    , p [o LASGUN,o PIPE] lasGunPulse
+             po [HELD LASGUN, HELD LASGUN, cr HARDWARE] dualBeam
+           , --    , p [o LASGUN,o $ cr PIPE, o $ cr PRISM] lasWidePulse
+             po [HELD LASGUN, cr TRANSFORMER] (lasWide 2)
+           , po [HELD LASGUN, HELD LASGUN, HELD LASGUN, cr HARDWARE] lasCircle
+           , p [o $ cr TRANSFORMER, p 2 $ cr CAN] sparkGun
+           , p [o (HELD SPARKGUN), p 2 $ cr PIPE] teslaGun
+           , p [o $ cr TELEPORTMODULE, p 2 $ cr MICROCHIP] blinkGun
+           , p [o $ LEFT BLINKER, p 2 $ cr MICROCHIP] unsafeBlinkGun
+           , po [cr MAGNET, cr TIN] magShield
+           , p [p 2 $ cr PIPE, o $ cr PLATE, o $ cr MOTOR] powerLegs
+           , p [p 4 $ cr CAN] plateCraft
+           , p [p 3 $ cr TIN] plateCraft
+           , p [p 2 $ cr DRUM] plateCraft
+           , p [p 2 $ cr PLATE] flatShield
+           , po [cr MICROCHIP, cr PRISM] (makeTypeCraft LIGHTSENSOR)
+           , po [cr MICROCHIP, cr MAGNET] (makeTypeCraft SOUNDSENSOR)
+           , po [cr MICROCHIP, cr THERMOMETER] (makeTypeCraft HEATSENSOR)
+           , po [cr MICROCHIP, cr TRANSMITTER, cr LIGHTSENSOR] (autoDetector ITEMDETECTOR)
+           , po [cr MICROCHIP, cr TRANSMITTER, cr SOUNDSENSOR] (autoDetector WALLDETECTOR)
+           , po [cr MICROCHIP, cr TRANSMITTER, cr HEATSENSOR] (autoDetector CREATUREDETECTOR)
+           , po [cr BATTERY, cr LED] torch
+           , po [hd TORCH, eq HAT] headLamp
+           , po [cr LIGHTER, cr THERMOMETER, cr MICROCHIP] (makeTypeCraft INCENDIARYMODULE)
+           , po [cr TRANSFORMER, cr BATTERY, cr MICROCHIP] (makeTypeCraft STATICMODULE)
+           ]
+        ++ map (\i -> po [HELD (LASWIDE i), cr TRANSFORMER] $ lasWide (i + 1)) [2 .. 9]
+        --    ++ map (\i -> po [LASGUNWIDE i,cr HARDWARE] $ lasFocus i) [2..10]
+        ++ map (\i -> po [cr PIPE, HELD (BANGSTICK i)] $ bangStick (i + 1)) [1 .. 8]
+        ++ map (\i -> po [hd (REVOLVERX i), cr CAN] $ revolverX (i + 1)) [1 .. 5]
+        ++ map (\i -> po [hd (VOLLEYGUN i), HELD (BANGSTICK 1)] $ volleyGun (i + 1)) [3 .. 5]
+        ++ map (\i -> po [hd (MINIGUNX i), HELD (BANGSTICK 1)] $ miniGunX (i + 1)) [3 .. 15]
+        ++ map (\i -> po [hd (GRAPECANNON i), cr DRUM] $ grapeCannon (i + 1)) [1, 2, 3]
+        ++ [ po (_iyBase (_itType it) : mtype) $ it & itType . iyModules . ix modtype .~ m
+           | (modtype, is, ms) <- moduleCombinations
+           , it <- is
+           , (mtype, m) <- ms
+           ]
   where
     p = (,)
-    po xs it = (map o xs,it)
+    po xs it = (map o xs, it)
     o = (1,)
     cr = CRAFT
     hd = HELD
@@ -121,81 +99,106 @@ itemCombinations =
 -- so there are two requirements for a module combination: the module slot must
 -- exist on the item, and the item must be in the given list below
 -- these two requirements should probably be combined
-moduleCombinations :: [( ModuleSlot, [Item], [([ItemBaseType],ItemModuleType)] )]
+moduleCombinations :: [(ModuleSlot, [Item], [([ItemBaseType], ItemModuleType)])]
 moduleCombinations =
-    [   ( ModRifleMag
+    [
-        ,   [repeater
+        ( ModRifleMag
-            ,autoRifle
+        ,
-            ,burstRifle
+            [ repeater
---            ,fastBurstRifle
+            , autoRifle
+            , burstRifle
+            --            ,fastBurstRifle
             ]
-        ,   [amod [cr DRUM,cr HARDWARE]  DRUMMAG
+        ,
-            ,amod [cr MOTOR,cr HARDWARE] BELTMAG
+            [ amod [cr DRUM, cr HARDWARE] DRUMMAG
+            , amod [cr MOTOR, cr HARDWARE] BELTMAG
             ]
         )
-    ,   ( ModHeldAttach
+    ,
-        ,   [rifle
+        ( ModHeldAttach
-            ,autoRifle
+        ,
-            ,burstRifle
+            [ rifle
+            , autoRifle
+            , burstRifle
             ]
-        ,   [amod [cr DUCTTAPE,HELD TORCH] ATTACHTORCH
+        ,
+            [ amod [cr DUCTTAPE, HELD TORCH] ATTACHTORCH
             ]
         )
-    ,   ( ModAutoMag
+    ,
-        ,   [autoRifle
+        ( ModAutoMag
-            ,autoPistol
+        ,
-            ,smg
+            [ autoRifle
+            , autoPistol
+            , smg
             ]
-        ,   [amod [cr MAGNET,cr HARDWARE] MAGNETMAG
+        ,
+            [ amod [cr MAGNET, cr HARDWARE] MAGNETMAG
             ]
         )
-    ,   ( ModBullet
+    ,
-        ,   bulletWeapons
+        ( ModBullet
-        ,   [amod [cr BOUNCEMODULE]     BOUNCEBUL
+        , bulletWeapons
-            ,amod [cr PENMODULE]        PENBUL
+        ,
+            [ amod [cr BOUNCEMODULE] BOUNCEBUL
+            , amod [cr PENMODULE] PENBUL
             ]
         )
-    ,   ( ModBulletSpawn
+    ,
-        ,   bulletWeapons
+        ( ModBulletSpawn
-        ,   [amod [cr INCENDIARYMODULE] INCENDBUL
+        , bulletWeapons
-            ,amod [cr STATICMODULE]     STATICBUL
+        ,
-            ,amod [cr CONCUSSMODULE]    CONCUSBUL
+            [ amod [cr INCENDIARYMODULE] INCENDBUL
+            , amod [cr STATICMODULE] STATICBUL
+            , amod [cr CONCUSSMODULE] CONCUSBUL
             ]
         )
-    ,   ( ModTarget
+    ,
+        ( ModTarget
         , homingLaunchers ++ bulletWeapons
-        ,   [amod [cr MICROCHIP,cr HEATSENSOR]  TARGCR
+        ,
-            ,amod [cr MICROCHIP,cr LIGHTSENSOR] TARGLAS
+            [ amod [cr MICROCHIP, cr HEATSENSOR] TARGCR
-            ,amod [cr MICROCHIP,cr SOUNDSENSOR] TARGPOS
+            , amod [cr MICROCHIP, cr LIGHTSENSOR] TARGLAS
+            , amod [cr MICROCHIP, cr SOUNDSENSOR] TARGPOS
             ]
         )
-    ,   ( ModBulletTrajectory
+    ,
-        ,   bulletWeapons
+        ( ModBulletTrajectory
-        ,   [amod [cr MAGNET,    cr MICROCHIP,cr HARDWARE]  MAGNETTRAJ
+        , bulletWeapons
-            ,amod [cr MICROCHIP, cr HARDWARE]               FLECHETRAJ
+        ,
-            ,amod [cr ANTIMATTER,cr HARDWARE]               BEZIERTRAJ
+            [ amod [cr MAGNET, cr MICROCHIP, cr HARDWARE] MAGNETTRAJ
+            , amod [cr MICROCHIP, cr HARDWARE] FLECHETRAJ
+            , amod [cr ANTIMATTER, cr HARDWARE] BEZIERTRAJ
             ]
         )
-    ,   ( ModDualBeam
+    ,
-        ,   [dualBeam]
+        ( ModDualBeam
-        ,   [amod [cr INCENDIARYMODULE] INCENDLAS
+        , [dualBeam]
-            ,amod [cr TRANSFORMER]      SPLITLAS
+        ,
-            ,amod [cr STATICMODULE]     STATICLAS
+            [ amod [cr INCENDIARYMODULE] INCENDLAS
+            , amod [cr TRANSFORMER] SPLITLAS
+            , amod [cr STATICMODULE] STATICLAS
             ]
         )
-    ,   ( ModTeleport
+    ,
-        ,   teleportableWeapons
+        ( ModTeleport
-        ,   [amod [cr TELEPORTMODULE,cr MICROCHIP] WEPTELE
+        , teleportableWeapons
+        ,
+            [ amod [cr TELEPORTMODULE, cr MICROCHIP] WEPTELE
             ]
         )
-    ,   ( ModLauncherHoming
+    ,
-        ,   homingLaunchers
+        ( ModLauncherHoming
-        ,   [ amod [cr MICROCHIP,cr TRANSMITTER] LAUNCHHOME
+        , homingLaunchers
+        ,
+            [ amod [cr MICROCHIP, cr TRANSMITTER] LAUNCHHOME
             ]
         )
-    ,   ( ModBattery
+    ,
+        ( ModBattery
         , batteryGuns
-        ,   [amod [cr BATTERY] EXTRABATTERY
+        ,
+            [ amod [cr BATTERY] EXTRABATTERY
             ]
         )
     ]
@@ -204,49 +207,49 @@ moduleCombinations =
     cr = CRAFT
 
 homingLaunchers :: [Item]
-homingLaunchers = launcher : [launcherX i | i <- [2..10]]
+homingLaunchers = launcher : [launcherX i | i <- [2 .. 10]]
 
 batteryGuns :: [Item]
 batteryGuns =
     [ teslaGun
     , sparkGun
     , lasGun
---    , lasSway
+    --    , lasSway
---    , lasSwing
+    --    , lasSwing
-    ] ++ 
+    ]
-    [ lasWide i | i <- [2..10]
+        ++ [ lasWide i | i <- [2 .. 10]
-    ] 
+           ]
+
 --    ++
 --    [ lasFocus i | i <- [1..10]]
 
 teleportableWeapons :: [Item]
-teleportableWeapons  = bulletWeapons ++ batteryGuns ++ homingLaunchers
+teleportableWeapons = bulletWeapons ++ batteryGuns ++ homingLaunchers
 
 bulletWeapons :: [Item]
-bulletWeapons 
+bulletWeapons =
-    =  [bangStick i | i <- [1..9] ]
+    [bangStick i | i <- [1 .. 9]]
-    ++ [volleyGun i | i <- [3..6] ]
+    ++ [volleyGun i | i <- [3 .. 6]]
-    ++ [revolverX i | i <- [1..5] ]
+        ++ [revolverX i | i <- [1 .. 5]]
-    ++ [miniGunX  i | i <- [3..16] ]
+        ++ [miniGunX i | i <- [3 .. 16]]
-    ++ [grapeCannon i | i <- [1,2,3,4] ]
+        ++ [grapeCannon i | i <- [1, 2, 3, 4]]
-    ++ 
+        ++ [ pistol
-    [pistol
+           , autoPistol
-    ,autoPistol
+           , smg
-    ,smg
+           , machinePistol
-    ,machinePistol
+           , revolver
-    ,revolver
+           , rifle
-    ,rifle
+           , repeater
-    ,repeater
+           , autoRifle
-    ,autoRifle
+           , burstRifle
-    ,burstRifle
+           , --    ,fastBurstRifle
---    ,fastBurstRifle
+             --    ,completeBurstRifle
---    ,completeBurstRifle
+             bangCone
-    ,bangCone
+           , blunderbuss
-    ,blunderbuss
+           , machineGun
-    ,machineGun
+           , elephantGun
-    ,elephantGun
+           , sniperRifle
-    ,sniperRifle
+           , amr
-    ,amr
+           , autoAmr
-    ,autoAmr
+           , bangRod
-    ,bangRod
+           ]
-    ]

src/Dodge/Creature.hs

@@ -21,10 +21,7 @@ import Dodge.Creature.PistolCrit
 import Dodge.Creature.SpreadGunCrit
 import Dodge.Data
 import Dodge.Default
-import Dodge.Item.Consumable
+import Dodge.Item
-import Dodge.Item.Craftable
-import Dodge.Item.Equipment
-import Dodge.Item.Weapon
 import Geometry.Data
 import qualified IntMapHelp as IM
 import Picture

src/Dodge/Creature/Impulse/UseItem.hs

@@ -53,7 +53,7 @@ tryReload cr it w f
     | _crID cr == _yourID (_cWorld w) && itNeedsLoading it && _mouseButtons w M.!? SDL.ButtonLeft == Just False =
         crToggleReloading cr
     | otherwise =
-        (runIdentity . pointerToItem (_itPos it) (return . (itUse . useHammer .~ HammerDown)))
+        (runIdentity . pointerToItemLocation (_itLocation it) (return . (itUse . useHammer .~ HammerDown)))
             . f
 
 itNeedsLoading :: Item -> Bool
@@ -116,7 +116,7 @@ useLeftItem cid w
         itm <- cr ^? crInv . ix invid
         f <- cr ^? crInv . ix invid . itUse . lUse
         return
-            . (runIdentity . pointerToItem (_itPos itm) (return . (itUse . useHammer .~ HammerDown)))
+            . (runIdentity . pointerToItemLocation (_itLocation itm) (return . (itUse . useHammer .~ HammerDown)))
             . useL f itm cr
             $ w
   where

src/Dodge/Creature/State.hs

@@ -213,7 +213,7 @@ itemUpdate cr i
     | otherwise     = baseupdate False
   where
     baseupdate bool = updateAutoRecharge . (itUse %~ useUpdate) 
-        . (itPos    .~ InInv (_crID cr) i) 
+        . (itLocation    .~ InInv (_crID cr) i) 
         . (itIsHeld .~ bool)
 updateAutoRecharge :: Item -> Item
 updateAutoRecharge it = case it ^? itUse . leftConsumption of

src/Dodge/Data/CWorld.hs

@@ -71,7 +71,7 @@ data CWorld = CWorld
     , _creatures :: IM.IntMap Creature
     , _crZoning :: IM.IntMap (IM.IntMap IS.IntSet)
     , _creatureGroups :: IM.IntMap CrGroupParams
-    , _itemPositions :: IM.IntMap ItemPos
+    , _itemLocations :: IM.IntMap ItemLocation
     , _clouds :: [Cloud]
     , _clZoning :: IM.IntMap (IM.IntMap [Cloud])
     , _gusts :: IM.IntMap Gust

src/Dodge/Data/Item.hs

@@ -9,7 +9,7 @@ module Dodge.Data.Item (
     module Dodge.Data.Item.Params,
     module Dodge.Data.Item.Use,
     module Dodge.Data.Item.CurseStatus,
-    module Dodge.Data.Item.Attachment,
+    module Dodge.Data.Item.Scope,
     module Dodge.Data.Item.Combine,
     module Dodge.Data.Item.Targeting,
 ) where
@@ -20,7 +20,7 @@ import Data.Aeson
 import Data.Aeson.TH
 import Dodge.Data.Item.Combine
 import Dodge.Data.Item.Effect
-import Dodge.Data.Item.Attachment
+import Dodge.Data.Item.Scope
 import Dodge.Data.Item.CurseStatus
 import Dodge.Data.Item.Misc
 import Dodge.Data.Item.Params
@@ -31,9 +31,8 @@ import Dodge.Data.Item.Targeting
 data Item = Item
     { _itUse :: ItemUse
     , _itType :: ItemType
-    , _itAttachment :: ItAttachment
     , _itID :: Maybe Int
-    , _itPos :: ItemPos
+    , _itLocation :: ItemLocation
     , _itIsHeld :: Bool
     , _itEffect :: ItEffect
     , _itInvSize :: Float

src/Dodge/Data/Item/Combine.hs

@@ -1,14 +1,14 @@
-{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
 module Dodge.Data.Item.Combine where
 
-import Dodge.Data.Item.Use.Consumption
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import qualified Data.Map.Strict as M
 import Dodge.Data.Equipment.Misc
+import Dodge.Data.Item.Use.Consumption
 
 data ItemType = ItemType
     { _iyBase :: ItemBaseType
@@ -79,6 +79,7 @@ data ItemBaseType
 
 data ConsumableItemType
     = MEDKIT Int
+    | EXPLOSIVES
     deriving (Eq, Ord, Show, Read)
 
 data EquipItemType
@@ -90,7 +91,6 @@ data EquipItemType
     | BRAINHAT
     | HAT
     | HEADLAMP
-    | HEADLAMP1
     | POWERLEGS
     | SPEEDLEGS
     | JUMPLEGS
@@ -118,17 +118,13 @@ data HeldItemType
     | BANGCONE
     | BLUNDERBUSS
     | GRAPECANNON {_xNum :: Int}
-    | --    | GRENADELAUNCHER Int -- number of chambers that can be reloaded
+    | MINIGUNX {_xNum :: Int}
-      --    | MORTARCONE / HANDMORTAR
-      MINIGUNX {_xNum :: Int}
     | VOLLEYGUN {_xNum :: Int}
     | RIFLE
     | REPEATER
     | AUTORIFLE
     | BURSTRIFLE
-    | --    | FASTBURSTRIFLE
+    | BANGROD
-      --    | COMPLETEBURSTRIFLE
-      BANGROD
     | ELEPHANTGUN
     | AMR
     | AUTOAMR
@@ -143,20 +139,12 @@ data HeldItemType
     | TESLAGUN
     | LASGUN
     | LASCIRCLE
-    | --    | LASPULSE
+    | DUALBEAM
-      DUALBEAM
+    | LASWIDE {_xNum :: Int}
-    | --    | LASGUNSWING
+    | TRACTORGUN
-
-      -- | LASGUNSWAY
-      --    | LASGUNWIDEPULSE
-      LASWIDE {_xNum :: Int}
-    | -- | LASGUNFOCUS Int
-      -- | SONICGUN
-      TRACTORGUN
     | LAUNCHER
     | LAUNCHERX {_xNum :: Int}
-    | --    | TRACKINGLAUNCHER
+    | REMOTELAUNCHER
-      REMOTELAUNCHER
     | POISONSPRAYER
     | DRONELAUNCHER
     | SHATTERGUN

src/Dodge/Data/Item/Effect.hs

@@ -7,39 +7,23 @@ import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 
-data ItEffect
+data ItEffect = ItEffect
-    = NoItEffect
+    { _ieInv :: ItInvEffect --Item -> Creature -> World -> World
-    | ItInvEffect
+    , _ieOnInsert :: ItInvEffect
-        { _ieInv :: ItInvEffect --Item -> Creature -> World -> World
+    , _ieOnDrop :: ItInvEffect --Item -> Creature -> World -> World
-        , _ieCounter :: Int
+    , _ieOnHeld :: ItInvEffect
-        }
+    , _ieOnStash :: ItInvEffect
-    | ItRewindEffect
+    }
-        { _ieInv :: ItInvEffect --Item -> Creature -> World -> World
-        }
-    | ItEffect
-        { _ieInv :: ItInvEffect --Item -> Creature -> World -> World
-        , _ieFloor :: ItFloorEffect --Int -> World -> World
-        , _ieCounter :: Int
-        }
-    | ItInvEffectID
-        { _ieInv :: ItInvEffect --Item -> Creature -> World -> World
-        , _ieMID :: Maybe Int
-        } -- the duplication of ieMID may cause errors...
-    | ItInvEffectDrop
-        { _ieInv :: ItInvEffect --Item -> Creature -> World -> World
-        , _ieDrop :: ItDropEffect --Item -> Creature -> World -> World
-        , _ieMID :: Maybe Int
-        }
     deriving (Eq, Ord, Show, Read)
 
 data ItInvEffect
     = NoInvEffect
     | RewindEffect
-    | ResetAttachmentEffect
+    | EffectIfHeld ItInvEffect ItInvEffect
-    | OnOffHeldEffect ItInvEffect ItInvEffect
     | CreateHeldLight
     | CreateShieldWall
     | RemoveShieldWall
+    | EffectWhileHeld ItInvEffect
     deriving (Eq, Ord, Show, Read)
 
 data ItFloorEffect = NoFloorEffect

src/Dodge/Data/Item/Misc.hs

@@ -1,53 +1,50 @@
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE StrictData #-}
+{-# LANGUAGE TemplateHaskell #-}
+
 module Dodge.Data.Item.Misc where
-import GHC.Generics
+
-import Data.Aeson
-import Geometry.Data
 import Control.Lens
+import Data.Aeson
+import Data.Aeson.TH
+import Geometry.Data
+
 data ItemDimension = ItemDimension
-    { _dimRad       :: Float
+    { _dimRad :: Float
-    , _dimCenter    :: Point3
+    , _dimCenter :: Point3
     , _dimAttachPos :: Point3
     }
-  deriving (Eq,Ord,Show,Read,Generic)
+    deriving (Eq, Show, Read)
-instance ToJSON ItemDimension  where
+
-    toEncoding = genericToEncoding defaultOptions
+data ItemPortage
-instance FromJSON ItemDimension 
-data ItemPortage 
     = HeldItem
         { _handlePos :: Float
-        , _muzPos    :: Float
+        , _muzPos :: Float
         }
     | WornItem
     | NoPortage
-  deriving (Eq,Ord,Show,Read,Generic)
+    deriving (Eq, Show, Read)
-instance ToJSON ItemPortage  where
+
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON ItemPortage 
 data ItemValue = ItemValue
     { _ivInt :: Int
     , _ivType :: ItemValueType
     }
-  deriving (Eq,Ord,Show,Read,Generic)
+    deriving (Eq, Show, Read)
-instance ToJSON ItemValue  where
+
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON ItemValue 
 data ItemValueType = MundaneItem | ArtefactItem
-  deriving (Eq,Ord,Show,Read,Generic)
+    deriving (Eq, Show, Read)
-instance ToJSON ItemValueType  where
+
-    toEncoding = genericToEncoding defaultOptions
+data ItemLocation
-instance FromJSON ItemValueType 
+    = InInv {_ipCrID :: Int, _ipInvID :: Int}
-data ItemPos 
+    | OnFloor {_ipFlID :: Int}
-    = InInv   { _ipCrID :: Int , _ipInvID :: Int }
-    | OnFloor { _ipFlID :: Int }
     | VoidItm
-  deriving (Eq,Ord,Show,Read,Generic)
+    deriving (Eq, Show, Read)
-instance ToJSON ItemPos  where
+
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON ItemPos 
 makeLenses ''ItemDimension
 makeLenses ''ItemPortage
 makeLenses ''ItemValue
-makeLenses ''ItemPos
+makeLenses ''ItemLocation
+deriveJSON defaultOptions ''ItemDimension
+deriveJSON defaultOptions ''ItemPortage
+deriveJSON defaultOptions ''ItemValue
+deriveJSON defaultOptions ''ItemValueType
+deriveJSON defaultOptions ''ItemLocation

src/Dodge/Data/Item/Params.hs

@@ -13,6 +13,12 @@ import Geometry.Data
 
 data ItemParams
     = NoParams
+    | MagShieldParams
+        {_magShieldMgMIX :: Maybe Int}
+    | ShrinkGunParams
+        {_shrinkGunStatus :: ShrinkGunStatus}
+    | FlatShieldParams
+        {_flatShieldWlMIX :: Maybe Int}
     | ShellLauncher
         { _shellSpinDrag :: Int
         , _shellSpinAmount :: Int
@@ -62,13 +68,12 @@ data ItemParams
     | BoostPropIX {_boostPropIX :: Maybe Int}
     deriving (Eq, Ord, Show, Read)
 
-
+data ShrinkGunStatus = FullSize | Shrunk
+    deriving (Eq, Ord, Show, Read)
 
 data PreviousArcEffect = NoPreviousArcEffect | PerturbTillBreakPreviousArc
     deriving (Eq, Ord, Show, Read)
 
-
-
 data GunBarrels
     = MultiBarrel
         { _brlSpread :: BarrelSpread
@@ -82,8 +87,6 @@ data GunBarrels
     | SingleBarrel {_brlInaccuracy :: Float}
     deriving (Eq, Ord, Show, Read)
 
-
-
 data Nozzle = Nozzle
     { _nzPressure :: Float
     , _nzDir :: Float
@@ -94,21 +97,18 @@ data Nozzle = Nozzle
     }
     deriving (Eq, Ord, Show, Read)
 
-
-
 data BarrelSpread
     = AlignedBarrels
     | SpreadBarrels {_spreadAngle :: Float}
     | RotatingBarrels {_rotatingBarrelInaccuracy :: Float}
     deriving (Eq, Ord, Show, Read)
 
-
-
 makeLenses ''BarrelSpread
 makeLenses ''ItemParams
 makeLenses ''Nozzle
 makeLenses ''GunBarrels
 deriveJSON defaultOptions ''ItemParams
+deriveJSON defaultOptions ''ShrinkGunStatus
 deriveJSON defaultOptions ''PreviousArcEffect
 deriveJSON defaultOptions ''GunBarrels
 deriveJSON defaultOptions ''Nozzle

src/Dodge/Data/Item/Scope.hs

@@ -1,23 +1,13 @@
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
-module Dodge.Data.Item.Attachment where
+module Dodge.Data.Item.Scope where
 
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import Geometry.Data
 
-data ItAttachment
-    = AttachFuse {_atFuseTime :: Int}
-    | AttachTargetPos {_atTargetPos :: Point2}
-    | AttachInt {_atInt :: Int}
-    | AttachMInt {_atMInt :: Maybe Int}
-    | AttachFloat {_atFloat :: Float}
-    | AttachBool {_atBool :: Bool}
-    | NoItAttachment
-    deriving (Eq, Ord, Show, Read)
-
 data Scope
     = NoScope
     | RemoteScope
@@ -36,9 +26,7 @@ data Scope
         , -- | if the camera offset is also the center of vision
           _scopeIsCamera :: Bool
         }
-    deriving (Eq, Ord, Show, Read)
+    deriving (Eq, Show, Read)
 
-makeLenses ''ItAttachment
 makeLenses ''Scope
-deriveJSON defaultOptions ''ItAttachment
 deriveJSON defaultOptions ''Scope

src/Dodge/Data/Item/Tweak.hs

@@ -1,37 +1,37 @@
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE StrictData #-}
+{-# LANGUAGE TemplateHaskell #-}
+
 module Dodge.Data.Item.Tweak where
-import GHC.Generics
+
-import Data.Aeson
 import Control.Lens
+import Data.Aeson
+import Data.Aeson.TH
 import qualified IntMapHelp as IM
+
 data ItemTweaks
     = NoTweaks
     | Tweakable
         { _tweakParams :: IM.IntMap TweakParam
         }
-  deriving (Eq,Ord,Show,Read,Generic)
+    deriving (Eq, Show, Read)
-instance ToJSON ItemTweaks where
+
-    toEncoding = genericToEncoding defaultOptions
+data TweakType
-instance FromJSON ItemTweaks
+    = TweakPhaseV
-data TweakType = TweakPhaseV
     | TweakTractionPower
     | TweakSpinDrag
     | TweakSpinAmount
     | TweakThrustDelay
-  deriving (Eq,Ord,Show,Read,Generic)
+    deriving (Eq, Show, Read)
-instance ToJSON TweakType  where
+
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON TweakType 
 data TweakParam = TweakParam
-        { _tweakType :: TweakType -- Int -> Item -> Item
+    { _tweakType :: TweakType -- Int -> Item -> Item
-        , _tweakVal  :: Int
+    , _tweakVal :: Int
-        , _tweakMax  :: Int
+    , _tweakMax :: Int
-        }
+    }
-  deriving (Eq,Ord,Show,Read,Generic)
+    deriving (Eq, Show, Read)
-instance ToJSON TweakParam  where
+
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON TweakParam 
 makeLenses ''TweakParam
 makeLenses ''ItemTweaks
+deriveJSON defaultOptions ''ItemTweaks
+deriveJSON defaultOptions ''TweakType
+deriveJSON defaultOptions ''TweakParam

src/Dodge/Data/Magnet.hs

@@ -1,30 +1,30 @@
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE StrictData #-}
+{-# LANGUAGE TemplateHaskell #-}
+
 module Dodge.Data.Magnet where
-import GHC.Generics
+
-import Data.Aeson
-import Geometry.Data
 import Control.Lens
+import Data.Aeson
+import Data.Aeson.TH
+import Geometry.Data
+
 newtype MagnetUpdate = MagnetUpdateTimer Int
-  deriving (Eq,Ord,Show,Read,Generic)
+    deriving (Eq, Ord, Show, Read)
-instance ToJSON MagnetUpdate  where
+
-    toEncoding = genericToEncoding defaultOptions
+data MagnetBuBu
-instance FromJSON MagnetUpdate 
+    = MagnetBuId
-data MagnetBuBu = MagnetBuId
     | MagnetBuBuCurveAroundField Float Float
-  deriving (Eq,Ord,Show,Read,Generic)
+    deriving (Eq, Ord, Show, Read)
-instance ToJSON MagnetBuBu  where
+
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON MagnetBuBu 
 data Magnet = Magnet
     { _mgID :: Int
     , _mgUpdate :: MagnetUpdate
     , _mgPos :: Point2
-    , _mgField  :: MagnetBuBu
+    , _mgField :: MagnetBuBu
     }
-  deriving (Eq,Ord,Show,Read,Generic)
+    deriving (Eq, Ord, Show, Read)
-instance ToJSON Magnet  where
+
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON Magnet 
 makeLenses ''Magnet
+deriveJSON defaultOptions ''MagnetUpdate
+deriveJSON defaultOptions ''MagnetBuBu
+deriveJSON defaultOptions ''Magnet

src/Dodge/Default.hs

@@ -1,93 +1,102 @@
 {- |
 Module      : Dodge.Default
-Description : Instances of data structures  
+Description : Instances of data structures
 
 This module contains prototypical data structures.
 -}
-module Dodge.Default 
+module Dodge.Default (
-    ( module Dodge.Default
+    module Dodge.Default,
-    , module Dodge.Default.Item
+    module Dodge.Default.Item,
-    , module Dodge.Default.LightSource
+    module Dodge.Default.LightSource,
-    , module Dodge.Default.Weapon
+    module Dodge.Default.Weapon,
-    , module Dodge.Default.Wall
+    module Dodge.Default.Wall,
-    , module Dodge.Default.Creature
+    module Dodge.Default.Creature,
-    , module Dodge.Default.Terminal
+    module Dodge.Default.Terminal,
-    ) where
+) where
+
+import Control.Lens
+import Dodge.Data
+import Dodge.Default.Creature
+import Dodge.Default.Item
+import Dodge.Default.LightSource
 import Dodge.Default.Terminal
 import Dodge.Default.Wall
-import Dodge.Default.Creature
 import Dodge.Default.Weapon
-import Dodge.Default.LightSource
-import Dodge.Default.Item
-import Dodge.Data
 import Dodge.SoundLogic
 import Geometry
 import Picture
-import Control.Lens
 
 defaultEquipment :: Item
-defaultEquipment = defaultItem
+defaultEquipment =
-    { _itInvColor = yellow
+    defaultItem
-    , _itUse = EquipUse defaultEquip
+        & itInvColor .~ yellow
-    , _itAttachment = NoItAttachment
+        & itUse .~ EquipUse defaultEquip
-    }
+
 defaultItZoom :: ItZoom
 defaultItZoom = ItZoom 20 0.2 1
+
 defaultConsumable :: Item
-defaultConsumable = defaultItem
+defaultConsumable =
-    & itUse .~ ConsumeUse CDoNothing 1
+    defaultItem
-    & itInvColor .~ blue
+        & itUse .~ ConsumeUse CDoNothing 1
+        & itInvColor .~ blue
 
 defaultFlIt :: FloorItem
-defaultFlIt = FlIt {_flItRot=0,_flIt = defaultConsumable, _flItPos = V2 0 0, _flItID = 0}
+defaultFlIt = FlIt{_flItRot = 0, _flIt = defaultConsumable, _flItPos = V2 0 0, _flItID = 0}
+
 defaultMachine :: Machine
-defaultMachine = Machine
+defaultMachine =
-    { _mcID = 0
+    Machine
-    , _mcWallIDs = mempty
+        { _mcID = 0
-    , _mcDraw = MachineDrawMempty
+        , _mcWallIDs = mempty
-    , _mcColor = white
+        , _mcDraw = MachineDrawMempty
-    , _mcPos = V2 0 0
+        , _mcColor = white
-    , _mcDir = 0
+        , _mcPos = V2 0 0
-    , _mcHP = 1000
+        , _mcDir = 0
-    , _mcSensor = NoSensor
+        , _mcHP = 1000
-    , _mcMaterial = Electronics
+        , _mcSensor = NoSensor
-    , _mcDamage = []
+        , _mcMaterial = Electronics
-    , _mcType = StaticMachine
+        , _mcDamage = []
-    , _mcName = ""
+        , _mcType = StaticMachine
-    , _mcMounts = mempty
+        , _mcName = ""
-    , _mcCloseSound = Nothing
+        , _mcMounts = mempty
-    }
+        , _mcCloseSound = Nothing
+        }
 
 defaultButton :: Button
-defaultButton = Button
+defaultButton =
-    { _btPict = DefaultDrawButton (dark red)
+    Button
-    , _btPos = V2 0 0
+        { _btPict = DefaultDrawButton (dark red)
-    , _btRot = 0
+        , _btPos = V2 0 0
-    , _btEvent = ButtonPress BtNoLabel ButtonDoNothing click1S NoWorldEffect
+        , _btRot = 0
-    , _btID = 0
+        , _btEvent = ButtonPress BtNoLabel ButtonDoNothing click1S NoWorldEffect
-    , _btText = "Button"
+        , _btID = 0
-    , _btState = BtOff
+        , _btText = "Button"
-    , _btTermMID = Nothing
+        , _btState = BtOff
-    , _btName = ""
+        , _btTermMID = Nothing
-    , _btColor = red
+        , _btName = ""
-    }
+        , _btColor = red
+        }
+
 defaultPP :: PressPlate
-defaultPP = PressPlate
+defaultPP =
-    { _ppPict = setDepth 1 . color (dim . dim $ bright blue) $ circleSolid 5
+    PressPlate
-    , _ppPos = V2 0 0
+        { _ppPict = setDepth 1 . color (dim . dim $ bright blue) $ circleSolid 5
-    , _ppRot = 0
+        , _ppPos = V2 0 0
-    , _ppEvent = PressPlateId
+        , _ppRot = 0
-    , _ppID = -1
+        , _ppEvent = PressPlateId
-    , _ppText = "Pressure plate"
+        , _ppID = -1
-    }
+        , _ppText = "Pressure plate"
+        }
 
 upHammer :: HammerType
 upHammer = HasHammer HammerUp
 
 defaultProximitySensor :: Sensor
-defaultProximitySensor = ProximitySensor
+defaultProximitySensor =
-    { _proxStatus   = NotClose
+    ProximitySensor
-    , _proxDist = 40
+        { _proxStatus = NotClose
-    , _proxRequirement  = RequireImpossible
+        , _proxDist = 40
-    , _sensToggle   = False
+        , _proxRequirement = RequireImpossible
-    }
+        , _sensToggle = False
+        }

src/Dodge/Default/Item.hs

@@ -1,5 +1,6 @@
 module Dodge.Default.Item (
     defaultItem,
+    defaultItEffect,
 ) where
 
 import Dodge.Data.Item
@@ -12,12 +13,12 @@ defaultItem =
         { _itCurseStatus = Uncursed
         , _itType = defaultItemType
         , --    , _itEquipPict = \_ _ -> (,) emptySH blank
-          _itEffect = NoItEffect
+          _itEffect = defaultItEffect
         , _itID = Nothing
         , _itIsHeld = False
         , _itInvColor = yellow
         , _itInvSize = 1
-        , _itPos = VoidItm
+        , _itLocation = VoidItm
         , _itDimension = ItemDimension 2 0 (V3 10 (-5) 3)
         , _itUse = CraftUse (ItAmount 1)
         , _itParams = NoParams
@@ -25,7 +26,16 @@ defaultItem =
         , _itScope = NoScope
         , _itTargeting = NoTargeting
         , _itValue = ItemValue 0 MundaneItem
-        , _itAttachment = NoItAttachment
+        }
+
+defaultItEffect :: ItEffect
+defaultItEffect =
+    ItEffect
+        { _ieInv = NoInvEffect
+        , _ieOnInsert = NoInvEffect
+        , _ieOnDrop = NoInvEffect
+        , _ieOnHeld = NoInvEffect
+        , _ieOnStash = NoInvEffect
         }
 
 defaultItemType :: ItemType

src/Dodge/Default/World.hs

@@ -47,7 +47,7 @@ defaultCWorld = CWorld
     , _clZoning         = mempty
     , _gusts            = IM.empty
     , _gsZoning         = mempty --Zoning IM.empty clZoneSize (zonePos _guPos)
-    , _itemPositions    = IM.empty
+    , _itemLocations    = IM.empty
     , _props            = IM.empty
     , _projectiles      = IM.empty
     , _instantBullets   = []

src/Dodge/Euse.hs

@@ -1,9 +1,22 @@
 module Dodge.Euse where
+
+import Dodge.LightSource
+import Dodge.Item.HeldOffset
+import Dodge.Wall.Create
+import Color
+import Dodge.Default.Wall
+import Dodge.Creature.Test
+import Dodge.Creature.HandPos
+import Geometry
+import Dodge.Wall.Move
+import Dodge.Wall.Delete
+import Dodge.Wall.ForceField
+import Dodge.Item.Location
 import Dodge.Data
 import Dodge.Item.Weapon.ExtraEffect
 import Dodge.Item.Weapon.Radar
 import Dodge.SoundLogic.ExternallyGeneratedSounds
-import Dodge.Item.Equipment
+import qualified IntMapHelp as IM
 import LensHelp
 
 useE :: Euse -> Item -> Creature -> World -> World
@@ -14,7 +27,108 @@ useE eo = case eo of
     EWristShield -> setWristShieldPos
     EHeadLamp -> createHeadLamp
     ECamouflage vis -> overCID (crCamouflage .~ vis)
-
     EonWristShield -> onEquipWristShield
-
     EoffWristShield -> onRemoveWristShield
+
+useMagShield :: Item -> Creature -> World -> World
+useMagShield it cr w = w & cWorld . magnets . at mgid ?~ themagnet
+  where
+    themagnet =
+        Magnet
+            { _mgID = mgid
+            , _mgUpdate = MagnetUpdateTimer 1
+            , _mgPos = _crPos cr
+            , _mgField = MagnetBuBuCurveAroundField 50 200
+            }
+    mgid = case it ^? itParams . magShieldMgMIX . _Just of
+        Just mgid' -> mgid'
+        Nothing -> IM.newKey $ _magnets (_cWorld w)
+
+onEquipWristShield :: Item -> Creature -> World -> World
+onEquipWristShield itm cr w =
+    w
+        & pointerToItem itm . itUse . eqEq . eqParams .~ EquipID i
+        & cWorld . walls . at i ?~ forceField{_wlID = i}
+        & setWristShieldPos (itm & itUse . eqEq . eqParams .~ EquipID i) cr
+  where
+    i = IM.newKey (_walls (_cWorld w))
+
+onRemoveWristShield :: Item -> Creature -> World -> World
+onRemoveWristShield itm _ =
+    (pointerToItem itm . itUse . eqEq . eqParams .~ NoEquipParams) . deleteWallID i
+  where
+    i = _eparamID $ _eqParams $ _eqEq $ _itUse itm
+
+setWristShieldPos :: Item -> Creature -> World -> World
+setWristShieldPos itm cr w =
+    w
+        & moveWallIDUnsafe i wlline
+  where
+    i = _eparamID $ _eqParams $ _eqEq $ _itUse itm
+    wlline = (f (V3 (-10) 7 0), f (V3 10 7 0))
+    invid = _ipInvID (_itLocation itm)
+    handtrans = case cr ^? crInvEquipped . ix invid of
+        Just OnLeftWrist -> \cr' -> translatePointToLeftHand cr' . g
+        _ -> translatePointToRightHand
+    g
+        | twists cr = (+.+.+ V3 (-5) 10 0)
+        | otherwise = id
+    f = (+.+ _crPos cr) . stripZ . rotate3 (_crDir cr) . handtrans cr
+
+shieldWall :: Int -> Wall
+shieldWall crid =
+    defaultWall
+        { _wlColor = yellow
+        , _wlOpacity = SeeAbove
+        , _wlPathable = True
+        , _wlWalkable = True
+        , _wlFireThrough = True
+        , _wlReflect = True
+        , _wlUnshadowed = False
+        , _wlRotateTo = False
+        , _wlStructure = CreaturePart crid -- shieldWallDamage
+        }
+
+-- TODO the reflection should be controled by the particle
+--shieldWallDamage :: Damage -> Wall -> Int -> World -> World
+--shieldWallDamage dm _ crid w = case _dmType dm of
+----    Lasering -> w
+--    _ | isMovementDam dm -> w & creatures . ix crid . crState . crDamage .:~ dm
+--    _ -> w
+
+createShieldWall :: Item -> Creature -> World -> World
+createShieldWall it cr w = case it ^? itParams . flatShieldWlMIX . _Just of
+    Nothing ->
+        let (wlid, w') = createWall ((shieldWall crid){_wlLine = wlline, _wlID = wlid}) w
+         in w' & pointerToItem it . itParams .~ FlatShieldParams (Just wlid)
+    Just wid -> moveWallID wid wlline w
+  where
+    crid = _crID cr
+    wlline = (a, b)
+    crdirv = unitVectorAtAngle $ _crDir cr
+    crpos = _crPos cr
+    rad = _crRad cr + 2
+    a = crpos +.+ rad *.* crdirv -.- 10 *.* therot crdirv
+    b = crpos +.+ rad *.* crdirv +.+ 10 *.* therot crdirv
+    therot
+        | crIsAiming cr = vNormal
+        | otherwise = rotateV (twoFlatHRot cr) . vNormal
+
+removeShieldWall :: Item -> Creature -> World -> World
+removeShieldWall it _ w = case it ^? itParams . flatShieldWlMIX . _Just of
+    Nothing -> w
+    Just wid ->
+        w & deleteWallID wid
+            & pointerToItem it . itParams . flatShieldWlMIX .~ Nothing
+
+createHeadLamp :: Item -> Creature -> World -> World
+createHeadLamp _ cr =
+    cWorld . tempLightSources
+        .:~ tlsTimeRadColPos
+            1
+            200
+            0.7
+            ((_crPos cr `v2z` 0) +.+.+ rotate3 (_crDir cr) (translatePointToHead cr (V3 5 0 3)))
+
+overCID :: (Creature -> Creature) -> Item -> Creature -> World -> World
+overCID f _ cr = cWorld . creatures . ix (_crID cr) %~ f

src/Dodge/FloorItem.hs

@@ -24,7 +24,7 @@ copyItemToFloorID pos it w = (,) flid $ w'
     (p',w') = findWallFreeDropPoint (_dimRad $ _itDimension it) pos w
     rot = fst . randomR (-pi,pi) $ _randGen w
     updateLocation = case it ^? itID of
-        Just (Just i')  -> cWorld . itemPositions . ix i' .~ OnFloor flid
+        Just (Just i')  -> cWorld . itemLocations . ix i' .~ OnFloor flid
         _ -> id
     flid = IM.newKey $ _floorItems (_cWorld w)
     theflit = FlIt 

src/Dodge/Inventory.hs

@@ -76,8 +76,8 @@ rmInvItem cid invid w = case w ^? cWorld . creatures . ix cid . crInv . ix invid
         rmf <- itm ^? itUse . eqEq . eqOnRemove
         return $ useE rmf itm cr
     doanyitemeffect = fromMaybe id $ do
-        rmf <- itm ^? itEffect . ieDrop
+        rmf <- itm ^? itEffect . ieOnDrop
-        return $ doDropEffect rmf itm cr
+        return $ doInvEffect rmf itm cr
     removeAnySlotEquipment = case w ^? cWorld . creatures . ix cid . crInvEquipped . ix invid of
         Just epos   -> cWorld . creatures . ix cid . crEquipment . at epos .~ Nothing
         Nothing     -> id

src/Dodge/Inventory/Add.hs

@@ -31,7 +31,7 @@ tryPutItemInInv cid flit w = case maybeInvSlot of
     maybeInvSlot = checkInvSlotsYou it w
     updateItLocation invid w' = case _itID it of 
         Nothing -> w'
-        Just j  -> w' & cWorld . itemPositions . ix j .~ InInv cid invid
+        Just j  -> w' & cWorld . itemLocations . ix j .~ InInv cid invid
 
 --{- | Pick up a specific item. -}
 --putItemInInv :: Int -> FloorItem -> World -> World

src/Dodge/ItEffect.hs

@@ -1,6 +1,7 @@
 module Dodge.ItEffect where
+
+import Dodge.Euse
 import Dodge.Data
-import Dodge.Item.Equipment
 import Dodge.LightSource.Torch
 import Control.Lens
 
@@ -8,25 +9,21 @@ doInvEffect :: ItInvEffect -> Item -> Creature -> World -> World
 doInvEffect iie = case iie of
     NoInvEffect -> const $ const id
     RewindEffect -> rewindEffect
-    ResetAttachmentEffect -> resetAttachmentEffect
+--    ResetAttachmentEffect -> resetAttachmentEffect
-    OnOffHeldEffect f g -> onOffEff f g
+    EffectIfHeld f g -> onOffEff f g
     CreateHeldLight -> createHeldLight
     CreateShieldWall -> createShieldWall
     RemoveShieldWall -> removeShieldWall
+    EffectWhileHeld f -> onOffEff f NoInvEffect
 
 doFloorEffect :: ItFloorEffect -> Int -> World -> World
 doFloorEffect NoFloorEffect = const id
 
-doDropEffect :: ItDropEffect -> Item -> Creature -> World -> World 
-doDropEffect iie = case iie of
-    NoDropEffect -> const $ const id
-
 onOffEff :: ItInvEffect -> ItInvEffect -> Item -> Creature -> World -> World
 onOffEff f g it
     | _itIsHeld it = doInvEffect f it
     | otherwise    = doInvEffect g it
 
-
 rewindEffect :: Item -> Creature -> World -> World
 rewindEffect itm cr w 
     | Just invid == _crLeftInvSel cr = w & cWorld . rewindWorlds %~ (take maxcharge . (cw : ))
@@ -34,20 +31,20 @@ rewindEffect itm cr w
     | otherwise = w & cWorld . rewindWorlds .~ []
         & ptrWpCharge .~ 0
   where
-    invid = _ipInvID $ _itPos itm
+    invid = _ipInvID $ _itLocation itm
     ptrWpCharge = cWorld . creatures . ix (_crID cr) . crInv . ix invid . itUse . leftConsumption . wpCharge
     maxcharge = itm ^?! itUse . leftConsumption . wpMaxCharge
     cw = _cWorld w 
         & rewindWorlds .~ []
 
-resetAttachmentEffect :: Item -> Creature -> World -> World
+--resetAttachmentEffect :: Item -> Creature -> World -> World
-resetAttachmentEffect itm cr w 
+--resetAttachmentEffect itm cr w 
-    | _ieCounter iteff < 0 = w & pointToIt . itAttachment .~ NoItAttachment
+--    | _ieCounter iteff < 0 = w & pointToIt . itAttachment .~ NoItAttachment
-    | otherwise = w & pointToIt . itEffect . ieCounter -~ 1
+--    | otherwise = w & pointToIt . itEffect . ieCounter -~ 1
-  where
+--  where
-    iteff = _itEffect itm
+--    iteff = _itEffect itm
-    invid = _ipInvID $ _itPos itm
+--    invid = _ipInvID $ _itLocation itm
-    pointToIt = cWorld . creatures . ix (_crID cr) . crInv . ix invid
+--    pointToIt = cWorld . creatures . ix (_crID cr) . crInv . ix invid
 
 createHeldLight :: Item -> Creature -> World -> World
 createHeldLight itm cr = createTorchLightOffset cr itm 0

src/Dodge/Item.hs

@@ -1,19 +1,21 @@
-module Dodge.Item 
+module Dodge.Item (
-    ( module Dodge.Item.Weapon
+    module Dodge.Item.Weapon,
-    , module Dodge.Item.Consumable
+    module Dodge.Item.Held,
-    , module Dodge.Item.Equipment
+    module Dodge.Item.Consumable,
-    , module Dodge.Item.PassKey
+    module Dodge.Item.Equipment,
-    , module Dodge.Item.Craftable
+    module Dodge.Item.PassKey,
-    , itemFromBase
+    module Dodge.Item.Craftable,
-    ) where
+    itemFromBase,
-import Dodge.Data
+) where
-import Dodge.Item.Weapon
+
-import Dodge.Item.Equipment
+import Dodge.Data
-import Dodge.Item.Consumable
+import Dodge.Item.Consumable
-import Dodge.Item.PassKey
+import Dodge.Item.Craftable
-import Dodge.Item.Craftable
+import Dodge.Item.Equipment
+import Dodge.Item.Held
+import Dodge.Item.PassKey
+import Dodge.Item.Weapon
 
--- this is not ideal, should fold the itemtype into a stackable/unstackable type
 itemFromBase :: ItemBaseType -> Item
 itemFromBase ibt = case ibt of
     HELD ht -> itemFromHeldType ht
@@ -21,94 +23,83 @@ itemFromBase ibt = case ibt of
     EQUIP et -> itemFromEquipType et
     Consumable et -> itemFromConsumableType et
     CRAFT cr -> makeTypeCraft cr
+
 itemFromConsumableType :: ConsumableItemType -> Item
 itemFromConsumableType ct = case ct of
     MEDKIT i -> medkit i
+    EXPLOSIVES -> undefined
+
 itemFromEquipType :: EquipItemType -> Item
 itemFromEquipType et = case et of
     MAGSHIELD -> magShield
-    FLAMESHIELD     -> flameShield
+    FLAMESHIELD -> flameShield
-    FRONTARMOUR     -> frontArmour
+    FRONTARMOUR -> frontArmour
-    WRISTARMOUR     -> wristArmour
+    WRISTARMOUR -> wristArmour
     INVISIBILITYEQUIPMENT GoesOnWrist -> wristInvisibility
     INVISIBILITYEQUIPMENT _ -> error "need to define invisibility for more than wrist"
-    BRAINHAT        -> brainHat
+    BRAINHAT -> brainHat
-    HAT             -> hat
+    HAT -> hat
-    HEADLAMP        -> headLamp
+    HEADLAMP -> headLamp
-    HEADLAMP1       -> headLamp1
+    POWERLEGS -> powerLegs
-    POWERLEGS       -> powerLegs
+    SPEEDLEGS -> speedLegs
-    SPEEDLEGS       -> speedLegs
+    JUMPLEGS -> jumpLegs
-    JUMPLEGS        -> jumpLegs
+    JETPACK -> jetPack
-    JETPACK     -> jetPack
+    AUTODETECTOR d -> autoDetector d
-    AUTODETECTOR  d -> autoDetector d
+
 itemFromLeftType :: LeftItemType -> Item
 itemFromLeftType lt = case lt of
     BOOSTER -> boosterGun
-    REWINDER    -> rewindGun
+    REWINDER -> rewindGun
-    BLINKER     -> blinkGun
+    BLINKER -> blinkGun
-    BLINKERUNSAFE       -> unsafeBlinkGun
+    BLINKERUNSAFE -> unsafeBlinkGun
-    SHRINKER        -> shrinkGun
+    SHRINKER -> shrinkGun
-    SPAWNER     -> error "need to datify creatures first"
+    SPAWNER -> error "need to datify creatures first"
-    -- Equipment
+
+-- Equipment
 itemFromHeldType :: HeldItemType -> Item
 itemFromHeldType ht = case ht of
     KEYCARD i -> keyCard i
-    TORCH       -> torch
+    TORCH -> torch
-    SHATTERGUN        -> shatterGun
+    SHATTERGUN -> shatterGun
     BANGSTICK i -> bangStick i
-    PISTOL      -> pistol
+    PISTOL -> pistol
-    REVOLVER    -> revolver
+    REVOLVER -> revolver
-    REVOLVERX i   -> revolverX i
+    REVOLVERX i -> revolverX i
-    MACHINEPISTOL   -> machinePistol
+    MACHINEPISTOL -> machinePistol
-    AUTOPISTOL  -> autoPistol
+    AUTOPISTOL -> autoPistol
-    SMG     -> smg
+    SMG -> smg
-    BANGCONE    -> bangCone
+    BANGCONE -> bangCone
-    BLUNDERBUSS     -> blunderbuss
+    BLUNDERBUSS -> blunderbuss
-    GRAPECANNON i  -> grapeCannon i
+    GRAPECANNON i -> grapeCannon i
-    --GRENADELAUNCHER Int -- number of chambers that can be reloaded
+    MINIGUNX i -> miniGunX i
---  --| MORTARCONE / HANDMORTAR
+    VOLLEYGUN i -> volleyGun i
-    MINIGUNX i    -> miniGunX i
+    RIFLE -> rifle
-    VOLLEYGUN i   -> volleyGun i 
+    REPEATER -> repeater
-    RIFLE   -> rifle
+    AUTORIFLE -> autoRifle
-    REPEATER    -> repeater
+    BURSTRIFLE -> burstRifle
-    AUTORIFLE   -> autoRifle
+    BANGROD -> bangRod
-    BURSTRIFLE  -> burstRifle
+    ELEPHANTGUN -> elephantGun
---    FASTBURSTRIFLE  -> fastBurstRifle
+    AMR -> amr
---    COMPLETEBURSTRIFLE  -> completeBurstRifle
+    AUTOAMR -> autoAmr
-    BANGROD     -> bangRod
+    SNIPERRIFLE -> sniperRifle
-    ELEPHANTGUN     -> elephantGun
+    MACHINEGUN -> machineGun
-    AMR     -> amr
+    FLAMESPITTER -> flameSpitter
-    AUTOAMR     -> autoAmr
+    FLAMETHROWER -> flameThrower
-    SNIPERRIFLE     -> sniperRifle
+    FLAMETORRENT -> flameTorrent
-    MACHINEGUN  -> machineGun
+    FLAMEWALL -> flameWall
-    FLAMESPITTER    -> flameSpitter
+    BLOWTORCH -> blowTorch
-    FLAMETHROWER    -> flameThrower
+    SPARKGUN -> sparkGun
-    FLAMETORRENT    -> flameTorrent
+    TESLAGUN -> teslaGun
-    FLAMEWALL   -> flameWall
+    LASGUN -> lasGun
-    BLOWTORCH   -> blowTorch
+    LASCIRCLE -> lasCircle
---    SPREADGUN   -> spreadGun
+    DUALBEAM -> dualBeam
---    MULTGUN     -> multGun
+    LASWIDE i -> lasWide i
-    SPARKGUN    -> sparkGun
+    TRACTORGUN -> tractorGun
-    TESLAGUN    -> teslaGun
+    LAUNCHER -> launcher
-    LASGUN  -> lasGun
+    LAUNCHERX i -> launcherX i
-    LASCIRCLE  -> lasCircle
-    --LASPULSE    -> lasPulse
-    DUALBEAM    -> dualBeam
-    --LASGUNSWING     -> lasSwing
-    --LASGUNSWAY  -> lasSway
---    LASGUNWIDEPULSE     -> lasWidePulse
-    LASWIDE i  -> lasWide i
-    --LASGUNFOCUS i     -> lasFocus i
---    SONICGUN    -> sonicGun
-    TRACTORGUN  -> tractorGun
-    LAUNCHER    -> launcher
-    LAUNCHERX i   -> launcherX  i
---  --| TRACKINGLAUNCHER
     REMOTELAUNCHER -> remoteLauncher
-    POISONSPRAYER   -> poisonSprayer
+    POISONSPRAYER -> poisonSprayer
-    DRONELAUNCHER   -> droneLauncher
+    DRONELAUNCHER -> droneLauncher
-    FORCEFIELDGUN       -> forceFieldGun
+    FORCEFIELDGUN -> forceFieldGun
-
     HELDDETECTOR d -> clickDetector d
-
+    FLATSHIELD -> flatShield
-    FLATSHIELD      -> flatShield

src/Dodge/Item/Attachment.hs

@@ -1,42 +0,0 @@
-module Dodge.Item.Attachment
-    ( charFiringStratI
-    , changeFuse
-    ) where
-import Dodge.Data
-import Dodge.ChainEffect
-import Dodge.Default
-
-import Control.Lens hiding ((|>),(<|))
-import Data.Sequence
-import Data.Maybe
-import qualified IntMapHelp as IM
-
-
-charFiringStratI
-    :: [(Char, ChainEffect)] -- ^ Different firing effects for different characters
-    -> ChainEffect
-charFiringStratI strats eff item cr w = case w ^? cWorld . creatures . ix cid . crInv 
-        . ix (crSel $ _creatures (_cWorld w) IM.! cid) . itUse . heldScroll . hsCharMode of
-    Just (c :<| _) -> fromMaybe id (Prelude.lookup c strats) eff item cr w
-    _ -> w
-  where
-    cid = _crID cr
-
-changeFuse 
-    :: Float  -- ^ Old fuse time
-    -> Creature  -- ^ Inventory item reference (I believe)
-    -> Item 
-    -> Item
-changeFuse scrollAmount _ it = it
-        & ( itAttachment .~ AttachFuse newTime )
-        & ( itUse . useAim . aimZoom .~ defaultItZoom{_itZoomMax = zm, _itZoomMin = zm} )
-  where 
-    oldTime = _atFuseTime $ _itAttachment it
-    newTime = min 90 $ max 20 $ oldTime - round (5 * scrollAmount)
-    zm = 50 / fromIntegral newTime
-
---removeItAttachment :: Int -> Int -> World -> World
---removeItAttachment i _ w = w & creatures . ix i . crInv . ix itRef . itAttachment .~ NoItAttachment
---  where 
---    cr = _creatures w IM.! i
---    itRef = _crInvSel cr

src/Dodge/Item/Draw.hs

@@ -33,7 +33,7 @@ pictureWeaponAim
     -> Creature 
     -> Item
     -> SPic
-pictureWeaponAim f cr itm = case _itPos itm of
+pictureWeaponAim f cr itm = case _itLocation itm of
     InInv _ i -> pictureWeaponOnAimItem (f itm) cr i
     _ -> mempty
 

src/Dodge/Item/Draw/SPic.hs

@@ -31,7 +31,6 @@ equipItemSPic et _ = case et of
     BRAINHAT  -> noPic (colorSH yellow $ upperPrismPoly 3 $ rectWH 4 4)
     HAT         -> noPic (colorSH yellow $ upperPrismPoly 3 $ rectWH 4 4)
     HEADLAMP  -> noPic headLampShape
-    HEADLAMP1 -> noPic headLampShape
     POWERLEGS -> legsSPic yellow
     SPEEDLEGS -> legsSPic green
     JUMPLEGS  -> legsSPic red

src/Dodge/Item/Equipment.hs

@@ -3,283 +3,89 @@ module Dodge.Item.Equipment (
     torch,
     magShield,
     powerLegs,
-    flatShield,
     wristInvisibility,
     wristArmour,
     hat,
     brainHat,
     frontArmour,
     headLamp,
-    headLamp1,
     jetPack,
     speedLegs,
     jumpLegs,
     flameShield,
-    useMagShield,
-    setWristShieldPos,
-    createHeadLamp,
-    overCID,
-    onEquipWristShield,
-    onRemoveWristShield,
-    createShieldWall,
-    removeShieldWall,
 ) where
 
-import Data.Maybe
+import Dodge.Data.CamouflageStatus
-import Dodge.Creature.HandPos
+import Dodge.Data.Item
-import Dodge.Creature.Test
-import Dodge.Data
 import Dodge.Default
 import Dodge.Item.Equipment.Booster
-import Dodge.Item.HeldOffset
-import Dodge.LightSource
-import Dodge.Wall
-import Dodge.Wall.ForceField
-import Geometry
-import qualified IntMapHelp as IM
 import LensHelp
-import Picture
 
 magShield :: Item
 magShield =
     defaultEquipment
-        { _itID = Nothing
+        & itParams .~ MagShieldParams Nothing
-        , _itAttachment = AttachMInt Nothing
+        & itUse . eqEq . eqUse .~ EMagShield
-        }
-        & itUse . eqEq . eqUse .~ EMagShield --useMagShield
         & itUse . eqEq . eqSite .~ GoesOnWrist
         & itType . iyBase .~ EQUIP MAGSHIELD
 
-useMagShield :: Item -> Creature -> World -> World
-useMagShield it cr w = w & cWorld . magnets . at mgid ?~ themagnet
-  where
-    themagnet =
-        Magnet
-            { _mgID = mgid
-            , _mgUpdate = MagnetUpdateTimer 1
-            , _mgPos = _crPos cr
-            , _mgField = MagnetBuBuCurveAroundField 50 200
-            }
-    mgid = case it ^? itAttachment . atMInt . _Just of
-        Just mgid' -> mgid'
-        Nothing -> IM.newKey $ _magnets (_cWorld w)
-
---    it = _crInv cr IM.! invid
-
 flameShield :: Item
 flameShield =
     defaultEquipment
-        { _itID = Nothing
-        }
         & itUse . eqEq . eqSite .~ GoesOnChest
         & itType . iyBase .~ EQUIP FLAMESHIELD
 
--- | Slows you down, blocks forward projectiles.
 frontArmour :: Item
 frontArmour =
     defaultEquipment
-        { _itID = Nothing
-        }
         & itUse . eqEq . eqSite .~ GoesOnChest
         & itType . iyBase .~ EQUIP FRONTARMOUR
 
 wristArmour :: Item
 wristArmour =
     defaultEquipment
-        { _itID = Nothing
-        }
         & itUse . eqEq . eqSite .~ GoesOnWrist
-        & itUse . eqEq . eqOnEquip .~ EonWristShield --onEquipWristShield
+        & itUse . eqEq . eqOnEquip .~ EonWristShield
-        & itUse . eqEq . eqUse .~ EWristShield --setWristShieldPos
+        & itUse . eqEq . eqUse .~ EWristShield
-        & itUse . eqEq . eqOnRemove .~ EoffWristShield --onRemoveWristShield
+        & itUse . eqEq . eqOnRemove .~ EoffWristShield
         & itType . iyBase .~ EQUIP WRISTARMOUR
 
-onEquipWristShield :: Item -> Creature -> World -> World
-onEquipWristShield itm cr w =
-    w
-        & cWorld . creatures . ix (_crID cr) . crInv . ix (_ipInvID (_itPos itm)) . itUse . eqEq . eqParams .~ EquipID i
-        & cWorld . walls . at i ?~ forceField{_wlID = i}
-        & setWristShieldPos (itm & itUse . eqEq . eqParams .~ EquipID i) cr
-  where
-    i = IM.newKey (_walls (_cWorld w))
-
-onRemoveWristShield :: Item -> Creature -> World -> World
-onRemoveWristShield itm cr w =
-    w
-        & cWorld . creatures . ix (_crID cr) . crInv . ix (_ipInvID (_itPos itm)) . itUse . eqEq . eqParams .~ NoEquipParams
-        & deleteWallID i
-  where
-    i = _eparamID $ _eqParams $ _eqEq $ _itUse itm
-
-setWristShieldPos :: Item -> Creature -> World -> World
-setWristShieldPos itm cr w =
-    w
-        & moveWallIDUnsafe i wlline
-  where
-    i = _eparamID $ _eqParams $ _eqEq $ _itUse itm
-    wlline = (f (V3 (-10) 7 0), f (V3 10 7 0))
-    invid = _ipInvID (_itPos itm)
-    --wlline = (V2 10 0, V2 (-10) 100)
-    handtrans = case cr ^? crInvEquipped . ix invid of
-        Just OnLeftWrist -> \cr' -> translatePointToLeftHand cr' . g
-        _ -> translatePointToRightHand
-    g
-        | twists cr = (+.+.+ V3 (-5) 10 0)
-        | otherwise = id
-    f = (+.+ _crPos cr) . stripZ . rotate3 (_crDir cr) . handtrans cr
-
 torch :: Item
 torch =
     defaultWeapon
-        & itEffect .~ effectOnOffHeld CreateHeldLight NoInvEffect -- createHeldLight (const $ const id)
+        & itEffect . ieInv .~ EffectWhileHeld CreateHeldLight
         & itType . iyBase .~ HELD TORCH
         & itUse . useAim . aimHandlePos .~ 5
         & itUse . useAim . aimMuzPos .~ 10
 
-flatShield :: Item
-flatShield =
-    defaultWeapon
-        & itEffect .~ effectOnOffHeld CreateShieldWall RemoveShieldWall
-        & itUse
-            .~ defaultrUse
-                { _useAim =
-                    AimParams
-                        { _aimWeight = 5
-                        , _aimRange = 0
-                        , _aimZoom = ItZoom 20 0.2 1
-                        , _aimStance = TwoHandFlat
-                        , _aimHandlePos = 0
-                        , _aimMuzPos = 0
-                        }
-                }
-        & itInvSize .~ 3
-        & itType . iyBase .~ HELD FLATSHIELD
-
-shieldWall :: Int -> Wall
-shieldWall crid =
-    defaultWall
-        { _wlColor = yellow
-        , _wlOpacity = SeeAbove
-        , _wlPathable = True
-        , _wlWalkable = True
-        , _wlFireThrough = True
-        , _wlReflect = True
-        , _wlUnshadowed = False
-        , _wlRotateTo = False
-        , _wlStructure = CreaturePart crid -- shieldWallDamage
-        }
-
--- TODO the reflection should be controled by the particle
---shieldWallDamage :: Damage -> Wall -> Int -> World -> World
---shieldWallDamage dm _ crid w = case _dmType dm of
-----    Lasering -> w
---    _ | isMovementDam dm -> w & creatures . ix crid . crState . crDamage .:~ dm
---    _ -> w
-
-createShieldWall :: Item -> Creature -> World -> World
-createShieldWall it cr w = case it ^? itEffect . ieMID . _Just of
-    Nothing ->
-        let (wlid, w') = createWall ((shieldWall crid){_wlLine = wlline, _wlID = wlid}) w
-         in w' & cWorld . creatures . ix crid . crInv . ix invid . itEffect . ieMID ?~ wlid
-    Just wid -> moveWallID wid wlline w
-  where
-    invid = fromJust $ _itID it
-    crid = _crID cr
-    wlline = (a, b)
-    crdirv = unitVectorAtAngle $ _crDir cr
-    crpos = _crPos cr
-    rad = _crRad cr + 2
-    a = crpos +.+ rad *.* crdirv -.- 10 *.* therot crdirv
-    b = crpos +.+ rad *.* crdirv +.+ 10 *.* therot crdirv
-    therot
-        | crIsAiming cr = vNormal
-        | otherwise = rotateV (twoFlatHRot cr) . vNormal
-
-removeShieldWall :: Item -> Creature -> World -> World
-removeShieldWall it cr w = case _ieMID $ _itEffect it of
-    Nothing -> w
-    Just wid ->
-        w & deleteWallID wid
-            & cWorld . creatures . ix crid . crInv . ix invid . itEffect . ieMID .~ Nothing
-  where
-    crid = _crID cr
-    invid = fromJust (_itID it)
-
-effectOnOffHeld ::
-    -- | effect when held
-    ItInvEffect ->
-    -- | effect when not held
-    ItInvEffect ->
-    ItEffect
-effectOnOffHeld f f' =
-    ItInvEffectID
-        { _ieInv = OnOffHeldEffect f f'
-        , _ieMID = Nothing
-        }
-
--- | Increases speed, reduces friction, cannot only move forwards.
 jetPack :: Item
 jetPack =
     defaultEquipment
-        { _itEffect = NoItEffect
-        , _itID = Nothing
-        }
         & itUse . eqEq . eqSite .~ GoesOnBack
         & itType . iyBase .~ EQUIP JETPACK
 
 brainHat :: Item
 brainHat =
     defaultEquipment
-        { _itEffect = NoItEffect
-        , _itID = Nothing
-        }
         & itUse . eqEq . eqSite .~ GoesOnHead
         & itType . iyBase .~ EQUIP BRAINHAT
 
 hat :: Item
 hat =
     defaultEquipment
-        { _itEffect = NoItEffect
-        , _itID = Nothing
-        }
         & itUse . eqEq . eqSite .~ GoesOnHead
         & itType . iyBase .~ EQUIP HAT
 
-headLamp1 :: Item
-headLamp1 =
-    defaultEquipment
-        { _itEffect = NoItEffect
-        , _itID = Nothing
-        }
-        & itUse . eqEq . eqUse .~ EHeadLamp --createHeadLamp
-        & itUse . eqEq . eqSite .~ GoesOnHead
-        & itType . iyBase .~ EQUIP HEADLAMP1
-
 headLamp :: Item
 headLamp =
     defaultEquipment
-        { _itEffect = NoItEffect
+        & itUse . eqEq . eqUse .~ EHeadLamp
-        , _itID = Nothing
-        }
-        & itUse . eqEq . eqUse .~ EHeadLamp --createHeadLamp
         & itUse . eqEq . eqSite .~ GoesOnHead
         & itType . iyBase .~ EQUIP HEADLAMP
 
-createHeadLamp :: Item -> Creature -> World -> World
-createHeadLamp _ cr =
-    cWorld . tempLightSources
-        .:~ tlsTimeRadColPos
-            1
-            200
-            0.7
-            ((_crPos cr `v2z` 0) +.+.+ rotate3 (_crDir cr) (translatePointToHead cr (V3 5 0 3)))
-
 powerLegs :: Item
 powerLegs =
     defaultEquipment
-        { _itEffect = NoItEffect
-        , _itID = Nothing
-        }
         & itUse . eqEq . eqSite .~ GoesOnLegs
         & itType . iyBase .~ EQUIP POWERLEGS
 
@@ -296,12 +102,7 @@ jumpLegs =
 wristInvisibility :: Item
 wristInvisibility =
     defaultEquipment
-        { _itID = Nothing
-        }
         & itUse . eqEq . eqSite .~ GoesOnWrist
         & itUse . eqEq . eqOnEquip .~ ECamouflage Invisible --overCID (crCamouflage .~ Invisible)
         & itUse . eqEq . eqOnRemove .~ ECamouflage FullyVisible --overCID (crCamouflage .~ FullyVisible)
         & itType . iyBase .~ EQUIP (INVISIBILITYEQUIPMENT GoesOnWrist)
-
-overCID :: (Creature -> Creature) -> Item -> Creature -> World -> World
-overCID f _ cr = cWorld . creatures . ix (_crID cr) %~ f

src/Dodge/Item/Equipment/Booster.hs

@@ -12,9 +12,9 @@ boosterGun =
     defaultLeftItem
         { _itInvColor = cyan
         , _itUse = luseInstantNoH LBoost
-        , _itEffect = resetAttachmentID
+--        , _itEffect = resetAttachmentID
         }
         & itType . iyBase .~ LEFT BOOSTER
 
-resetAttachmentID :: ItEffect
+--resetAttachmentID :: ItEffect
-resetAttachmentID = ItInvEffect ResetAttachmentEffect 0
+--resetAttachmentID = ItInvEffect ResetAttachmentEffect 0

src/Dodge/Item/Equipment/Shape.hs

@@ -8,7 +8,7 @@ import Data.Maybe
 
 pictureOnEquip :: SPic -> Creature -> Item -> SPic
 pictureOnEquip sp cr itm = fromMaybe mempty $ do
-    i <- itm ^? itPos . ipInvID
+    i <- itm ^? itLocation . ipInvID
     epos <- cr^? crInvEquipped . ix i
     return $ equipPosition epos cr sp
 

src/Dodge/Item/Held.hs

@@ -0,0 +1,24 @@
+module Dodge.Item.Held
+    where
+import Dodge.Default.Weapon
+import Dodge.Data.Item
+import Control.Lens
+flatShield :: Item
+flatShield =
+    defaultWeapon
+        & itEffect . ieInv .~ EffectIfHeld CreateShieldWall RemoveShieldWall
+        & itUse
+            .~ defaultrUse
+                { _useAim =
+                    AimParams
+                        { _aimWeight = 5
+                        , _aimRange = 0
+                        , _aimZoom = ItZoom 20 0.2 1
+                        , _aimStance = TwoHandFlat
+                        , _aimHandlePos = 0
+                        , _aimMuzPos = 0
+                        }
+                }
+        & itInvSize .~ 3
+        & itType . iyBase .~ HELD FLATSHIELD
+

src/Dodge/Item/Location.hs

@@ -12,26 +12,30 @@ getHeldItemLoc :: Creature -> World -> (World,Int)
 getHeldItemLoc cr w = case maybeitid of
     Nothing -> 
         ( w & cWorld . creatures . ix cid . crInv . ix j . itID ?~ newitid
-            & cWorld . itemPositions %~ IM.insert newitid (InInv cid j)
+            & cWorld . itemLocations %~ IM.insert newitid (InInv cid j)
         , itid)
     _ -> (w, itid)
   where
     cid = _crID cr
     j = crSel cr
-    newitid = IM.newKey $ _itemPositions (_cWorld w)
+    newitid = IM.newKey $ _itemLocations (_cWorld w)
     maybeitid = cr ^? crInv . ix j . itID . _Just
     itid = fromMaybe newitid maybeitid
 
 getItem :: Int -> World -> Maybe Item
 getItem itid w = do
-    itpos <- w ^? cWorld . itemPositions . ix itid
+    itpos <- w ^? cWorld . itemLocations . ix itid
     case itpos of
         OnFloor flitid -> w ^? cWorld . floorItems . ix flitid . flIt
         InInv cid invid -> w ^? cWorld . creatures . ix cid . crInv . ix invid
         VoidItm -> Nothing
 
+pointerToItemLocation :: Applicative f =>
+    ItemLocation -> (Item -> f Item) -> World -> f World
+pointerToItemLocation (InInv cid invid) = cWorld . creatures . ix cid . crInv . ix invid
+pointerToItemLocation (OnFloor flid) = cWorld . floorItems . ix flid . flIt
+pointerToItemLocation _ = const pure
+
 pointerToItem :: Applicative f =>
-    ItemPos -> (Item -> f Item) -> World -> f World
+    Item -> (Item -> f Item) -> World -> f World
-pointerToItem (InInv cid invid) = cWorld . creatures . ix cid . crInv . ix invid
+pointerToItem = pointerToItemLocation . _itLocation
-pointerToItem (OnFloor flid) = cWorld . floorItems . ix flid . flIt
-pointerToItem _ = const pure

src/Dodge/Item/PassKey.hs

@@ -5,17 +5,9 @@ import Picture
 import LensHelp
 keyCard :: Int -> Item
 keyCard n = defaultEquipment
-    { _itEffect = NoItEffect
+    & itInvColor .~ aquamarine
-    , _itID = Nothing
---    , _itZoom = defaultItZoom
-    , _itInvColor = aquamarine
-    }
     & itType . iyBase .~ HELD (KEYCARD n)
 
 latchkey :: Int -> Item
 latchkey _ = defaultEquipment
-    { _itEffect = NoItEffect
+    & itInvColor .~ yellow
-    , _itID = Nothing
---    , _itZoom = defaultItZoom
-    , _itInvColor = yellow
-    }

src/Dodge/Item/Weapon/ExtraEffect.hs

@@ -38,11 +38,11 @@ import qualified SDL
 autoEffect :: (Item -> Creature -> World -> World) -> Int -> SoundID -> Item -> Creature -> World -> World
 autoEffect eff t sid itm cr w
     | _eparamInt (_eqParams (_eqEq $ _itUse itm)) < 1 = eff itm cr w 
-        & cWorld . creatures . ix (_crID cr) . crInv . ix (_ipInvID $ _itPos itm)
+        & cWorld . creatures . ix (_crID cr) . crInv . ix (_ipInvID $ _itLocation itm)
                                      . itUse . eqEq . eqParams . eparamInt .~ t
        & soundStart OnceSound (_crPos cr) sid Nothing
     | otherwise = w 
-        & cWorld . creatures . ix (_crID cr) . crInv . ix (_ipInvID $ _itPos itm)
+        & cWorld . creatures . ix (_crID cr) . crInv . ix (_ipInvID $ _itLocation itm)
                                      . itUse . eqEq . eqParams . eparamInt -~ 1
 
 {- | Automatically send out radar pulses that detect walls.  -}

src/Dodge/Item/Weapon/Launcher.hs

@@ -118,5 +118,5 @@ explodeRemoteRocket itid pjid w =
         & itPoint . itUse . rUse .~ HeldDoNothing
         & usePayload (_prjPayload thepj) (_prjPos thepj)
   where
-    itPoint = pointerToItem $ _itemPositions (_cWorld w) IM.! itid
+    itPoint = pointerToItemLocation $ _itemLocations (_cWorld w) IM.! itid
     thepj = _projectiles (_cWorld w) IM.! pjid

src/Dodge/Item/Weapon/Remote.hs

@@ -1,18 +1,16 @@
 module Dodge.Item.Weapon.Remote
-    ( pointerToItem
+    ( setRemoteScope
-    , setRemoteScope
     , setRemoteBombScope
     ) where
 import Dodge.Data
 import Dodge.Default
 import Geometry
-import Dodge.Item.Location
 
 import qualified IntMapHelp as IM
 import Control.Lens
 
 setRemoteBombScope :: Int -> Prop -> World -> World
-setRemoteBombScope itid pj w' = case _itemPositions (_cWorld w') IM.! itid of
+setRemoteBombScope itid pj w' = case _itemLocations (_cWorld w') IM.! itid of
     InInv cid invid 
         -> w' & cWorld . creatures . ix cid . crInv . ix invid . itScope 
                 . scopePos .~ (_prPos pj -.- _crPos (_creatures (_cWorld w') IM.! cid))
@@ -21,7 +19,7 @@ setRemoteBombScope itid pj w' = case _itemPositions (_cWorld w') IM.! itid of
     _   -> w'
 
 setRemoteScope :: Int -> Point2 -> World -> World
-setRemoteScope itid pos w' = case w' ^? cWorld . itemPositions . ix itid of
+setRemoteScope itid pos w' = case w' ^? cWorld . itemLocations . ix itid of
     Just (InInv cid' invid )
         -> w' & cWorld . creatures . ix cid' . crInv . ix invid . itScope
                 . scopePos .~ (pos -.- _crPos (_creatures (_cWorld w') IM.! cid'))

src/Dodge/Item/Weapon/TriggerType.hs

@@ -363,7 +363,7 @@ shootL f item cr w
     | otherwise = w
   where 
     cid = _crID cr
-    invid = _ipInvID $ _itPos item
+    invid = _ipInvID $ _itLocation item
     pointerToItem = cWorld . creatures . ix cid . crInv . ix invid
     fireCondition = _rateTime (_useDelay (_itUse item)) == 0
         && _arLoaded (_leftConsumption (_itUse item)) > 0

src/Dodge/Item/Weapon/Utility.hs

@@ -18,12 +18,12 @@ rewindGun :: Item
 rewindGun =
     defaultLeftItem
         { _itInvColor = cyan
-        , _itEffect = ItRewindEffect RewindEffect -- []
         , _itUse =
             defaultlUse
                 & lUse .~ LRewind --useRewindGun
                 & eqEq . eqSite .~ GoesOnChest
         }
+        & itEffect . ieInv .~ RewindEffect
         & itType . iyBase .~ LEFT REWINDER
         & itUse . leftConsumption
             .~ ChargeableAmmo
@@ -35,10 +35,8 @@ rewindGun =
 shrinkGun :: Item
 shrinkGun =
     defaultLeftItem
-        { _itUse = defaultlUse & lUse .~ LShrink -- hammerCheckL useShrinkGun
+        & itUse .~ (defaultlUse & lUse .~ LShrink)
-        --    , _itFloorPict = shrinkGunPic
+        & itParams .~ ShrinkGunParams FullSize
-        , _itAttachment = AttachBool True
-        }
         & itType . iyBase .~ LEFT SHRINKER
 
 shrinkGunPic :: Item -> SPic
@@ -100,7 +98,7 @@ useForceFieldGun itm cr w = fromMaybe w $ do
     return $
         w
             & cWorld . walls %~ IM.insertWith (\_ x -> x) i forceField{_wlID = i}
-            & cWorld . creatures . ix (_crID cr) . crInv . ix (_ipInvID (_itPos itm)) . itParams . paramMID ?~ i
+            & cWorld . creatures . ix (_crID cr) . crInv . ix (_ipInvID (_itLocation itm)) . itParams . paramMID ?~ i
             & moveWallIDUnsafe i wlline
   where
     i = fromMaybe (IM.newKey (_walls (_cWorld w))) $ itm ^? itParams . paramMID . _Just

src/Dodge/Luse.hs

@@ -1,7 +1,6 @@
 module Dodge.Luse where
 
 import Dodge.Base
-import Data.Maybe
 import Dodge.Creature.Action
 import Dodge.Data
 import Dodge.Default.Creature
@@ -38,16 +37,16 @@ useRewindGun _ _ w = case _rewindWorlds (_cWorld w) of
 -- creature but using the old crInvSel value
 -- 22.05.23 this has been changed from using invids to items
 useShrinkGun :: Item -> Creature -> World -> World
-useShrinkGun it cr w =
+useShrinkGun it cr w = case it ^? itParams . shrinkGunStatus of
-    if _atBool $ _itAttachment it
+    Just FullSize -> tryResize 0.5 $ stripNoItems cr . f Shrunk UndroppableIdentified . dropExcept cr invid
-        then tryResize 0.5 $ stripNoItems cr . f False UndroppableIdentified . dropExcept cr invid
+    Just Shrunk -> tryResize 1 $ f FullSize Uncursed . setMinInvSize defaultInvSize cr
-        else tryResize 1 $ f True Uncursed . setMinInvSize defaultInvSize cr
+    Nothing -> error "useShrinkGun applied to item with incorrect ItParam"
   where
-    invid = _ipInvID $ _itPos it
+    invid = _ipInvID $ _itLocation it
     tryResize x g = maybe w g $ sizeSelf x cr w
     f isInUse cstatus =
         cWorld . creatures . ix (_crID cr) . crInv . ix invid
-            %~ ((itAttachment . atBool .~ isInUse) . (itCurseStatus .~ cstatus))
+            %~ ((itParams . shrinkGunStatus .~ isInUse) . (itCurseStatus .~ cstatus))
 
 boostSelfL ::
     -- | boost amount
@@ -56,27 +55,29 @@ boostSelfL ::
     Creature ->
     World ->
     World
-boostSelfL x itm cr w = case boostPoint x cr w of
+boostSelfL = undefined
-    Left p -> crEff p (itUse . leftConsumption . arLoaded .~ 0)
+
-    Right p -> crEff p (itUse . leftConsumption . arLoaded -~ 1)
+--boostSelfL x itm cr w = case boostPoint x cr w of
-  where
+--    Left p -> crEff p (itUse . leftConsumption . arLoaded .~ 0)
-    invid = _ipInvID $ _itPos itm
+--    Right p -> crEff p (itUse . leftConsumption . arLoaded -~ 1)
-    cid = _crID cr
+--  where
-    cpos = _crPos cr
+--    invid = _ipInvID $ _itLocation itm
-    r = _crRad cr
+--    cid = _crID cr
-    pid =
+--    cpos = _crPos cr
-        fromMaybe
+--    r = _crRad cr
-            (IM.newKey $ _props (_cWorld w))
+--    pid =
-            (cr ^? crInv . ix invid . itAttachment . atInt)
+--        fromMaybe
-    crEff p ammoEff =
+--            (IM.newKey $ _props (_cWorld w))
-        addBoostShockwave pid p (r *.* normalizeV (p -.- cpos)) w
+--            (cr ^? crInv . ix invid . itAttachment . atInt)
-            & cWorld . creatures . ix cid
+--    crEff p ammoEff =
-                %~ (crPos .~ p)
+--        addBoostShockwave pid p (r *.* normalizeV (p -.- cpos)) w
-                    . ( crInv . ix invid
+--            & cWorld . creatures . ix cid
-                            %~ ammoEff
+--                %~ (crPos .~ p)
-                                . (itEffect . ieCounter .~ 1)
+--                    . ( crInv . ix invid
-                                . (itAttachment .~ AttachInt pid)
+--                            %~ ammoEff
-                      )
+--                                . (itEffect . ieCounter .~ 1)
+--                                . (itAttachment .~ AttachInt pid)
+--                      )
 
 -- | Move a creature towards the mouse position, with shockwave
 boostPoint ::

src/Dodge/Projectile/Update.hs

@@ -69,9 +69,9 @@ explodeRemoteRocket' mitid thepj w =
   where
     updateitem = fromMaybe (cWorld . projectiles . at pjid .~ Nothing) $ do
         itid <- mitid
-        itpos <- w ^? cWorld . itemPositions . ix itid
+        itpos <- w ^? cWorld . itemLocations . ix itid
         return $
-            (pointerToItem itpos . itUse . rUse .~ HeldDoNothing)
+            (pointerToItemLocation itpos . itUse . rUse .~ HeldDoNothing)
                 . (cWorld . projectiles . ix pjid . prjUpdates .~ [PJRetireRemote itid 30 pjid])
     pjid = _prjID thepj
 
@@ -125,7 +125,7 @@ upProjectile pu pj = case pu of
 retireRemoteProj'' :: Int -> Int -> World -> World
 retireRemoteProj'' itid pjid w =
     w
-        & pointerToItem (_itemPositions (_cWorld w) IM.! itid)
+        & pointerToItemLocation (_itemLocations (_cWorld w) IM.! itid)
             %~ ( (itScope . scopePos .~ V2 0 0)
                     . (itUse . rUse .~ HeldFireRemoteShell)
                )
@@ -138,7 +138,7 @@ setRemoteDir cid itid pj w = w & cWorld . projectiles . ix (_prjID pj) . prjDir
     newdir
         | SDL.ButtonRight `M.member` _mouseButtons w
             && w ^? cWorld . creatures . ix cid . crInvSel . iselPos
-                == w ^? cWorld . itemPositions . ix itid . ipInvID =
+                == w ^? cWorld . itemLocations . ix itid . ipInvID =
             _cameraRot (_cWorld w) + argV (_mousePos w)
         | otherwise = _prjDir pj
 
@@ -189,7 +189,7 @@ pjTrack' itid pj w = rotateToTarget pj w
                     (_prjPos pj)
                     tpos
                     (argV $ _prjAcc pj)
-    itPoint = pointerToItem $ _itemPositions (_cWorld w) IM.! itid
+    itPoint = pointerToItemLocation $ _itemLocations (_cWorld w) IM.! itid
 
 reduceSpinBy' :: Float -> Proj -> World -> World
 reduceSpinBy' x pj = cWorld . projectiles . ix (_prjID pj) . prjSpin *~ x