Move equipType out of record

src/Dodge/Data/Item/Use/Equipment.hs

@@ -18,7 +18,7 @@ data EquipEffect = EquipEffect
     { _eeUse :: Euse --Item -> Creature -> World -> World
     , _eeOnEquip :: ItmCrWdWd --Item -> Creature -> World -> World
     , _eeOnRemove :: ItmCrWdWd --Item -> Creature -> World -> World
-    , _eeType :: EquipType
+--    , _eeType :: EquipType
     , _eeParams :: EquipParams
     , _eeViewDist :: Maybe Float
     , _eeAttachPos :: Point3

src/Dodge/Default/Item.hs

@@ -1,17 +1,12 @@
 module Dodge.Default.Item (
     defaultHeldItem,
---    singleAmmo,
-    defaultBulletWeapon,
-    --    defaultLeftItem,
     defaultCraftItem,
     module Dodge.Default.Item.Use,
 ) where
 
 import Control.Lens
---import qualified Data.IntMap.Strict as IM
 import Dodge.Data.Item
 import Dodge.Default.Item.Use
---import Geometry.Data
 
 defaultHeldItem :: Item
 defaultHeldItem =
@@ -21,7 +16,6 @@ defaultHeldItem =
         , _itEffect = defaultItEffect
         , _itID = 0 -- should this return an error ? const $ error "itID not correctly initialised" ?
         , _itTargeting = NoItTargeting
---        , _itAmmoSlots = mempty
         , _itLocation = InVoid
         , _itUse = UseHeld
         , _itParams = NoParams
@@ -30,22 +24,9 @@ defaultHeldItem =
         , _itTimeLastUsed = 0
         }
 
---defaultLeftItem :: Item
---defaultLeftItem = defaultHeldItem & itUse .~ defaultLeftUse
-
 defaultCraftItem :: Item
 defaultCraftItem = defaultHeldItem & itUse .~ UseNothing
 
---singleAmmo :: a -> IM.IntMap a
---singleAmmo x = IM.insert 0 x mempty
-
-defaultBulletWeapon :: Item
-defaultBulletWeapon =
-    defaultHeldItem
---        & itAmmoSlots .~ singleAmmo BulletAmmo
---        & itUse . heldMuzzles .~ 
---            [Muzzle (V2 15 0) 0 0.01 0 BasicFlare MuzzleShootBullet (UseExactly 1) 0]
-
 defaultItEffect :: ItEffect
 defaultItEffect =
     ItEffect

src/Dodge/Default/Item/Use/Equipment.hs

@@ -6,8 +6,8 @@ import Dodge.Data.Item.Use.Equipment
 defaultEquip :: EquipEffect
 defaultEquip =
     EquipEffect
