From ad76359dcf26e265f35219a879850af7e795e1d4 Mon Sep 17 00:00:00 2001 From: justin Date: Mon, 30 Sep 2024 13:17:10 +0100 Subject: [PATCH] Cleanup invSelectionItem --- ghcidOutput | 2 +- src/Dodge/Combine.hs | 52 +- src/Dodge/Creature/State.hs | 1 - src/Dodge/Data/Item/Targeting.hs | 1 - src/Dodge/DisplayInventory.hs | 5 +- src/Dodge/Inventory/SelectionList.hs | 36 +- src/Dodge/Item/Weapon/Targeting.hs | 16 - src/Dodge/LockAndKey.hs | 2 - src/Dodge/Targeting.hs | 120 ----- src/Dodge/Targeting/Draw.hs | 3 - tags | 729 +++++++++++++-------------- 11 files changed, 384 insertions(+), 583 deletions(-) delete mode 100644 src/Dodge/Item/Weapon/Targeting.hs delete mode 100644 src/Dodge/Targeting.hs diff --git a/ghcidOutput b/ghcidOutput index a6244b778..1be0c7037 100644 --- a/ghcidOutput +++ b/ghcidOutput @@ -1 +1 @@ -All good (611 modules, at 12:49:31) +All good (609 modules, at 13:12:14) diff --git a/src/Dodge/Combine.hs b/src/Dodge/Combine.hs index e05ce0816..374249324 100644 --- a/src/Dodge/Combine.hs +++ b/src/Dodge/Combine.hs @@ -12,7 +12,6 @@ import Dodge.Data.Combine import Dodge.Data.Universe import Dodge.Item.Display import Dodge.Item.InventoryColor ---import Dodge.Module import qualified IntMapHelp as IM import SimpleTrie @@ -36,59 +35,14 @@ combineItemListYouX :: World -> [([Int], Item)] combineItemListYouX = map (first concat) . flatLookupItems . yourInv combineList :: World -> [SelectionItem CombinableItem] -combineList = map f . combineListInfo +combineList = map f . combineItemListYouX where - f (is, (strs, itm)) = + f (is, itm) = SelectionItem { _siPictures = basicItemDisplay itm , _siHeight = _itInvSize itm , _siIsSelectable = True , _siColor = itemInvColor itm , _siOffX = 0 - , _siPayload = CombinableItem is itm strs + , _siPayload = CombinableItem is itm [] } - -combineListInfo :: World -> [([Int], ([String], Item))] -combineListInfo w = map (cmm inv) $ combineItemListYouX w - where - inv = yourInv w ---combineListInfo w = filter f . map (cmm inv) $ combineItemListYouX w --- where --- inv = yourInv w --- f (is, (_, itm)) = _itType itm `notElem` fmap _itType (IM.restrictKeys inv (IS.fromList is)) - -cmm :: IM.IntMap Item -> ([Int], Item) -> ([Int], ([String], Item)) -cmm _ (is, itm) = (is, ([], itm)) - ---cmm :: IM.IntMap Item -> ([Int], Item) -> ([Int], ([String], Item)) ---cmm inv (is, itm) = (is, itm & itType . iyModules %%~ flip combineModuleMaps mms) --- where --- mms = map (_iyModules . _itType . (inv IM.!)) is - ---combineModuleMaps :: --- M.Map ModuleSlot ItemModuleType -> --- [M.Map ModuleSlot ItemModuleType] -> --- ([String], M.Map ModuleSlot ItemModuleType) ---combineModuleMaps = foldM combineTwoModuleMaps - ---combineTwoModuleMaps :: --- M.Map ModuleSlot ItemModuleType -> --- M.Map ModuleSlot ItemModuleType -> --- ([String], M.Map ModuleSlot ItemModuleType) ---combineTwoModuleMaps = --- mergeA --- preserveMissing --- (filterAMissing f) --- (zipWithAMatched g) --- where --- f _ EMPTYMODULE = ([], False) --- f _ md = ([rm "REMOVES" md], False) --- g _ EMPTYMODULE md = ([], md) --- g _ md EMPTYMODULE = ([], md) --- g _ md2 md1 = ([rm "REPLACES" md1 ++ rm " WITH" md2], md2) --- rm str md = str ++ " " ++ fullModuleName md - --- g above could be a monoid of some description... - ---fullModuleName :: ItemModuleType -> String ---fullModuleName = fromMaybe "EMPTYMODULE" . moduleName diff --git a/src/Dodge/Creature/State.hs b/src/Dodge/Creature/State.hs index 3bd78cf60..bcc01bcaa 100644 --- a/src/Dodge/Creature/State.hs +++ b/src/Dodge/Creature/State.hs @@ -298,7 +298,6 @@ updateItemTargeting tt cr itm w = w & case tt of TargetCursor -> cWorld . lWorld . creatures . ix (_crID cr) . crInv . ix (_ilInvID $ _itLocation itm) . itUse .~ TargetingUse (Just (mouseWorldPos (w ^. input) (w ^. wCam))) Nothing True - _ -> id where isattached = itm ^?! itLocation . ilIsAttached rbpressed = SDL.ButtonRight `M.member` _mouseButtons (_input w) diff --git a/src/Dodge/Data/Item/Targeting.hs b/src/Dodge/Data/Item/Targeting.hs index 93557a6b8..8371ed92c 100644 --- a/src/Dodge/Data/Item/Targeting.hs +++ b/src/Dodge/Data/Item/Targeting.hs @@ -11,7 +11,6 @@ import Data.Aeson.TH data TargetingType = TARGETLASER | TargetRBPress - | TargetRBLine | TargetRBCreature | TargetCursor deriving (Eq, Ord, Show, Read, Enum, Bounded) --Generic, Flat) diff --git a/src/Dodge/DisplayInventory.hs b/src/Dodge/DisplayInventory.hs index e48364ece..a7d904473 100644 --- a/src/Dodge/DisplayInventory.hs +++ b/src/Dodge/DisplayInventory.hs @@ -9,6 +9,7 @@ module Dodge.DisplayInventory ( updateCombinePositioning, ) where +import Control.Lens import Dodge.Inventory.SelectionList import Control.Monad import qualified Data.IntMap.Strict as IM @@ -24,7 +25,6 @@ import Dodge.Inventory.CheckSlots import Dodge.ListDisplayParams import Dodge.SelectionList import Dodge.Item.Grammar -import LensHelp import ListHelp import Picture.Base import Regex @@ -113,8 +113,7 @@ updateDisplaySections w cfig sss = coitems' = IM.fromDistinctAscList . zip [0 ..] $ map closeObjectToSelectionItem (w ^. hud . closeObjects) - --invitems' = MIM.merge MIM.dropMissing MIM.dropMissing (MIM.zipWithMatched $ const addindent) indents $ IM.mapWithKey (invSelectionItem cr) inv - invitems' = IM.mapWithKey (invSelectionItem cr) inv + invitems' = IM.mapWithKey (\k (x,y,_) -> invSelectionItem cr k x y) inv cr = you w inv = invIndentIM $ _crInv (you w) --indents = indentInv inv diff --git a/src/Dodge/Inventory/SelectionList.hs b/src/Dodge/Inventory/SelectionList.hs index b97c1c251..df9f3eae8 100644 --- a/src/Dodge/Inventory/SelectionList.hs +++ b/src/Dodge/Inventory/SelectionList.hs @@ -14,25 +14,25 @@ import LensHelp import Picture.Base invSelectionItem' :: Creature -> Int -> Item -> SelectionItem () -invSelectionItem' cr i it = - SelectionItem - { _siPictures = pics & ix 0 %~ (++ anyequippos ++ anyhotkey) - , _siHeight = _itInvSize it - , _siIsSelectable = True - , _siColor = col - , _siOffX = 0 - , _siPayload = () - } - where - anyhotkey = maybe [] ((' ':) .hotkeyToString) (cr ^? crInvHotkeys . ix i) - anyequippos = maybe [] (rightPad 8 ' ' . (' ':) . eqPosText) (cr ^? crInvEquipped . ix i) - col = itemInvColor it - pics = case _itCurseStatus it of - UndroppableIdentified -> itemDisplay cr it - _ -> itemDisplay cr it +invSelectionItem' cr i it = invSelectionItem cr i it 0 +-- SelectionItem +-- { _siPictures = pics & ix 0 %~ (++ anyequippos ++ anyhotkey) +-- , _siHeight = _itInvSize it +-- , _siIsSelectable = True +-- , _siColor = col +-- , _siOffX = 0 +-- , _siPayload = () +-- } +-- where +-- anyhotkey = maybe [] ((' ':) .hotkeyToString) (cr ^? crInvHotkeys . ix i) +-- anyequippos = maybe [] (rightPad 8 ' ' . (' ':) . eqPosText) (cr ^? crInvEquipped . ix i) +-- col = itemInvColor it +-- pics = case _itCurseStatus it of +-- UndroppableIdentified -> itemDisplay cr it +-- _ -> itemDisplay cr it -invSelectionItem :: Creature -> Int -> (Item,Int,a) -> SelectionItem () -invSelectionItem cr i (it,indent,_) = +invSelectionItem :: Creature -> Int -> Item -> Int -> SelectionItem () +invSelectionItem cr i it indent = SelectionItem { _siPictures = pics & ix 0 %~ (++ anyequippos ++ anyhotkey) , _siHeight = _itInvSize it diff --git a/src/Dodge/Item/Weapon/Targeting.hs b/src/Dodge/Item/Weapon/Targeting.hs deleted file mode 100644 index 9e205feac..000000000 --- a/src/Dodge/Item/Weapon/Targeting.hs +++ /dev/null @@ -1,16 +0,0 @@ -module Dodge.Item.Weapon.Targeting ( --- useTargetPos, -) where - ---import Control.Lens ---import Dodge.Data.World ---import Geometry.Data - ---useTargetPos :: --- (Maybe Point2 -> Creature -> World -> World) -> --- Creature -> --- World -> --- World ---useTargetPos f cr w = case cr ^? crTargeting . ctPos of --- Nothing -> w --- Just p -> f p cr w diff --git a/src/Dodge/LockAndKey.hs b/src/Dodge/LockAndKey.hs index ab5af97f9..013ba96d6 100644 --- a/src/Dodge/LockAndKey.hs +++ b/src/Dodge/LockAndKey.hs @@ -25,8 +25,6 @@ lockRoomMultiItems = lockRoomKeyItems :: RandomGen g => [(Int -> State g (MetaTree Room String), State g ItemType)] lockRoomKeyItems = [ (lasCenSensEdge, takeOne [HELD LAUNCHER, HELD LASGUN, HELD SPARKGUN, HELD FLATSHIELD, HELD FORCEFIELDGUN]) --- , (sensorRoomRunPast ELECTRICAL, takeOne [CRAFT (ENERGYBALLCRAFT TeslaBall), HELD SPARKGUN]) --- , (sensorRoomRunPast FLAMING, takeOne [HELD FLAMESPITTER, CRAFT (ENERGYBALLCRAFT IncBall)]) , (sensorRoomRunPast LASERING, return $ HELD LASGUN) , (const slowDoorRoomRunPast, return $ HELD (MINIGUNX 3)) , (const longRoomRunPast, takeOne [HELD SNIPERRIFLE, HELD FLATSHIELD]) diff --git a/src/Dodge/Targeting.hs b/src/Dodge/Targeting.hs deleted file mode 100644 index 340d0950e..000000000 --- a/src/Dodge/Targeting.hs +++ /dev/null @@ -1,120 +0,0 @@ -module Dodge.Targeting ( --- updateTargeting, -) where - ---import Color ---import qualified Data.Map.Strict as M ---import Data.Maybe ---import Dodge.Base.Collide ---import Dodge.Base.Coordinate ---import Dodge.Creature.Test ---import Dodge.Data.World ---import Dodge.Item.Weapon.LaserPath ---import Dodge.Zoning.Creature ---import FoldableHelp ---import Geometry.Vector ---import LensHelp ---import qualified SDL - ---updateTargeting :: Maybe TargetingType -> Creature -> World -> World ---updateTargeting tu = case tu of --- Nothing -> clearTargeting --- Just TARGETLASER -> targetLaserUpdate' --- Just TargetRBPress -> upCT (flip targetRBPressUpdate . _crTargeting) --- Just TargetRBLine -> upCT (flip targetRBPressUpdate . _crTargeting) --- Just TargetRBCreature -> upCT targetRBCreatureUp --- Just TargetCursor -> upCT (flip targetCursorUpdate . _crTargeting) - ---clearTargeting :: Creature -> World -> World ---clearTargeting cr = cWorld . lWorld . creatures . ix (_crID cr) . crTargeting .~ defaultTargeting --- ---defaultTargeting :: CreatureTargeting ---defaultTargeting = CreatureTargeting Nothing Nothing Nothing False --- ---upCT :: (Creature -> World -> CreatureTargeting) -> Creature -> World -> World ---upCT f cr w = w & cWorld . lWorld . creatures . ix (_crID cr) . crTargeting .~ f cr w --- ---targetRBCreatureUp :: Creature -> World -> CreatureTargeting ---targetRBCreatureUp cr w --- | SDL.ButtonRight `M.member` _mouseButtons (_input w) && isJust (t ^? ctID . _Just) --- && canSeeTarget = --- t & updatePos & ctActive .~ True --- & ctType ?~ TargetRBCreature --- | otherwise = t & ctID .~ fmap _crID newtarg & updatePos & ctActive .~ False --- & ctType ?~ TargetRBCreature --- where --- t = _crTargeting cr --- newtarg = --- safeMinimumOn (dist mwp . _crPos) --- . filter (canseepos . _crPos) --- $ crsNearCirc mwp 40 w --- canseepos p = hasLOS (_crPos cr) p w --- mwp = mouseWorldPos (w ^. input) (w ^. wCam) --- updatePos t' = t' & ctPos .~ posFromMaybeID (_ctID t') --- posFromMaybeID Nothing = Nothing --- posFromMaybeID (Just i) = w ^? cWorld . lWorld . creatures . ix i . crPos --- canSeeTarget = fromMaybe False $ do --- cid <- t ^? ctID . _Just --- cpos <- w ^? cWorld . lWorld . creatures . ix cid . crPos --- Just $ hasLOS cpos (_crPos cr) w --- ---targetCursorUpdate :: World -> CreatureTargeting -> CreatureTargeting ---targetCursorUpdate w ct = --- ct --- & ctPos . _Just .~ mouseWorldPos (w ^. input) (w ^. wCam) --- & ctActive .~ True --- & ctType ?~ TargetCursor --- ---targetRBPressUpdate :: World -> CreatureTargeting -> CreatureTargeting ---targetRBPressUpdate w t --- | SDL.ButtonRight `M.member` _mouseButtons (_input w) = --- t --- & ctPos %~ maybe (Just $ mouseWorldPos (w ^. input) (w ^. wCam)) Just --- & ctActive .~ True --- & ctType ?~ TargetRBPress --- | otherwise = --- t --- & ctPos %~ const Nothing --- & ctActive .~ False --- & ctType ?~ TargetRBPress --- ---targetLaserUpdate' :: Creature -> World -> World ---targetLaserUpdate' cr w = --- let (w', ct') = targetLaserUpdate cr w (_crTargeting cr) --- in w' & cWorld . lWorld . creatures . ix (_crID cr) . crTargeting .~ ct' --- ---targetLaserUpdate :: Creature -> World -> CreatureTargeting -> (World, CreatureTargeting) ---targetLaserUpdate cr w t --- | crIsAiming cr = --- --( addLaserPic w --- ( w --- , t --- & ctPos .~ fmap fst mp --- & ctActive .~ True --- & ctType ?~ TARGETLASER --- ) --- | otherwise = --- ( w --- , t & ctPos %~ const Nothing --- & ctActive .~ False --- ) --- where --- (mp, _) = reflectLaserAlong 0.2 sp ep w --- sp = _crPos cr +.+ 15 *.* unitVectorAtAngle (_crDir cr) --- ep = sp +.+ 5000 *.* normalizeV (mouseWorldPos (w ^. input) (w ^. wCam) -.- sp) ----- addLaserPic = ----- cWorld . lWorld . lasers ----- .:~ LaserStart ----- { _lpPhaseV = 1 ----- , _lpDir = _crDir cr ----- , _lpPos = sp ----- , _lpColor = col ----- , _lpType = TargetingLaser ----- } --- --wpammo = _itConsumption it --- -- reloadFrac --- -- | _laLoaded wpammo == 0 = 1 --- -- | otherwise = case _laTransfer wpammo of --- -- Transfer _ rs -> fromIntegral rs / fromIntegral (_laReloadTime wpammo) --- -- NoTransfer -> 1 ----- col = blue -- mixColors reloadFrac (1-reloadFrac) blue red diff --git a/src/Dodge/Targeting/Draw.hs b/src/Dodge/Targeting/Draw.hs index 2b20f5729..b7ffa4727 100644 --- a/src/Dodge/Targeting/Draw.hs +++ b/src/Dodge/Targeting/Draw.hs @@ -14,7 +14,6 @@ import Picture drawTargeting :: TargetingType -> Creature -> Configuration -> World -> Picture drawTargeting td = case td of TargetRBCreature -> targetRBCreatureDraw - TargetRBLine -> targetDistanceDraw TARGETLASER -> targetSimpleDraw TargetRBPress -> targetSimpleDraw TargetCursor -> targetSimpleDraw @@ -22,8 +21,6 @@ drawTargeting td = case td of targetSimpleDraw :: Creature -> Configuration -> World -> Picture targetSimpleDraw = targetDraw activeTargetCursorPic -targetDistanceDraw :: Creature -> Configuration -> World -> Picture -targetDistanceDraw _ _ _ = mempty --targetDistanceDraw cr _ w = mempty -- fromMaybe mempty $ do -- p <- cr ^? crTargeting . ctPos . _Just diff --git a/tags b/tags index 43d6730b6..d61907c4a 100644 --- a/tags +++ b/tags @@ -21,25 +21,25 @@ <$> src/Dodge/Data/LWorld.hs 160;" o <$> src/Dodge/Data/Terminal.hs 129;" o AIUNIT src/Dodge/Combine/Data.hs 48;" C -AIUNIT src/Dodge/Data/Item/Combine.hs 46;" C -AMMOMAG src/Dodge/Data/Item/Combine.hs 82;" C +AIUNIT src/Dodge/Data/Item/Combine.hs 52;" C +AMMOMAG src/Dodge/Data/Item/Combine.hs 22;" C AMR src/Dodge/Combine/Data.hs 157;" C -AMR src/Dodge/Data/Item/Combine.hs 159;" C +AMR src/Dodge/Data/Item/Combine.hs 150;" C ANTIMATTER src/Dodge/Combine/Data.hs 44;" C -ANTIMATTER src/Dodge/Data/Item/Combine.hs 40;" C +ANTIMATTER src/Dodge/Data/Item/Combine.hs 46;" C AQUAMARINE src/Color/Data.hs 24;" C -ATTACH src/Dodge/Data/Item/Combine.hs 81;" C +ATTACH src/Dodge/Data/Item/Combine.hs 21;" C ATTACHTORCH src/Dodge/Combine/Data.hs 219;" C -AUGMENTEDHUD src/Dodge/Data/Item/Combine.hs 92;" C +AUGMENTEDHUD src/Dodge/Data/Item/Combine.hs 86;" C AUTOAMR src/Dodge/Combine/Data.hs 158;" C -AUTOAMR src/Dodge/Data/Item/Combine.hs 160;" C +AUTOAMR src/Dodge/Data/Item/Combine.hs 151;" C AUTODETECTOR src/Dodge/Combine/Data.hs 117;" C -AUTODETECTOR src/Dodge/Data/Item/Combine.hs 129;" C +AUTODETECTOR src/Dodge/Data/Item/Combine.hs 120;" C AUTOEFFGUN src/Dodge/Combine/Data.hs 84;" C AUTOPISTOL src/Dodge/Combine/Data.hs 139;" C -AUTOPISTOL src/Dodge/Data/Item/Combine.hs 147;" C +AUTOPISTOL src/Dodge/Data/Item/Combine.hs 138;" C AUTORIFLE src/Dodge/Combine/Data.hs 151;" C -AUTORIFLE src/Dodge/Data/Item/Combine.hs 155;" C +AUTORIFLE src/Dodge/Data/Item/Combine.hs 146;" C AZURE src/Color/Data.hs 23;" C AccessTerminal src/Dodge/Data/WorldEffect.hs 28;" C Action src/Dodge/Data/ActionPlan.hs 78;" t @@ -76,7 +76,7 @@ AmmoEffectLink src/Dodge/Data/ComposedItem.hs 20;" C AmmoEffectSF src/Dodge/Data/ComposedItem.hs 38;" C AmmoInLink src/Dodge/Data/ComposedItem.hs 16;" C AmmoMagSF src/Dodge/Data/ComposedItem.hs 32;" C -AmmoMagType src/Dodge/Data/Item/Combine.hs 95;" t +AmmoMagType src/Dodge/Data/Item/Combine.hs 89;" t AmmoMagUse src/Dodge/Data/Item/Use.hs 69;" C AmmoModLink src/Dodge/Data/ComposedItem.hs 17;" C AmmoModifierSF src/Dodge/Data/ComposedItem.hs 35;" C @@ -133,7 +133,7 @@ AttachMInt src/Dodge/Item/Attachment/Data.hs 17;" C AttachMode src/Dodge/Item/Attachment/Data.hs 13;" C AttachTargetPos src/Dodge/Data/Item/Attachment.hs 13;" C AttachTargetPos src/Dodge/Item/Attachment/Data.hs 15;" C -AttachType src/Dodge/Data/Item/Combine.hs 87;" t +AttachType src/Dodge/Data/Item/Combine.hs 81;" t AttachUse src/Dodge/Data/Item/Use.hs 66;" C Attachment src/Dodge/Data/Item/Attachment.hs 4;" m Attachment src/Dodge/Item/Attachment.hs 1;" m @@ -154,7 +154,7 @@ AutoDoor src/Dodge/LevelGen/AutoDoor.hs 5;" m AutoDoorObstacle src/Dodge/Data/PathGraph.hs 51;" C AutoGun src/Dodge/Item/Weapon/AutoGun.hs 1;" m AutoRecharging src/Dodge/Data/Item/Consumption.hs 23;" C -AutoRecharging src/Dodge/Data/Item/Use/Consumption.hs 28;" C +AutoRecharging src/Dodge/Data/Item/Use/Consumption.hs 27;" C AutoTrigger src/Dodge/Data/Item/Use.hs 89;" C AuxAddition src/Shader/AuxAddition.hs 1;" m AwakeLevel src/Dodge/Creature/AlertLevel/Data.hs 14;" t @@ -164,42 +164,42 @@ Awareness src/Dodge/Creature/Picture/Awareness.hs 1;" m AwarenessInt src/Dodge/Creature/AlertLevel/Data.hs 26;" C AwarenessLevel src/Dodge/Creature/AlertLevel/Data.hs 25;" t BANGCONE src/Dodge/Combine/Data.hs 141;" C -BANGCONE src/Dodge/Data/Item/Combine.hs 149;" C +BANGCONE src/Dodge/Data/Item/Combine.hs 140;" C BANGROD src/Dodge/Combine/Data.hs 155;" C -BANGROD src/Dodge/Data/Item/Combine.hs 157;" C +BANGROD src/Dodge/Data/Item/Combine.hs 148;" C BANGSTICK src/Dodge/Combine/Data.hs 134;" C -BANGSTICK src/Dodge/Data/Item/Combine.hs 144;" C +BANGSTICK src/Dodge/Data/Item/Combine.hs 135;" C BATTERY src/Dodge/Combine/Data.hs 59;" C -BATTERY src/Dodge/Data/Item/Combine.hs 101;" C -BATTERYPACK src/Dodge/Data/Item/Combine.hs 128;" C +BATTERY src/Dodge/Data/Item/Combine.hs 94;" C +BATTERYPACK src/Dodge/Data/Item/Combine.hs 119;" C BELTMAG src/Dodge/Combine/Data.hs 200;" C -BELTMAG src/Dodge/Data/Item/Combine.hs 99;" C +BELTMAG src/Dodge/Data/Item/Combine.hs 92;" C BEZIERTRAJ src/Dodge/Combine/Data.hs 212;" C BLACK src/Color/Data.hs 28;" C BLINKER src/Dodge/Combine/Data.hs 125;" C -BLINKER src/Dodge/Data/Item/Combine.hs 137;" C +BLINKER src/Dodge/Data/Item/Combine.hs 128;" C BLINKERUNSAFE src/Dodge/Combine/Data.hs 126;" C -BLINKERUNSAFE src/Dodge/Data/Item/Combine.hs 138;" C +BLINKERUNSAFE src/Dodge/Data/Item/Combine.hs 129;" C BLOWTORCH src/Dodge/Combine/Data.hs 165;" C -BLOWTORCH src/Dodge/Data/Item/Combine.hs 166;" C +BLOWTORCH src/Dodge/Data/Item/Combine.hs 157;" C BLUE src/Color/Data.hs 17;" C BLUNDERBUSS src/Dodge/Combine/Data.hs 142;" C -BLUNDERBUSS src/Dodge/Data/Item/Combine.hs 150;" C +BLUNDERBUSS src/Dodge/Data/Item/Combine.hs 141;" C BLUNT src/Dodge/Data/Damage/Type.hs 13;" C BLUNT src/Dodge/Data/DamageType.hs 12;" C BOOSTER src/Dodge/Combine/Data.hs 123;" C -BOOSTER src/Dodge/Data/Item/Combine.hs 133;" C +BOOSTER src/Dodge/Data/Item/Combine.hs 124;" C BOUNCEBUL src/Dodge/Combine/Data.hs 203;" C BOUNCEMODULE src/Dodge/Combine/Data.hs 69;" C BQuad src/Geometry/Bezier.hs 9;" t BRAINHAT src/Dodge/Combine/Data.hs 109;" C -BRAINHAT src/Dodge/Data/Item/Combine.hs 117;" C -BULLETBELTBRACER src/Dodge/Data/Item/Combine.hs 127;" C -BULLETBELTPACK src/Dodge/Data/Item/Combine.hs 126;" C -BULLETMOD src/Dodge/Data/Item/Combine.hs 84;" C -BULLETSYNTHESIZER src/Dodge/Data/Item/Combine.hs 89;" C +BRAINHAT src/Dodge/Data/Item/Combine.hs 109;" C +BULLETBELTBRACER src/Dodge/Data/Item/Combine.hs 118;" C +BULLETBELTPACK src/Dodge/Data/Item/Combine.hs 117;" C +BULLETMOD src/Dodge/Data/Item/Combine.hs 24;" C +BULLETSYNTHESIZER src/Dodge/Data/Item/Combine.hs 83;" C BURSTRIFLE src/Dodge/Combine/Data.hs 152;" C -BURSTRIFLE src/Dodge/Data/Item/Combine.hs 156;" C +BURSTRIFLE src/Dodge/Data/Item/Combine.hs 147;" C BackgroundSound src/Dodge/Data/SoundOrigin.hs 14;" C Ball src/Dodge/Tesla/Ball.hs 1;" m Bark src/Dodge/Data/ActionPlan.hs 40;" C @@ -302,8 +302,8 @@ Bullet src/Dodge/Data/Bullet.hs 6;" m Bullet src/Dodge/Item/Weapon/Bullet.hs 1;" m BulletAmmo src/Dodge/Data/Ammo.hs 37;" C BulletAmmo src/Dodge/Data/Item/Use/Consumption/Ammo.hs 41;" C -BulletBeltAttachment src/Dodge/Data/Item.hs 55;" C -BulletClipAttachment src/Dodge/Data/Item.hs 54;" C +BulletBeltAttachment src/Dodge/Data/Item.hs 52;" C +BulletClipAttachment src/Dodge/Data/Item.hs 51;" C BulletEffect src/Dodge/Data/Bullet.hs 36;" t BulletGun src/Dodge/Item/Held/BulletGun.hs 1;" m BulletGuns src/Dodge/Item/Weapon/BulletGuns.hs 1;" m @@ -332,12 +332,12 @@ ButtonPress src/Dodge/Data/Button.hs 24;" C ButtonSimpleSwith src/Dodge/Data/Button.hs 40;" C ButtonState src/Dodge/Data/Button.hs 63;" t CAMERA src/Dodge/Combine/Data.hs 49;" C -CAMERA src/Dodge/Data/Item/Combine.hs 47;" C +CAMERA src/Dodge/Data/Item/Combine.hs 53;" C CAN src/Dodge/Combine/Data.hs 32;" C -CAN src/Dodge/Data/Item/Combine.hs 28;" C +CAN src/Dodge/Data/Item/Combine.hs 34;" C CDoNothing src/Dodge/Data/Item/HeldUse.hs 25;" C CHARTREUSE src/Color/Data.hs 25;" C -CHEMFUELPOUCH src/Dodge/Data/Item/Combine.hs 102;" C +CHEMFUELPOUCH src/Dodge/Data/Item/Combine.hs 95;" C CHeal src/Dodge/Data/Item/HeldUse.hs 26;" C CIRCLE src/Dodge/Data/GenParams.hs 20;" C CME src/Dodge/Data/MuzzleEffect.hs 11;" C @@ -345,13 +345,13 @@ CONCUSBUL src/Dodge/Combine/Data.hs 206;" C CONCUSSIVE src/Dodge/Data/Damage/Type.hs 22;" C CONCUSSIVE src/Dodge/Data/DamageType.hs 21;" C CONCUSSMODULE src/Dodge/Combine/Data.hs 66;" C -CONSUMABLE src/Dodge/Data/Item/Combine.hs 79;" C +CONSUMABLE src/Dodge/Data/Item/Combine.hs 19;" C CRAFT src/Dodge/Combine/Data.hs 97;" C -CRAFT src/Dodge/Data/Item/Combine.hs 80;" C +CRAFT src/Dodge/Data/Item/Combine.hs 20;" C CREATUREDETECTOR src/Dodge/Combine/Data.hs 226;" C -CREATUREDETECTOR src/Dodge/Data/Item/Combine.hs 185;" C +CREATUREDETECTOR src/Dodge/Data/Item/Combine.hs 176;" C CREATURESENSOR src/Dodge/Combine/Data.hs 57;" C -CREATURESENSOR src/Dodge/Data/Item/Combine.hs 57;" C +CREATURESENSOR src/Dodge/Data/Item/Combine.hs 63;" C CRUSHING src/Dodge/Data/Damage/Type.hs 16;" C CRUSHING src/Dodge/Data/DamageType.hs 15;" C CUTTING src/Dodge/Data/Damage/Type.hs 14;" C @@ -395,7 +395,7 @@ ChangeStrategy src/Dodge/Data/ActionPlan.hs 44;" C ChargeIfEquipped src/Dodge/Data/Item/Effect.hs 21;" C ChargeIfInInventory src/Dodge/Data/Item/Effect.hs 22;" C ChargeableAmmo src/Dodge/Data/Item/Consumption.hs 29;" C -ChargeableAmmo src/Dodge/Data/Item/Use/Consumption.hs 34;" C +ChargeableAmmo src/Dodge/Data/Item/Use/Consumption.hs 33;" C ChaseAI src/Dodge/Data/Creature/Misc.hs 50;" C ChaseCrit src/Dodge/Creature/ChaseCrit.hs 1;" m ChaseCritters src/Dodge/Creature/State/Data.hs 33;" C @@ -446,9 +446,9 @@ ColorFaction src/Dodge/Data/Creature/State.hs 41;" C Comatose src/Dodge/Creature/AlertLevel/Data.hs 15;" C Comatose src/Dodge/Creature/Perception/Data.hs 56;" C Comatose src/Dodge/Data/Creature/Perception.hs 53;" C -CombClust src/Dodge/Combine/Graph.hs 16;" t -CombEdge src/Dodge/Combine/Graph.hs 29;" t -CombNode src/Dodge/Combine/Graph.hs 22;" t +CombClust src/Dodge/Combine/Graph.hs 15;" t +CombEdge src/Dodge/Combine/Graph.hs 28;" t +CombNode src/Dodge/Combine/Graph.hs 21;" t CombinableItem src/Dodge/Data/Combine.hs 5;" t Combinations src/Dodge/Combine/Combinations.hs 3;" m Combine src/Dodge/Combine.hs 2;" m @@ -477,7 +477,7 @@ ConstFloat src/Dodge/Data/GenFloat.hs 11;" C ConstantIntensity src/Dodge/Data/LightSource.hs 17;" C Consumable src/Dodge/Item/Consumable.hs 1;" m ConsumableFamily src/Dodge/Item/Family.hs 7;" C -ConsumableItemType src/Dodge/Data/Item/Combine.hs 106;" t +ConsumableItemType src/Dodge/Data/Item/Combine.hs 98;" t ConsumeUse src/Dodge/Data/Item/Use.hs 56;" C Consumption src/Dodge/Data/Item/Consumption.hs 5;" m Consumption src/Dodge/Data/Item/Use/Consumption.hs 8;" m @@ -539,9 +539,9 @@ Cr_awareness src/Dodge/Config/Data.hs 36;" C Cr_awareness src/Dodge/Data/Config.hs 72;" C Cr_status src/Dodge/Config/Data.hs 35;" C Cr_status src/Dodge/Data/Config.hs 71;" C -CraftClust src/Dodge/Combine/Graph.hs 17;" C +CraftClust src/Dodge/Combine/Graph.hs 16;" C CraftType src/Dodge/Combine/Data.hs 26;" t -CraftType src/Dodge/Data/Item/Combine.hs 21;" t +CraftType src/Dodge/Data/Item/Combine.hs 27;" t CraftUse src/Dodge/Data/Item/Use.hs 64;" C Craftable src/Dodge/Item/Craftable.hs 1;" m CraftingFamily src/Dodge/Item/Family.hs 4;" C @@ -590,10 +590,10 @@ Cuse src/Dodge/Cuse.hs 1;" m Cylinder src/Shape/Data.hs 19;" C DPoint2 src/Geometry/Data.hs 34;" t DRONELAUNCHER src/Dodge/Combine/Data.hs 184;" C -DRONELAUNCHER src/Dodge/Data/Item/Combine.hs 174;" C +DRONELAUNCHER src/Dodge/Data/Item/Combine.hs 165;" C DRUM src/Dodge/Combine/Data.hs 34;" C DRUMMAG src/Dodge/Combine/Data.hs 199;" C -DRUMMAG src/Dodge/Data/Item/Combine.hs 98;" C +DRUMMAG src/Dodge/Data/Item/Combine.hs 91;" C DS src/DoubleStack.hs 3;" t DT src/Dodge/Data/DoubleTree.hs 29;" C DTBottomNode src/Dodge/Data/DoubleTree.hs 19;" C @@ -695,7 +695,7 @@ DestroyItem src/Dodge/Data/Scenario.hs 7;" C DestroyPU src/Dodge/Data/Item/Use/Consumption/Ammo.hs 34;" C DestroyTLS src/Dodge/Data/LightSource.hs 22;" C Detector src/Dodge/Combine/Data.hs 224;" t -Detector src/Dodge/Data/Item/Combine.hs 183;" t +Detector src/Dodge/Data/Item/Combine.hs 174;" t Dirt src/Dodge/Data/Material.hs 11;" C DisasterType src/Dodge/Data/Scenario.hs 24;" t Display src/Dodge/Item/Display.hs 1;" m @@ -813,17 +813,17 @@ EHeadLamp src/Dodge/Data/Item/HeldUse.hs 34;" C ELECTRICAL src/Dodge/Data/Damage/Type.hs 20;" C ELECTRICAL src/Dodge/Data/DamageType.hs 19;" C ELEPHANTGUN src/Dodge/Combine/Data.hs 156;" C -ELEPHANTGUN src/Dodge/Data/Item/Combine.hs 158;" C +ELEPHANTGUN src/Dodge/Data/Item/Combine.hs 149;" C EMPTYMODULE src/Dodge/Combine/Data.hs 198;" C EMagShield src/Dodge/Data/Item/HeldUse.hs 32;" C ENTERREMENT src/Dodge/Data/Damage/Type.hs 24;" C ENTERREMENT src/Dodge/Data/DamageType.hs 25;" C EQUIP src/Dodge/Combine/Data.hs 88;" C -EQUIP src/Dodge/Data/Item/Combine.hs 78;" C +EQUIP src/Dodge/Data/Item/Combine.hs 18;" C EWristShield src/Dodge/Data/Item/HeldUse.hs 33;" C EXPLOSIVE src/Dodge/Data/Damage/Type.hs 21;" C EXPLOSIVE src/Dodge/Data/DamageType.hs 20;" C -EXPLOSIVES src/Dodge/Data/Item/Combine.hs 108;" C +EXPLOSIVES src/Dodge/Data/Item/Combine.hs 100;" C EXTRABATTERY src/Dodge/Combine/Data.hs 218;" C Ears src/Dodge/Creature/Perception/Data.hs 48;" C Ears src/Dodge/Data/Creature/Perception.hs 47;" C @@ -857,7 +857,7 @@ EquipCounter src/Dodge/Data/Item/Use/Equipment.hs 31;" C EquipEffect src/Dodge/Data/Item/Use/Equipment.hs 17;" t EquipID src/Dodge/Data/Item/Use/Equipment.hs 30;" C EquipItemType src/Dodge/Combine/Data.hs 103;" t -EquipItemType src/Dodge/Data/Item/Combine.hs 111;" t +EquipItemType src/Dodge/Data/Item/Combine.hs 103;" t EquipOptions src/Dodge/Data/RightButtonOptions.hs 15;" C EquipParams src/Dodge/Data/Item/Use/Equipment.hs 28;" t EquipPosition src/Dodge/Data/Equipment/Misc.hs 20;" t @@ -895,36 +895,36 @@ Eyes src/Dodge/Data/Creature/Perception.hs 41;" C FBO src/Shader/Data.hs 57;" t FBranch src/TreeExtra.hs 8;" C FBranches src/TreeExtra.hs 9;" C -FLAKCRAFT src/Dodge/Data/Item/Combine.hs 64;" C +FLAKCRAFT src/Dodge/Data/Item/Combine.hs 70;" C FLAMESHIELD src/Dodge/Combine/Data.hs 105;" C -FLAMESHIELD src/Dodge/Data/Item/Combine.hs 113;" C +FLAMESHIELD src/Dodge/Data/Item/Combine.hs 105;" C FLAMESPITTER src/Dodge/Combine/Data.hs 161;" C -FLAMESPITTER src/Dodge/Data/Item/Combine.hs 162;" C +FLAMESPITTER src/Dodge/Data/Item/Combine.hs 153;" C FLAMETHROWER src/Dodge/Combine/Data.hs 162;" C -FLAMETHROWER src/Dodge/Data/Item/Combine.hs 163;" C +FLAMETHROWER src/Dodge/Data/Item/Combine.hs 154;" C FLAMETORRENT src/Dodge/Combine/Data.hs 163;" C -FLAMETORRENT src/Dodge/Data/Item/Combine.hs 164;" C +FLAMETORRENT src/Dodge/Data/Item/Combine.hs 155;" C FLAMEWALL src/Dodge/Combine/Data.hs 164;" C -FLAMEWALL src/Dodge/Data/Item/Combine.hs 165;" C +FLAMEWALL src/Dodge/Data/Item/Combine.hs 156;" C FLAMING src/Dodge/Data/Damage/Type.hs 18;" C FLAMING src/Dodge/Data/DamageType.hs 17;" C FLASHMODULE src/Dodge/Combine/Data.hs 68;" C -FLASHMODULE src/Dodge/Data/Item/Combine.hs 62;" C +FLASHMODULE src/Dodge/Data/Item/Combine.hs 68;" C FLATSHIELD src/Dodge/Combine/Data.hs 192;" C -FLATSHIELD src/Dodge/Data/Item/Combine.hs 179;" C +FLATSHIELD src/Dodge/Data/Item/Combine.hs 170;" C FLECHETRAJ src/Dodge/Combine/Data.hs 211;" C FLeaf src/TreeExtra.hs 10;" C FORCEFIELDGUN src/Dodge/Combine/Data.hs 188;" C -FORCEFIELDGUN src/Dodge/Data/Item/Combine.hs 176;" C -FRAGCRAFT src/Dodge/Data/Item/Combine.hs 65;" C +FORCEFIELDGUN src/Dodge/Data/Item/Combine.hs 167;" C +FRAGCRAFT src/Dodge/Data/Item/Combine.hs 71;" C FRAGMODULE src/Dodge/Combine/Data.hs 67;" C -FRAGMODULE src/Dodge/Data/Item/Combine.hs 61;" C +FRAGMODULE src/Dodge/Data/Item/Combine.hs 67;" C FRONTARMOUR src/Dodge/Combine/Data.hs 106;" C -FRONTARMOUR src/Dodge/Data/Item/Combine.hs 114;" C +FRONTARMOUR src/Dodge/Data/Item/Combine.hs 106;" C FTree src/TreeExtra.hs 7;" t FUELCELL src/Dodge/Combine/Data.hs 60;" C -FUELCELL src/Dodge/Data/Item/Combine.hs 59;" C -FUELPACK src/Dodge/Data/Item/Combine.hs 125;" C +FUELCELL src/Dodge/Data/Item/Combine.hs 65;" C +FUELPACK src/Dodge/Data/Item/Combine.hs 116;" C FacilityType src/Dodge/Data/Scenario.hs 55;" t Faction src/Dodge/Creature/State/Data.hs 29;" t Faction src/Dodge/Data/Creature/State.hs 34;" t @@ -1013,14 +1013,14 @@ FullShadowFidelity src/Shape/Data.hs 24;" C FullSize src/Dodge/Data/Item/Params.hs 58;" C FullyVisible src/Dodge/Data/CamouflageStatus.hs 12;" C Furniture src/Dodge/Room/Furniture.hs 1;" m -GASINJECTOR src/Dodge/Data/Item/Combine.hs 63;" C +GASINJECTOR src/Dodge/Data/Item/Combine.hs 69;" C GEqC src/SameConstr.hs 20;" c -GLASSSHARD src/Dodge/Data/Item/Combine.hs 32;" C +GLASSSHARD src/Dodge/Data/Item/Combine.hs 38;" C GLHelp src/GLHelp.hs 1;" m GRAPECANNON src/Dodge/Combine/Data.hs 143;" C -GRAPECANNON src/Dodge/Data/Item/Combine.hs 151;" C +GRAPECANNON src/Dodge/Data/Item/Combine.hs 142;" C GRAVITYMODULE src/Dodge/Combine/Data.hs 75;" C -GRAVITYMODULE src/Dodge/Data/Item/Combine.hs 71;" C +GRAVITYMODULE src/Dodge/Data/Item/Combine.hs 77;" C GREEN src/Color/Data.hs 16;" C GameOver src/Dodge/World/Trigger/Data.hs 11;" C GameOverOptions src/Dodge/Data/Universe.hs 68;" C @@ -1077,7 +1077,7 @@ GoesOnWrist src/Dodge/Equipment/Data.hs 10;" C Government src/Dodge/Data/Scenario.hs 43;" C GovernmentScope src/Dodge/Data/Scenario.hs 49;" t Grammar src/Dodge/Item/Grammar.hs 1;" m -Graph src/Dodge/Combine/Graph.hs 3;" m +Graph src/Dodge/Combine/Graph.hs 2;" m Graph src/Dodge/Graph.hs 2;" m GraphHelp src/GraphHelp.hs 1;" m GraphVizHelp src/GraphVizHelp.hs 2;" m @@ -1086,22 +1086,22 @@ Grid src/Grid.hs 1;" m Gust src/Dodge/Data/Gust.hs 13;" t Gust src/Dodge/Data/Gust.hs 6;" m GymSS src/Dodge/Data/Scenario.hs 104;" C -HARDDRIVE src/Dodge/Data/Item/Combine.hs 44;" C +HARDDRIVE src/Dodge/Data/Item/Combine.hs 50;" C HARDWARE src/Dodge/Combine/Data.hs 29;" C -HARDWARE src/Dodge/Data/Item/Combine.hs 24;" C +HARDWARE src/Dodge/Data/Item/Combine.hs 30;" C HAT src/Dodge/Combine/Data.hs 110;" C -HAT src/Dodge/Data/Item/Combine.hs 118;" C +HAT src/Dodge/Data/Item/Combine.hs 110;" C HEADLAMP src/Dodge/Combine/Data.hs 111;" C -HEADLAMP src/Dodge/Data/Item/Combine.hs 120;" C +HEADLAMP src/Dodge/Data/Item/Combine.hs 111;" C HEADLAMP1 src/Dodge/Combine/Data.hs 112;" C HEATSENSOR src/Dodge/Combine/Data.hs 56;" C -HEATSENSOR src/Dodge/Data/Item/Combine.hs 54;" C +HEATSENSOR src/Dodge/Data/Item/Combine.hs 60;" C HELD src/Dodge/Combine/Data.hs 86;" C -HELD src/Dodge/Data/Item/Combine.hs 76;" C +HELD src/Dodge/Data/Item/Combine.hs 16;" C HELDDETECTOR src/Dodge/Combine/Data.hs 190;" C -HELDDETECTOR src/Dodge/Data/Item/Combine.hs 177;" C -HOMINGMODULE src/Dodge/Data/Item/Combine.hs 91;" C -HOSE src/Dodge/Data/Item/Combine.hs 26;" C +HELDDETECTOR src/Dodge/Data/Item/Combine.hs 168;" C +HOMINGMODULE src/Dodge/Data/Item/Combine.hs 85;" C +HOSE src/Dodge/Data/Item/Combine.hs 32;" C HPtLayer src/Dodge/Picture/Layer/Data.hs 17;" C HUD src/Dodge/Data/HUD.hs 35;" t HUD src/Dodge/Data/HUD.hs 6;" m @@ -1128,7 +1128,7 @@ HeldConsumption src/Dodge/Data/Item/Consumption.hs 14;" t HeldDelay src/Dodge/Data/Item/HeldDelay.hs 6;" m HeldFamily src/Dodge/Item/Family.hs 3;" C HeldItemType src/Dodge/Combine/Data.hs 133;" t -HeldItemType src/Dodge/Data/Item/Combine.hs 143;" t +HeldItemType src/Dodge/Data/Item/Combine.hs 134;" t HeldOffset src/Dodge/Item/HeldOffset.hs 1;" m HeldParams src/Dodge/Data/Item/Use.hs 93;" t HeldScroll src/Dodge/Data/Item/HeldScroll.hs 13;" t @@ -1175,11 +1175,11 @@ INCENDBUL src/Dodge/Combine/Data.hs 202;" C INCENDIARYMODULE src/Dodge/Combine/Data.hs 64;" C INCENDLAS src/Dodge/Combine/Data.hs 213;" C INVISIBILITYEQUIPMENT src/Dodge/Combine/Data.hs 108;" C -INVISIBILITYEQUIPMENT src/Dodge/Data/Item/Combine.hs 116;" C +INVISIBILITYEQUIPMENT src/Dodge/Data/Item/Combine.hs 108;" C IRONBAR src/Dodge/Combine/Data.hs 53;" C -IRONBAR src/Dodge/Data/Item/Combine.hs 51;" C +IRONBAR src/Dodge/Data/Item/Combine.hs 57;" C ITEMDETECTOR src/Dodge/Combine/Data.hs 225;" C -ITEMDETECTOR src/Dodge/Data/Item/Combine.hs 184;" C +ITEMDETECTOR src/Dodge/Data/Item/Combine.hs 175;" C IcAmount src/Dodge/Data/ItemAmount.hs 9;" t ImmediateEffect src/Loop/Data.hs 8;" C Importance src/Shape/Data.hs 34;" t @@ -1259,7 +1259,7 @@ IsClose src/Dodge/Data/Machine/Sensor.hs 39;" C IsClose src/Dodge/Data/Sensor.hs 33;" C IsolationUnitSS src/Dodge/Data/Scenario.hs 101;" C ItAmount src/Dodge/Data/Item/Use/Amount.hs 9;" t -ItAmount src/Dodge/Data/Item/Use/Consumption.hs 40;" t +ItAmount src/Dodge/Data/Item/Use/Consumption.hs 39;" t ItAttachment src/Dodge/Data/Item/Attachment.hs 11;" t ItAttachment src/Dodge/Item/Attachment/Data.hs 11;" t ItCrWdId src/Dodge/Data/WorldEffect.hs 19;" C @@ -1274,7 +1274,7 @@ ItEffect src/Dodge/Data/ItEffect.hs 5;" m ItEffect src/Dodge/ItEffect.hs 1;" m ItFloorEffect src/Dodge/Data/ItEffect.hs 46;" t ItFloorEffect src/Dodge/Data/Item/Effect.hs 31;" t -ItID src/Dodge/Data/Item.hs 34;" t +ItID src/Dodge/Data/Item.hs 32;" t ItInvEffect src/Dodge/Data/ItEffect.hs 36;" t ItInvEffect src/Dodge/Data/Item/Effect.hs 19;" t ItInvEffect src/Dodge/Data/ItEffect.hs 13;" C @@ -1282,17 +1282,16 @@ ItInvEffectDrop src/Dodge/Data/ItEffect.hs 29;" C ItInvEffectID src/Dodge/Data/ItEffect.hs 25;" C ItRewindEffect src/Dodge/Data/ItEffect.hs 17;" C ItZoom src/Dodge/Data/Item/Use.hs 205;" t -Item src/Dodge/Data/Item.hs 37;" t +Item src/Dodge/Data/Item.hs 35;" t Item src/Dodge/Base/Item.hs 1;" m -Item src/Dodge/Data/Item.hs 6;" m +Item src/Dodge/Data/Item.hs 4;" m Item src/Dodge/Default/Item.hs 1;" m -Item src/Dodge/Item.hs 1;" m +Item src/Dodge/Item.hs 3;" m ItemAmount src/Dodge/Data/Item/Use/Amount.hs 4;" m ItemAmount src/Dodge/Data/ItemAmount.hs 4;" m -ItemAttachment src/Dodge/Data/Item.hs 53;" t +ItemAttachment src/Dodge/Data/Item.hs 49;" t ItemBaseType src/Dodge/Combine/Data.hs 81;" t -ItemBaseType src/Dodge/Data/Item/Combine.hs 75;" t -ItemClust src/Dodge/Combine/Graph.hs 18;" C +ItemClust src/Dodge/Combine/Graph.hs 17;" C ItemDimension src/Dodge/Data/Item/Misc.hs 13;" t ItemFamily src/Dodge/Item/Family.hs 3;" t ItemLocation src/Dodge/Data/Item/Location.hs 27;" t @@ -1304,21 +1303,21 @@ ItemSpace src/Dodge/Inventory/ItemSpace.hs 1;" m ItemStructuralFunction src/Dodge/Data/ComposedItem.hs 27;" t ItemTweaks src/Dodge/Data/Item/Tweak.hs 13;" t ItemType src/Dodge/Combine/Data.hs 12;" t -ItemType src/Dodge/Data/Item/Combine.hs 16;" t +ItemType src/Dodge/Data/Item/Combine.hs 15;" t ItemUnlocker src/Dodge/Lock/Data.hs 13;" C ItemUse src/Dodge/Data/Item/Use.hs 36;" t ItmInt src/Dodge/Data/Item/Location.hs 24;" t JETPACK src/Dodge/Combine/Data.hs 116;" C -JETPACK src/Dodge/Data/Item/Combine.hs 124;" C +JETPACK src/Dodge/Data/Item/Combine.hs 115;" C JGK src/Control/Foldl/JGK.hs 1;" m JUMPLEGS src/Dodge/Combine/Data.hs 115;" C -JUMPLEGS src/Dodge/Data/Item/Combine.hs 123;" C -JoinClust src/Dodge/Combine/Graph.hs 19;" C +JUMPLEGS src/Dodge/Data/Item/Combine.hs 114;" C +JoinClust src/Dodge/Combine/Graph.hs 18;" C Just' src/MaybeHelp.hs 13;" C JustStartedPlaying src/Sound/Data.hs 25;" C Justify src/Justify.hs 1;" m KEYCARD src/Dodge/Combine/Data.hs 94;" C -KEYCARD src/Dodge/Data/Item/Combine.hs 180;" C +KEYCARD src/Dodge/Data/Item/Combine.hs 171;" C Key src/Dodge/Layout/Tree/Annotate.hs 16;" C KeyConfig src/Dodge/Config/KeyConfig.hs 3;" m KeyConfigSDL src/Dodge/Config/KeyConfig.hs 17;" t @@ -1328,12 +1327,12 @@ LASCIRCLE src/Dodge/Combine/Data.hs 169;" C LASERING src/Dodge/Data/Damage/Type.hs 19;" C LASERING src/Dodge/Data/DamageType.hs 18;" C LASGUN src/Dodge/Combine/Data.hs 168;" C -LASGUN src/Dodge/Data/Item/Combine.hs 169;" C +LASGUN src/Dodge/Data/Item/Combine.hs 160;" C LASWIDE src/Dodge/Combine/Data.hs 175;" C LAUNCHER src/Dodge/Combine/Data.hs 179;" C -LAUNCHER src/Dodge/Data/Item/Combine.hs 171;" C +LAUNCHER src/Dodge/Data/Item/Combine.hs 162;" C LAUNCHERX src/Dodge/Combine/Data.hs 180;" C -LAUNCHERX src/Dodge/Data/Item/Combine.hs 172;" C +LAUNCHERX src/Dodge/Data/Item/Combine.hs 163;" C LAUNCHHOME src/Dodge/Combine/Data.hs 217;" C LBlink src/Dodge/Data/Item/HeldUse.hs 54;" C LBoost src/Dodge/Data/Item/HeldUse.hs 56;" C @@ -1347,14 +1346,14 @@ LDTRootNode src/Dodge/Data/DoubleTree.hs 23;" C LDTTopNode src/Dodge/Data/DoubleTree.hs 24;" C LDoNothing src/Dodge/Data/Item/HeldUse.hs 49;" C LED src/Dodge/Combine/Data.hs 51;" C -LED src/Dodge/Data/Item/Combine.hs 49;" C +LED src/Dodge/Data/Item/Combine.hs 55;" C LEFT src/Dodge/Combine/Data.hs 87;" C -LEFT src/Dodge/Data/Item/Combine.hs 77;" C +LEFT src/Dodge/Data/Item/Combine.hs 17;" C LHS src/Geometry/LHS.hs 1;" m LIGHTER src/Dodge/Combine/Data.hs 42;" C -LIGHTER src/Dodge/Data/Item/Combine.hs 38;" C +LIGHTER src/Dodge/Data/Item/Combine.hs 44;" C LIGHTSENSOR src/Dodge/Combine/Data.hs 54;" C -LIGHTSENSOR src/Dodge/Data/Item/Combine.hs 52;" C +LIGHTSENSOR src/Dodge/Data/Item/Combine.hs 58;" C LLeaf src/TreeExtra.hs 25;" C LRewind src/Dodge/Data/Item/HeldUse.hs 50;" C LS src/Dodge/Data/LightSource.hs 34;" C @@ -1406,11 +1405,11 @@ Left src/Dodge/Default/Item/Left.hs 1;" m Left src/Dodge/Item/Left.hs 1;" m LeftButton src/Dodge/Terminal/LeftButton.hs 1;" m LeftClickFamily src/Dodge/Item/Family.hs 6;" C -LeftConsumption src/Dodge/Data/Item/Use/Consumption.hs 27;" t +LeftConsumption src/Dodge/Data/Item/Use/Consumption.hs 26;" t LeftForward src/Dodge/Creature/Stance/Data.hs 34;" C LeftForward src/Dodge/Data/Creature/Stance.hs 32;" C LeftItemType src/Dodge/Combine/Data.hs 122;" t -LeftItemType src/Dodge/Data/Item/Combine.hs 132;" t +LeftItemType src/Dodge/Data/Item/Combine.hs 123;" t LeftUse src/Dodge/Data/Item/Use.hs 49;" C LensHelp src/LensHelp.hs 1;" m Lethargic src/Dodge/Creature/AlertLevel/Data.hs 17;" C @@ -1491,31 +1490,31 @@ Luse src/Dodge/Data/Item/HeldUse.hs 48;" t Luse src/Dodge/Luse.hs 1;" m MACHINEGUN src/Dodge/Combine/Data.hs 160;" C MACHINEPISTOL src/Dodge/Combine/Data.hs 138;" C -MACHINEPISTOL src/Dodge/Data/Item/Combine.hs 146;" C +MACHINEPISTOL src/Dodge/Data/Item/Combine.hs 137;" C MAGENTA src/Color/Data.hs 20;" C MAGNET src/Dodge/Combine/Data.hs 43;" C -MAGNET src/Dodge/Data/Item/Combine.hs 39;" C +MAGNET src/Dodge/Data/Item/Combine.hs 45;" C MAGNETMAG src/Dodge/Combine/Data.hs 201;" C MAGNETTRAJ src/Dodge/Combine/Data.hs 210;" C MAGSHIELD src/Dodge/Combine/Data.hs 104;" C -MAGSHIELD src/Dodge/Data/Item/Combine.hs 112;" C +MAGSHIELD src/Dodge/Data/Item/Combine.hs 104;" C MBranch src/Dodge/Tree/Compose/Data.hs 10;" C MCrAc src/Dodge/Data/CreatureEffect.hs 45;" t MCrNoAction src/Dodge/Data/CreatureEffect.hs 45;" C MEDKIT src/Dodge/Combine/Data.hs 96;" C -MEDKIT src/Dodge/Data/Item/Combine.hs 107;" C +MEDKIT src/Dodge/Data/Item/Combine.hs 99;" C MICROCHIP src/Dodge/Combine/Data.hs 47;" C -MICROCHIP src/Dodge/Data/Item/Combine.hs 43;" C -MICROPHONE src/Dodge/Data/Item/Combine.hs 55;" C +MICROCHIP src/Dodge/Data/Item/Combine.hs 49;" C +MICROPHONE src/Dodge/Data/Item/Combine.hs 61;" C MINIDISPLAY src/Dodge/Combine/Data.hs 50;" C -MINIDISPLAY src/Dodge/Data/Item/Combine.hs 48;" C +MINIDISPLAY src/Dodge/Data/Item/Combine.hs 54;" C MINIGUNX src/Dodge/Combine/Data.hs 147;" C -MINIGUNX src/Dodge/Data/Item/Combine.hs 152;" C +MINIGUNX src/Dodge/Data/Item/Combine.hs 143;" C MODBlockedString src/Dodge/Data/Universe.hs 96;" C MODString src/Dodge/Data/Universe.hs 95;" C MODStringOption src/Dodge/Data/Universe.hs 97;" C MOTOR src/Dodge/Combine/Data.hs 38;" C -MOTOR src/Dodge/Data/Item/Combine.hs 35;" C +MOTOR src/Dodge/Data/Item/Combine.hs 41;" C MP2Ac src/Dodge/Data/CreatureEffect.hs 56;" t MP2NoAction src/Dodge/Data/CreatureEffect.hs 56;" C MTRS src/Dodge/Annotation/Data.hs 11;" t @@ -1656,7 +1655,7 @@ MvPt src/Dodge/MvPt.hs 1;" m MvTurnToward src/Dodge/Data/ActionPlan.hs 34;" C MvWalking src/Dodge/Data/Creature/Misc.hs 39;" C NAILBOX src/Dodge/Combine/Data.hs 52;" C -NAILBOX src/Dodge/Data/Item/Combine.hs 50;" C +NAILBOX src/Dodge/Data/Item/Combine.hs 56;" C NInt src/NewInt.hs 15;" C NIntMap src/NewInt.hs 18;" C NOTDEFINED src/Dodge/Combine/Data.hs 82;" C @@ -1846,9 +1845,9 @@ PENMODULE src/Dodge/Combine/Data.hs 70;" C PIERCING src/Dodge/Data/Damage/Type.hs 12;" C PIERCING src/Dodge/Data/DamageType.hs 11;" C PIPE src/Dodge/Combine/Data.hs 27;" C -PIPE src/Dodge/Data/Item/Combine.hs 22;" C +PIPE src/Dodge/Data/Item/Combine.hs 28;" C PISTOL src/Dodge/Combine/Data.hs 135;" C -PISTOL src/Dodge/Data/Item/Combine.hs 145;" C +PISTOL src/Dodge/Data/Item/Combine.hs 136;" C PJReduceSpin src/Dodge/Data/Ammo.hs 24;" C PJRemoteDirection src/Dodge/Data/Ammo.hs 25;" C PJRetireRemote src/Dodge/Data/Ammo.hs 27;" C @@ -1857,28 +1856,28 @@ PJSpin src/Dodge/Data/Ammo.hs 22;" C PJThrust src/Dodge/Data/Ammo.hs 21;" C PJTrack src/Dodge/Data/Ammo.hs 23;" C PLANK src/Dodge/Combine/Data.hs 35;" C -PLANK src/Dodge/Data/Item/Combine.hs 31;" C +PLANK src/Dodge/Data/Item/Combine.hs 37;" C PLATE src/Dodge/Combine/Data.hs 45;" C -PLATE src/Dodge/Data/Item/Combine.hs 41;" C +PLATE src/Dodge/Data/Item/Combine.hs 47;" C PLUS src/Dodge/Data/GenParams.hs 20;" C POISONDAM src/Dodge/Data/Damage/Type.hs 23;" C POISONDAM src/Dodge/Data/DamageType.hs 24;" C POISONSPRAYER src/Dodge/Combine/Data.hs 183;" C -POISONSPRAYER src/Dodge/Data/Item/Combine.hs 173;" C +POISONSPRAYER src/Dodge/Data/Item/Combine.hs 164;" C PORTABLEFUSION src/Dodge/Combine/Data.hs 61;" C -PORTABLEFUSION src/Dodge/Data/Item/Combine.hs 60;" C +PORTABLEFUSION src/Dodge/Data/Item/Combine.hs 66;" C POWERLEGS src/Dodge/Combine/Data.hs 113;" C -POWERLEGS src/Dodge/Data/Item/Combine.hs 121;" C +POWERLEGS src/Dodge/Data/Item/Combine.hs 112;" C PPLevelReset src/Dodge/Data/PressPlate.hs 16;" C PRISM src/Dodge/Combine/Data.hs 40;" C -PRISM src/Dodge/Data/Item/Combine.hs 37;" C +PRISM src/Dodge/Data/Item/Combine.hs 43;" C PS src/Dodge/Data/GenWorld.hs 64;" C PSNoShiftCont src/Dodge/Data/GenWorld.hs 65;" C PSPos src/Dodge/Data/GenWorld.hs 66;" C PSRoomRand src/Dodge/Data/GenWorld.hs 71;" C PSType src/Dodge/Data/GenWorld.hs 31;" t PUMP src/Dodge/Combine/Data.hs 37;" C -PUMP src/Dodge/Data/Item/Combine.hs 34;" C +PUMP src/Dodge/Data/Item/Combine.hs 40;" C PUSHDAM src/Dodge/Data/DamageType.hs 23;" C PackAnimal src/Dodge/Data/Creature/Capability.hs 20;" C Padding src/Padding.hs 2;" m @@ -1964,7 +1963,7 @@ PosPl src/Dodge/Room/Data.hs 45;" C PosRooms src/Dodge/Tree/Shift.hs 28;" t Posture src/Dodge/Creature/Stance/Data.hs 42;" t Posture src/Dodge/Data/Creature/Stance.hs 38;" t -PowerSourceAttachment src/Dodge/Data/Item.hs 57;" C +PowerSourceAttachment src/Dodge/Data/Item.hs 54;" C PrWdLsId src/Dodge/Data/Prop.hs 70;" C PrWdLsLs src/Dodge/Data/Prop.hs 69;" t PrWdLsLs src/Dodge/PrWdLsLs.hs 1;" m @@ -2066,21 +2065,20 @@ QuarterRes src/Dodge/Config/Data.hs 54;" C QuarterRes src/Dodge/Data/Config.hs 95;" C Quaternion src/Quaternion.hs 12;" m QuicksaveSlot src/Dodge/Data/SaveSlot.hs 10;" C -RAM src/Dodge/Data/Item/Combine.hs 45;" C +RAM src/Dodge/Data/Item/Combine.hs 51;" C RBList src/Dodge/Inventory/RBList.hs 1;" m RBranches src/TreeExtra.hs 48;" C RED src/Color/Data.hs 15;" C REMOTELAUNCHER src/Dodge/Combine/Data.hs 182;" C -REMOTESCREEN src/Dodge/Data/Item/Combine.hs 90;" C +REMOTESCREEN src/Dodge/Data/Item/Combine.hs 84;" C REPEATER src/Dodge/Combine/Data.hs 150;" C -REVOLVEMAG src/Dodge/Data/Item/Combine.hs 96;" C REVOLVER src/Dodge/Combine/Data.hs 136;" C REVOLVERX src/Dodge/Combine/Data.hs 137;" C REWINDER src/Dodge/Combine/Data.hs 124;" C -REWINDWATCH src/Dodge/Data/Item/Combine.hs 135;" C +REWINDWATCH src/Dodge/Data/Item/Combine.hs 126;" C RGBA src/Color/Data.hs 31;" t RIFLE src/Dodge/Combine/Data.hs 149;" C -RIFLE src/Dodge/Data/Item/Combine.hs 154;" C +RIFLE src/Dodge/Data/Item/Combine.hs 145;" C RLeaf src/TreeExtra.hs 49;" C ROSE src/Color/Data.hs 21;" C RPLinkStatus src/Dodge/Data/Room.hs 55;" t @@ -2198,35 +2196,35 @@ RoomWire src/Dodge/Room/Data.hs 40;" t RoundedFaces src/Shape/Data.hs 18;" C RunPast src/Dodge/Room/RunPast.hs 1;" m RunningSideEffect src/Dodge/Data/Universe.hs 65;" C -SCRAPMETAL src/Dodge/Data/Item/Combine.hs 33;" C -SCROLLWATCH src/Dodge/Data/Item/Combine.hs 136;" C +SCRAPMETAL src/Dodge/Data/Item/Combine.hs 39;" C +SCROLLWATCH src/Dodge/Data/Item/Combine.hs 127;" C SHARDGLASS src/Dodge/Combine/Data.hs 36;" C SHATTERGUN src/Dodge/Combine/Data.hs 186;" C -SHATTERGUN src/Dodge/Data/Item/Combine.hs 175;" C +SHATTERGUN src/Dodge/Data/Item/Combine.hs 166;" C SHATTERING src/Dodge/Data/Damage/Type.hs 17;" C SHATTERING src/Dodge/Data/DamageType.hs 16;" C -SHELLMAG src/Dodge/Data/Item/Combine.hs 100;" C +SHELLMAG src/Dodge/Data/Item/Combine.hs 93;" C SHRINKER src/Dodge/Combine/Data.hs 127;" C -SHRINKER src/Dodge/Data/Item/Combine.hs 139;" C +SHRINKER src/Dodge/Data/Item/Combine.hs 130;" C SIZEMODULE src/Dodge/Combine/Data.hs 74;" C -SIZEMODULE src/Dodge/Data/Item/Combine.hs 70;" C +SIZEMODULE src/Dodge/Data/Item/Combine.hs 76;" C SMG src/Dodge/Combine/Data.hs 140;" C -SMG src/Dodge/Data/Item/Combine.hs 148;" C +SMG src/Dodge/Data/Item/Combine.hs 139;" C SNIPERRIFLE src/Dodge/Combine/Data.hs 159;" C -SNIPERRIFLE src/Dodge/Data/Item/Combine.hs 161;" C +SNIPERRIFLE src/Dodge/Data/Item/Combine.hs 152;" C SOUNDSENSOR src/Dodge/Combine/Data.hs 55;" C -SOUNDSENSOR src/Dodge/Data/Item/Combine.hs 53;" C +SOUNDSENSOR src/Dodge/Data/Item/Combine.hs 59;" C SPARKGUN src/Dodge/Combine/Data.hs 166;" C -SPARKGUN src/Dodge/Data/Item/Combine.hs 167;" C +SPARKGUN src/Dodge/Data/Item/Combine.hs 158;" C SPARKING src/Dodge/Data/Damage/Type.hs 15;" C SPARKING src/Dodge/Data/DamageType.hs 14;" C SPAWNER src/Dodge/Combine/Data.hs 128;" C -SPAWNER src/Dodge/Data/Item/Combine.hs 140;" C +SPAWNER src/Dodge/Data/Item/Combine.hs 131;" C SPEEDLEGS src/Dodge/Combine/Data.hs 114;" C -SPEEDLEGS src/Dodge/Data/Item/Combine.hs 122;" C +SPEEDLEGS src/Dodge/Data/Item/Combine.hs 113;" C SPLITLAS src/Dodge/Combine/Data.hs 214;" C SPRING src/Dodge/Combine/Data.hs 30;" C -SPRING src/Dodge/Data/Item/Combine.hs 25;" C +SPRING src/Dodge/Data/Item/Combine.hs 31;" C SPic src/ShapePicture/Data.hs 4;" t SPic src/Dodge/Item/Draw/SPic.hs 1;" m SQUARE src/Dodge/Data/GenParams.hs 20;" C @@ -2235,8 +2233,8 @@ ST src/Dodge/Tree/Compose/Data.hs 12;" C STATICBUL src/Dodge/Combine/Data.hs 205;" C STATICLAS src/Dodge/Combine/Data.hs 215;" C STATICMODULE src/Dodge/Combine/Data.hs 65;" C -STEELDRUM src/Dodge/Data/Item/Combine.hs 30;" C -STOPWATCH src/Dodge/Data/Item/Combine.hs 134;" C +STEELDRUM src/Dodge/Data/Item/Combine.hs 36;" C +STOPWATCH src/Dodge/Data/Item/Combine.hs 125;" C SameConstr src/SameConstr.hs 5;" m Save src/Dodge/Save.hs 1;" m SaveSlot src/Dodge/Data/SaveSlot.hs 9;" t @@ -2250,7 +2248,7 @@ Scope src/Dodge/Data/Item/Scope.hs 13;" t Scope src/Dodge/Item/Attachment/Data.hs 25;" t Scope src/Dodge/Data/Item/Scope.hs 6;" m Scope src/Dodge/Item/Scope.hs 1;" m -ScopeAttachment src/Dodge/Data/Item.hs 53;" C +ScopeAttachment src/Dodge/Data/Item.hs 50;" C ScopeUse src/Dodge/Data/Item/Use.hs 74;" C ScreenLayer src/Dodge/Data/Universe.hs 77;" t ScreenLayer src/Dodge/Update/Input/ScreenLayer.hs 1;" m @@ -2426,7 +2424,7 @@ Stack src/Dodge/Combine/Data.hs 21;" t Stance src/Dodge/Creature/Stance/Data.hs 11;" t Stance src/Dodge/Data/Creature/Stance.hs 13;" t Stance src/Dodge/Data/Creature/Stance.hs 6;" m -StandAttachment src/Dodge/Data/Item.hs 56;" C +StandAttachment src/Dodge/Data/Item.hs 53;" C StandaloneWall src/Dodge/Data/Wall.hs 49;" C Standing src/Dodge/Creature/Stance/Data.hs 25;" C Standing src/Dodge/Data/Creature/Stance.hs 25;" C @@ -2468,39 +2466,38 @@ SwarmPlacement src/Dodge/LevelGen/SwarmPlacement.hs 1;" m Switch src/Dodge/LevelGen/Switch.hs 1;" m SwitchToItem src/Dodge/Data/ActionPlan.hs 38;" C Synonyms src/Dodge/SoundLogic/Synonyms.hs 1;" m -TAPE src/Dodge/Data/Item/Combine.hs 27;" C +TAPE src/Dodge/Data/Item/Combine.hs 33;" C TARGCR src/Dodge/Combine/Data.hs 207;" C -TARGETING src/Dodge/Data/Item/Combine.hs 83;" C -TARGETINGHAT src/Dodge/Data/Item/Combine.hs 119;" C +TARGETING src/Dodge/Data/Item/Combine.hs 23;" C TARGETLASER src/Dodge/Data/Item/Targeting.hs 12;" C TARGLAS src/Dodge/Combine/Data.hs 208;" C TARGPOS src/Dodge/Combine/Data.hs 209;" C TELEPORTMODULE src/Dodge/Combine/Data.hs 72;" C -TELEPORTMODULE src/Dodge/Data/Item/Combine.hs 68;" C +TELEPORTMODULE src/Dodge/Data/Item/Combine.hs 74;" C TESLAGUN src/Dodge/Combine/Data.hs 167;" C -TESLAGUN src/Dodge/Data/Item/Combine.hs 168;" C +TESLAGUN src/Dodge/Data/Item/Combine.hs 159;" C THERMOMETER src/Dodge/Combine/Data.hs 41;" C -THERMOMETER src/Dodge/Data/Item/Combine.hs 56;" C +THERMOMETER src/Dodge/Data/Item/Combine.hs 62;" C THREELINES src/Dodge/Data/GenParams.hs 20;" C TIMEMODULE src/Dodge/Combine/Data.hs 73;" C -TIMEMODULE src/Dodge/Data/Item/Combine.hs 69;" C +TIMEMODULE src/Dodge/Data/Item/Combine.hs 75;" C TIN src/Dodge/Combine/Data.hs 33;" C -TIN src/Dodge/Data/Item/Combine.hs 29;" C -TINMAG src/Dodge/Data/Item/Combine.hs 97;" C +TIN src/Dodge/Data/Item/Combine.hs 35;" C +TINMAG src/Dodge/Data/Item/Combine.hs 90;" C TLS src/Dodge/Data/LightSource.hs 42;" C TLSFade src/Dodge/Data/LightSource.hs 18;" C TLSIntensity src/Dodge/Data/LightSource.hs 16;" t TLSUpdate src/Dodge/Data/LightSource.hs 21;" t TO src/Shader/Data.hs 59;" t TORCH src/Dodge/Combine/Data.hs 191;" C -TORCH src/Dodge/Data/Item/Combine.hs 178;" C +TORCH src/Dodge/Data/Item/Combine.hs 169;" C TORQUEDAM src/Dodge/Data/DamageType.hs 22;" C TRACTORGUN src/Dodge/Combine/Data.hs 178;" C -TRACTORGUN src/Dodge/Data/Item/Combine.hs 170;" C +TRACTORGUN src/Dodge/Data/Item/Combine.hs 161;" C TRANSFORMER src/Dodge/Combine/Data.hs 39;" C -TRANSFORMER src/Dodge/Data/Item/Combine.hs 36;" C +TRANSFORMER src/Dodge/Data/Item/Combine.hs 42;" C TRANSMITTER src/Dodge/Combine/Data.hs 46;" C -TRANSMITTER src/Dodge/Data/Item/Combine.hs 42;" C +TRANSMITTER src/Dodge/Data/Item/Combine.hs 48;" C TSbackspace src/Dodge/Data/Input.hs 38;" C TSbackspace src/Dodge/Data/TermSignal.hs 6;" C TSdelete src/Dodge/Data/Input.hs 39;" C @@ -2520,19 +2517,18 @@ TStab src/Dodge/Data/TermSignal.hs 8;" C TSup src/Dodge/Data/Input.hs 43;" C TSup src/Dodge/Data/TermSignal.hs 11;" C TUBE src/Dodge/Combine/Data.hs 28;" C -TUBE src/Dodge/Data/Item/Combine.hs 23;" C +TUBE src/Dodge/Data/Item/Combine.hs 29;" C Tank src/Dodge/Placement/Instance/Tank.hs 1;" m Tanks src/Dodge/Room/Tanks.hs 1;" m Tap src/Dodge/Data/SoundOrigin.hs 36;" C -TargetCursor src/Dodge/Data/Item/Targeting.hs 16;" C +TargetCursor src/Dodge/Data/Item/Targeting.hs 15;" C TargetCursorUpdate src/Dodge/Data/Targeting.hs 26;" C TargetDistanceDraw src/Dodge/Data/Targeting.hs 32;" C TargetDraw src/Dodge/Data/Targeting.hs 31;" t TargetLaserUpdate src/Dodge/Data/Targeting.hs 23;" C -TargetRBCreature src/Dodge/Data/Item/Targeting.hs 15;" C +TargetRBCreature src/Dodge/Data/Item/Targeting.hs 14;" C TargetRBCreatureDraw src/Dodge/Data/Targeting.hs 34;" C TargetRBCreatureUpdate src/Dodge/Data/Targeting.hs 25;" C -TargetRBLine src/Dodge/Data/Item/Targeting.hs 14;" C TargetRBPress src/Dodge/Data/Item/Targeting.hs 13;" C TargetRBPressUpdate src/Dodge/Data/Targeting.hs 24;" C TargetUpdate src/Dodge/Data/Targeting.hs 22;" t @@ -2757,7 +2753,7 @@ VBO src/Shader/Data.hs 81;" t VF src/Polyhedra/Data.hs 21;" t VIOLET src/Color/Data.hs 22;" C VOLLEYGUN src/Dodge/Combine/Data.hs 148;" C -VOLLEYGUN src/Dodge/Data/Item/Combine.hs 153;" C +VOLLEYGUN src/Dodge/Data/Item/Combine.hs 144;" C VariableRate src/Dodge/Data/Item/Use/Delay.hs 16;" C VariableRate src/Dodge/Data/Item/UseDelay.hs 16;" C VariableSelectionWidth src/Dodge/Data/SelectionList.hs 68;" C @@ -2782,14 +2778,14 @@ Vocalization src/Dodge/Data/Creature/Misc.hs 27;" t Vocalization src/Dodge/Creature/Vocalization.hs 1;" m Volition src/Dodge/Creature/Volition.hs 2;" m WALLDETECTOR src/Dodge/Combine/Data.hs 227;" C -WALLDETECTOR src/Dodge/Data/Item/Combine.hs 186;" C +WALLDETECTOR src/Dodge/Data/Item/Combine.hs 177;" C WASD src/Dodge/WASD.hs 1;" m WEPTELE src/Dodge/Combine/Data.hs 216;" C WHITE src/Color/Data.hs 27;" C WIRE src/Dodge/Combine/Data.hs 58;" C -WIRE src/Dodge/Data/Item/Combine.hs 58;" C +WIRE src/Dodge/Data/Item/Combine.hs 64;" C WRISTARMOUR src/Dodge/Combine/Data.hs 107;" C -WRISTARMOUR src/Dodge/Data/Item/Combine.hs 115;" C +WRISTARMOUR src/Dodge/Data/Item/Combine.hs 107;" C WaitMessage src/Dodge/Data/Menu.hs 5;" C WaitThen src/Dodge/Data/ActionPlan.hs 103;" C WalkCycle src/Dodge/Creature/State/WalkCycle.hs 1;" m @@ -2892,7 +2888,7 @@ YELLOW src/Color/Data.hs 18;" C You src/Dodge/Base/You.hs 1;" m YourAI src/Dodge/Data/Creature/Misc.hs 49;" C YourControl src/Dodge/Creature/YourControl.hs 1;" m -ZOOMSCOPE src/Dodge/Data/Item/Combine.hs 88;" C +ZOOMSCOPE src/Dodge/Data/Item/Combine.hs 82;" C ZombieFaction src/Dodge/Creature/State/Data.hs 31;" C ZombieFaction src/Dodge/Data/Creature/State.hs 36;" C Zone src/Dodge/Zone/Data.hs 8;" t @@ -2957,13 +2953,13 @@ _apGoal src/Dodge/Data/ActionPlan.hs 22;" f _apImpulse src/Dodge/Data/ActionPlan.hs 19;" f _apStrategy src/Dodge/Data/ActionPlan.hs 21;" f _arLoaded src/Dodge/Data/Item/Consumption.hs 24;" f -_arLoaded src/Dodge/Data/Item/Use/Consumption.hs 29;" f +_arLoaded src/Dodge/Data/Item/Use/Consumption.hs 28;" f _arMax src/Dodge/Data/Item/Consumption.hs 25;" f -_arMax src/Dodge/Data/Item/Use/Consumption.hs 30;" f +_arMax src/Dodge/Data/Item/Use/Consumption.hs 29;" f _arProgress src/Dodge/Data/Item/Consumption.hs 27;" f -_arProgress src/Dodge/Data/Item/Use/Consumption.hs 32;" f +_arProgress src/Dodge/Data/Item/Use/Consumption.hs 31;" f _arTime src/Dodge/Data/Item/Consumption.hs 26;" f -_arTime src/Dodge/Data/Item/Use/Consumption.hs 31;" f +_arTime src/Dodge/Data/Item/Use/Consumption.hs 30;" f _arbitraryAction src/Dodge/Data/ActionPlan.hs 167;" f _arcNumber src/Dodge/Data/Item/Params.hs 50;" f _arcSize src/Dodge/Data/Item/Params.hs 49;" f @@ -3391,7 +3387,7 @@ _getCrZoning src/Dodge/Data/Zoning.hs 19;" f _getFixated src/Dodge/Creature/AlertLevel/Data.hs 23;" f _getFixated src/Dodge/Creature/Perception/Data.hs 67;" f _getFixated src/Dodge/Data/Creature/Perception.hs 62;" f -_getItAmount src/Dodge/Data/Item/Use/Consumption.hs 40;" f +_getItAmount src/Dodge/Data/Item/Use/Consumption.hs 39;" f _getSoundID src/Sound/Data.hs 32;" f _gfConstant src/Dodge/Data/GenFloat.hs 11;" f _gfMax src/Dodge/Data/GenFloat.hs 12;" f @@ -3439,17 +3435,18 @@ _hudElement src/Dodge/Data/HUD.hs 36;" f _humanoidAI src/Dodge/Data/Creature/Misc.hs 69;" f _iaLoaded src/Dodge/Data/Item/Use/Consumption.hs 22;" f _iaMax src/Dodge/Data/Item/Use/Consumption.hs 21;" f -_ibtAmmoMag src/Dodge/Data/Item/Combine.hs 82;" f -_ibtAttach src/Dodge/Data/Item/Combine.hs 81;" f -_ibtBulletMod src/Dodge/Data/Item/Combine.hs 84;" f -_ibtConsumable src/Dodge/Data/Item/Combine.hs 79;" f +_ibtAmmoMag src/Dodge/Data/Item/Combine.hs 22;" f +_ibtAttach src/Dodge/Data/Item/Combine.hs 21;" f +_ibtBulletMod src/Dodge/Data/Item/Combine.hs 24;" f +_ibtConsumable src/Dodge/Data/Item/Combine.hs 19;" f +_ibtCraft src/Dodge/Data/Item/Combine.hs 20;" f _ibtEquip src/Dodge/Combine/Data.hs 88;" f -_ibtEquip src/Dodge/Data/Item/Combine.hs 78;" f +_ibtEquip src/Dodge/Data/Item/Combine.hs 18;" f _ibtHeld src/Dodge/Combine/Data.hs 86;" f -_ibtHeld src/Dodge/Data/Item/Combine.hs 76;" f +_ibtHeld src/Dodge/Data/Item/Combine.hs 16;" f _ibtLeft src/Dodge/Combine/Data.hs 87;" f -_ibtLeft src/Dodge/Data/Item/Combine.hs 77;" f -_ibtTargeting src/Dodge/Data/Item/Combine.hs 83;" f +_ibtLeft src/Dodge/Data/Item/Combine.hs 17;" f +_ibtTargeting src/Dodge/Data/Item/Combine.hs 23;" f _ieCounter src/Dodge/Data/ItEffect.hs 15;" f _ieCounter src/Dodge/Data/ItEffect.hs 23;" f _ieDrop src/Dodge/Data/ItEffect.hs 31;" f @@ -3496,21 +3493,20 @@ _iselPos src/Dodge/Data/Creature/Capability.hs 22;" f _iselPos src/Dodge/Data/Creature/InvSel.hs 14;" f _iselPos src/Dodge/Data/LoadAction.hs 19;" f _ispCloseObject src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 30;" f -_itAttachments src/Dodge/Data/Item.hs 49;" f -_itCurseStatus src/Dodge/Data/Item.hs 45;" f -_itDimension src/Dodge/Data/Item.hs 44;" f -_itEffect src/Dodge/Data/Item.hs 42;" f -_itID src/Dodge/Data/Item.hs 40;" f -_itInvSize src/Dodge/Data/Item.hs 43;" f -_itLocation src/Dodge/Data/Item.hs 41;" f -_itParams src/Dodge/Data/Item.hs 48;" f -_itTweaks src/Dodge/Data/Item.hs 46;" f -_itType src/Dodge/Data/Item.hs 39;" f -_itUse src/Dodge/Data/Item.hs 38;" f -_itUseAimStance src/Dodge/Data/Item.hs 60;" f +_itAttachments src/Dodge/Data/Item.hs 46;" f +_itCurseStatus src/Dodge/Data/Item.hs 43;" f +_itDimension src/Dodge/Data/Item.hs 42;" f +_itEffect src/Dodge/Data/Item.hs 40;" f +_itID src/Dodge/Data/Item.hs 38;" f +_itInvSize src/Dodge/Data/Item.hs 41;" f +_itLocation src/Dodge/Data/Item.hs 39;" f +_itParams src/Dodge/Data/Item.hs 45;" f +_itTweaks src/Dodge/Data/Item.hs 44;" f +_itType src/Dodge/Data/Item.hs 37;" f +_itUse src/Dodge/Data/Item.hs 36;" f +_itUseAimStance src/Dodge/Data/Item.hs 57;" f _itemLocations src/Dodge/Data/LWorld.hs 101;" f _iyBase src/Dodge/Combine/Data.hs 13;" f -_iyBase src/Dodge/Data/Item/Combine.hs 17;" f _iyModules src/Dodge/Combine/Data.hs 14;" f _iyStack src/Dodge/Combine/Data.hs 15;" f _izFac src/Dodge/Data/Item/Use.hs 208;" f @@ -4155,8 +4151,8 @@ _tweakMax src/Dodge/Data/Item/Tweak.hs 31;" f _tweakParams src/Dodge/Data/Item/Tweak.hs 16;" f _tweakType src/Dodge/Data/Item/Tweak.hs 29;" f _tweakVal src/Dodge/Data/Item/Tweak.hs 30;" f -_unCombEdge src/Dodge/Combine/Graph.hs 29;" f -_unCombNode src/Dodge/Combine/Graph.hs 22;" f +_unCombEdge src/Dodge/Combine/Graph.hs 28;" f +_unCombNode src/Dodge/Combine/Graph.hs 21;" f _unFBO src/Shader/Data.hs 57;" f _unNInt src/NewInt.hs 15;" f _unNIntMap src/NewInt.hs 18;" f @@ -4265,9 +4261,9 @@ _wlZoning src/Dodge/Data/World.hs 51;" f _worldEventFlags src/Dodge/Data/World.hs 48;" f _worldEvents src/Dodge/Data/LWorld.hs 134;" f _wpCharge src/Dodge/Data/Item/Consumption.hs 31;" f -_wpCharge src/Dodge/Data/Item/Use/Consumption.hs 36;" f +_wpCharge src/Dodge/Data/Item/Use/Consumption.hs 35;" f _wpMaxCharge src/Dodge/Data/Item/Consumption.hs 30;" f -_wpMaxCharge src/Dodge/Data/Item/Use/Consumption.hs 35;" f +_wpMaxCharge src/Dodge/Data/Item/Use/Consumption.hs 34;" f _wsBlock src/Dodge/Data/Wall.hs 52;" f _wsDoor src/Dodge/Data/Wall.hs 50;" f _wsMachine src/Dodge/Data/Wall.hs 51;" f @@ -4277,9 +4273,9 @@ _xNum src/Dodge/Combine/Data.hs 143;" f _xNum src/Dodge/Combine/Data.hs 147;" f _xNum src/Dodge/Combine/Data.hs 175;" f _xNum src/Dodge/Combine/Data.hs 180;" f -_xNum src/Dodge/Data/Item/Combine.hs 144;" f -_xNum src/Dodge/Data/Item/Combine.hs 151;" f -_xNum src/Dodge/Data/Item/Combine.hs 172;" f +_xNum src/Dodge/Data/Item/Combine.hs 135;" f +_xNum src/Dodge/Data/Item/Combine.hs 142;" f +_xNum src/Dodge/Data/Item/Combine.hs 163;" f _znBounds src/Dodge/Base/Zone.hs 24;" f _znFunc src/Dodge/Data/Zoning.hs 15;" f _znObjects src/Dodge/Base/Zone.hs 22;" f @@ -4306,7 +4302,7 @@ aTreeStrut src/Dodge/Layout/Tree/GenerateStructure.hs 39;" f aTreeStrut src/Dodge/Tree/GenerateStructure.hs 37;" f aWallPulse src/Dodge/Item/Weapon/UseEffect.hs 21;" f accessTerminal src/Dodge/WorldEffect.hs 54;" f -activeTargetCursorPic src/Dodge/Targeting/Draw.hs 52;" f +activeTargetCursorPic src/Dodge/Targeting/Draw.hs 49;" f addArmour src/Dodge/Creature.hs 83;" f addBlock src/Dodge/LevelGen/Block.hs 20;" f addBoostShockwave src/Dodge/Item/Weapon/Booster.hs 56;" f @@ -4349,7 +4345,7 @@ addSideEffect src/Dodge/Concurrent.hs 32;" f addSouthPillars src/Dodge/Room/LongDoor.hs 87;" f addTermSignal src/Dodge/Event/Input.hs 34;" f addTile src/Dodge/Room/AddTile.hs 11;" f -addTinClip src/Dodge/Item/Draw/SPic.hs 307;" f +addTinClip src/Dodge/Item/Draw/SPic.hs 304;" f addToTrunk src/Dodge/Layout/Tree/Polymorphic.hs 116;" f addToTrunk src/Dodge/Tree/Polymorphic.hs 129;" f addToTrunk src/TreeHelp.hs 156;" f @@ -4361,7 +4357,7 @@ advanceSmoothScroll src/Dodge/SmoothScroll.hs 29;" f advanceStepCounter src/Dodge/Creature/Action/Movement.hs 56;" f advanceStepCounter src/Dodge/Creature/Impulse/Movement.hs 45;" f aimDelaySweep src/Dodge/Render/ShapePicture.hs 47;" f -aimStanceInfo src/Dodge/Item/Info.hs 216;" f +aimStanceInfo src/Dodge/Item/Info.hs 215;" f aimTurn src/Dodge/Creature/YourControl.hs 189;" f aimingMuzzleLength src/Dodge/Creature/HandPos.hs 46;" f aimingMuzzlePos src/Dodge/Creature/HandPos.hs 41;" f @@ -4463,7 +4459,7 @@ attachOnward' src/Dodge/Tree/Compose.hs 98;" f attachTree src/Dodge/Tree/Compose.hs 38;" f attentionViewPoint src/Dodge/Creature/ReaderUpdate.hs 66;" f attribSize src/Shader/Compile.hs 352;" f -augmentedHUD src/Dodge/Item/Scope.hs 51;" f +augmentedHUD src/Dodge/Item/Scope.hs 47;" f autoAmr src/Dodge/Item/Held/Rod.hs 51;" f autoAmr src/Dodge/Item/Weapon/BulletGun/Rod.hs 62;" f autoBS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 350;" f @@ -4474,7 +4470,7 @@ autoGun src/Dodge/Item/Weapon/AutoGun.hs 24;" f autoGunPic src/Dodge/Item/Weapon/AutoGun.hs 66;" f autoGunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 496;" f autoGunSound src/Dodge/SoundLogic/Synonyms.hs 4;" f -autoPistol src/Dodge/Item/Held/Stick.hs 53;" f +autoPistol src/Dodge/Item/Held/Stick.hs 51;" f autoPistol src/Dodge/Item/Weapon/BulletGun/Stick.hs 79;" f autoRadarEffect src/Dodge/Item/Weapon/ExtraEffect.hs 39;" f autoRifle src/Dodge/Item/Held/Cane.hs 68;" f @@ -4489,10 +4485,10 @@ azure src/Color.hs 22;" f bQuadToF src/Geometry/Bezier.hs 37;" f bQuadToLine src/Geometry/Bezier.hs 30;" f backpackCombinations src/Dodge/Combine/Combinations.hs 25;" f -backpackShape src/Dodge/Item/Draw/SPic.hs 76;" f +backpackShape src/Dodge/Item/Draw/SPic.hs 73;" f backspaceInputted src/Dodge/Update/Input/Text.hs 26;" f bangCone src/Dodge/Item/Held/Cone.hs 11;" f -bangConeShape src/Dodge/Item/Draw/SPic.hs 237;" f +bangConeShape src/Dodge/Item/Draw/SPic.hs 234;" f bangEchoS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 370;" f bangRod src/Dodge/Item/Held/Rod.hs 18;" f bangRod src/Dodge/Item/Weapon/BulletGun/Rod.hs 18;" f @@ -4502,25 +4498,25 @@ bangStick src/Dodge/Item/Weapon/BulletGun/Stick.hs 17;" f bangStickSoundChoice src/Dodge/HeldUse/BulletWeapon.hs 226;" f barPP src/Dodge/Room/Foreground.hs 236;" f barrel src/Dodge/Creature/Inanimate.hs 17;" f -baseAMRShape src/Dodge/Item/Draw/SPic.hs 451;" f +baseAMRShape src/Dodge/Item/Draw/SPic.hs 448;" f baseBlockPane src/Dodge/Placement/Instance/Wall.hs 86;" f baseBlockPane src/Dodge/Placements/Wall.hs 63;" f baseBlockPane src/Dodge/Room/Placement.hs 93;" f -baseCaneShape src/Dodge/Item/Draw/SPic.hs 257;" f +baseCaneShape src/Dodge/Item/Draw/SPic.hs 254;" f baseDebris src/Dodge/Block/Debris.hs 122;" f baseFloorTileSize src/Tile.hs 38;" f basePartiallyComposedItem src/Dodge/Item/Grammar.hs 35;" f -baseRifleShape src/Dodge/Item/Draw/SPic.hs 260;" f -baseRodShape src/Dodge/Item/Draw/SPic.hs 448;" f -baseSMGShape src/Dodge/Item/Draw/SPic.hs 419;" f +baseRifleShape src/Dodge/Item/Draw/SPic.hs 257;" f +baseRodShape src/Dodge/Item/Draw/SPic.hs 445;" f +baseSMGShape src/Dodge/Item/Draw/SPic.hs 416;" f baseShoulder src/Dodge/Creature/Picture.hs 159;" f -baseStickShape src/Dodge/Item/Draw/SPic.hs 234;" f -baseStickShapeX src/Dodge/Item/Draw/SPic.hs 229;" f +baseStickShape src/Dodge/Item/Draw/SPic.hs 231;" f +baseStickShapeX src/Dodge/Item/Draw/SPic.hs 226;" f baseStickSpread src/Dodge/Item/Held/Stick.hs 32;" f baseStickSpread src/Dodge/Item/Weapon/BulletGun/Stick.hs 46;" f baseWindowPane src/Dodge/Placements/Wall.hs 73;" f baseWindowPane src/Dodge/Room/Placement.hs 103;" f -basicAmPjMoves src/Dodge/Item/Held/Launcher.hs 74;" f +basicAmPjMoves src/Dodge/Item/Held/Launcher.hs 66;" f basicAttentionUpdate src/Dodge/Creature/AlertLevel.hs 50;" f basicAttentionUpdate src/Dodge/Creature/Perception.hs 127;" f basicAwarenessUpdate src/Dodge/Creature/AlertLevel.hs 25;" f @@ -4530,16 +4526,16 @@ basicCrPict src/Dodge/Creature/Picture.hs 26;" f basicCrShape src/Dodge/Creature/Picture.hs 33;" f basicCrSilhouette src/Dodge/Creature/Silhouette.hs 17;" f basicDrawBeam src/Dodge/Beam/Draw.hs 11;" f -basicItemDisplay src/Dodge/Item/Display.hs 51;" f +basicItemDisplay src/Dodge/Item/Display.hs 48;" f basicMachineApplyDamage src/Dodge/Machine/Damage.hs 6;" f basicMachineUpdate src/Dodge/Machine.hs 13;" f basicMuzFlare src/Dodge/HeldUse.hs 156;" f basicPerceptionUpdateR src/Dodge/Creature/AlertLevel.hs 17;" f basicTerminal src/Dodge/Terminal.hs 32;" f -battery src/Dodge/Item/Ammo.hs 75;" f -batteryPack src/Dodge/Item/Equipment.hs 58;" f -belowNumX src/Dodge/Combine/Graph.hs 77;" f -beltMag src/Dodge/Item/Ammo.hs 42;" f +battery src/Dodge/Item/Ammo.hs 72;" f +batteryPack src/Dodge/Item/Equipment.hs 57;" f +belowNumX src/Dodge/Combine/Graph.hs 76;" f +beltMag src/Dodge/Item/Ammo.hs 40;" f bezierGun src/Dodge/Item/Weapon/Bezier.hs 24;" f bfsNodePoints src/Dodge/Path.hs 58;" f bfsThenReturn src/Dodge/Creature/ReaderUpdate.hs 216;" f @@ -4571,7 +4567,7 @@ blood6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 500;" f blood7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 342;" f blood8S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 330;" f bloodPuddleAt src/Dodge/Creature/State.hs 142;" f -blowTorch src/Dodge/Item/Held/SprayGuns.hs 54;" f +blowTorch src/Dodge/Item/Held/SprayGuns.hs 51;" f blowTorch src/Dodge/Item/Weapon/SprayGuns.hs 49;" f blue src/Color.hs 16;" f blunderbuss src/Dodge/Item/Held/Cone.hs 29;" f @@ -4594,7 +4590,7 @@ boxSurfaces src/Shader/Poke.hs 269;" f boxSurfacesIndices src/Shader/Poke.hs 282;" f boxXYZ src/Polyhedra.hs 93;" f boxXYZnobase src/Polyhedra.hs 79;" f -brainHat src/Dodge/Item/Equipment.hs 99;" f +brainHat src/Dodge/Item/Equipment.hs 98;" f branchRectWith src/Dodge/Room/Branch.hs 15;" f branchWith src/Dodge/Room/Room.hs 69;" f bres src/Dodge/Base/Zone.hs 80;" f @@ -4609,16 +4605,16 @@ bufferShaderLayers src/Shader/Bind.hs 35;" f bulDamageCr src/Dodge/Particle/Bullet/DestroyDamage.hs 21;" f bulDamageWall src/Dodge/Particle/Bullet/DestroyDamage.hs 30;" f bulSelTweak src/Dodge/TweakBullet.hs 15;" f -bulletBeltBracer src/Dodge/Item/Equipment.hs 83;" f -bulletBeltPack src/Dodge/Item/Equipment.hs 74;" f -bulletCombinations src/Dodge/Combine/Graph.hs 35;" f -bulletModule src/Dodge/Item/Scope.hs 39;" f -bulletPayloadModule src/Dodge/Item/Scope.hs 48;" f -bulletSynthesizer src/Dodge/Item/Ammo.hs 103;" f -bulletTargetingModule src/Dodge/Item/Scope.hs 45;" f +bulletBeltBracer src/Dodge/Item/Equipment.hs 82;" f +bulletBeltPack src/Dodge/Item/Equipment.hs 73;" f +bulletCombinations src/Dodge/Combine/Graph.hs 34;" f +bulletModule src/Dodge/Item/Scope.hs 35;" f +bulletPayloadModule src/Dodge/Item/Scope.hs 44;" f +bulletSynthesizer src/Dodge/Item/Ammo.hs 100;" f +bulletTargetingModule src/Dodge/Item/Scope.hs 41;" f bulletTypes src/Dodge/TweakBullet.hs 26;" f bulletWeapons src/Dodge/Combine/Combinations.hs 246;" f -burstRifle src/Dodge/Item/Held/Cane.hs 77;" f +burstRifle src/Dodge/Item/Held/Cane.hs 74;" f burstRifle src/Dodge/Item/Weapon/BulletGun/Cane.hs 105;" f buzzS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 502;" f buzzSound src/Dodge/SoundLogic/Synonyms.hs 4;" f @@ -4664,12 +4660,12 @@ checkEndGame src/Dodge/Update.hs 584;" f checkErrorGL src/Shader/Compile.hs 301;" f checkFBO src/Framebuffer/Check.hs 6;" f checkGLError src/GLHelp.hs 17;" f -checkInvSlotsYou src/Dodge/Inventory/CheckSlots.hs 15;" f +checkInvSlotsYou src/Dodge/Inventory/CheckSlots.hs 16;" f checkTermDist src/Dodge/Update.hs 283;" f checkWallLeft src/Dodge/LevelGen/StaticWalls/Deprecated.hs 29;" f checkWallRight src/Dodge/LevelGen/StaticWalls.hs 54;" f checkWallRight src/Dodge/LevelGen/StaticWalls/Deprecated.hs 59;" f -chemFuelPouch src/Dodge/Item/Ammo.hs 89;" f +chemFuelPouch src/Dodge/Item/Ammo.hs 86;" f chooseCursorBorders src/Dodge/Render/List.hs 126;" f chooseEquipmentPosition src/Dodge/Inventory/RBList.hs 36;" f chooseFootSound src/Dodge/Creature/State/WalkCycle.hs 39;" f @@ -4710,8 +4706,8 @@ clockCycle src/Dodge/Clock.hs 9;" f closeObjEq src/Dodge/Inventory/CloseObject.hs 12;" f closeObjPos src/Dodge/Inventory/CloseObject.hs 7;" f closeObjectInfo src/Dodge/Render/HUD.hs 114;" f -closeObjectToSelectionItem src/Dodge/Inventory/SelectionList.hs 66;" f -closeObjectToTextPictures src/Dodge/Inventory/SelectionList.hs 81;" f +closeObjectToSelectionItem src/Dodge/Inventory/SelectionList.hs 65;" f +closeObjectToTextPictures src/Dodge/Inventory/SelectionList.hs 80;" f closestCreatureID src/Dodge/Debug.hs 91;" f closestPointOnLine src/Geometry/Intersect.hs 251;" f closestPointOnLineParam src/Geometry/Intersect.hs 267;" f @@ -4723,9 +4719,9 @@ clsNearCirc src/Dodge/Zoning/Cloud.hs 18;" f clsNearPoint src/Dodge/Zoning/Cloud.hs 9;" f clsNearRect src/Dodge/Zoning/Cloud.hs 15;" f clsNearSeg src/Dodge/Zoning/Cloud.hs 12;" f -clusterFormatting src/Dodge/Combine/Graph.hs 113;" f -clusterFunc src/Dodge/Combine/Graph.hs 107;" f -cmm src/Dodge/Combine.hs 66;" f +clusterFormatting src/Dodge/Combine/Graph.hs 112;" f +clusterFunc src/Dodge/Combine/Graph.hs 106;" f +cmm src/Dodge/Combine.hs 60;" f cogRaised src/Dodge/Creature/Perception.hs 101;" f colCrWall src/Dodge/WallCreatureCollisions.hs 26;" f colCrsWalls src/Dodge/WallCreatureCollisions.hs 17;" f @@ -4745,19 +4741,19 @@ color2d src/PolyPic.hs 24;" f colorLamp src/Dodge/Creature/Lamp.hs 10;" f colorLightAt src/Dodge/LightSources/Lamp.hs 22;" f colorSH src/Shape.hs 233;" f -combinationsDotGraph src/Dodge/Combine/Graph.hs 86;" f -combinationsGraph src/Dodge/Combine/Graph.hs 67;" f +combinationsDotGraph src/Dodge/Combine/Graph.hs 85;" f +combinationsGraph src/Dodge/Combine/Graph.hs 66;" f combinationsOf src/Multiset.hs 40;" f -combinationsTrie src/Dodge/Combine/Trie.hs 17;" f +combinationsTrie src/Dodge/Combine/Trie.hs 19;" f combineAwareness src/Dodge/Creature/AlertLevel.hs 33;" f combineAwareness src/Dodge/Creature/Perception.hs 109;" f combineBeamBeams src/Dodge/Update.hs 479;" f combineBeams src/Dodge/Update.hs 470;" f combineFloors src/Dodge/Room/Procedural.hs 171;" f combineInventoryExtra src/Dodge/Render/HUD.hs 201;" f -combineItemListYouX src/Dodge/Combine.hs 41;" f -combineList src/Dodge/Combine.hs 44;" f -combineListInfo src/Dodge/Combine.hs 57;" f +combineItemListYouX src/Dodge/Combine.hs 35;" f +combineList src/Dodge/Combine.hs 38;" f +combineListInfo src/Dodge/Combine.hs 51;" f combineRooms src/Dodge/Room/Procedural.hs 151;" f combineS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 344;" f combineTree src/Dodge/Tree/Compose.hs 66;" f @@ -4780,7 +4776,7 @@ connectionBlurb src/Dodge/Terminal.hs 100;" f connectionBlurbLines src/Dodge/Terminal.hs 45;" f constructEdges src/Polyhedra.hs 33;" f constructEdgesList src/Polyhedra.hs 42;" f -consumableInfo src/Dodge/Item/Info.hs 136;" f +consumableInfo src/Dodge/Item/Info.hs 135;" f contToIDCont src/Dodge/LevelGen/Data.hs 57;" f contToIDCont src/Dodge/LevelGen/PlacementHelper.hs 57;" f convexHull src/Geometry/Polygon.hs 91;" f @@ -4792,7 +4788,7 @@ corDoor src/Dodge/Room/Room.hs 378;" f cornerList src/Preload/Render.hs 194;" f corpseOrGib src/Dodge/Creature/State.hs 105;" f corridor src/Dodge/Room/Corridor.hs 17;" f -corridorBoss src/Dodge/LockAndKey.hs 142;" f +corridorBoss src/Dodge/LockAndKey.hs 140;" f corridorN src/Dodge/Room/Corridor.hs 52;" f corridorWallN src/Dodge/Room/Corridor.hs 71;" f crAdd src/Dodge/Room/RezBox.hs 102;" f @@ -4811,7 +4807,7 @@ crHit src/Dodge/WorldEvent/ThingsHit.hs 68;" f crIXsNearCirc src/Dodge/Zoning/Creature.hs 30;" f crIXsNearPoint src/Dodge/Zoning/Creature.hs 13;" f crInAimStance src/Dodge/Creature/Test.hs 88;" f -crInvSize src/Dodge/Inventory/CheckSlots.hs 37;" f +crInvSize src/Dodge/Inventory/CheckSlots.hs 38;" f crIsAiming src/Dodge/Creature/Test.hs 56;" f crIsArmouredFrom src/Dodge/Creature/Property.hs 16;" f crIsArmouredFrom src/Dodge/Creature/Test.hs 109;" f @@ -4824,7 +4820,7 @@ crMvForward src/Dodge/Creature/Impulse/Movement.hs 38;" f crNearPoint src/Dodge/Creature/Property.hs 39;" f crNearPoint src/Dodge/Creature/Test.hs 135;" f crNearSeg src/Dodge/Creature/Property.hs 36;" f -crNumFreeSlots src/Dodge/Inventory/CheckSlots.hs 34;" f +crNumFreeSlots src/Dodge/Inventory/CheckSlots.hs 35;" f crOnWall src/Dodge/WallCreatureCollisions.hs 84;" f crReloadToggle src/Dodge/Reloading.hs 45;" f crSafeDistFromTarg src/Dodge/Creature/Test.hs 67;" f @@ -4838,7 +4834,7 @@ crUpdateItemLocations src/Dodge/Inventory/FindRoot.hs 23;" f crUpdateItemLocations src/Dodge/Inventory/Location.hs 48;" f crZoneOfPoint src/Dodge/Base/Zone.hs 54;" f crZoneSize src/Dodge/Zoning/Creature.hs 39;" f -craftInfo src/Dodge/Item/Info.hs 141;" f +craftInfo src/Dodge/Item/Info.hs 140;" f crankSlowS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 420;" f createArc src/Dodge/Tesla/Arc.hs 67;" f createBarrelSpark src/Dodge/Particle/Spark.hs 21;" f @@ -4981,7 +4977,7 @@ dededumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 448;" f dedumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 316;" f defDamageMaterial src/Dodge/Material/Damage.hs 17;" f defLSPic src/Dodge/LightSource/Draw.hs 11;" f -defSPic src/Dodge/Item/Draw/SPic.hs 243;" f +defSPic src/Dodge/Item/Draw/SPic.hs 240;" f defaultAimMvType src/Dodge/Default/Creature.hs 122;" f defaultAimParams src/Dodge/Default/Item/Held/AimParams.hs 4;" f defaultAimParams src/Dodge/Default/Item/Use/AimParams.hs 6;" f @@ -5100,9 +5096,9 @@ destroyMount src/Dodge/Block.hs 98;" f destroyMounts src/Dodge/Block.hs 95;" f destroyProjectile src/Dodge/Projectile/Update.hs 62;" f detV src/Geometry/Vector.hs 93;" f -detectorColor src/Dodge/Item/Draw/SPic.hs 511;" f +detectorColor src/Dodge/Item/Draw/SPic.hs 508;" f detectorEffect src/Dodge/Item/Weapon/Radar.hs 19;" f -detectorInfo src/Dodge/Item/Info.hs 196;" f +detectorInfo src/Dodge/Item/Info.hs 195;" f determineInvSelCursorWidth src/Dodge/ListDisplayParams.hs 54;" f determineProjectileTracking src/Dodge/HeldUse.hs 441;" f diagonalLinesRect src/Dodge/Room/Foreground.hs 52;" f @@ -5350,7 +5346,7 @@ dropByState src/Dodge/Creature/State.hs 164;" f dropExcept src/Dodge/Creature/Action.hs 172;" f dropItem src/Dodge/Creature/Action.hs 177;" f dropItemKey src/Dodge/Config/KeyConfig.hs 24;" f -drumMag src/Dodge/Item/Ammo.hs 36;" f +drumMag src/Dodge/Item/Ammo.hs 34;" f dtIL src/Dodge/DoubleTree.hs 22;" f dtToAdjRootParent src/Dodge/DoubleTree.hs 73;" f dtToAdjRootParentEither src/Dodge/DoubleTree.hs 79;" f @@ -5362,7 +5358,7 @@ dtToRootIntMap' src/Dodge/DoubleTree.hs 39;" f dtToUpDownAdj src/Dodge/DoubleTree.hs 43;" f dummyMenuOption src/Dodge/Menu/Option.hs 81;" f ebFlicker src/Dodge/EnergyBall.hs 94;" f -edgeFormatting src/Dodge/Combine/Graph.hs 119;" f +edgeFormatting src/Dodge/Combine/Graph.hs 118;" f edgeToPic src/Dodge/Debug/Picture.hs 392;" f ejectS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 470;" f elecCrackleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 362;" f @@ -5380,10 +5376,10 @@ eqConstr src/SameConstr.hs 17;" f eqPosText src/Dodge/Equipment/Text.hs 6;" f equipAimSpeed src/Dodge/Creature/Action/Movement.hs 109;" f equipInfo src/Dodge/Item/Info.hs 107;" f -equipItemSPic src/Dodge/Item/Draw/SPic.hs 45;" f +equipItemSPic src/Dodge/Item/Draw/SPic.hs 43;" f equipPosition src/Dodge/Item/Draw.hs 31;" f equipPosition src/Dodge/Item/Equipment/Shape.hs 15;" f -equipSiteInfo src/Dodge/Item/Info.hs 226;" f +equipSiteInfo src/Dodge/Item/Info.hs 225;" f equipSiteToPositions src/Dodge/Inventory/RBList.hs 77;" f equipSpeed src/Dodge/Creature/Action/Movement.hs 106;" f equipSpeed src/Dodge/Creature/Impulse/Movement.hs 99;" f @@ -5441,7 +5437,7 @@ findBoundDists src/Dodge/Update/Camera.hs 239;" f findClosePoint src/Dodge/LevelGen/StaticWalls.hs 155;" f findClosePoint src/Dodge/LevelGen/StaticWalls/Deprecated.hs 74;" f findIndex src/IntMapHelp.hs 84;" f -findItemSlot src/Dodge/Inventory/CheckSlots.hs 25;" f +findItemSlot src/Dodge/Inventory/CheckSlots.hs 26;" f findReverseEdge src/Polyhedra.hs 49;" f findReverseEdgeList src/Polyhedra.hs 56;" f findWallFreeDropPoint src/Dodge/FloorItem.hs 47;" f @@ -5457,29 +5453,28 @@ fixedSizePicClampArrow src/Dodge/Picture/SizeInvariant.hs 57;" f flDamageInArea src/Dodge/Flame.hs 110;" f flFlicker src/Dodge/Flame.hs 124;" f flameBeamCombine src/Dodge/Beam.hs 24;" f -flameShield src/Dodge/Item/Equipment.hs 37;" f -flameSpitter src/Dodge/Item/Held/SprayGuns.hs 30;" f +flameShield src/Dodge/Item/Equipment.hs 36;" f +flameSpitter src/Dodge/Item/Held/SprayGuns.hs 29;" f flameSpitter src/Dodge/Item/Weapon/SprayGuns.hs 27;" f -flameThrower src/Dodge/Item/Held/SprayGuns.hs 75;" f +flameThrower src/Dodge/Item/Held/SprayGuns.hs 72;" f flameThrower src/Dodge/Item/Weapon/SprayGuns.hs 70;" f -flameTorrent src/Dodge/Item/Held/SprayGuns.hs 43;" f +flameTorrent src/Dodge/Item/Held/SprayGuns.hs 40;" f flameTorrent src/Dodge/Item/Weapon/SprayGuns.hs 38;" f -flameWall src/Dodge/Item/Held/SprayGuns.hs 59;" f +flameWall src/Dodge/Item/Held/SprayGuns.hs 56;" f flameWall src/Dodge/Item/Weapon/SprayGuns.hs 54;" f -flamerPic src/Dodge/Item/Draw/SPic.hs 422;" f +flamerPic src/Dodge/Item/Draw/SPic.hs 419;" f flareCircleAt src/Dodge/WorldEvent/Flash.hs 46;" f -flatCombinationsTrie src/Dodge/Combine/Trie.hs 10;" f flatItemCombinations src/Dodge/Combine/Combinations.hs 49;" f -flatLookupItems src/Dodge/Combine.hs 36;" f +flatLookupItems src/Dodge/Combine.hs 30;" f flatShield src/Dodge/Item/Held/Utility.hs 9;" f -flatShieldEquipSPic src/Dodge/Item/Draw/SPic.hs 495;" f +flatShieldEquipSPic src/Dodge/Item/Draw/SPic.hs 492;" f flatV2 src/Picture/Data.hs 65;" f flatV3 src/Picture/Data.hs 68;" f flatV4 src/Picture/Data.hs 71;" f flattenIMIMIM src/Dodge/Base/Zone.hs 246;" f fleeFrom src/Dodge/CreatureEffect.hs 120;" f fleeFromTarget src/Dodge/CreatureEffect.hs 66;" f -fletchingModule src/Dodge/Item/Scope.hs 36;" f +fletchingModule src/Dodge/Item/Scope.hs 32;" f flickerMod src/Dodge/Placement/Instance/LightSource/Flicker.hs 10;" f flickerUpdate src/Dodge/Placement/Instance/LightSource/Flicker.hs 24;" f flipSwitch src/Dodge/Button/Event.hs 21;" f @@ -5532,9 +5527,9 @@ fromJust' src/MaybeHelp.hs 24;" f fromListL src/DoubleStack.hs 7;" f fromTopLeft src/Dodge/ScreenPos.hs 9;" f fromV3 src/Geometry/Data.hs 43;" f -frontArmour src/Dodge/Item/Equipment.hs 43;" f +frontArmour src/Dodge/Item/Equipment.hs 42;" f fstV2 src/Geometry/Data.hs 50;" f -fuelPack src/Dodge/Item/Equipment.hs 66;" f +fuelPack src/Dodge/Item/Equipment.hs 65;" f functionalUpdate src/Dodge/Update.hs 232;" f fuseFunc src/Dodge/Path.hs 150;" f fusePairs src/Dodge/Path.hs 153;" f @@ -5616,7 +5611,7 @@ graphToEdges src/Dodge/Graph.hs 35;" f graphToIncidence src/Dodge/Graph.hs 40;" f graphicsMenu src/Dodge/Menu.hs 162;" f graphicsMenuOptions src/Dodge/Menu.hs 165;" f -gravityModule src/Dodge/Item/Craftable.hs 41;" f +gravityModule src/Dodge/Item/Craftable.hs 40;" f green src/Color.hs 15;" f grenadeBang src/Dodge/SoundLogic/Synonyms.hs 4;" f grenadeLauncher src/Dodge/Item/Weapon/BulletGuns.hs 23;" f @@ -5627,7 +5622,7 @@ gridPoints src/Grid.hs 67;" f gridPoints' src/Grid.hs 79;" f gridPoints'' src/Grid.hs 74;" f gridPointsOff src/Grid.hs 62;" f -groupSplitItemAmounts src/Dodge/Combine.hs 31;" f +groupSplitItemAmounts src/Dodge/Combine.hs 25;" f gruntS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 484;" f guardDisconnectedID src/Dodge/Update/Scroll.hs 70;" f gut1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 516;" f @@ -5661,10 +5656,10 @@ hasFrontArmour src/Dodge/Creature/Property.hs 19;" f hasFrontArmour src/Dodge/Creature/Test.hs 112;" f hasLOS src/Dodge/Base/Collide.hs 200;" f hasLOSIndirect src/Dodge/Base/Collide.hs 214;" f -hat src/Dodge/Item/Equipment.hs 105;" f +hat src/Dodge/Item/Equipment.hs 104;" f head src/DoubleStack.hs 14;" f -headLamp src/Dodge/Item/Equipment.hs 118;" f -headLampShape src/Dodge/Item/Draw/SPic.hs 501;" f +headLamp src/Dodge/Item/Equipment.hs 117;" f +headLampShape src/Dodge/Item/Draw/SPic.hs 498;" f headMap src/Dodge/DoubleTree.hs 117;" f heal src/Dodge/Item/Consumable.hs 17;" f heal25 src/Dodge/Item/Consumable.hs 14;" f @@ -5679,8 +5674,8 @@ heldEffect src/Dodge/HeldUse.hs 45;" f heldEffectMuzzles src/Dodge/HeldUse.hs 48;" f heldInfo src/Dodge/Item/Info.hs 48;" f heldItemOffset src/Dodge/Item/HeldOffset.hs 24;" f -heldItemSPic src/Dodge/Item/Draw/SPic.hs 163;" f -heldPositionInfo src/Dodge/Item/Info.hs 213;" f +heldItemSPic src/Dodge/Item/Draw/SPic.hs 160;" f +heldPositionInfo src/Dodge/Item/Info.hs 212;" f helpCommand src/Dodge/Terminal.hs 64;" f helpPoly3D src/Polyhedra.hs 124;" f heron src/Geometry.hs 221;" f @@ -5696,10 +5691,10 @@ holdForm src/Dodge/Creature/Boid.hs 136;" f holsterWeapon src/Dodge/Creature/Volition.hs 14;" f holsterWeaponSound src/Dodge/SoundLogic/Synonyms.hs 4;" f homingDrawType src/Dodge/Projectile/Create.hs 12;" f -homingModule src/Dodge/Item/Scope.hs 30;" f +homingModule src/Dodge/Item/Scope.hs 27;" f horPipe src/Dodge/Placement/Instance/Pipe.hs 9;" f hotkeyToScancode src/Dodge/Creature/YourControl.hs 55;" f -hotkeyToString src/Dodge/Inventory/SelectionList.hs 51;" f +hotkeyToString src/Dodge/Inventory/SelectionList.hs 50;" f humanoidAIList src/Dodge/Humanoid.hs 181;" f hvBulDams src/Dodge/Particle/Damage.hs 13;" f hvBulHitCr src/Dodge/Particle/Bullet/HitEffect.hs 17;" f @@ -5797,11 +5792,11 @@ invHead src/Dodge/Render/HUD.hs 296;" f invIndentIM src/Dodge/Item/Grammar.hs 155;" f invLDT src/Dodge/Item/Grammar.hs 114;" f invRootMap src/Dodge/Item/Grammar.hs 132;" f -invSelectionItem src/Dodge/Inventory/SelectionList.hs 35;" f -invSelectionItem' src/Dodge/Inventory/SelectionList.hs 17;" f +invSelectionItem src/Dodge/Inventory/SelectionList.hs 34;" f +invSelectionItem' src/Dodge/Inventory/SelectionList.hs 16;" f invShiftPointBy src/Dodge/ShiftPoint.hs 8;" f invSideEff src/Dodge/Creature/State.hs 242;" f -invSize src/Dodge/Inventory/CheckSlots.hs 40;" f +invSize src/Dodge/Inventory/CheckSlots.hs 41;" f invTrees src/Dodge/Item/Grammar.hs 160;" f inventoryExtra src/Dodge/Render/HUD.hs 189;" f inventoryExtraH src/Dodge/Render/HUD.hs 193;" f @@ -5809,7 +5804,7 @@ inventoryX src/Dodge/Creature.hs 115;" f inverseShockwaveAt src/Dodge/WorldEvent/Shockwave.hs 43;" f invertEncircleDistP src/Dodge/Creature/Boid.hs 13;" f invertIntMap src/Multiset.hs 61;" f -invertInventoryToMap src/Dodge/Combine.hs 25;" f +invertInventoryToMap src/Dodge/Combine.hs 19;" f invisibleChaseCrit src/Dodge/Creature/ChaseCrit.hs 25;" f invisibleWall src/Dodge/Placement/Instance/Wall.hs 16;" f isAmmoIntLink src/Dodge/HeldUse.hs 177;" f @@ -5817,7 +5812,7 @@ isAnimate src/Dodge/Creature/Test.hs 138;" f isCognizant src/Dodge/Creature/Perception.hs 105;" f isElectrical src/Dodge/Data/Damage.hs 42;" f isElectrical src/Dodge/Data/DamageType.hs 44;" f -isFrictionless src/Dodge/Creature/State.hs 387;" f +isFrictionless src/Dodge/Creature/State.hs 386;" f isGas src/Dodge/Euse.hs 64;" f isInLnk src/Dodge/PlacementSpot.hs 160;" f isJust' src/MaybeHelp.hs 29;" f @@ -5845,44 +5840,44 @@ itSlotsTaken src/Dodge/Inventory/ItemSpace.hs 9;" f itSlotsTaken src/Dodge/Item/SlotsTaken.hs 9;" f itStackAmount src/Dodge/Item/Amount.hs 7;" f itUseCharge src/Dodge/Item/Weapon/TriggerType.hs 131;" f -itemBaseName src/Dodge/Item/Display.hs 63;" f +itemBaseName src/Dodge/Item/Display.hs 60;" f itemBlips src/Dodge/Item/Weapon/UseEffect.hs 38;" f itemBlips src/Dodge/RadarSweep.hs 75;" f itemCombinations src/Dodge/Combine/Combinations.hs 54;" f -itemCombinationsEdges src/Dodge/Combine/Graph.hs 55;" f +itemCombinationsEdges src/Dodge/Combine/Graph.hs 54;" f itemDetectorEffect src/Dodge/HeldUse.hs 202;" f -itemDisplay src/Dodge/Item/Display.hs 34;" f -itemDisplayPad src/Dodge/Item/Display.hs 46;" f +itemDisplay src/Dodge/Item/Display.hs 31;" f +itemDisplayPad src/Dodge/Item/Display.hs 43;" f itemEffect src/Dodge/Creature/Action/UseItem.hs 28;" f itemEquipPict src/Dodge/Item/Draw.hs 19;" f -itemFromAmmoMag src/Dodge/Item.hs 31;" f -itemFromAttachType src/Dodge/Item.hs 41;" f -itemFromBase src/Dodge/Item.hs 19;" f +itemFromAmmoMag src/Dodge/Item.hs 33;" f +itemFromAttachType src/Dodge/Item.hs 42;" f +itemFromBase src/Dodge/Item.hs 21;" f itemFromConsumableType src/Dodge/Item.hs 51;" f itemFromEquipType src/Dodge/Item.hs 56;" f itemFromHeldType src/Dodge/Item/Held.hs 25;" f -itemFromLeftType src/Dodge/Item.hs 78;" f +itemFromLeftType src/Dodge/Item.hs 77;" f itemInfo src/Dodge/Item/Info.hs 12;" f -itemInvColor src/Dodge/Item/InventoryColor.hs 7;" f +itemInvColor src/Dodge/Item/InventoryColor.hs 9;" f itemInvSideEffect src/Dodge/Creature/State.hs 254;" f -itemNumberDisplay src/Dodge/Item/Display.hs 114;" f -itemRooms src/Dodge/LockAndKey.hs 41;" f +itemNumberDisplay src/Dodge/Item/Display.hs 110;" f +itemRooms src/Dodge/LockAndKey.hs 39;" f itemSPic src/Dodge/Item/Draw/SPic.hs 29;" f -itemString src/Dodge/Item/Display.hs 60;" f -itemUpdate src/Dodge/Creature/State.hs 328;" f +itemString src/Dodge/Item/Display.hs 57;" f +itemUpdate src/Dodge/Creature/State.hs 327;" f itemUseEffect src/Dodge/Creature/Impulse/UseItem.hs 35;" f iterateUntil src/MonadHelp.hs 23;" f iterateWhile src/MonadHelp.hs 30;" f itmBaseInfo src/Dodge/Item/Info.hs 22;" f -itmEquipSiteInfo src/Dodge/Item/Info.hs 223;" f +itmEquipSiteInfo src/Dodge/Item/Info.hs 222;" f itmSpaceInfo src/Dodge/Item/Info.hs 17;" f -itmUsageInfo src/Dodge/Item/Info.hs 202;" f +itmUsageInfo src/Dodge/Item/Info.hs 201;" f ixNZ src/Dodge/Base/Zone.hs 200;" f ixZone src/Dodge/Base/Zone.hs 197;" f jShape src/Dodge/Placement/Instance/LightSource.hs 86;" f jShape src/Dodge/Placements/LightSource.hs 43;" f jaggedShape src/Dodge/Block/Debris.hs 191;" f -jetPack src/Dodge/Item/Equipment.hs 92;" f +jetPack src/Dodge/Item/Equipment.hs 91;" f joinItemsInList src/Dodge/Item/Grammar.hs 105;" f jps0' src/Dodge/LevelGen/Data.hs 60;" f jps0' src/Dodge/LevelGen/PlacementHelper.hs 60;" f @@ -5896,15 +5891,15 @@ jsps0J src/Dodge/LevelGen/Data.hs 48;" f jsps0J src/Dodge/LevelGen/PlacementHelper.hs 48;" f jspsJ src/Dodge/LevelGen/Data.hs 45;" f jspsJ src/Dodge/LevelGen/PlacementHelper.hs 45;" f -jumpLegs src/Dodge/Item/Equipment.hs 134;" f +jumpLegs src/Dodge/Item/Equipment.hs 133;" f justify src/Justify.hs 9;" f k src/ShortShow.hs 34;" f keyCard src/Dodge/Item/Held/Utility.hs 20;" f keyCard src/Dodge/Item/PassKey.hs 8;" f keyCardAnalyserByDoor src/Dodge/Room/LasTurret.hs 69;" f keyCardRoomRunPast src/Dodge/Room/LasTurret.hs 57;" f -keyCardRunPastRand src/Dodge/LockAndKey.hs 38;" f -keyPic src/Dodge/Item/Draw/SPic.hs 517;" f +keyCardRunPastRand src/Dodge/LockAndKey.hs 36;" f +keyPic src/Dodge/Item/Draw/SPic.hs 514;" f keyholeCorridor src/Dodge/Room/Corridor.hs 39;" f killBulletUpdate src/Dodge/WorldEvent/HitEffect.hs 30;" f killParticleUpdate src/Dodge/Particle/Update.hs 9;" f @@ -5923,9 +5918,9 @@ lampCrSPic src/Dodge/Render/ShapePicture.hs 97;" f lasBeamCombine src/Dodge/Beam.hs 31;" f lasCenSensEdge src/Dodge/Room/LasTurret.hs 112;" f lasDronesPic src/Dodge/Item/Weapon/Drone.hs 22;" f -lasGun src/Dodge/Item/Held/BatteryGuns.hs 49;" f -lasGunPic src/Dodge/Item/Draw/SPic.hs 464;" f -lasGunTweak src/Dodge/Item/Held/BatteryGuns.hs 84;" f +lasGun src/Dodge/Item/Held/BatteryGuns.hs 45;" f +lasGunPic src/Dodge/Item/Draw/SPic.hs 461;" f +lasGunTweak src/Dodge/Item/Held/BatteryGuns.hs 78;" f lasRayAt src/Dodge/Beam.hs 62;" f lasSensorTurretTest src/Dodge/Room/LasTurret.hs 105;" f lasTunnel src/Dodge/Room/LasTurret.hs 124;" f @@ -5937,9 +5932,9 @@ latchkey src/Dodge/Item/Held/Utility.hs 23;" f latchkey src/Dodge/Item/PassKey.hs 14;" f launcher src/Dodge/Item/Held/Launcher.hs 12;" f launcherCrit src/Dodge/Creature/LauncherCrit.hs 12;" f -launcherPic src/Dodge/Item/Draw/SPic.hs 438;" f +launcherPic src/Dodge/Item/Draw/SPic.hs 435;" f launcherSound src/Dodge/SoundLogic/Synonyms.hs 4;" f -launcherX src/Dodge/Item/Held/Launcher.hs 48;" f +launcherX src/Dodge/Item/Held/Launcher.hs 42;" f layerNum src/Picture/Data.hs 31;" f layoutLevelFromSeed src/Dodge/LevelGen.hs 47;" f ldpVerticalSelection src/Dodge/Update/Input/ScreenLayer.hs 90;" f @@ -5950,10 +5945,10 @@ ldtToIndentList src/Dodge/DoubleTree.hs 93;" f left src/DoubleStack.hs 16;" f leftInfo src/Dodge/Item/Info.hs 96;" f leftIsParentCombine src/Dodge/Item/Grammar.hs 77;" f -leftItemSPic src/Dodge/Item/Draw/SPic.hs 79;" f +leftItemSPic src/Dodge/Item/Draw/SPic.hs 76;" f leftPad src/Padding.hs 14;" f leftRightCombine src/Dodge/Item/Grammar.hs 89;" f -legsSPic src/Dodge/Item/Draw/SPic.hs 535;" f +legsSPic src/Dodge/Item/Draw/SPic.hs 532;" f liShape src/Dodge/Placement/Instance/LightSource.hs 99;" f liShape src/Dodge/Placements/LightSource.hs 55;" f light src/Color.hs 100;" f @@ -6037,11 +6032,11 @@ ltAutoCrit src/Dodge/Creature/LtAutoCrit.hs 13;" f m src/ShortShow.hs 34;" f machineAddSound src/Dodge/Machine.hs 49;" f machineGun src/Dodge/Item/Weapon/BulletGun/Rod.hs 79;" f -machinePistol src/Dodge/Item/Held/Stick.hs 62;" f +machinePistol src/Dodge/Item/Held/Stick.hs 58;" f machinePistol src/Dodge/Item/Weapon/BulletGun/Stick.hs 86;" f machineUpdateDeathEff src/Dodge/Machine.hs 34;" f machineUpdateLiveDieEff src/Dodge/Machine.hs 16;" f -magShield src/Dodge/Item/Equipment.hs 29;" f +magShield src/Dodge/Item/Equipment.hs 28;" f magV src/Geometry/Vector.hs 160;" f magV3 src/Geometry/Vector3D.hs 78;" f magazineCombinations src/Dodge/Combine/Combinations.hs 41;" f @@ -6114,13 +6109,13 @@ makeThickSmokeAt src/Dodge/WorldEvent/Cloud.hs 54;" f makeThinSmokeAt src/Dodge/WorldEvent/Cloud.hs 57;" f makeTileFromPoly src/Tile.hs 28;" f makeTlsTimeRadColPos src/Dodge/LightSource.hs 88;" f -makeTypeCraft src/Dodge/Item/Craftable.hs 15;" f +makeTypeCraft src/Dodge/Item/Craftable.hs 14;" f makeTypeCraftNum src/Dodge/Item/Craftable.hs 7;" f mapOverlay src/Dodge/Render/HUD/Carte.hs 24;" f markWallSeen src/Dodge/Update.hs 570;" f marshalEPrimitiveMode src/Shader/ExtraPrimitive.hs 8;" f maxDamageType src/Dodge/Damage.hs 37;" f -maxShowX src/Dodge/Combine/Graph.hs 44;" f +maxShowX src/Dodge/Combine/Graph.hs 43;" f maxT src/Dodge/Item/Weapon/Booster.hs 108;" f maxT src/Dodge/Luse.hs 138;" f maxViewDistance src/Dodge/Viewpoints.hs 26;" f @@ -6136,7 +6131,7 @@ maybeOpenTerminal src/Dodge/Update.hs 115;" f maybeReadFile src/Dodge/LoadSeed.hs 10;" f maybeTakeOne src/Dodge/RandomHelp.hs 96;" f maybeTakeOne src/RandomHelp.hs 107;" f -maybeWarmupStatus src/Dodge/Item/Display.hs 143;" f +maybeWarmupStatus src/Dodge/Item/Display.hs 139;" f mcApplyDamage src/Dodge/Machine/Update.hs 90;" f mcKillBut src/Dodge/Machine/Destroy.hs 34;" f mcKillTerm src/Dodge/Machine/Destroy.hs 26;" f @@ -6152,8 +6147,8 @@ mcTypeUpdate src/Dodge/Machine/Update.hs 24;" f mcUseHeld src/Dodge/HeldUse.hs 344;" f mcUseItem src/Dodge/Machine/Update.hs 61;" f medkit src/Dodge/Item/Consumable.hs 8;" f -megaBattery src/Dodge/Item/Ammo.hs 70;" f -megaShellMag src/Dodge/Item/Ammo.hs 49;" f +megaBattery src/Dodge/Item/Ammo.hs 67;" f +megaShellMag src/Dodge/Item/Ammo.hs 47;" f megaTinMag src/Dodge/Item/Ammo.hs 8;" f meleeHeadingMove src/Dodge/Creature/Boid.hs 281;" f meleeHeadingMove src/Dodge/Creature/ImpulseRat.hs 10;" f @@ -6195,10 +6190,10 @@ minStreamOn src/StreamingHelp.hs 14;" f mini1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 322;" f miniGunCrit src/Dodge/Creature.hs 62;" f miniGunUse src/Dodge/Item/Weapon/BulletGun/Cane.hs 113;" f -miniGunX src/Dodge/Item/Held/Cane.hs 88;" f +miniGunX src/Dodge/Item/Held/Cane.hs 83;" f miniGunX src/Dodge/Item/Weapon/BulletGun/Cane.hs 120;" f -miniGunXPict src/Dodge/Item/Draw/SPic.hs 398;" f -miniGunXPictItem src/Dodge/Item/Draw/SPic.hs 392;" f +miniGunXPict src/Dodge/Item/Draw/SPic.hs 395;" f +miniGunXPictItem src/Dodge/Item/Draw/SPic.hs 389;" f miniS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 510;" f miniTree2 src/Dodge/Room/Room.hs 108;" f minimumOn src/FoldlHelp.hs 12;" f @@ -6309,7 +6304,7 @@ mvPt' src/Dodge/Particle/Update.hs 5;" f mvSpark src/Dodge/Particle/Bullet/Update.hs 46;" f myIntersectLineLine src/Geometry/Intersect.hs 177;" f myIntersectSegSeg src/Geometry/Intersect.hs 155;" f -myParams src/Dodge/Combine/Graph.hs 92;" f +myParams src/Dodge/Combine/Graph.hs 91;" f nRays src/Geometry.hs 170;" f nRaysRad src/Geometry.hs 174;" f nearCollinear src/Dodge/LevelGen/StaticWalls/Deprecated.hs 19;" f @@ -6328,7 +6323,7 @@ newTextureFramebuffer src/Framebuffer/Setup.hs 16;" f noPic src/ShapePicture.hs 25;" f noShape src/ShapePicture.hs 29;" f noclipCheck src/Dodge/WallCreatureCollisions.hs 20;" f -nodeFormatting src/Dodge/Combine/Graph.hs 134;" f +nodeFormatting src/Dodge/Combine/Graph.hs 133;" f normalGait src/Dodge/Creature/State/WalkCycle.hs 19;" f normalizeAngle src/Geometry/Vector.hs 127;" f normalizeAnglePi src/Dodge/Base.hs 132;" f @@ -6451,7 +6446,7 @@ pincerP' src/Dodge/Creature/Boid.hs 93;" f pincerP'' src/Dodge/Creature/Boid.hs 103;" f pincerP''' src/Dodge/Creature/Boid.hs 74;" f pingPongBetween src/Render.hs 220;" f -pipe src/Dodge/Item/Craftable.hs 44;" f +pipe src/Dodge/Item/Craftable.hs 43;" f pistol src/Dodge/Item/Held/Stick.hs 35;" f pistol src/Dodge/Item/Weapon/BulletGun/Stick.hs 59;" f pistolCrit src/Dodge/Creature/PistolCrit.hs 13;" f @@ -6485,7 +6480,7 @@ placeSpotUsingLink src/Dodge/Placement/PlaceSpot.hs 60;" f placeString src/Dodge/Render/MenuScreen.hs 54;" f placeWallPoly src/Dodge/Placement/PlaceSpot.hs 156;" f plainRegex src/Dodge/DisplayInventory.hs 156;" f -plateCraft src/Dodge/Item/Craftable.hs 47;" f +plateCraft src/Dodge/Item/Craftable.hs 46;" f playIfFree src/Sound.hs 136;" f playPositionalSoundQueue src/Sound.hs 144;" f playSoundAndUpdate src/Sound.hs 54;" f @@ -6584,7 +6579,7 @@ postUniverseLoadSideEffect src/Dodge/WorldLoad.hs 11;" f postWorldLoad src/Dodge/WorldLoad.hs 14;" f powerFakeout src/Dodge/Room/Start.hs 37;" f powerFakeout' src/Dodge/Room/Start.hs 34;" f -powerLegs src/Dodge/Item/Equipment.hs 125;" f +powerLegs src/Dodge/Item/Equipment.hs 124;" f powlist src/Multiset.hs 55;" f powlistUpToN src/Multiset.hs 20;" f powlistUpToN' src/Multiset.hs 9;" f @@ -6781,7 +6776,7 @@ reloadS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 426;" f reloadSound src/Dodge/SoundLogic/Synonyms.hs 4;" f rememberSounds src/Dodge/Creature/Perception.hs 177;" f remoteBombUnarmedPic src/Dodge/Item/Weapon/Grenade.hs 268;" f -remoteScreen src/Dodge/Item/Scope.hs 56;" f +remoteScreen src/Dodge/Item/Scope.hs 52;" f remoteShellShape src/Dodge/Projectile/Draw.hs 41;" f removeAmmoFromMag src/Dodge/HeldUse.hs 260;" f removeDot src/ShortShow.hs 30;" f @@ -6822,7 +6817,6 @@ retreatFireLauncher src/Dodge/Humanoid.hs 269;" f retreatPointForFrom src/Dodge/Creature/Action/Flee.hs 7;" f retreatPointForFrom src/Dodge/Creature/Impulse/Flee.hs 7;" f reversePair src/Dodge/LevelGen.hs 82;" f -revolveMag src/Dodge/Item/Ammo.hs 29;" f revolver src/Dodge/Item/Weapon/BulletGun/Stick.hs 49;" f revolverX src/Dodge/Item/Weapon/BulletGun/Stick.hs 104;" f rewindWatch src/Dodge/Item/Weapon/Utility.hs 37;" f @@ -6996,7 +6990,7 @@ sentinelExtraWatchUpdate src/Dodge/Creature/SentinelAI.hs 83;" f sentinelFireType src/Dodge/Creature/SentinelAI.hs 50;" f setChannelPos src/Sound.hs 149;" f setClickWorldPos src/Dodge/Update.hs 99;" f -setClusterID src/Dodge/Combine/Graph.hs 104;" f +setClusterID src/Dodge/Combine/Graph.hs 103;" f setDepth src/Picture/Base.hs 128;" f setDirPS src/Dodge/PlacementSpot.hs 49;" f setFallback src/Dodge/PlacementSpot.hs 127;" f @@ -7020,7 +7014,7 @@ setOutLinks src/Dodge/RoomLink.hs 48;" f setOutLinksByType src/Dodge/RoomLink.hs 57;" f setOutLinksPD src/Dodge/RoomLink.hs 77;" f setPS src/Dodge/Placements/Spot.hs 9;" f -setRBCreatureTargeting src/Dodge/Creature/State.hs 308;" f +setRBCreatureTargeting src/Dodge/Creature/State.hs 307;" f setSelectionListRestriction src/Dodge/Update/Input/ScreenLayer.hs 121;" f setShaderSource src/Shader/Compile.hs 336;" f setShadowLimits src/Dodge/Shadows.hs 11;" f @@ -7063,11 +7057,11 @@ shapeVerxAttributes src/Shape/Parameters.hs 13;" f shapeVerxSize src/Shape/Parameters.hs 10;" f shardShape src/Dodge/Block/Debris.hs 181;" f shatterGun src/Dodge/Item/Held/Weapons.hs 8;" f -shatterGunSPic src/Dodge/Item/Draw/SPic.hs 246;" f +shatterGunSPic src/Dodge/Item/Draw/SPic.hs 243;" f shatterWall src/Dodge/Item/Weapon/Shatter.hs 26;" f shellCollisionCheck src/Dodge/Projectile/Update.hs 51;" f shellCollisionEffect src/Dodge/Projectile/Update.hs 47;" f -shellMag src/Dodge/Item/Ammo.hs 54;" f +shellMag src/Dodge/Item/Ammo.hs 52;" f shellShape src/Dodge/Projectile/Draw.hs 26;" f shellTrailCloud src/Dodge/WorldEvent/Cloud.hs 65;" f shieldWall src/Dodge/Euse.hs 114;" f @@ -7132,10 +7126,10 @@ shotgunSound src/Dodge/SoundLogic/Synonyms.hs 4;" f shoulderHeight src/Dodge/Item/HeldOffset.hs 57;" f shoulderSH src/Dodge/Creature/Picture.hs 171;" f shoulderSP src/Dodge/Creature/HandPos.hs 196;" f -showAttachItem src/Dodge/Item/Display.hs 79;" f -showAutoRechargeProgress src/Dodge/Item/Display.hs 93;" f -showEquipItem src/Dodge/Item/Display.hs 88;" f -showEquipmentNumber src/Dodge/Item/Display.hs 134;" f +showAttachItem src/Dodge/Item/Display.hs 76;" f +showAutoRechargeProgress src/Dodge/Item/Display.hs 89;" f +showEquipItem src/Dodge/Item/Display.hs 85;" f +showEquipmentNumber src/Dodge/Item/Display.hs 130;" f showInt src/Dodge/Item/Info.hs 31;" f showIntsString src/Dodge/Tree/Compose.hs 129;" f showManObj src/Dodge/TestString.hs 39;" f @@ -7173,7 +7167,7 @@ singleLDT src/Dodge/DoubleTree.hs 9;" f singleton src/DoubleStack.hs 11;" f singletonTrie src/SimpleTrie.hs 14;" f sizeFBOs src/Framebuffer/Update.hs 22;" f -sizeModule src/Dodge/Item/Craftable.hs 38;" f +sizeModule src/Dodge/Item/Craftable.hs 37;" f sizeSelf src/Dodge/Creature/Action.hs 204;" f sizeZoneOfPoint src/Dodge/Base/Zone.hs 43;" f skwareFadeTwoSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 366;" f @@ -7192,14 +7186,14 @@ smallGlass3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 372;" f smallGlass4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 334;" f smallPillar src/Dodge/Room/Pillar.hs 32;" f smallRoom src/Dodge/Room/RunPast.hs 31;" f -smg src/Dodge/Item/Held/Stick.hs 72;" f +smg src/Dodge/Item/Held/Stick.hs 65;" f smg src/Dodge/Item/Weapon/BulletGun/Stick.hs 95;" f smokeCloudAt src/Dodge/WorldEvent/Cloud.hs 41;" f smokeTrailSound src/Dodge/SoundLogic/Synonyms.hs 4;" f sndV2 src/Geometry/Data.hs 52;" f sniperRifle src/Dodge/Item/Held/Rod.hs 56;" f sniperRifle src/Dodge/Item/Weapon/BulletGun/Rod.hs 68;" f -someCrits src/Dodge/LockAndKey.hs 129;" f +someCrits src/Dodge/LockAndKey.hs 127;" f sortStreamOn src/StreamingHelp.hs 21;" f soundAngle src/Dodge/SoundLogic.hs 157;" f soundContinue src/Dodge/SoundLogic.hs 125;" f @@ -7234,9 +7228,9 @@ spawnGun src/Dodge/Item/Weapon/Spawn.hs 12;" f spawnSmokeAtCursor src/Dodge/WorldEvent/Cloud.hs 73;" f spawnerCrit src/Dodge/Creature.hs 55;" f spawnerRoom src/Dodge/Room/Room.hs 362;" f -speedLegs src/Dodge/Item/Equipment.hs 131;" f -spinDrag src/Dodge/Item/Held/Launcher.hs 82;" f -spinStart src/Dodge/Item/Held/Launcher.hs 90;" f +speedLegs src/Dodge/Item/Equipment.hs 130;" f +spinDrag src/Dodge/Item/Held/Launcher.hs 74;" f +spinStart src/Dodge/Item/Held/Launcher.hs 82;" f splashMenu src/Dodge/Menu.hs 27;" f splashMenuOptions src/Dodge/Menu.hs 32;" f splashScreen src/Dodge/Initialisation.hs 11;" f @@ -7280,7 +7274,7 @@ ssfold src/FoldableHelp.hs 105;" f stackPicturesAt src/Dodge/Render/List.hs 81;" f stackPicturesAtOff src/Dodge/Render/List.hs 84;" f stackText src/Picture/Base.hs 188;" f -stackedInventory src/Dodge/Creature.hs 287;" f +stackedInventory src/Dodge/Creature.hs 281;" f startCr src/Dodge/Creature.hs 91;" f startCrafts src/Dodge/Room/Start.hs 102;" f startInvList src/Dodge/Creature.hs 109;" f @@ -7357,23 +7351,20 @@ tap3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 434;" f tap4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 506;" f tapQuiet src/Dodge/SoundLogic/Synonyms.hs 4;" f tapQuietS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 328;" f -targCorner src/Dodge/Targeting/Draw.hs 74;" f -targetCursorPic src/Dodge/Targeting/Draw.hs 80;" f -targetDistanceDraw src/Dodge/Targeting/Draw.hs 25;" f -targetDraw src/Dodge/Targeting/Draw.hs 42;" f -targetRBCreatureDraw src/Dodge/Targeting/Draw.hs 66;" f -targetSimpleDraw src/Dodge/Targeting/Draw.hs 22;" f +targCorner src/Dodge/Targeting/Draw.hs 71;" f +targetCursorPic src/Dodge/Targeting/Draw.hs 77;" f +targetDraw src/Dodge/Targeting/Draw.hs 39;" f +targetRBCreatureDraw src/Dodge/Targeting/Draw.hs 63;" f +targetSimpleDraw src/Dodge/Targeting/Draw.hs 21;" f targetYouCognizant src/Dodge/Creature/ChooseTarget.hs 13;" f targetYouLOS src/Dodge/Creature/ChooseTarget.hs 7;" f targetYouWhenCognizant src/Dodge/Creature/ReaderUpdate.hs 194;" f targetYouWhenCognizant src/Dodge/Creature/SetTarget.hs 9;" f -targetingHat src/Dodge/Item/Equipment.hs 111;" f -targetingInfo src/Dodge/Item/Info.hs 128;" f -targetingScope src/Dodge/Item/Scope.hs 24;" f +targetingScope src/Dodge/Item/Scope.hs 22;" f telRoomLev src/Dodge/Room/Teleport.hs 14;" f teleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 378;" f teleSound src/Dodge/SoundLogic/Synonyms.hs 4;" f -teleportModule src/Dodge/Item/Craftable.hs 32;" f +teleportModule src/Dodge/Item/Craftable.hs 31;" f termButton src/Dodge/Placement/Instance/Terminal.hs 51;" f termSoundLine src/Dodge/Terminal.hs 109;" f termTextColor src/Dodge/Terminal.hs 112;" f @@ -7384,12 +7375,12 @@ terminalShape src/Dodge/Machine/Draw.hs 31;" f terminalWheelEvent src/Dodge/Update/Scroll.hs 75;" f teslaBeamCombine src/Dodge/Beam.hs 48;" f teslaGun src/Dodge/Item/Held/BatteryGuns.hs 27;" f -teslaGunPic src/Dodge/Item/Draw/SPic.hs 454;" f +teslaGunPic src/Dodge/Item/Draw/SPic.hs 451;" f teslaParams src/Dodge/Tesla/ItemParams.hs 6;" f testCrossWalls src/Dodge/Room/Path.hs 47;" f testEvent src/Dodge/Event/Test.hs 10;" f testEventKey src/Dodge/Config/KeyConfig.hs 27;" f -testInventory src/Dodge/Creature.hs 263;" f +testInventory src/Dodge/Creature.hs 257;" f testPic src/Dodge/Render/ShapePicture.hs 157;" f testStringInit src/Dodge/TestString.hs 22;" f text src/Picture/Base.hs 193;" f @@ -7418,12 +7409,12 @@ thingsHit src/Dodge/WorldEvent/ThingsHit.hs 29;" f thingsHitExceptCr src/Dodge/WorldEvent/ThingsHit.hs 73;" f threeLineDecoration src/Dodge/Placement/TopDecoration.hs 61;" f throwRemoteBomb src/Dodge/Item/Weapon/Grenade.hs 205;" f -thrustParam src/Dodge/Item/Held/Launcher.hs 98;" f +thrustParam src/Dodge/Item/Held/Launcher.hs 90;" f tileTexCoords src/Tile.hs 10;" f tilesFromRooms src/Dodge/Layout.hs 205;" f tilesToLine src/Shader/AuxAddition.hs 66;" f timeFlowUpdate src/Dodge/Update.hs 160;" f -timeModule src/Dodge/Item/Craftable.hs 35;" f +timeModule src/Dodge/Item/Craftable.hs 34;" f timerTLS src/Dodge/LightSource/Update.hs 22;" f tinMag src/Dodge/Item/Ammo.hs 13;" f tinitusS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 402;" f @@ -7435,7 +7426,7 @@ tmUpdate src/Dodge/Update.hs 331;" f toBothLnk src/Dodge/RoomLink.hs 121;" f toClosestMultiple src/HelpNum.hs 3;" f toColor8 src/Color.hs 144;" f -toCombNodeLabel src/Dodge/Combine/Graph.hs 82;" f +toCombNodeLabel src/Dodge/Combine/Graph.hs 81;" f toCrUpdate' src/Dodge/RemoveCreatureEndo.hs 10;" f toFloatVAs src/Shader/Compile.hs 257;" f toLabel src/Dodge/Cleat.hs 16;" f @@ -7463,15 +7454,15 @@ topPrismEdgeIndices src/Shader/Poke.hs 327;" f topPrismIndices src/Shader/Poke.hs 402;" f topTestPart src/Dodge/TestString.hs 34;" f torch src/Dodge/Item/Held/Utility.hs 26;" f -torchShape src/Dodge/Item/Draw/SPic.hs 210;" f +torchShape src/Dodge/Item/Draw/SPic.hs 207;" f torqueCr src/Dodge/WorldEffect.hs 70;" f torso src/Dodge/Creature/Picture.hs 133;" f tractCr src/Dodge/TractorBeam/Update.hs 28;" f tractFlIt src/Dodge/TractorBeam/Update.hs 23;" f tractorBeamAt src/Dodge/HeldUse.hs 232;" f -tractorGun src/Dodge/Item/Held/BatteryGuns.hs 92;" f -tractorGunPic src/Dodge/Item/Draw/SPic.hs 492;" f -tractorGunTweak src/Dodge/Item/Held/BatteryGuns.hs 110;" f +tractorGun src/Dodge/Item/Held/BatteryGuns.hs 86;" f +tractorGunPic src/Dodge/Item/Draw/SPic.hs 489;" f +tractorGunTweak src/Dodge/Item/Held/BatteryGuns.hs 101;" f tractorPullPos src/Dodge/TractorBeam/Update.hs 33;" f tractorSPic src/Dodge/TractorBeam/Draw.hs 10;" f tranRot src/Picture/Base.hs 124;" f @@ -7603,7 +7594,7 @@ upHammer src/Dodge/Default.hs 77;" f upProjectile src/Dodge/Projectile/Update.hs 25;" f updateAllNodes src/TreeHelp.hs 85;" f updateArc src/Dodge/Tesla/Arc.hs 86;" f -updateAutoRecharge src/Dodge/Creature/State.hs 337;" f +updateAutoRecharge src/Dodge/Creature/State.hs 336;" f updateBackspaceRegex src/Dodge/Update/Input/InGame.hs 159;" f updateBarrel src/Dodge/Barreloid.hs 45;" f updateBarreloid src/Dodge/Barreloid.hs 13;" f @@ -7660,7 +7651,7 @@ updateLinearShockwave src/Dodge/LinearShockwave/Update.hs 8;" f updateLongPressInGame src/Dodge/Update/Input/InGame.hs 128;" f updateMIM src/Dodge/Update.hs 548;" f updateMachine src/Dodge/Machine/Update.hs 16;" f -updateMovement src/Dodge/Creature/State.hs 376;" f +updateMovement src/Dodge/Creature/State.hs 375;" f updateObjCatMaybes src/Dodge/Update.hs 407;" f updateObjMapMaybe src/Dodge/Update.hs 400;" f updatePS src/Dodge/Placements/Spot.hs 26;" f @@ -7800,7 +7791,7 @@ visionCheck src/Dodge/Creature/Perception.hs 152;" f vocalizationTest src/Dodge/Creature/Vocalization.hs 8;" f volleyGun src/Dodge/Item/Held/Cane.hs 32;" f volleyGun src/Dodge/Item/Weapon/BulletGun/Cane.hs 43;" f -volleyGunShape src/Dodge/Item/Draw/SPic.hs 380;" f +volleyGunShape src/Dodge/Item/Draw/SPic.hs 377;" f waistSP src/Dodge/Creature/HandPos.hs 199;" f walkNozzle src/Dodge/HeldUse.hs 207;" f walkableNodeNear src/Dodge/Path.hs 48;" f @@ -7904,8 +7895,8 @@ worldSPic src/Dodge/Render/ShapePicture.hs 27;" f worldShape src/Dodge/Render/Shape.hs 14;" f worldToGenWorld src/Dodge/LevelGen/LevelStructure.hs 14;" f wpAdd src/Dodge/Room/RezBox.hs 134;" f -wristArmour src/Dodge/Item/Equipment.hs 49;" f -wristInvisibility src/Dodge/Item/Equipment.hs 137;" f +wristArmour src/Dodge/Item/Equipment.hs 48;" f +wristInvisibility src/Dodge/Item/Equipment.hs 136;" f writeConfig src/Dodge/Menu.hs 159;" f writeSaveSlot src/Dodge/Save.hs 34;" f xCylinder src/Shape.hs 134;" f @@ -7936,7 +7927,7 @@ zeroZ src/Geometry/Vector.hs 8;" f zipArcs src/Dodge/Tesla/Arc.hs 96;" f zipCount src/Dodge/Tree/Shift.hs 129;" f zipCountDown src/Dodge/Room/Procedural.hs 117;" f -zipWithDefaults src/Dodge/Item/Display.hs 39;" f +zipWithDefaults src/Dodge/Item/Display.hs 36;" f zoneAroundPoint src/Dodge/Base/Zone.hs 63;" f zoneAroundPoint src/Dodge/Zone.hs 43;" f zoneAroundPoint' src/Dodge/Base/Zone.hs 69;" f