-        { _eeType = GoesOnHead
+        { --_eeType = GoesOnHead
-        , _eeUse = EDoNothing
+         _eeUse = EDoNothing
         , _eeOnEquip = ItmCrWdWdDoNothing
         , _eeOnRemove = ItmCrWdWdDoNothing
         , _eeParams = NoEquipParams

src/Dodge/Inventory/RBList.hs

@@ -4,6 +4,7 @@ module Dodge.Inventory.RBList (
     eqSiteToPositions,
 ) where
 
+import Dodge.Data.EquipType
 import Control.Applicative
 import Control.Lens
 import Data.List (elemIndex, findIndex)
@@ -19,7 +20,7 @@ updateRBList w = case w ^. rbOptions of
     EquipOptions{} -> w
     _ -> fromMaybe (w & rbOptions .~ NoRightButtonOptions) $ do
         i <- cr ^? crManipulation . manObject . imSelectedItem
-        esite <- cr ^? crInv . ix i . itUse . uequipEffect . eeType
+        esite <- cr ^? crInv . ix i >>= equipType -- . itUse . uequipEffect . eeType
         return $
             w & rbOptions
                 .~ EquipOptions
@@ -44,7 +45,7 @@ chooseFreeSite cr = fromMaybe 0 . findIndex hasnoequipment
 
 getEquipmentAllocation :: Int -> World -> EquipmentAllocation
 getEquipmentAllocation invid w = fromMaybe DoNotMoveEquipment $ do
-    esite <- you w ^? crInv . ix invid . itUse . uequipEffect . eeType
+    esite <- you w ^? crInv . ix invid >>= equipType-- . itUse . uequipEffect . eeType
     i <-
         w ^? rbOptions . opSel
             <|> Just (chooseEquipPosition (you w) (eqSiteToPositions esite))

src/Dodge/Item/Equipment.hs

@@ -28,25 +28,24 @@ magShield :: Item
 magShield =
     defaultEquipment
         & itUse . uequipEffect . eeUse .~ EMagShield MagnetRepulse
-        & itUse . uequipEffect . eeType .~ GoesOnWrist
         & itType .~ EQUIP MAGSHIELD
 
 flameShield :: Item
 flameShield =
     defaultEquipment
-        & itUse . uequipEffect . eeType .~ GoesOnChest
+--        & itUse . uequipEffect . eeType .~ GoesOnChest
         & itType .~ EQUIP FLAMESHIELD
 
 frontArmour :: Item
 frontArmour =
     defaultEquipment
-        & itUse . uequipEffect . eeType .~ GoesOnChest
+--        & itUse . uequipEffect . eeType .~ GoesOnChest
         & itType .~ EQUIP FRONTARMOUR
 
 wristArmour :: Item
 wristArmour =
     defaultEquipment
-        & itUse . uequipEffect . eeType .~ GoesOnWrist
+--        & itUse . uequipEffect . eeType .~ GoesOnWrist
         & itUse . uequipEffect . eeOnEquip .~ EonWristShield
         & itUse . uequipEffect . eeUse .~ EWristShield
         & itUse . uequipEffect . eeOnRemove .~ EoffWristShield
@@ -55,7 +54,7 @@ wristArmour =
 batteryPack :: Item
 batteryPack =
     defaultEquipment
-        & itUse . uequipEffect . eeType .~ GoesOnBack
+--        & itUse . uequipEffect . eeType .~ GoesOnBack
         & itUse . uequipEffect . eeAttachPos .~ V3 (-8) 0 10
         & itUse . uequipEffect . eeUse .~ EDoNothing
         & itConsumables
@@ -73,7 +72,7 @@ batteryPack =
 fuelPack :: Item
 fuelPack =
     defaultEquipment
-        & itUse . uequipEffect . eeType .~ GoesOnBack
+--        & itUse . uequipEffect . eeType .~ GoesOnBack
         & itUse . uequipEffect . eeAttachPos .~ V3 (-9) 0 10
 --        & itUse . uequipEffect . eeUse .~ EFuelSource 10000 10000
         & itType .~ EQUIP FUELPACK
@@ -91,7 +90,7 @@ fuelPack =
 bulletBeltPack :: Item
 bulletBeltPack =
     defaultEquipment
-        & itUse . uequipEffect . eeType .~ GoesOnBack
+        -- & itUse . uequipEffect . eeType .~ GoesOnBack
         & itUse . uequipEffect . eeAttachPos .~ V3 (-9) 0 10
         & itUse . uequipEffect . eeUse .~ EDoNothing
         & itConsumables
@@ -109,7 +108,7 @@ bulletBeltPack =
 bulletBeltBracer :: Item
 bulletBeltBracer =
     defaultEquipment
-        & itUse . uequipEffect . eeType .~ GoesOnWrist
+        -- & itUse . uequipEffect . eeType .~ GoesOnWrist
         & itUse . uequipEffect . eeAttachPos .~ V3 (-9) 0 10
         & itUse . uequipEffect . eeUse .~ EDoNothing
         & itConsumables
@@ -127,26 +126,25 @@ bulletBeltBracer =
 brainHat :: Item
 brainHat =
     defaultEquipment
-        & itUse . uequipEffect . eeType .~ GoesOnHead
+        -- & itUse . uequipEffect . eeType .~ GoesOnHead
         & itType .~ EQUIP BRAINHAT
 
 hat :: Item
 hat =
     defaultEquipment
-        & itUse . uequipEffect . eeType .~ GoesOnHead
+        -- & itUse . uequipEffect . eeType .~ GoesOnHead
         & itType .~ EQUIP HAT
 
 headLamp :: Item
 headLamp =
     defaultEquipment
         & itUse . uequipEffect . eeUse .~ EHeadLamp
-        & itUse . uequipEffect . eeType .~ GoesOnHead
+        -- & itUse . uequipEffect . eeType .~ GoesOnHead
         & itType .~ EQUIP HEADLAMP
 
 powerLegs :: Item
 powerLegs =
     defaultEquipment
-        & itUse . uequipEffect . eeType .~ GoesOnLegs
         & itType .~ EQUIP POWERLEGS
 
 speedLegs :: Item
@@ -158,7 +156,6 @@ jumpLegs = powerLegs & itType .~ EQUIP JUMPLEGS
 wristInvisibility :: Item
 wristInvisibility =
     defaultEquipment
-        & itUse . uequipEffect . eeType .~ GoesOnWrist
 --        & itUse . uequipEffect . eeOnEquip .~ ECamouflage Invisible 
 --        & itUse . uequipEffect . eeOnRemove .~ ECamouflage FullyVisible 
         & itType .~ EQUIP (INVISIBILITYEQUIPMENT GoesOnWrist)
@@ -166,5 +163,4 @@ wristInvisibility =
 pulseChecker :: Item
 pulseChecker =
     defaultEquipment
-        & itUse . uequipEffect . eeType .~ GoesOnWrist
         & itType .~ EQUIP WRIST_ECG

src/Dodge/Item/Held/Cane.hs

@@ -12,17 +12,9 @@ import Dodge.Default
 --import qualified Data.IntMap.Strict as IM
 import LensHelp
 
-defaultBangCane :: Item
-defaultBangCane =
-    defaultBulletWeapon
---        & itUse . heldParams . recoil .~ 50
---        & itUse . heldDelay . rateMax .~ 6
---        & itUse . heldMods .~ BangCaneMod
-        -- & itUse . heldAim . aimHandlePos .~ 5
-
 volleyGun :: Int -> Item
 volleyGun i =
-    defaultBangCane
+    defaultHeldItem
 --        & itUse . heldMuzzles .~ getZipList 
 --            (ZipList [Muzzle (V2 15 x) 0 0.01 | x <- spreadAroundCenter i 6]
 --            <*> ZipList [0..i-1] 
@@ -36,7 +28,7 @@ volleyGun i =
 --        & itUse . heldUseEffect .~ RandomiseMuzzleFrames i
 
 rifle :: Item
-rifle = defaultBangCane & itType .~ HELD RIFLE
+rifle = defaultHeldItem & itType .~ HELD RIFLE
 --        & itUse . heldMuzzles . ix 0 . mzPos .~ V2 25 0
 
 alteRifle :: Item

src/Dodge/Item/Held/Cone.hs

@@ -7,24 +7,12 @@ module Dodge.Item.Held.Cone (
 import Control.Lens
 import Dodge.Data.Item
 import Dodge.Default.Item
---import Geometry.Data
---import Linear
 
 bangCone :: Item
-bangCone =
+bangCone = defaultHeldItem & itType .~ HELD BANGCONE
-    defaultBulletWeapon
---        & itUse . heldDelay . rateMax .~ 20
---        & itUse . heldMuzzles
---            .~ [Muzzle (V2 15 0) 0 0.5 0 BasicFlare MuzzleShootBullet (UseUpTo 15) 0]
-        & itType .~ HELD BANGCONE
 
 blunderbuss :: Item
-blunderbuss =
+blunderbuss = bangCone & itType .~ HELD BLUNDERBUSS
-    bangCone
---        & itUse . heldMuzzles . ix 0 . mzPos . _x .~ 30
-        & itType .~ HELD BLUNDERBUSS
 
 grapeCannon :: Int -> Item
-grapeCannon i =
+grapeCannon i = blunderbuss & itType .~ HELD (GRAPECANNON i)
-    blunderbuss
-        & itType .~ HELD (GRAPECANNON i)

src/Dodge/Item/Held/Rod.hs

@@ -17,7 +17,7 @@ import LensHelp
 
 bangRod :: Item
 bangRod =
-    defaultBulletWeapon
+    defaultHeldItem
 --        & itUse . heldDelay . rateMax .~ 12
         & itType .~ HELD BANGROD
 --        & itUse . heldMuzzles . ix 0 . mzPos .~ V2 30 0

src/Dodge/Item/Held/Stick.hs

@@ -14,7 +14,7 @@ import LensHelp
 
 bangStick :: Int -> Item
 bangStick i =
-    defaultBulletWeapon
+    defaultHeldItem
 --        & itUse . heldParams . recoil .~ 25
         & itType .~ HELD (BANGSTICK i)
 --        & itUse . heldDelay . rateMax .~ 8

src/Dodge/Item/Info.hs

@@ -4,6 +4,7 @@ module Dodge.Item.Info (
     itemInfo,
 ) where
 
+import Dodge.Data.EquipType
 import Dodge.Data.AimStance
 import Data.Char
 --import qualified Data.Map.Strict as M
@@ -245,7 +246,7 @@ aimStanceInfo as = case as of
     OneHand -> "It is held in one hand."
 
 itmEquipSiteInfo :: Item -> String
-itmEquipSiteInfo = maybe "" equipSiteInfo . (^? itUse . uequipEffect . eeType)
+itmEquipSiteInfo = maybe "" equipSiteInfo . equipType-- (^? itUse . uequipEffect . eeType)
 
 equipSiteInfo :: EquipType -> String
 equipSiteInfo es = case es of

src/Dodge/Render/HUD.hs

@@ -4,6 +4,7 @@ module Dodge.Render.HUD (
     drawHUD,
 ) where
 
+import Dodge.Data.EquipType
 import Dodge.Item.Location
 import Control.Applicative
 import Control.Lens
@@ -252,7 +253,7 @@ drawRBOptions cfig w = fold $ do
     invid <- you w ^? crManipulation . manObject . imSelectedItem
     eslist <-
         fmap eqSiteToPositions $
-            you w ^? crInv . ix invid . itUse . uequipEffect . eeType
+            you w ^? crInv . ix invid >>= equipType-- . itUse . uequipEffect . eeType
     i <- w ^? rbOptions . opSel
     let ae = getEquipmentAllocation invid w
     sss <- w ^? hud . hudElement . diSections

src/Dodge/Update/Scroll.hs

@@ -2,6 +2,7 @@ module Dodge.Update.Scroll (
     updateWheelEvent,
 ) where
 
+import Dodge.Data.EquipType
 import Padding
 import Control.Monad
 import qualified Data.Map.Strict as M
@@ -38,7 +39,7 @@ updateBaseWheelEvent yi w
     bdown b = w & has (input . mouseButtons . ix b)
     rbscrollmax = fromMaybe 1 $ do
         invid <- you w ^? crManipulation . manObject . imSelectedItem
-        esite <- you w ^? crInv . ix invid . itUse . uequipEffect . eeType
+        esite <- you w ^? crInv . ix invid >>= equipType -- . itUse . uequipEffect . eeType
         return . length $ eqSiteToPositions esite
 
 selectedItemScroll :: Int -> World -> Maybe World

tags

@@ -36,7 +36,7 @@ AUTOAMR	src/Dodge/Data/Item/Combine.hs	158;"	C
 AUTOPISTOL	src/Dodge/Data/Item/Combine.hs	144;"	C
 AUTORIFLE	src/Dodge/Data/Item/Combine.hs	153;"	C
 AZURE	src/Color/Data.hs	23;"	C
-AccessTerminal	src/Dodge/Data/WorldEffect.hs	29;"	C
+AccessTerminal	src/Dodge/Data/WorldEffect.hs	26;"	C
 Action	src/Dodge/Data/ActionPlan.hs	78;"	t
 Action	src/Dodge/Creature/Action.hs	4;"	m
 ActionNothing	src/Dodge/Data/ActionPlan.hs	83;"	C
@@ -76,7 +76,7 @@ AmmoSlots	src/Dodge/Item/AmmoSlots.hs	3;"	m
 AmmoTargetingLink	src/Dodge/Data/ComposedItem.hs	21;"	C
 AmmoTargetingSF	src/Dodge/Data/ComposedItem.hs	59;"	C
 AmmoType	src/Dodge/Data/AmmoType.hs	9;"	t
-AmmoType	src/Dodge/Data/AmmoType.hs	3;"	m
+AmmoType	src/Dodge/Data/AmmoType.hs	4;"	m
 AnRoom	src/Dodge/Annotation/Data.hs	18;"	C
 AnTree	src/Dodge/Annotation/Data.hs	19;"	C
 Analyser	src/Dodge/Placement/Instance/Analyser.hs	1;"	m
@@ -543,7 +543,7 @@ Door	src/Dodge/Room/Door.hs	2;"	m
 DoorClosed	src/Dodge/Data/Door.hs	23;"	C
 DoorHalfway	src/Dodge/Data/Door.hs	23;"	C
 DoorInt	src/Dodge/Data/Door.hs	23;"	C
-DoorMechanism	src/Dodge/Data/WorldEffect.hs	73;"	C
+DoorMechanism	src/Dodge/Data/WorldEffect.hs	70;"	C
 DoorObstacle	src/Dodge/Data/PathGraph.hs	50;"	C
 DoorOpen	src/Dodge/Data/Door.hs	23;"	C
 DoorPane	src/Dodge/LevelGen/DoorPane.hs	1;"	m
@@ -555,10 +555,10 @@ DoubleTree	src/Dodge/Data/DoubleTree.hs	30;"	t
 DoubleTree	src/Dodge/Data/DoubleTree.hs	6;"	m
 DoubleTree	src/Dodge/DoubleTree.hs	1;"	m
 DoubleTreeNodeType	src/Dodge/Data/DoubleTree.hs	15;"	t
-DrWdId	src/Dodge/Data/WorldEffect.hs	70;"	C
+DrWdId	src/Dodge/Data/WorldEffect.hs	67;"	C
-DrWdMakeDoorDebris	src/Dodge/Data/WorldEffect.hs	71;"	C
+DrWdMakeDoorDebris	src/Dodge/Data/WorldEffect.hs	68;"	C
-DrWdMechanismStepwise	src/Dodge/Data/WorldEffect.hs	72;"	C
+DrWdMechanismStepwise	src/Dodge/Data/WorldEffect.hs	69;"	C
-DrWdWd	src/Dodge/Data/WorldEffect.hs	69;"	t
+DrWdWd	src/Dodge/Data/WorldEffect.hs	66;"	t
 DrWdWd	src/Dodge/DrWdWd.hs	1;"	m
 Draw	src/Dodge/Beam/Draw.hs	1;"	m
 Draw	src/Dodge/Block/Draw.hs	1;"	m
@@ -639,6 +639,7 @@ EquipOptions	src/Dodge/Data/RightButtonOptions.hs	15;"	C
 EquipParams	src/Dodge/Data/Item/Use/Equipment.hs	35;"	t
 EquipSite	src/Dodge/Data/Equipment/Misc.hs	21;"	t
 EquipType	src/Dodge/Data/Equipment/Misc.hs	11;"	t
+EquipType	src/Dodge/Data/EquipType.hs	3;"	m
 Equipment	src/Dodge/Data/Item/Use/Equipment.hs	5;"	m
 Equipment	src/Dodge/Default/Item/Use/Equipment.hs	1;"	m
 Equipment	src/Dodge/Equipment.hs	1;"	m
@@ -939,9 +940,9 @@ InwardShockwave	src/Dodge/Data/Shockwave.hs	14;"	C
 IsClose	src/Dodge/Data/Machine/Sensor.hs	39;"	C
 IsolationUnitSS	src/Dodge/Data/Scenario.hs	101;"	C
 ItAmount	src/Dodge/Data/Item/Use/Consumption.hs	39;"	t
-ItCrWdItemHeldEffect	src/Dodge/Data/WorldEffect.hs	20;"	C
+ItCrWdItemHeldEffect	src/Dodge/Data/WorldEffect.hs	17;"	C
-ItCrWdItemHeldEffectNoHammer	src/Dodge/Data/WorldEffect.hs	21;"	C
+ItCrWdItemHeldEffectNoHammer	src/Dodge/Data/WorldEffect.hs	18;"	C
-ItCrWdWd	src/Dodge/Data/WorldEffect.hs	20;"	t
+ItCrWdWd	src/Dodge/Data/WorldEffect.hs	17;"	t
 ItDropEffect	src/Dodge/Data/Item/Effect.hs	37;"	t
 ItEffect	src/Dodge/Data/Item/Effect.hs	16;"	t
 ItEffect	src/Dodge/ItEffect.hs	3;"	m
@@ -990,7 +991,7 @@ LASER	src/Dodge/Data/Item/Combine.hs	167;"	C
 LASERING	src/Dodge/Data/Damage/Type.hs	19;"	C
 LDT	src/Dodge/Data/DoubleTree.hs	40;"	C
 LDTBottomNode	src/Dodge/Data/DoubleTree.hs	28;"	C
-LDTComb	src/Dodge/Item/Grammar.hs	236;"	t
+LDTComb	src/Dodge/Item/Grammar.hs	237;"	t
 LDTMidAboveNode	src/Dodge/Data/DoubleTree.hs	26;"	C
 LDTMidBelowNode	src/Dodge/Data/DoubleTree.hs	27;"	C
 LDTRootNode	src/Dodge/Data/DoubleTree.hs	24;"	C
@@ -1124,7 +1125,7 @@ MachineAltSound	src/Dodge/Data/SoundOrigin.hs	22;"	C
 MachinePart	src/Dodge/Data/Wall/Structure.hs	15;"	C
 MachineSound	src/Dodge/Data/SoundOrigin.hs	21;"	C
 MachineType	src/Dodge/Data/Machine.hs	49;"	t
-MagAmmoType	src/Dodge/Item/MagAmmoType.hs	1;"	m
+MagAmmoType	src/Dodge/Item/MagAmmoType.hs	3;"	m
 Magnet	src/Dodge/Data/Magnet.hs	23;"	t
 Magnet	src/Dodge/Data/Magnet.hs	6;"	m
 Magnet	src/Dodge/Magnet.hs	1;"	m
@@ -1144,8 +1145,8 @@ MakeAutoLink	src/Dodge/Data/ComposedItem.hs	32;"	C
 MakeAutoSF	src/Dodge/Data/ComposedItem.hs	63;"	C
 MakeDefaultCorpse	src/Dodge/Data/Creature.hs	72;"	C
 MakeSound	src/Dodge/Data/ActionPlan.hs	43;"	C
-MakeStartCloudAt	src/Dodge/Data/WorldEffect.hs	32;"	C
+MakeStartCloudAt	src/Dodge/Data/WorldEffect.hs	29;"	C
-MakeTempLight	src/Dodge/Data/WorldEffect.hs	36;"	C
+MakeTempLight	src/Dodge/Data/WorldEffect.hs	33;"	C
 ManipulatedObject	src/Dodge/Data/Item/Use/Consumption/LoadAction.hs	20;"	t
 Manipulation	src/Dodge/Data/Item/Use/Consumption/LoadAction.hs	14;"	t
 Manipulator	src/Dodge/Data/Item/Use/Consumption/LoadAction.hs	15;"	C
@@ -1162,11 +1163,11 @@ McSensor	src/Dodge/Data/Machine.hs	52;"	C
 McStatic	src/Dodge/Data/Machine.hs	50;"	C
 McTerminal	src/Dodge/Data/Machine.hs	51;"	C
 McTurret	src/Dodge/Data/Machine.hs	53;"	C
-MdFlickerUpdate	src/Dodge/Data/WorldEffect.hs	51;"	C
+MdFlickerUpdate	src/Dodge/Data/WorldEffect.hs	48;"	C
-MdSetLSCol	src/Dodge/Data/WorldEffect.hs	50;"	C
+MdSetLSCol	src/Dodge/Data/WorldEffect.hs	47;"	C
-MdTrigIf	src/Dodge/Data/WorldEffect.hs	49;"	C
+MdTrigIf	src/Dodge/Data/WorldEffect.hs	46;"	C
-MdWdId	src/Dodge/Data/WorldEffect.hs	48;"	C
+MdWdId	src/Dodge/Data/WorldEffect.hs	45;"	C
-MdWdWd	src/Dodge/Data/WorldEffect.hs	47;"	t
+MdWdWd	src/Dodge/Data/WorldEffect.hs	44;"	t
 MedBaySS	src/Dodge/Data/Scenario.hs	100;"	C
 Medium	src/Shape/Data.hs	30;"	C
 Melee	src/Dodge/Data/ActionPlan.hs	41;"	C
@@ -1301,7 +1302,7 @@ NoShadowFidelity	src/Shape/Data.hs	25;"	C
 NoShadows	src/Dodge/Data/Config.hs	103;"	C
 NoSubInventory	src/Dodge/Data/HUD.hs	29;"	C
 NoTrigger	src/Dodge/Data/TriggerType.hs	12;"	C
-NoWorldEffect	src/Dodge/Data/WorldEffect.hs	25;"	C
+NoWorldEffect	src/Dodge/Data/WorldEffect.hs	22;"	C
 Noclip	src/Dodge/Data/Config.hs	70;"	C
 NodeMTree	src/Dodge/Data/MetaTree.hs	14;"	C
 NodeMTree	src/Dodge/Tree/Compose/Data.hs	9;"	C
@@ -1743,9 +1744,9 @@ Sensor	src/Dodge/Placement/Instance/Sensor.hs	1;"	m
 SensorDoor	src/Dodge/Room/SensorDoor.hs	2;"	m
 SentinelAI	src/Dodge/Creature/SentinelAI.hs	1;"	m
 SentinelAt	src/Dodge/Data/ActionPlan.hs	199;"	C
-SetLSCol	src/Dodge/Data/WorldEffect.hs	28;"	C
+SetLSCol	src/Dodge/Data/WorldEffect.hs	25;"	C
 SetTarget	src/Dodge/Creature/SetTarget.hs	2;"	m
-SetTrigger	src/Dodge/Data/WorldEffect.hs	26;"	C
+SetTrigger	src/Dodge/Data/WorldEffect.hs	23;"	C
 Setup	src/Framebuffer/Setup.hs	2;"	m
 ShadNum	src/Picture/Data.hs	35;"	t
 Shader	src/Shader/Data.hs	51;"	t
@@ -1820,7 +1821,7 @@ SoundID	src/Sound/Data.hs	32;"	t
 SoundLogic	src/Dodge/SoundLogic.hs	7;"	m
 SoundOrigin	src/Dodge/Data/SoundOrigin.hs	12;"	t
 SoundOrigin	src/Dodge/Data/SoundOrigin.hs	6;"	m
-SoundStart	src/Dodge/Data/WorldEffect.hs	31;"	C
+SoundStart	src/Dodge/Data/WorldEffect.hs	28;"	C
 SoundStatus	src/Sound/Data.hs	16;"	t
 South	src/Dodge/Data/CardinalPoint.hs	6;"	C
 South8	src/Dodge/Data/CardinalPoint.hs	15;"	C
@@ -1986,13 +1987,13 @@ TmTm	src/Dodge/TmTm.hs	1;"	m
 TmTmClearDisplayedLines	src/Dodge/Data/Terminal.hs	62;"	C
 TmTmSetPartialCommand	src/Dodge/Data/Terminal.hs	64;"	C
 TmTmSetStatus	src/Dodge/Data/Terminal.hs	63;"	C
-TmWdId	src/Dodge/Data/WorldEffect.hs	77;"	C
+TmWdId	src/Dodge/Data/WorldEffect.hs	74;"	C
-TmWdWd	src/Dodge/Data/WorldEffect.hs	76;"	t
+TmWdWd	src/Dodge/Data/WorldEffect.hs	73;"	t
 TmWdWd	src/Dodge/TmWdWd.hs	1;"	m
-TmWdWdDisconnectTerminal	src/Dodge/Data/WorldEffect.hs	78;"	C
+TmWdWdDisconnectTerminal	src/Dodge/Data/WorldEffect.hs	75;"	C
-TmWdWdDoDeathTriggers	src/Dodge/Data/WorldEffect.hs	81;"	C
+TmWdWdDoDeathTriggers	src/Dodge/Data/WorldEffect.hs	78;"	C
-TmWdWdTermSound	src/Dodge/Data/WorldEffect.hs	80;"	C
+TmWdWdTermSound	src/Dodge/Data/WorldEffect.hs	77;"	C
-TmWdWdfromWdWd	src/Dodge/Data/WorldEffect.hs	79;"	C
+TmWdWdfromWdWd	src/Dodge/Data/WorldEffect.hs	76;"	C
 ToContinueStart	src/Sound/Data.hs	27;"	C
 ToPlaySound	src/Sound/Data.hs	35;"	t
 ToStart	src/Sound/Data.hs	26;"	C
@@ -2006,7 +2007,7 @@ TopDecoration	src/Dodge/Placement/TopDecoration.hs	1;"	m
 TopEscapeMenuOption	src/Dodge/Data/Universe.hs	78;"	C
 TopLDT	src/Dodge/Data/DoubleTree.hs	49;"	C
 TorpedoBaySS	src/Dodge/Data/Scenario.hs	99;"	C
-TorqueCr	src/Dodge/Data/WorldEffect.hs	33;"	C
+TorqueCr	src/Dodge/Data/WorldEffect.hs	30;"	C
 TorqueDamage	src/Dodge/Data/Damage.hs	27;"	C
 TractorBeam	src/Dodge/Data/TractorBeam.hs	13;"	t
 TractorBeam	src/Dodge/Data/TractorBeam.hs	6;"	m
@@ -2056,7 +2057,7 @@ Unimportant	src/Shape/Data.hs	37;"	C
 Universe	src/Dodge/Data/Universe.hs	31;"	t
 Universe	src/Dodge/Data/Universe.hs	6;"	m
 UnloadedWeaponSF	src/Dodge/Data/ComposedItem.hs	41;"	C
-UnlockInv	src/Dodge/Data/WorldEffect.hs	30;"	C
+UnlockInv	src/Dodge/Data/WorldEffect.hs	27;"	C
 UnusedLink	src/Dodge/Data/Room.hs	65;"	C
 Update	src/Dodge/Config/Update.hs	4;"	m
 Update	src/Dodge/Creature/Update.hs	1;"	m
@@ -2088,7 +2089,7 @@ UseFromLocation	src/Dodge/Data/Item/Use.hs	54;"	C
 UseFromRoot	src/Dodge/Data/Item/Use.hs	53;"	C
 UseHeld	src/Dodge/Data/Item/Use.hs	33;"	C
 UseInt	src/Dodge/Data/Item/Use.hs	40;"	C
-UseInvItem	src/Dodge/Data/WorldEffect.hs	37;"	C
+UseInvItem	src/Dodge/Data/WorldEffect.hs	34;"	C
 UseItem	src/Dodge/Data/ActionPlan.hs	37;"	C
 UseItem	src/Dodge/Creature/Impulse/UseItem.hs	3;"	m
 UseItemWidth	src/Dodge/Data/SelectionList.hs	41;"	C
@@ -2164,13 +2165,13 @@ WarningCry	src/Dodge/Data/ActionPlan.hs	185;"	C
 WasLeftForward	src/Dodge/Data/Creature/Stance.hs	34;"	C
 WasRightForward	src/Dodge/Data/Creature/Stance.hs	35;"	C
 WatchAndWait	src/Dodge/Data/ActionPlan.hs	183;"	C
-WdBl	src/Dodge/Data/WorldEffect.hs	54;"	t
+WdBl	src/Dodge/Data/WorldEffect.hs	51;"	t
-WdBlBtNotOff	src/Dodge/Data/WorldEffect.hs	61;"	C
+WdBlBtNotOff	src/Dodge/Data/WorldEffect.hs	58;"	C
-WdBlBtOn	src/Dodge/Data/WorldEffect.hs	60;"	C
+WdBlBtOn	src/Dodge/Data/WorldEffect.hs	57;"	C
-WdBlConst	src/Dodge/Data/WorldEffect.hs	57;"	C
+WdBlConst	src/Dodge/Data/WorldEffect.hs	54;"	C
-WdBlCrFilterNearPoint	src/Dodge/Data/WorldEffect.hs	59;"	C
+WdBlCrFilterNearPoint	src/Dodge/Data/WorldEffect.hs	56;"	C
-WdBlDoorMoving	src/Dodge/Data/WorldEffect.hs	56;"	C
+WdBlDoorMoving	src/Dodge/Data/WorldEffect.hs	53;"	C
-WdBlNegate	src/Dodge/Data/WorldEffect.hs	58;"	C
+WdBlNegate	src/Dodge/Data/WorldEffect.hs	55;"	C
 WdCrBl	src/Dodge/Data/CreatureEffect.hs	31;"	t
 WdCrBlfromCrBl	src/Dodge/Data/CreatureEffect.hs	33;"	C
 WdCrCr	src/Dodge/Data/CreatureEffect.hs	11;"	t
@@ -2178,19 +2179,18 @@ WdCrLOSTarget	src/Dodge/Data/CreatureEffect.hs	35;"	C
 WdCrNegate	src/Dodge/Data/CreatureEffect.hs	34;"	C
 WdCrSafeDistFromTarget	src/Dodge/Data/CreatureEffect.hs	36;"	C
 WdCrTrue	src/Dodge/Data/CreatureEffect.hs	32;"	C
-WdP2	src/Dodge/Data/WorldEffect.hs	42;"	t
+WdP2	src/Dodge/Data/WorldEffect.hs	39;"	t
 WdP2	src/Dodge/WdP2.hs	1;"	m
-WdP2Const	src/Dodge/Data/WorldEffect.hs	43;"	C
+WdP2Const	src/Dodge/Data/WorldEffect.hs	40;"	C
-WdP2f	src/Dodge/Data/WorldEffect.hs	64;"	t
+WdP2f	src/Dodge/Data/WorldEffect.hs	61;"	t
 WdP2f	src/Dodge/WdP2f.hs	2;"	m
-WdP2f0	src/Dodge/Data/WorldEffect.hs	65;"	C
+WdP2f0	src/Dodge/Data/WorldEffect.hs	62;"	C
-WdP2fDoorPosition	src/Dodge/Data/WorldEffect.hs	66;"	C
+WdP2fDoorPosition	src/Dodge/Data/WorldEffect.hs	63;"	C
-WdTrig	src/Dodge/Data/WorldEffect.hs	55;"	C
+WdTrig	src/Dodge/Data/WorldEffect.hs	52;"	C
-WdWd	src/Dodge/Data/WorldEffect.hs	24;"	t
+WdWd	src/Dodge/Data/WorldEffect.hs	21;"	t
-WdWdBurstFireRepetition	src/Dodge/Data/WorldEffect.hs	38;"	C
+WdWdBurstFireRepetition	src/Dodge/Data/WorldEffect.hs	35;"	C
-WdWdFromItCrixWdWd	src/Dodge/Data/WorldEffect.hs	35;"	C
+WdWdNegateTrig	src/Dodge/Data/WorldEffect.hs	31;"	C
-WdWdNegateTrig	src/Dodge/Data/WorldEffect.hs	34;"	C
+WdYouPos	src/Dodge/Data/WorldEffect.hs	41;"	C
-WdYouPos	src/Dodge/Data/WorldEffect.hs	44;"	C
 Weapon	src/Dodge/Item/Weapon.hs	2;"	m
 WeaponScopeLink	src/Dodge/Data/ComposedItem.hs	24;"	C
 WeaponScopeSF	src/Dodge/Data/ComposedItem.hs	47;"	C
@@ -2211,7 +2211,7 @@ World	src/Dodge/Zoning/World.hs	1;"	m
 WorldBool	src/Dodge/WorldBool.hs	1;"	m
 WorldEffect	src/Dodge/Data/WorldEffect.hs	6;"	m
 WorldEffect	src/Dodge/WorldEffect.hs	1;"	m
-WorldEffects	src/Dodge/Data/WorldEffect.hs	27;"	C
+WorldEffects	src/Dodge/Data/WorldEffect.hs	24;"	C
 WorldEvent	src/Dodge/WorldEvent.hs	1;"	m
 WorldEventFlag	src/Dodge/Data/World.hs	30;"	t
 WorldGovernment	src/Dodge/Data/Scenario.hs	52;"	C
@@ -2538,7 +2538,6 @@ _eeAttachPos	src/Dodge/Data/Item/Use/Equipment.hs	24;"	f
 _eeOnEquip	src/Dodge/Data/Item/Use/Equipment.hs	19;"	f
 _eeOnRemove	src/Dodge/Data/Item/Use/Equipment.hs	20;"	f
 _eeParams	src/Dodge/Data/Item/Use/Equipment.hs	22;"	f
-_eeType	src/Dodge/Data/Item/Use/Equipment.hs	21;"	f
 _eeUse	src/Dodge/Data/Item/Use/Equipment.hs	18;"	f
 _eeViewDist	src/Dodge/Data/Item/Use/Equipment.hs	23;"	f
 _emoMenuOption	src/Dodge/Data/Universe.hs	77;"	f
@@ -3386,10 +3385,10 @@ airlockDoor	src/Dodge/Room/Airlock.hs	51;"	f
 airlockDoubleDoor	src/Dodge/Room/Airlock.hs	54;"	f
 airlockSimple	src/Dodge/Room/Airlock.hs	66;"	f
 airlockZ	src/Dodge/Room/Airlock.hs	91;"	f
-allInvLocs	src/Dodge/Item/Grammar.hs	315;"	f
+allInvLocs	src/Dodge/Item/Grammar.hs	316;"	f
 allVisibleWalls	src/Dodge/Base/Collide.hs	131;"	f
 alongSegBy	src/Geometry.hs	40;"	f
-alteRifle	src/Dodge/Item/Held/Cane.hs	42;"	f
+alteRifle	src/Dodge/Item/Held/Cane.hs	34;"	f
 ammoMagInfo	src/Dodge/Item/Info.hs	46;"	f
 ammoMagSPic	src/Dodge/Item/Draw/SPic.hs	124;"	f
 amr	src/Dodge/Item/Held/Rod.hs	34;"	f
@@ -3469,7 +3468,7 @@ autoDetector	src/Dodge/Item/Weapon/Radar.hs	11;"	f
 autoEffect	src/Dodge/Item/Weapon/ExtraEffect.hs	18;"	f
 autoGunS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	532;"	f
 autoPistol	src/Dodge/Item/Held/Stick.hs	49;"	f
-autoRifle	src/Dodge/Item/Held/Cane.hs	48;"	f
+autoRifle	src/Dodge/Item/Held/Cane.hs	40;"	f
 awakeLevelPerception	src/Dodge/Creature/Perception.hs	162;"	f
 axisInt	src/Geometry/Intersect.hs	227;"	f
 azure	src/Color.hs	22;"	f
@@ -3478,7 +3477,7 @@ bQuadToLine	src/Geometry/Bezier.hs	30;"	f
 backpackCombinations	src/Dodge/Combine/Combinations.hs	26;"	f
 backpackShape	src/Dodge/Item/Draw/SPic.hs	173;"	f
 backspaceInputted	src/Dodge/Update/Input/Text.hs	25;"	f
-bangCone	src/Dodge/Item/Held/Cone.hs	13;"	f
+bangCone	src/Dodge/Item/Held/Cone.hs	11;"	f
 bangConeShape	src/Dodge/Item/Draw/SPic.hs	288;"	f
 bangEchoS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	394;"	f
 bangRod	src/Dodge/Item/Held/Rod.hs	18;"	f
@@ -3488,7 +3487,7 @@ barPP	src/Dodge/Room/Foreground.hs	236;"	f
 barrel	src/Dodge/Creature/Inanimate.hs	17;"	f
 baseAMRShape	src/Dodge/Item/Draw/SPic.hs	402;"	f
 baseBlockPane	src/Dodge/Placement/Instance/Wall.hs	86;"	f
-baseCI	src/Dodge/Item/Grammar.hs	190;"	f
+baseCI	src/Dodge/Item/Grammar.hs	191;"	f
 baseCaneShape	src/Dodge/Item/Draw/SPic.hs	308;"	f
 baseDebris	src/Dodge/Block/Debris.hs	122;"	f
 baseFloorTileSize	src/Tile.hs	45;"	f
@@ -3547,7 +3546,7 @@ blood7S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	366;"	f
 blood8S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	354;"	f
 blowTorch	src/Dodge/Item/Held/SprayGuns.hs	43;"	f
 blue	src/Color.hs	16;"	f
-blunderbuss	src/Dodge/Item/Held/Cone.hs	21;"	f
+blunderbuss	src/Dodge/Item/Held/Cone.hs	14;"	f
 boosterGun	src/Dodge/Item/Equipment/Booster.hs	9;"	f
 bossKeyItems	src/Dodge/LockAndKey.hs	12;"	f
 bossRoom	src/Dodge/Room/Boss.hs	60;"	f
@@ -3576,7 +3575,7 @@ bulletModule	src/Dodge/Item/Scope.hs	118;"	f
 bulletPayloadModule	src/Dodge/Item/Scope.hs	132;"	f
 bulletSynthesizer	src/Dodge/Item/Ammo.hs	117;"	f
 bulletWeapons	src/Dodge/Combine/Combinations.hs	247;"	f
-burstRifle	src/Dodge/Item/Held/Cane.hs	53;"	f
+burstRifle	src/Dodge/Item/Held/Cane.hs	45;"	f
 buzzS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	538;"	f
 cFilledRect	src/Dodge/CharacterEnums.hs	6;"	f
 cWireRect	src/Dodge/CharacterEnums.hs	10;"	f
@@ -3899,11 +3898,9 @@ defaultArcStep	src/Dodge/Tesla/Arc.hs	140;"	f
 defaultArcStep	src/Dodge/Tesla/Arc/Default.hs	15;"	f
 defaultAudition	src/Dodge/Default/Creature.hs	94;"	f
 defaultAutoWall	src/Dodge/Default/Door.hs	15;"	f
-defaultBangCane	src/Dodge/Item/Held/Cane.hs	15;"	f
 defaultBlock	src/Dodge/Default/Block.hs	5;"	f
 defaultBounds	src/Dodge/Data/Bounds.hs	20;"	f
 defaultBullet	src/Dodge/Item/Weapon/Bullet.hs	10;"	f
-defaultBulletWeapon	src/Dodge/Default/Item.hs	42;"	f
 defaultButton	src/Dodge/Default.hs	50;"	f
 defaultCWCam	src/Dodge/Default/World.hs	68;"	f
 defaultCWGen	src/Dodge/Default/World.hs	58;"	f
@@ -3912,7 +3909,7 @@ defaultChaseMvType	src/Dodge/Default/Creature.hs	108;"	f
 defaultClusterStatus	src/Dodge/Default/Room.hs	38;"	f
 defaultConfig	src/Dodge/Data/Config.hs	127;"	f
 defaultCorpse	src/Dodge/Corpse/Make.hs	29;"	f
-defaultCraftItem	src/Dodge/Default/Item.hs	36;"	f
+defaultCraftItem	src/Dodge/Default/Item.hs	27;"	f
 defaultCreature	src/Dodge/Default/Creature.hs	12;"	f
 defaultCreatureMemory	src/Dodge/Default/Creature.hs	67;"	f
 defaultCreatureSkin	src/Dodge/Default/Creature.hs	61;"	f
@@ -3929,13 +3926,13 @@ defaultEquipment	src/Dodge/Default.hs	25;"	f
 defaultFlIt	src/Dodge/Default.hs	29;"	f
 defaultForeground	src/Dodge/Default/ForegroundShape.hs	5;"	f
 defaultHUD	src/Dodge/Default/World.hs	154;"	f
-defaultHeldItem	src/Dodge/Default/Item.hs	16;"	f
+defaultHeldItem	src/Dodge/Default/Item.hs	11;"	f
 defaultImpulsive	src/Dodge/Humanoid.hs	190;"	f
 defaultInanimate	src/Dodge/Default/Creature.hs	64;"	f
 defaultInput	src/Dodge/Default/World.hs	14;"	f
 defaultIntention	src/Dodge/Default/Creature.hs	100;"	f
 defaultInvSize	src/Dodge/Default/Creature.hs	74;"	f
-defaultItEffect	src/Dodge/Default/Item.hs	49;"	f
+defaultItEffect	src/Dodge/Default/Item.hs	30;"	f
 defaultLS	src/Dodge/Default/LightSource.hs	8;"	f
 defaultLWorld	src/Dodge/Default/World.hs	95;"	f
 defaultLeftLoadable	src/Dodge/Default/Item/Use/Consumption.hs	8;"	f
@@ -4053,7 +4050,6 @@ doIndividualPlacements	src/Dodge/Layout.hs	117;"	f
 doInputScreenInput	src/Dodge/Update/Input/ScreenLayer.hs	28;"	f
 doIntImp	src/Dodge/CreatureEffect.hs	24;"	f
 doInvEffect	src/Dodge/ItEffect.hs	16;"	f
-doItCrWdWd	src/Dodge/WorldEffect.hs	54;"	f
 doItemTimeScroll	src/Dodge/Update.hs	195;"	f
 doItmCrWdWd	src/Dodge/Euse.hs	27;"	f
 doLoop	src/Loop.hs	60;"	f
@@ -4258,6 +4254,7 @@ ebFlicker	src/Dodge/EnergyBall.hs	98;"	f
 edgeFormatting	src/Dodge/Combine/Graph.hs	130;"	f
 edgeToPic	src/Dodge/Debug/Picture.hs	431;"	f
 effectWhileAttached	src/Dodge/ItEffect.hs	58;"	f
+eitType	src/Dodge/Data/EquipType.hs	13;"	f
 ejectS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	502;"	f
 elecCrackleS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	386;"	f
 elephantGun	src/Dodge/Item/Held/Rod.hs	27;"	f
@@ -4280,6 +4277,7 @@ equipInfo	src/Dodge/Item/Info.hs	138;"	f
 equipItemSPic	src/Dodge/Item/Draw/SPic.hs	144;"	f
 equipPosition	src/Dodge/Item/Draw.hs	28;"	f
 equipSiteInfo	src/Dodge/Item/Info.hs	250;"	f
+equipType	src/Dodge/Data/EquipType.hs	8;"	f
 equipmentStrValue	src/Dodge/Creature/Statistics.hs	21;"	f
 errorAngleVV	src/Geometry.hs	59;"	f
 errorClosestPointOnLine	src/Geometry.hs	71;"	f
@@ -4305,8 +4303,8 @@ extTrigLitPos	src/Dodge/Placement/Instance/Button.hs	84;"	f
 extendAway	src/Dodge/Placement/Instance/LightSource.hs	200;"	f
 extendConeToScreenEdge	src/Dodge/Debug/Picture.hs	82;"	f
 extraPics	src/Dodge/Render/ShapePicture.hs	82;"	f
-extraWeaponLinks	src/Dodge/Item/Grammar.hs	123;"	f
+extraWeaponLinks	src/Dodge/Item/Grammar.hs	124;"	f
-extraWeaponLinksBelow	src/Dodge/Item/Grammar.hs	132;"	f
+extraWeaponLinksBelow	src/Dodge/Item/Grammar.hs	133;"	f
 extractRoomPos	src/Dodge/RoomPos.hs	6;"	f
 faceEdges	src/Polyhedra.hs	65;"	f
 facesToVF	src/Polyhedra/Geodesic.hs	69;"	f
@@ -4426,11 +4424,11 @@ geometryTests	test/Spec.hs	17;"	f
 geometryUnitTests	test/Spec.hs	22;"	f
 geqConstr	src/SameConstr.hs	21;"	f
 getAimZoom	src/Dodge/Update/Camera.hs	134;"	f
-getAmmoLinks	src/Dodge/Item/Grammar.hs	139;"	f
+getAmmoLinks	src/Dodge/Item/Grammar.hs	140;"	f
 getArguments	src/Dodge/Update/Scroll.hs	177;"	f
 getArguments'	src/Dodge/Update/Scroll.hs	165;"	f
 getAttachedSFLink	src/Dodge/HeldUse.hs	759;"	f
-getAutoSpringLinks	src/Dodge/Item/Grammar.hs	118;"	f
+getAutoSpringLinks	src/Dodge/Item/Grammar.hs	119;"	f
 getAvailableListLines	src/Dodge/SelectionList.hs	10;"	f
 getBulletType	src/Dodge/HeldUse.hs	879;"	f
 getCloseObj	src/Dodge/Update/Input/InGame.hs	515;"	f
@@ -4486,7 +4484,7 @@ goToPostStrat	src/Dodge/Creature/Strategy.hs	10;"	f
 goToTarget	src/Dodge/Creature/ReaderUpdate.hs	136;"	f
 grahamEliminate	src/Geometry/Polygon.hs	125;"	f
 grahamScan	src/Geometry/Polygon.hs	116;"	f
-grapeCannon	src/Dodge/Item/Held/Cone.hs	27;"	f
+grapeCannon	src/Dodge/Item/Held/Cone.hs	17;"	f
 graphToEdges	src/Dodge/Graph.hs	35;"	f
 graphToIncidence	src/Dodge/Graph.hs	40;"	f
 graphicsMenu	src/Dodge/Menu.hs	165;"	f
@@ -4649,16 +4647,16 @@ interweave	src/Justify.hs	17;"	f
 introScan	src/Dodge/Item/Scope.hs	57;"	f
 introScanValue	src/Dodge/Inventory/SelectionList.hs	77;"	f
 intsToPos	src/Dodge/Room/Modify/Girder.hs	160;"	f
-invAdj	src/Dodge/Item/Grammar.hs	296;"	f
+invAdj	src/Dodge/Item/Grammar.hs	297;"	f
 invCursorParams	src/Dodge/ListDisplayParams.hs	36;"	f
 invDP	src/Dodge/ListDisplayParams.hs	30;"	f
 invDimColor	src/Dodge/DisplayInventory.hs	192;"	f
 invHead	src/Dodge/Render/HUD.hs	404;"	f
 invItemLocUpdate	src/Dodge/Creature/State.hs	178;"	f
-invLDT	src/Dodge/Item/Grammar.hs	276;"	f
+invLDT	src/Dodge/Item/Grammar.hs	277;"	f
 invRootItemEffs	src/Dodge/Creature/State.hs	171;"	f
-invRootMap	src/Dodge/Item/Grammar.hs	285;"	f
+invRootMap	src/Dodge/Item/Grammar.hs	286;"	f
-invRootTrees	src/Dodge/Item/Grammar.hs	306;"	f
+invRootTrees	src/Dodge/Item/Grammar.hs	307;"	f
 invSelectionItem	src/Dodge/Inventory/SelectionList.hs	30;"	f
 invSetSelection	src/Dodge/Inventory.hs	180;"	f
 invSetSelectionPos	src/Dodge/Inventory.hs	188;"	f
@@ -4705,7 +4703,7 @@ isotriBWH	src/Geometry/Polygon.hs	20;"	f
 itDim	src/Dodge/Item/InvSize.hs	21;"	f
 itInvHeight	src/Dodge/Item/InvSize.hs	11;"	f
 itemAmmoSlots	src/Dodge/Item/AmmoSlots.hs	12;"	f
-itemBaseConnections	src/Dodge/Item/Grammar.hs	193;"	f
+itemBaseConnections	src/Dodge/Item/Grammar.hs	194;"	f
 itemBaseName	src/Dodge/Item/Display.hs	59;"	f
 itemBlips	src/Dodge/RadarSweep.hs	93;"	f
 itemBulkiness	src/Dodge/Creature/YourControl.hs	170;"	f
@@ -4735,8 +4733,8 @@ itemScrollDisplay	src/Dodge/Inventory/SelectionList.hs	118;"	f
 itemScrollValue	src/Dodge/Inventory/SelectionList.hs	145;"	f
 itemSidePush	src/Dodge/HeldUse.hs	378;"	f
 itemString	src/Dodge/Item/Display.hs	55;"	f
-itemToBreakLists	src/Dodge/Item/Grammar.hs	65;"	f
+itemToBreakLists	src/Dodge/Item/Grammar.hs	66;"	f
-itemToFunction	src/Dodge/Item/Grammar.hs	145;"	f
+itemToFunction	src/Dodge/Item/Grammar.hs	146;"	f
 itemTreeSPic	src/Dodge/Item/Draw/SPic.hs	22;"	f
 itemWeight	src/Dodge/Creature/Statistics.hs	36;"	f
 iterateUntil	src/MonadHelp.hs	23;"	f
@@ -4747,7 +4745,7 @@ itmSpaceInfo	src/Dodge/Item/Info.hs	23;"	f
 itmUsageInfo	src/Dodge/Item/Info.hs	227;"	f
 jShape	src/Dodge/Placement/Instance/LightSource.hs	85;"	f
 jaggedShape	src/Dodge/Block/Debris.hs	191;"	f
-joinItemsInList	src/Dodge/Item/Grammar.hs	266;"	f
+joinItemsInList	src/Dodge/Item/Grammar.hs	267;"	f
 joystick	src/Dodge/Item/Scope.hs	150;"	f
 jps0'	src/Dodge/LevelGen/PlacementHelper.hs	60;"	f
 jps0PushPS	src/Dodge/LevelGen/PlacementHelper.hs	63;"	f
@@ -4781,7 +4779,7 @@ lasTunnel	src/Dodge/Room/LasTurret.hs	126;"	f
 lasTunnelRunPast	src/Dodge/Room/LasTurret.hs	167;"	f
 lasTurret	src/Dodge/Placement/Instance/Turret.hs	38;"	f
 laser	src/Dodge/Item/Held/BatteryGuns.hs	41;"	f
-laserLinkTest	src/Dodge/Item/Grammar.hs	199;"	f
+laserLinkTest	src/Dodge/Item/Grammar.hs	200;"	f
 lastMap	src/Dodge/DoubleTree.hs	174;"	f
 launcherCrit	src/Dodge/Creature/LauncherCrit.hs	12;"	f
 layoutLevelFromSeed	src/Dodge/LevelGen.hs	47;"	f
@@ -4796,9 +4794,9 @@ ldtToIM	src/Dodge/DoubleTree.hs	143;"	f
 ldtToIndentList	src/Dodge/DoubleTree.hs	146;"	f
 ldtToLoc	src/Dodge/DoubleTree.hs	187;"	f
 left	src/DoubleStack.hs	16;"	f
-leftIsParentCombine	src/Dodge/Item/Grammar.hs	238;"	f
+leftIsParentCombine	src/Dodge/Item/Grammar.hs	239;"	f
 leftPad	src/Padding.hs	15;"	f
-leftRightCombine	src/Dodge/Item/Grammar.hs	252;"	f
+leftRightCombine	src/Dodge/Item/Grammar.hs	253;"	f
 legsSPic	src/Dodge/Item/Draw/SPic.hs	472;"	f
 liShape	src/Dodge/Placement/Instance/LightSource.hs	98;"	f
 light	src/Color.hs	104;"	f
@@ -4826,8 +4824,8 @@ listCursorChooseBorderScale	src/Dodge/Render/List.hs	135;"	f
 listGuard	src/Dodge/Creature/ReaderUpdate.hs	188;"	f
 listSelectionColorPicture	src/Dodge/DisplayInventory.hs	308;"	f
 litCorridor90	src/Dodge/Room/RoadBlock.hs	26;"	f
-llleft	src/Dodge/Item/Grammar.hs	202;"	f
+llleft	src/Dodge/Item/Grammar.hs	203;"	f
-llright	src/Dodge/Item/Grammar.hs	208;"	f
+llright	src/Dodge/Item/Grammar.hs	209;"	f
 lmt	src/MatrixHelper.hs	43;"	f
 lnkBothAnd	src/Dodge/Room/Procedural.hs	121;"	f
 lnkMidPosInvSelsCol	src/Dodge/Render/HUD.hs	393;"	f
@@ -4872,12 +4870,12 @@ lsPosCol	src/Dodge/LightSource.hs	26;"	f
 lsPosRad	src/Dodge/LightSource.hs	17;"	f
 ltAutoCrit	src/Dodge/Creature/LtAutoCrit.hs	12;"	f
 m	src/ShortShow.hs	33;"	f
-mAT	src/Dodge/Item/MagAmmoType.hs	11;"	f
+mAT	src/Dodge/Item/MagAmmoType.hs	19;"	f
 machineAddSound	src/Dodge/Machine.hs	49;"	f
 machinePistol	src/Dodge/Item/Held/Stick.hs	52;"	f
 machineUpdateDeathEff	src/Dodge/Machine.hs	34;"	f
 machineUpdateLiveDieEff	src/Dodge/Machine.hs	16;"	f
-magAmmoType	src/Dodge/Item/MagAmmoType.hs	8;"	f
+magAmmoType	src/Dodge/Item/MagAmmoType.hs	11;"	f
 magShield	src/Dodge/Item/Equipment.hs	27;"	f
 magV	src/Geometry/Vector.hs	171;"	f
 magV3	src/Geometry/Vector3D.hs	78;"	f
@@ -5019,7 +5017,7 @@ minCrIXOn	src/Dodge/Zoning/Creature.hs	46;"	f
 minOn	src/FoldableHelp.hs	35;"	f
 mini1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	346;"	f
 miniGunCrit	src/Dodge/Creature.hs	62;"	f
-miniGunX	src/Dodge/Item/Held/Cane.hs	60;"	f
+miniGunX	src/Dodge/Item/Held/Cane.hs	52;"	f
 miniGunXPict	src/Dodge/Item/Draw/SPic.hs	360;"	f
 miniGunXPictItem	src/Dodge/Item/Draw/SPic.hs	354;"	f
 miniS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	548;"	f
@@ -5529,9 +5527,9 @@ rezInvBox	src/Dodge/Room/RezBox.hs	134;"	f
 rezText	src/Dodge/Story.hs	4;"	f
 rezText'	src/Dodge/Story.hs	17;"	f
 rhombus	src/Polyhedra.hs	72;"	f
-rifle	src/Dodge/Item/Held/Cane.hs	38;"	f
+rifle	src/Dodge/Item/Held/Cane.hs	30;"	f
 right	src/DoubleStack.hs	16;"	f
-rightIsParentCombine	src/Dodge/Item/Grammar.hs	245;"	f
+rightIsParentCombine	src/Dodge/Item/Grammar.hs	246;"	f
 rightPad	src/Padding.hs	19;"	f
 rightPadNoSquash	src/Padding.hs	23;"	f
 rlPosDir	src/Dodge/RoomLink.hs	94;"	f
@@ -5880,7 +5878,7 @@ spreadCenter	src/Dodge/Base.hs	187;"	f
 spreadFromCenter	src/Dodge/Base.hs	176;"	f
 spreadGunCrit	src/Dodge/Creature/SpreadGunCrit.hs	12;"	f
 spreadOut	src/Dodge/Creature/Boid.hs	157;"	f
-springLinkTest	src/Dodge/Item/Grammar.hs	220;"	f
+springLinkTest	src/Dodge/Item/Grammar.hs	221;"	f
 sps	src/Dodge/LevelGen/PlacementHelper.hs	30;"	f
 sps0	src/Dodge/LevelGen/PlacementHelper.hs	42;"	f
 square	src/Geometry/Polygon.hs	46;"	f
@@ -5937,7 +5935,7 @@ strideRot	src/Dodge/Item/HeldOffset.hs	77;"	f
 stringToList	src/Picture/Base.hs	313;"	f
 stringToListGrad	src/Picture/Text.hs	12;"	f
 stripZ	src/Geometry/Vector3D.hs	97;"	f
-structureToPotentialFunction	src/Dodge/Item/Grammar.hs	180;"	f
+structureToPotentialFunction	src/Dodge/Item/Grammar.hs	181;"	f
 structureUseAtLoc	src/Dodge/Creature/Impulse/UseItem.hs	78;"	f
 subInvX	src/Dodge/ListDisplayParams.hs	48;"	f
 subMap	src/TreeHelp.hs	118;"	f
@@ -6044,7 +6042,7 @@ toClosestMultiple	src/HelpNum.hs	3;"	f
 toColor8	src/Color.hs	148;"	f
 toFloatVAs	src/Shader/Compile.hs	211;"	f
 toLabel	src/Dodge/Cleat.hs	16;"	f
-toLasgunUpdate	src/Dodge/Item/Grammar.hs	213;"	f
+toLasgunUpdate	src/Dodge/Item/Grammar.hs	214;"	f
 toMultiset	src/Multiset.hs	64;"	f
 toOnward	src/Dodge/Tree/Compose.hs	101;"	f
 toTopLeft	src/Dodge/Render/List.hs	219;"	f
@@ -6127,7 +6125,7 @@ triggerSwitchSPicLight	src/Dodge/Placement/Instance/Button.hs	31;"	f
 truncFaces	src/Polyhedra/Geodesic.hs	53;"	f
 truncate	src/Polyhedra/Geodesic.hs	38;"	f
 trunkDepth	src/TreeHelp.hs	161;"	f
-tryAttachItems	src/Dodge/Item/Grammar.hs	28;"	f
+tryAttachItems	src/Dodge/Item/Grammar.hs	29;"	f
 tryClickUse	src/Dodge/Creature/YourControl.hs	219;"	f
 tryCombine	src/Dodge/Update/Input/InGame.hs	526;"	f
 tryDropSelected	src/Dodge/Update/Input/InGame.hs	125;"	f
@@ -6309,8 +6307,8 @@ upperPrismPolyST	src/Shape.hs	107;"	f
 upperPrismPolySU	src/Shape.hs	113;"	f
 upperPrismPolyTS	src/Shape.hs	119;"	f
 upperRounded	src/Shape.hs	184;"	f
-useBreakL	src/Dodge/Item/Grammar.hs	34;"	f
+useBreakL	src/Dodge/Item/Grammar.hs	35;"	f
-useBreakListsLinkTest	src/Dodge/Item/Grammar.hs	42;"	f
+useBreakListsLinkTest	src/Dodge/Item/Grammar.hs	43;"	f
 useBulletPayload	src/Dodge/Bullet.hs	111;"	f
 useC	src/Dodge/Cuse.hs	8;"	f
 useC'	src/Dodge/Cuse.hs	13;"	f
@@ -6368,7 +6366,7 @@ violet	src/Color.hs	21;"	f
 visibleWalls	src/Dodge/Base/Collide.hs	123;"	f
 visionCheck	src/Dodge/Creature/Perception.hs	152;"	f
 vocalizationTest	src/Dodge/Creature/Vocalization.hs	8;"	f
-volleyGun	src/Dodge/Item/Held/Cane.hs	23;"	f
+volleyGun	src/Dodge/Item/Held/Cane.hs	15;"	f
 volleyGunShape	src/Dodge/Item/Draw/SPic.hs	342;"	f
 waistSP	src/Dodge/Creature/HandPos.hs	173;"	f
 walkNozzle	src/Dodge/HeldUse.hs	780;"	f