diff --git a/ghcidOutput b/ghcidOutput index 3ec47f821..6115bbb7c 100644 --- a/ghcidOutput +++ b/ghcidOutput @@ -1,40 +1 @@ -/home/justin/Haskell/loop/src/Dodge/DisplayInventory.hs:25:1-25: warning: [-Wunused-imports] - The import of ‘Dodge.Item.Grammar’ is redundant - | -25 | import Dodge.Item.Grammar - | ^^^^^^^^^^^^^^^^^^^^^^^^^ -/home/justin/Haskell/loop/src/Dodge/Item/Draw/SPic.hs:20:1: warning: [-Wunused-top-binds] - Defined but not used: ‘itemHeldAmmoPic’ - | -20 | itemHeldAmmoPic itm amit = itemSPic itm <> addAmmoClip itm amit - | ^^^^^^^^^^^^^^^ -/home/justin/Haskell/loop/src/Dodge/Item/Draw/SPic.hs:23:1: warning: [-Wunused-top-binds] - Defined but not used: ‘addAmmoClip’ - | -23 | addAmmoClip itm amit = fromMaybe mempty $ do - | ^^^^^^^^^^^ -/home/justin/Haskell/loop/src/Dodge/Item/Draw/SPic.hs:23:17: warning: [-Wunused-matches] - Defined but not used: ‘amit’ - | -23 | addAmmoClip itm amit = fromMaybe mempty $ do - | ^^^^ -/home/justin/Haskell/loop/src/Dodge/Item/Draw/SPic.hs:24:5: warning: [-Wunused-matches] - Defined but not used: ‘hit’ - | -24 | hit <- itm ^? itType . iyBase . ibtHeld - | ^^^ -/home/justin/Haskell/loop/src/Dodge/Inventory/CheckSlots.hs:7:1: warning: [-Wunused-imports] - The import of ‘Control.Lens’ is redundant - | -7 | import Control.Lens - | ^^^^^^^^^^^^^^^^^^^ -/home/justin/Haskell/loop/src/Dodge/Inventory/CheckSlots.hs:8:1: warning: [-Wunused-imports] - The import of ‘Data.Maybe’ is redundant - | -8 | import Data.Maybe - | ^^^^^^^^^^^^^^^^^ -/home/justin/Haskell/loop/src/Dodge/Inventory/CheckSlots.hs:28:14: warning: [-Wunused-matches] - Defined but not used: ‘it’ - | -28 | findItemSlot it inv = maybe 0 ((+ 1) . fst) $ IM.lookupMax inv - | ^^ +All good (614 modules, at 16:33:21) diff --git a/src/Dodge/Creature.hs b/src/Dodge/Creature.hs index 1491cde04..8d886edfd 100644 --- a/src/Dodge/Creature.hs +++ b/src/Dodge/Creature.hs @@ -238,6 +238,7 @@ inventoryX c = case c of , rifle , shellMag ] + 'P' -> [burstRifle , tinMag, bulletSynthesizer] 'T' -> testInventory _ -> [] @@ -269,6 +270,7 @@ stackedInventory :: [Item] stackedInventory = [ burstRifle , tinMag + , bulletSynthesizer , drumMag , launcher , shellMag diff --git a/src/Dodge/Data/ComposedItem.hs b/src/Dodge/Data/ComposedItem.hs index 346097ef4..2768ff496 100644 --- a/src/Dodge/Data/ComposedItem.hs +++ b/src/Dodge/Data/ComposedItem.hs @@ -11,6 +11,8 @@ import Data.Aeson.TH data ComposedItem = WeaponCI + | WeaponScopeCI + | AmmoModifierCI | BulletAmmoCI | UncomposableCI deriving (Eq,Ord,Show,Read) diff --git a/src/Dodge/Data/Item/Combine.hs b/src/Dodge/Data/Item/Combine.hs index bb38c3b27..ede0b1140 100644 --- a/src/Dodge/Data/Item/Combine.hs +++ b/src/Dodge/Data/Item/Combine.hs @@ -97,6 +97,7 @@ data ItemBaseType data AttachType = SCROLLATTACH ScrollAttachType | TARGETATTACH {_ibtAttachTarget :: TargetType} + | BULLETSYNTHESIZER -- | BULPAYLOADATTACH -- | BULTRAJECTORYATTACH deriving (Eq, Ord, Show, Read) diff --git a/src/Dodge/Data/Item/Use.hs b/src/Dodge/Data/Item/Use.hs index 2e6735841..b82b6ea9c 100644 --- a/src/Dodge/Data/Item/Use.hs +++ b/src/Dodge/Data/Item/Use.hs @@ -77,6 +77,7 @@ data HeldParams data AttachParams = ScrollAttachParams {_scrollAttachParams :: ScrollAttachParams} | TargetAttachParams + | NoAttachParams data AmmoParams = BulletParams {_ampBullet :: Bullet} | ProjectileParams diff --git a/src/Dodge/DisplayInventory.hs b/src/Dodge/DisplayInventory.hs index 452373ab9..a9dc9cea9 100644 --- a/src/Dodge/DisplayInventory.hs +++ b/src/Dodge/DisplayInventory.hs @@ -11,6 +11,7 @@ module Dodge.DisplayInventory ( import Control.Monad import qualified Data.IntMap.Strict as IM +import qualified Data.IntMap.Merge.Strict as MIM import Data.Maybe import Dodge.Base.You import Dodge.Combine @@ -112,9 +113,11 @@ updateDisplaySections w cfig sss = coitems' = IM.fromDistinctAscList . zip [0 ..] $ map closeObjectToSelectionItem (w ^. hud . closeObjects) - invitems' = IM.mapWithKey (invSelectionItem cr) inv + invitems' = MIM.merge MIM.dropMissing MIM.dropMissing (MIM.zipWithMatched $ const addindent) indents $ IM.mapWithKey (invSelectionItem cr) inv + addindent x y = y & siPictures %~ map (x ++) cr = you w inv = _crInv (you w) + indents = indentInv inv --inv = indentInv $ _crInv (you w) nfreeslots = crNumFreeSlots cr filtpair i itms filtdescription = diff --git a/src/Dodge/Inventory/CheckSlots.hs b/src/Dodge/Inventory/CheckSlots.hs index 95dd4833a..12470041f 100644 --- a/src/Dodge/Inventory/CheckSlots.hs +++ b/src/Dodge/Inventory/CheckSlots.hs @@ -4,8 +4,6 @@ module Dodge.Inventory.CheckSlots ( crInvSize, ) where -import Control.Lens -import Data.Maybe import Dodge.Base.You import Dodge.Data.World import Dodge.Item.SlotsTaken @@ -17,15 +15,15 @@ import qualified IntMapHelp as IM checkInvSlotsYou :: Item -> World -> Maybe Int checkInvSlotsYou it w | crNumFreeSlots ycr >= ceiling (_itInvSize it) = - Just $ findItemSlot it (_crInv ycr) + Just $ findItemSlot (_crInv ycr) | otherwise = Nothing where ycr = you w -- Assumes that the item is singular. -- Do not want to stack floor items for now -findItemSlot :: Item -> IM.IntMap Item -> Int -findItemSlot it inv = maybe 0 ((+ 1) . fst) $ IM.lookupMax inv +findItemSlot :: IM.IntMap Item -> Int +findItemSlot = maybe 0 ((+ 1) . fst) . IM.lookupMax --findItemSlot it inv = case it ^? itUse . useAmount of -- Just _ -> -- fromMaybe newslot $ IM.findIndex (\it' -> _itType it == _itType it') inv diff --git a/src/Dodge/Item.hs b/src/Dodge/Item.hs index 28d88a37f..d52318706 100644 --- a/src/Dodge/Item.hs +++ b/src/Dodge/Item.hs @@ -39,6 +39,7 @@ itemFromAttachType :: AttachType -> Item itemFromAttachType at = case at of SCROLLATTACH ZOOMSCOPE -> zoomScope TARGETATTACH tt -> targetingScope tt + BULLETSYNTHESIZER -> bulletSynthesizer itemFromConsumableType :: ConsumableItemType -> Item diff --git a/src/Dodge/Item/Ammo.hs b/src/Dodge/Item/Ammo.hs index f1a98d17c..b04567a3a 100644 --- a/src/Dodge/Item/Ammo.hs +++ b/src/Dodge/Item/Ammo.hs @@ -71,3 +71,8 @@ battery = , _iaLoaded = 100 } } + +bulletSynthesizer :: Item +bulletSynthesizer = defaultHeldItem + & itType . iyBase .~ ATTACH BULLETSYNTHESIZER + & itUse .~ AttachUse NoAttachParams diff --git a/src/Dodge/Item/Display.hs b/src/Dodge/Item/Display.hs index c22e94d38..a223bb70c 100644 --- a/src/Dodge/Item/Display.hs +++ b/src/Dodge/Item/Display.hs @@ -88,6 +88,7 @@ showAttachItem :: AttachType -> String showAttachItem t = case t of SCROLLATTACH x -> show x TARGETATTACH x -> show x + BULLETSYNTHESIZER -> "BSYNTH" showEquipItem :: EquipItemType -> String showEquipItem eit = case eit of diff --git a/src/Dodge/Item/Draw/SPic.hs b/src/Dodge/Item/Draw/SPic.hs index 0a630b72e..a75460dc7 100644 --- a/src/Dodge/Item/Draw/SPic.hs +++ b/src/Dodge/Item/Draw/SPic.hs @@ -14,15 +14,15 @@ import LensHelp import Picture import Shape import ShapePicture -import Data.Maybe +--import Data.Maybe -itemHeldAmmoPic :: Item -> Item -> SPic -itemHeldAmmoPic itm amit = itemSPic itm <> addAmmoClip itm amit +--itemHeldAmmoPic :: Item -> Item -> SPic +--itemHeldAmmoPic itm amit = itemSPic itm <> addAmmoClip itm amit -addAmmoClip :: Item -> Item -> SPic -addAmmoClip itm amit = fromMaybe mempty $ do - hit <- itm ^? itType . iyBase . ibtHeld - return mempty +--addAmmoClip :: Item -> Item -> SPic +--addAmmoClip itm amit = fromMaybe mempty $ do +-- hit <- itm ^? itType . iyBase . ibtHeld +-- return mempty itemSPic :: Item -> SPic itemSPic it = diff --git a/src/Dodge/Item/Grammar.hs b/src/Dodge/Item/Grammar.hs index 7db3befc7..dbca11343 100644 --- a/src/Dodge/Item/Grammar.hs +++ b/src/Dodge/Item/Grammar.hs @@ -19,7 +19,9 @@ singleDT x = DT x [] [] baseComposedItem :: ItemBaseType -> PCI baseComposedItem ibt = case ibt of HELD BURSTRIFLE -> (WeaponCI, [BulletAmmoCI]) - AMMOMAG TINMAG -> (BulletAmmoCI, []) + AMMOMAG TINMAG -> (BulletAmmoCI, [AmmoModifierCI]) + AMMOMAG DRUMMAG -> (BulletAmmoCI, [AmmoModifierCI]) + ATTACH BULLETSYNTHESIZER -> (AmmoModifierCI, []) _ -> (UncomposableCI, []) baseCI :: Item -> PCI' @@ -34,7 +36,7 @@ joinItems t@(DT (itm,px,cx) ls' rs') s@(DT (_,py,_) _ _) checkdepth a a'@(DT b ls rs) = fromMaybe (checktop a a') $ do c <- safeHead ls d <- checkdepth a c - return $ Just $ DT b (d:ls) rs + return $ Just $ DT b (d:tail ls) rs checktop a@(DT (_,pa,_) _ _) (DT (itm2,pb,cb) ls rs) | pa `elem` cb = Just (DT (itm2,pb, delete pa cb) (a:ls) rs) | otherwise = Nothing @@ -107,9 +109,17 @@ iDTboth fspace fline flink (DT x l r) = DT (flink x) flattenDT :: DoubleTree a -> [a] flattenDT (DT x l r) = concatMap flattenDT l ++ (x : concatMap flattenDT r) -indentInv :: IM.IntMap Item -> [String] -indentInv = - concatMap (flattenDT .indentDoubleTreeWith (' ':) ('|':) ('+':) . fmap (const "")) . +prettyDT :: (a -> String) -> DoubleTree a -> [String] +prettyDT f (DT x l r) = concatMap (map ('/':) . prettyDT f) r + ++ (f x : concatMap (map ('\\':) . prettyDT f) l) + +invTree :: IM.IntMap Item -> [String] +invTree = concatMap (prettyDT (\(itm,_,_) -> show (_itType itm))) . + joinItemsInList joinItems . IM.elems . fmap (singleDT . baseCI) + +indentInv :: IM.IntMap Item -> IM.IntMap String +indentInv = IM.fromList . zip [0..] . + reverse . concatMap (flattenDT .indentDoubleTreeWith (' ':) ('|':) ('+':) . fmap (const "")) . joinItemsInList joinItems . IM.elems . fmap (singleDT . baseCI) --indentInv :: IM.IntMap Item -> [String] diff --git a/src/Dodge/TestString.hs b/src/Dodge/TestString.hs index 458363d6a..6e32feb6a 100644 --- a/src/Dodge/TestString.hs +++ b/src/Dodge/TestString.hs @@ -1,6 +1,7 @@ {-# OPTIONS_GHC -Wno-unused-imports #-} module Dodge.TestString where +import Dodge.Item.Grammar import Dodge.Item.Display import AesonHelp import Dodge.SmoothScroll @@ -19,10 +20,7 @@ import Dodge.Data.Universe --import qualified Data.Map.Strict as M import qualified IntMapHelp as IM testStringInit :: Universe -> [String] -testStringInit u = [fromMaybe "" $ do - proj <- u ^? uvWorld . cWorld . lWorld . projectiles - return $ show $ IM.size proj - ] +testStringInit u = maybe [] invTree (u ^? uvWorld . cWorld . lWorld . creatures . ix 0 . crInv) -- [fromMaybe "" $ do -- cr <- u ^? uvWorld . cWorld . lWorld . creatures . ix 0 -- i <- cr ^? crManipulation . manObject . inInventory . ispItem diff --git a/tags b/tags index ff0245ab2..d36aa8487 100644 --- a/tags +++ b/tags @@ -24,22 +24,22 @@ AIUNIT src/Dodge/Combine/Data.hs 48;" C AIUNIT src/Dodge/Data/Item/Combine.hs 54;" C AMMOMAG src/Dodge/Data/Item/Combine.hs 92;" C AMR src/Dodge/Combine/Data.hs 157;" C -AMR src/Dodge/Data/Item/Combine.hs 177;" C +AMR src/Dodge/Data/Item/Combine.hs 178;" C ANTIMATTER src/Dodge/Combine/Data.hs 44;" C ANTIMATTER src/Dodge/Data/Item/Combine.hs 48;" C AQUAMARINE src/Color/Data.hs 24;" C ATTACH src/Dodge/Data/Item/Combine.hs 91;" C ATTACHTORCH src/Dodge/Combine/Data.hs 219;" C -ATTACHTORCH src/Dodge/Data/Item/Combine.hs 218;" C +ATTACHTORCH src/Dodge/Data/Item/Combine.hs 219;" C AUTOAMR src/Dodge/Combine/Data.hs 158;" C -AUTOAMR src/Dodge/Data/Item/Combine.hs 178;" C +AUTOAMR src/Dodge/Data/Item/Combine.hs 179;" C AUTODETECTOR src/Dodge/Combine/Data.hs 117;" C -AUTODETECTOR src/Dodge/Data/Item/Combine.hs 143;" C +AUTODETECTOR src/Dodge/Data/Item/Combine.hs 144;" C AUTOEFFGUN src/Dodge/Combine/Data.hs 84;" C AUTOPISTOL src/Dodge/Combine/Data.hs 139;" C -AUTOPISTOL src/Dodge/Data/Item/Combine.hs 163;" C +AUTOPISTOL src/Dodge/Data/Item/Combine.hs 164;" C AUTORIFLE src/Dodge/Combine/Data.hs 151;" C -AUTORIFLE src/Dodge/Data/Item/Combine.hs 173;" C +AUTORIFLE src/Dodge/Data/Item/Combine.hs 174;" C AZURE src/Color/Data.hs 23;" C AccessTerminal src/Dodge/Data/WorldEffect.hs 26;" C Action src/Dodge/Data/ActionPlan.hs 78;" t @@ -54,11 +54,11 @@ AddGoal src/Dodge/Data/ActionPlan.hs 45;" C AddTile src/Dodge/Room/AddTile.hs 1;" m AesonHelp src/AesonHelp.hs 1;" m AimAt src/Dodge/Data/ActionPlan.hs 84;" C -AimParams src/Dodge/Data/Item/Use.hs 101;" t +AimParams src/Dodge/Data/Item/Use.hs 102;" t AimParams src/Dodge/Default/AimParams.hs 1;" m AimParams src/Dodge/Default/Item/Held/AimParams.hs 1;" m AimParams src/Dodge/Default/Item/Use/AimParams.hs 1;" m -AimStance src/Dodge/Data/Item/Use.hs 119;" t +AimStance src/Dodge/Data/Item/Use.hs 120;" t Aiming src/Dodge/Creature/Stance/Data.hs 42;" C Aiming src/Dodge/Data/Creature/Stance.hs 39;" C AirFiltrationSS src/Dodge/Data/Scenario.hs 95;" C @@ -74,9 +74,10 @@ Ammo src/Dodge/Data/Item/Use/Consumption/Ammo.hs 6;" m Ammo src/Dodge/Item/Ammo.hs 1;" m AmmoCheckMod src/Dodge/Data/Item/HeldUse.hs 82;" C AmmoHammerTimeUseOneMod src/Dodge/Data/Item/HeldUse.hs 84;" C -AmmoMagType src/Dodge/Data/Item/Combine.hs 108;" t +AmmoMagType src/Dodge/Data/Item/Combine.hs 109;" t AmmoMagUse src/Dodge/Data/Item/Use.hs 58;" C -AmmoParams src/Dodge/Data/Item/Use.hs 81;" t +AmmoModifierCI src/Dodge/Data/ComposedItem.hs 15;" C +AmmoParams src/Dodge/Data/Item/Use.hs 82;" t AmmoParams src/Dodge/Item/Weapon/AmmoParams.hs 1;" m AmmoPosition src/Dodge/Item/AmmoPosition.hs 8;" t AmmoPosition src/Dodge/Item/AmmoPosition.hs 2;" m @@ -159,44 +160,45 @@ 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 165;" C +BANGCONE src/Dodge/Data/Item/Combine.hs 166;" C BANGROD src/Dodge/Combine/Data.hs 155;" C -BANGROD src/Dodge/Data/Item/Combine.hs 175;" C +BANGROD src/Dodge/Data/Item/Combine.hs 176;" C BANGSTICK src/Dodge/Combine/Data.hs 134;" C -BANGSTICK src/Dodge/Data/Item/Combine.hs 160;" C +BANGSTICK src/Dodge/Data/Item/Combine.hs 161;" C BATTERY src/Dodge/Combine/Data.hs 59;" C -BATTERY src/Dodge/Data/Item/Combine.hs 114;" C -BATTERYPACK src/Dodge/Data/Item/Combine.hs 142;" C +BATTERY src/Dodge/Data/Item/Combine.hs 115;" C +BATTERYPACK src/Dodge/Data/Item/Combine.hs 143;" C BELTMAG src/Dodge/Combine/Data.hs 200;" C -BELTMAG src/Dodge/Data/Item/Combine.hs 112;" C +BELTMAG src/Dodge/Data/Item/Combine.hs 113;" 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 153;" C +BLINKER src/Dodge/Data/Item/Combine.hs 154;" C BLINKERUNSAFE src/Dodge/Combine/Data.hs 126;" C -BLINKERUNSAFE src/Dodge/Data/Item/Combine.hs 154;" C +BLINKERUNSAFE src/Dodge/Data/Item/Combine.hs 155;" C BLOWTORCH src/Dodge/Combine/Data.hs 165;" C -BLOWTORCH src/Dodge/Data/Item/Combine.hs 185;" C +BLOWTORCH src/Dodge/Data/Item/Combine.hs 186;" C BLUE src/Color/Data.hs 17;" C BLUNDERBUSS src/Dodge/Combine/Data.hs 142;" C -BLUNDERBUSS src/Dodge/Data/Item/Combine.hs 166;" C +BLUNDERBUSS src/Dodge/Data/Item/Combine.hs 167;" 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 149;" C +BOOSTER src/Dodge/Data/Item/Combine.hs 150;" 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 131;" C -BULBODY src/Dodge/Data/Item/Combine.hs 210;" C +BRAINHAT src/Dodge/Data/Item/Combine.hs 132;" C +BULBODY src/Dodge/Data/Item/Combine.hs 211;" C BULBODYCRAFT src/Dodge/Data/Item/Combine.hs 75;" C -BULLETBELTBRACER src/Dodge/Data/Item/Combine.hs 141;" C -BULLETBELTPACK src/Dodge/Data/Item/Combine.hs 140;" C -BULPAY src/Dodge/Data/Item/Combine.hs 209;" C -BULTRAJ src/Dodge/Data/Item/Combine.hs 211;" C +BULLETBELTBRACER src/Dodge/Data/Item/Combine.hs 142;" C +BULLETBELTPACK src/Dodge/Data/Item/Combine.hs 141;" C +BULLETSYNTHESIZER src/Dodge/Data/Item/Combine.hs 100;" C +BULPAY src/Dodge/Data/Item/Combine.hs 210;" C +BULTRAJ src/Dodge/Data/Item/Combine.hs 212;" C BURSTRIFLE src/Dodge/Combine/Data.hs 152;" C -BURSTRIFLE src/Dodge/Data/Item/Combine.hs 174;" C +BURSTRIFLE src/Dodge/Data/Item/Combine.hs 175;" C BackgroundSound src/Dodge/Data/SoundOrigin.hs 14;" C Ball src/Dodge/Tesla/Ball.hs 1;" m BangCaneMod src/Dodge/Data/Item/HeldUse.hs 85;" C @@ -301,13 +303,13 @@ 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 39;" C -BulletAmmoCI src/Dodge/Data/ComposedItem.hs 14;" C +BulletAmmoCI src/Dodge/Data/ComposedItem.hs 16;" 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 -BulletParams src/Dodge/Data/Item/Use.hs 81;" C +BulletParams src/Dodge/Data/Item/Use.hs 82;" C BulletShooterParams src/Dodge/Data/Item/Use.hs 69;" C BulletSpawn src/Dodge/Data/Bullet.hs 42;" t BulletTrajectory src/Dodge/Data/Bullet.hs 50;" t @@ -343,7 +345,7 @@ CONSUMABLE src/Dodge/Data/Item/Combine.hs 89;" C CRAFT src/Dodge/Combine/Data.hs 97;" C CRAFT src/Dodge/Data/Item/Combine.hs 90;" C CREATUREDETECTOR src/Dodge/Combine/Data.hs 226;" C -CREATUREDETECTOR src/Dodge/Data/Item/Combine.hs 223;" C +CREATUREDETECTOR src/Dodge/Data/Item/Combine.hs 224;" C CREATURESENSOR src/Dodge/Combine/Data.hs 57;" C CREATURESENSOR src/Dodge/Data/Item/Combine.hs 65;" C CRUSHING src/Dodge/Data/Damage/Type.hs 16;" C @@ -382,7 +384,7 @@ ChainEffect src/Dodge/ChainEffect.hs 1;" m ChainUpdates src/Dodge/Creature/ChainUpdates.hs 1;" m ChangePosture src/Dodge/Data/ActionPlan.hs 42;" C ChangeStrategy src/Dodge/Data/ActionPlan.hs 44;" C -CharScrollParams src/Dodge/Data/Item/Use.hs 98;" C +CharScrollParams src/Dodge/Data/Item/Use.hs 99;" C ChargeIfEquipped src/Dodge/Data/Item/Effect.hs 22;" C ChargeIfInInventory src/Dodge/Data/Item/Effect.hs 23;" C ChargeableAmmo src/Dodge/Data/Item/Consumption.hs 29;" C @@ -466,7 +468,7 @@ Connectors src/Dodge/Render/Connectors.hs 1;" m 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 118;" t +ConsumableItemType src/Dodge/Data/Item/Combine.hs 119;" t ConsumeUse src/Dodge/Data/Item/Use.hs 46;" C Consumption src/Dodge/Data/Item/Consumption.hs 5;" m Consumption src/Dodge/Data/Item/Use/Consumption.hs 8;" m @@ -579,14 +581,14 @@ 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 197;" C +DRONELAUNCHER src/Dodge/Data/Item/Combine.hs 198;" C DRUM src/Dodge/Combine/Data.hs 34;" C DRUMMAG src/Dodge/Combine/Data.hs 199;" C -DRUMMAG src/Dodge/Data/Item/Combine.hs 111;" C +DRUMMAG src/Dodge/Data/Item/Combine.hs 112;" C DS src/DoubleStack.hs 3;" t DT src/Dodge/Data/DoubleTree.hs 13;" C DUALBEAM src/Dodge/Combine/Data.hs 171;" C -DUALBEAM src/Dodge/Data/Item/Combine.hs 190;" C +DUALBEAM src/Dodge/Data/Item/Combine.hs 191;" C DUCTTAPE src/Dodge/Combine/Data.hs 31;" C Damage src/Dodge/Data/Damage.hs 32;" t Damage src/Dodge/Data/DamageType.hs 38;" t @@ -678,7 +680,7 @@ DestroyDamage src/Dodge/Particle/Bullet/DestroyDamage.hs 1;" m DestroyItem src/Dodge/Data/Scenario.hs 7;" C DestroyTLS src/Dodge/Data/LightSource.hs 22;" C Detector src/Dodge/Combine/Data.hs 224;" t -Detector src/Dodge/Data/Item/Combine.hs 221;" t +Detector src/Dodge/Data/Item/Combine.hs 222;" 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 @@ -795,9 +797,9 @@ EHeadLamp src/Dodge/Data/Item/HeldUse.hs 43;" 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 176;" C +ELEPHANTGUN src/Dodge/Data/Item/Combine.hs 177;" C EMPTYMODULE src/Dodge/Combine/Data.hs 198;" C -EMPTYMODULE src/Dodge/Data/Item/Combine.hs 207;" C +EMPTYMODULE src/Dodge/Data/Item/Combine.hs 208;" C EMagShield src/Dodge/Data/Item/HeldUse.hs 41;" C ENERGYBALLCRAFT src/Dodge/Data/Item/Combine.hs 74;" C ENTERREMENT src/Dodge/Data/Damage/Type.hs 24;" C @@ -807,7 +809,7 @@ EQUIP src/Dodge/Data/Item/Combine.hs 88;" C EWristShield src/Dodge/Data/Item/HeldUse.hs 42;" 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 120;" C +EXPLOSIVES src/Dodge/Data/Item/Combine.hs 121;" 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 @@ -842,7 +844,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 125;" t +EquipItemType src/Dodge/Data/Item/Combine.hs 126;" 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 @@ -882,34 +884,34 @@ FBranch src/TreeExtra.hs 8;" C FBranches src/TreeExtra.hs 9;" C FLAKCRAFT src/Dodge/Data/Item/Combine.hs 72;" C FLAMESHIELD src/Dodge/Combine/Data.hs 105;" C -FLAMESHIELD src/Dodge/Data/Item/Combine.hs 127;" C +FLAMESHIELD src/Dodge/Data/Item/Combine.hs 128;" C FLAMESPITTER src/Dodge/Combine/Data.hs 161;" C -FLAMESPITTER src/Dodge/Data/Item/Combine.hs 181;" C +FLAMESPITTER src/Dodge/Data/Item/Combine.hs 182;" C FLAMETHROWER src/Dodge/Combine/Data.hs 162;" C -FLAMETHROWER src/Dodge/Data/Item/Combine.hs 182;" C +FLAMETHROWER src/Dodge/Data/Item/Combine.hs 183;" C FLAMETORRENT src/Dodge/Combine/Data.hs 163;" C -FLAMETORRENT src/Dodge/Data/Item/Combine.hs 183;" C +FLAMETORRENT src/Dodge/Data/Item/Combine.hs 184;" C FLAMEWALL src/Dodge/Combine/Data.hs 164;" C -FLAMEWALL src/Dodge/Data/Item/Combine.hs 184;" C +FLAMEWALL src/Dodge/Data/Item/Combine.hs 185;" 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 70;" C FLATSHIELD src/Dodge/Combine/Data.hs 192;" C -FLATSHIELD src/Dodge/Data/Item/Combine.hs 202;" C +FLATSHIELD src/Dodge/Data/Item/Combine.hs 203;" 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 199;" C +FORCEFIELDGUN src/Dodge/Data/Item/Combine.hs 200;" C FRAGCRAFT src/Dodge/Data/Item/Combine.hs 73;" C FRAGMODULE src/Dodge/Combine/Data.hs 67;" C FRAGMODULE src/Dodge/Data/Item/Combine.hs 69;" C FRONTARMOUR src/Dodge/Combine/Data.hs 106;" C -FRONTARMOUR src/Dodge/Data/Item/Combine.hs 128;" C +FRONTARMOUR src/Dodge/Data/Item/Combine.hs 129;" C FTree src/TreeExtra.hs 7;" t FUELCELL src/Dodge/Combine/Data.hs 60;" C FUELCELL src/Dodge/Data/Item/Combine.hs 67;" C -FUELPACK src/Dodge/Data/Item/Combine.hs 139;" C +FUELPACK src/Dodge/Data/Item/Combine.hs 140;" 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 @@ -1003,7 +1005,7 @@ GEqC src/SameConstr.hs 20;" c GLASSSHARD src/Dodge/Data/Item/Combine.hs 40;" C GLHelp src/GLHelp.hs 1;" m GRAPECANNON src/Dodge/Combine/Data.hs 143;" C -GRAPECANNON src/Dodge/Data/Item/Combine.hs 167;" C +GRAPECANNON src/Dodge/Data/Item/Combine.hs 168;" C GRAVITYMODULE src/Dodge/Combine/Data.hs 75;" C GRAVITYMODULE src/Dodge/Data/Item/Combine.hs 79;" C GREEN src/Color/Data.hs 16;" C @@ -1018,7 +1020,7 @@ GasAmmo src/Dodge/Data/Item/Use/Consumption/Ammo.hs 42;" C GasCloud src/Dodge/Data/Cloud.hs 31;" C GasCreate src/Dodge/Data/Gas.hs 6;" t GasCreate src/Dodge/Data/Item/Use/Consumption/Ammo.hs 48;" t -GasParams src/Dodge/Data/Item/Use.hs 87;" C +GasParams src/Dodge/Data/Item/Use.hs 88;" C GasSprayParams src/Dodge/Data/Item/Use.hs 67;" C GenCr src/Dodge/Creature/State/Data.hs 24;" C GenCr src/Dodge/Data/Creature/State.hs 31;" C @@ -1072,16 +1074,16 @@ HARDDRIVE src/Dodge/Data/Item/Combine.hs 52;" C HARDWARE src/Dodge/Combine/Data.hs 29;" C HARDWARE src/Dodge/Data/Item/Combine.hs 32;" C HAT src/Dodge/Combine/Data.hs 110;" C -HAT src/Dodge/Data/Item/Combine.hs 132;" C +HAT src/Dodge/Data/Item/Combine.hs 133;" C HEADLAMP src/Dodge/Combine/Data.hs 111;" C -HEADLAMP src/Dodge/Data/Item/Combine.hs 134;" C +HEADLAMP src/Dodge/Data/Item/Combine.hs 135;" C HEADLAMP1 src/Dodge/Combine/Data.hs 112;" C HEATSENSOR src/Dodge/Combine/Data.hs 56;" C HEATSENSOR src/Dodge/Data/Item/Combine.hs 62;" C HELD src/Dodge/Combine/Data.hs 86;" C HELD src/Dodge/Data/Item/Combine.hs 86;" C HELDDETECTOR src/Dodge/Combine/Data.hs 190;" C -HELDDETECTOR src/Dodge/Data/Item/Combine.hs 200;" C +HELDDETECTOR src/Dodge/Data/Item/Combine.hs 201;" C HOSE src/Dodge/Data/Item/Combine.hs 34;" C HPtLayer src/Dodge/Picture/Layer/Data.hs 17;" C HUD src/Dodge/Data/HUD.hs 35;" t @@ -1114,7 +1116,7 @@ HeldFamily src/Dodge/Item/Family.hs 3;" C HeldFireRemoteShell src/Dodge/Data/Item/HeldUse.hs 21;" C HeldForceField src/Dodge/Data/Item/HeldUse.hs 29;" C HeldItemType src/Dodge/Combine/Data.hs 133;" t -HeldItemType src/Dodge/Data/Item/Combine.hs 159;" t +HeldItemType src/Dodge/Data/Item/Combine.hs 160;" t HeldLaser src/Dodge/Data/Item/HeldUse.hs 25;" C HeldMod src/Dodge/Data/Item/HeldUse.hs 68;" t HeldModNothing src/Dodge/Data/Item/HeldUse.hs 69;" C @@ -1169,13 +1171,13 @@ Huse src/Dodge/Data/Item/HeldUse.hs 15;" t INCENDBUL src/Dodge/Combine/Data.hs 202;" C INCENDIARYMODULE src/Dodge/Combine/Data.hs 64;" C INCENDLAS src/Dodge/Combine/Data.hs 213;" C -INCENDLAS src/Dodge/Data/Item/Combine.hs 213;" C +INCENDLAS src/Dodge/Data/Item/Combine.hs 214;" C INVISIBILITYEQUIPMENT src/Dodge/Combine/Data.hs 108;" C -INVISIBILITYEQUIPMENT src/Dodge/Data/Item/Combine.hs 130;" C +INVISIBILITYEQUIPMENT src/Dodge/Data/Item/Combine.hs 131;" C IRONBAR src/Dodge/Combine/Data.hs 53;" C IRONBAR src/Dodge/Data/Item/Combine.hs 59;" C ITEMDETECTOR src/Dodge/Combine/Data.hs 225;" C -ITEMDETECTOR src/Dodge/Data/Item/Combine.hs 222;" C +ITEMDETECTOR src/Dodge/Data/Item/Combine.hs 223;" C IcAmount src/Dodge/Data/ItemAmount.hs 9;" t ImmediateEffect src/Loop/Data.hs 8;" C Importance src/Shape/Data.hs 34;" t @@ -1279,7 +1281,7 @@ ItInvEffect src/Dodge/Data/ItEffect.hs 13;" C 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 128;" t +ItZoom src/Dodge/Data/Item/Use.hs 129;" t Item src/Dodge/Data/Item.hs 33;" t Item src/Dodge/Base/Item.hs 1;" m Item src/Dodge/Data/Item.hs 6;" m @@ -1295,7 +1297,7 @@ ItemDimension src/Dodge/Data/Item/Misc.hs 13;" t ItemFamily src/Dodge/Item/Family.hs 3;" t ItemLocation src/Dodge/Data/Item/Location.hs 11;" t ItemModuleType src/Dodge/Combine/Data.hs 197;" t -ItemModuleType src/Dodge/Data/Item/Combine.hs 206;" t +ItemModuleType src/Dodge/Data/Item/Combine.hs 207;" t ItemParams src/Dodge/Data/Item/Params.hs 16;" t ItemParams src/Dodge/Tesla/ItemParams.hs 1;" m ItemScrollTimeFlow src/Dodge/Data/World.hs 61;" C @@ -1306,35 +1308,35 @@ ItemType src/Dodge/Data/Item/Combine.hs 16;" t ItemUnlocker src/Dodge/Lock/Data.hs 13;" C ItemUse src/Dodge/Data/Item/Use.hs 28;" t JETPACK src/Dodge/Combine/Data.hs 116;" C -JETPACK src/Dodge/Data/Item/Combine.hs 138;" C +JETPACK src/Dodge/Data/Item/Combine.hs 139;" C JGK src/Control/Foldl/JGK.hs 1;" m JUMPLEGS src/Dodge/Combine/Data.hs 115;" C -JUMPLEGS src/Dodge/Data/Item/Combine.hs 137;" C +JUMPLEGS src/Dodge/Data/Item/Combine.hs 138;" C JoinClust src/Dodge/Combine/Graph.hs 19;" 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 203;" C +KEYCARD src/Dodge/Data/Item/Combine.hs 204;" 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 Keyboard src/Dodge/Event/Keyboard.hs 2;" m Kill src/Dodge/Data/ActionPlan.hs 198;" C LASCIRCLE src/Dodge/Combine/Data.hs 169;" C -LASCIRCLE src/Dodge/Data/Item/Combine.hs 189;" C +LASCIRCLE src/Dodge/Data/Item/Combine.hs 190;" 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 188;" C +LASGUN src/Dodge/Data/Item/Combine.hs 189;" C LASWIDE src/Dodge/Combine/Data.hs 175;" C -LASWIDE src/Dodge/Data/Item/Combine.hs 191;" C +LASWIDE src/Dodge/Data/Item/Combine.hs 192;" C LAUNCHER src/Dodge/Combine/Data.hs 179;" C -LAUNCHER src/Dodge/Data/Item/Combine.hs 193;" C +LAUNCHER src/Dodge/Data/Item/Combine.hs 194;" C LAUNCHERX src/Dodge/Combine/Data.hs 180;" C -LAUNCHERX src/Dodge/Data/Item/Combine.hs 194;" C +LAUNCHERX src/Dodge/Data/Item/Combine.hs 195;" C LAUNCHHOME src/Dodge/Combine/Data.hs 217;" C -LAUNCHHOME src/Dodge/Data/Item/Combine.hs 217;" C +LAUNCHHOME src/Dodge/Data/Item/Combine.hs 218;" C LBlink src/Dodge/Data/Item/HeldUse.hs 63;" C LBoost src/Dodge/Data/Item/HeldUse.hs 65;" C LBranches src/TreeExtra.hs 24;" C @@ -1404,7 +1406,7 @@ LeftConsumption src/Dodge/Data/Item/Use/Consumption.hs 27;" 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 148;" t +LeftItemType src/Dodge/Data/Item/Combine.hs 149;" t LeftUse src/Dodge/Data/Item/Use.hs 39;" C LensHelp src/LensHelp.hs 1;" m Lethargic src/Dodge/Creature/AlertLevel/Data.hs 17;" C @@ -1481,29 +1483,29 @@ Lure src/Dodge/Data/ActionPlan.hs 179;" C Luse src/Dodge/Data/Item/HeldUse.hs 57;" t Luse src/Dodge/Luse.hs 1;" m MACHINEGUN src/Dodge/Combine/Data.hs 160;" C -MACHINEGUN src/Dodge/Data/Item/Combine.hs 180;" C +MACHINEGUN src/Dodge/Data/Item/Combine.hs 181;" C MACHINEPISTOL src/Dodge/Combine/Data.hs 138;" C -MACHINEPISTOL src/Dodge/Data/Item/Combine.hs 162;" C +MACHINEPISTOL src/Dodge/Data/Item/Combine.hs 163;" C MAGENTA src/Color/Data.hs 20;" C MAGNET src/Dodge/Combine/Data.hs 43;" C MAGNET src/Dodge/Data/Item/Combine.hs 47;" C MAGNETMAG src/Dodge/Combine/Data.hs 201;" C -MAGNETMAG src/Dodge/Data/Item/Combine.hs 208;" C +MAGNETMAG src/Dodge/Data/Item/Combine.hs 209;" C MAGNETTRAJ src/Dodge/Combine/Data.hs 210;" C MAGSHIELD src/Dodge/Combine/Data.hs 104;" C -MAGSHIELD src/Dodge/Data/Item/Combine.hs 126;" C +MAGSHIELD src/Dodge/Data/Item/Combine.hs 127;" 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 119;" C +MEDKIT src/Dodge/Data/Item/Combine.hs 120;" C MICROCHIP src/Dodge/Combine/Data.hs 47;" C MICROCHIP src/Dodge/Data/Item/Combine.hs 51;" C MICROPHONE src/Dodge/Data/Item/Combine.hs 63;" C MINIDISPLAY src/Dodge/Combine/Data.hs 50;" C MINIDISPLAY src/Dodge/Data/Item/Combine.hs 56;" C MINIGUNX src/Dodge/Combine/Data.hs 147;" C -MINIGUNX src/Dodge/Data/Item/Combine.hs 168;" C +MINIGUNX src/Dodge/Data/Item/Combine.hs 169;" 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 @@ -1513,7 +1515,7 @@ MP2Ac src/Dodge/Data/CreatureEffect.hs 56;" t MP2NoAction src/Dodge/Data/CreatureEffect.hs 56;" C MTRS src/Dodge/Annotation/Data.hs 11;" t MTree src/Dodge/Tree/Compose/Data.hs 8;" C -MULTIGUN src/Dodge/Data/Item/Combine.hs 170;" C +MULTIGUN src/Dodge/Data/Item/Combine.hs 171;" C Machine src/Dodge/Data/Machine.hs 31;" t Machine src/Dodge/Data/Machine.hs 6;" m Machine src/Dodge/Machine.hs 1;" m @@ -1592,29 +1594,29 @@ Misc src/Dodge/Data/Creature/Misc.hs 6;" m Misc src/Dodge/Data/Equipment/Misc.hs 6;" m Misc src/Dodge/Data/Item/Misc.hs 6;" m ModAutoMag src/Dodge/Combine/Data.hs 236;" C -ModAutoMag src/Dodge/Data/Item/Combine.hs 231;" C +ModAutoMag src/Dodge/Data/Item/Combine.hs 232;" C ModBattery src/Dodge/Combine/Data.hs 240;" C -ModBattery src/Dodge/Data/Item/Combine.hs 235;" C +ModBattery src/Dodge/Data/Item/Combine.hs 236;" C ModBullet src/Dodge/Combine/Data.hs 233;" C -ModBulletCollision src/Dodge/Data/Item/Combine.hs 228;" C -ModBulletPayload src/Dodge/Data/Item/Combine.hs 229;" C +ModBulletCollision src/Dodge/Data/Item/Combine.hs 229;" C +ModBulletPayload src/Dodge/Data/Item/Combine.hs 230;" C ModBulletSpawn src/Dodge/Combine/Data.hs 234;" C ModBulletTrajectory src/Dodge/Combine/Data.hs 238;" C -ModBulletTrajectory src/Dodge/Data/Item/Combine.hs 233;" C +ModBulletTrajectory src/Dodge/Data/Item/Combine.hs 234;" C ModDualBeam src/Dodge/Combine/Data.hs 242;" C -ModDualBeam src/Dodge/Data/Item/Combine.hs 237;" C +ModDualBeam src/Dodge/Data/Item/Combine.hs 238;" C ModHeldAttach src/Dodge/Combine/Data.hs 243;" C -ModHeldAttach src/Dodge/Data/Item/Combine.hs 238;" C +ModHeldAttach src/Dodge/Data/Item/Combine.hs 239;" C ModIDID src/Dodge/Data/Modification.hs 23;" C ModIDTimerPoint3Bool src/Dodge/Data/Modification.hs 15;" C ModLauncherHoming src/Dodge/Combine/Data.hs 239;" C -ModLauncherHoming src/Dodge/Data/Item/Combine.hs 234;" C +ModLauncherHoming src/Dodge/Data/Item/Combine.hs 235;" C ModRifleMag src/Dodge/Combine/Data.hs 235;" C -ModRifleMag src/Dodge/Data/Item/Combine.hs 230;" C +ModRifleMag src/Dodge/Data/Item/Combine.hs 231;" C ModTarget src/Dodge/Combine/Data.hs 237;" C -ModTarget src/Dodge/Data/Item/Combine.hs 232;" C +ModTarget src/Dodge/Data/Item/Combine.hs 233;" C ModTeleport src/Dodge/Combine/Data.hs 241;" C -ModTeleport src/Dodge/Data/Item/Combine.hs 236;" C +ModTeleport src/Dodge/Data/Item/Combine.hs 237;" C ModWithDirectedTeleport src/Dodge/Data/Item/HeldUse.hs 93;" C Modification src/Dodge/Data/Modification.hs 14;" t Modification src/Dodge/Data/Modification.hs 6;" m @@ -1625,7 +1627,7 @@ Module src/Dodge/Combine/Module.hs 1;" m Module src/Dodge/Item/Module.hs 1;" m Module src/Dodge/Module.hs 1;" m ModuleSlot src/Dodge/Combine/Data.hs 232;" t -ModuleSlot src/Dodge/Data/Item/Combine.hs 227;" t +ModuleSlot src/Dodge/Data/Item/Combine.hs 228;" t MonadHelp src/MonadHelp.hs 1;" m MountedLS src/Dodge/Data/MountedObject.hs 12;" C MountedObject src/Dodge/Data/MountedObject.hs 11;" t @@ -1649,7 +1651,7 @@ Music src/Music.hs 1;" m MusicData src/Music.hs 7;" t Mute src/Dodge/Data/Creature/Misc.hs 28;" C MuzFlare src/Dodge/Data/Flare.hs 15;" C -Muzzle src/Dodge/Data/Item/Use.hs 112;" t +Muzzle src/Dodge/Data/Item/Use.hs 113;" t MvForward src/Dodge/Data/ActionPlan.hs 35;" C MvPt src/Dodge/MvPt.hs 1;" m MvTurnToward src/Dodge/Data/ActionPlan.hs 34;" C @@ -1673,6 +1675,7 @@ Ngon src/Dodge/Room/Ngon.hs 1;" m NoAction src/Dodge/Data/ActionPlan.hs 152;" C NoAmmoPosition src/Dodge/Item/AmmoPosition.hs 11;" C NoArguments src/Dodge/Data/Terminal.hs 93;" C +NoAttachParams src/Dodge/Data/Item/Use.hs 80;" C NoBeamCombine src/Dodge/Data/Beam.hs 43;" C NoConcurrentEffect src/Loop/Data.hs 7;" C NoConsumption src/Dodge/Data/Item/Consumption.hs 33;" C @@ -1812,7 +1815,7 @@ OnSpecial src/Dodge/Equipment/Data.hs 24;" C OnTurret src/Dodge/Data/Item/Location.hs 13;" C OnceSound src/Dodge/Data/SoundOrigin.hs 15;" C OneArgument src/Dodge/Data/Terminal.hs 94;" C -OneHand src/Dodge/Data/Item/Use.hs 123;" C +OneHand src/Dodge/Data/Item/Use.hs 124;" C OnwardCluster src/Dodge/Data/RoomCluster.hs 14;" C OnwardCluster src/Dodge/RoomCluster/Data.hs 12;" C OnwardList src/Dodge/Annotation/Data.hs 15;" C @@ -1846,7 +1849,7 @@ PIERCING src/Dodge/Data/DamageType.hs 11;" C PIPE src/Dodge/Combine/Data.hs 27;" C PIPE src/Dodge/Data/Item/Combine.hs 30;" C PISTOL src/Dodge/Combine/Data.hs 135;" C -PISTOL src/Dodge/Data/Item/Combine.hs 161;" C +PISTOL src/Dodge/Data/Item/Combine.hs 162;" C PJDecTimMvVel src/Dodge/Data/Item/Use/Consumption/Ammo.hs 32;" C PJReduceSpin src/Dodge/Data/Ammo.hs 24;" C PJReduceSpin src/Dodge/Data/Item/Use/Consumption/Ammo.hs 28;" C @@ -1872,11 +1875,11 @@ 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 196;" C +POISONSPRAYER src/Dodge/Data/Item/Combine.hs 197;" C PORTABLEFUSION src/Dodge/Combine/Data.hs 61;" C PORTABLEFUSION src/Dodge/Data/Item/Combine.hs 68;" C POWERLEGS src/Dodge/Combine/Data.hs 113;" C -POWERLEGS src/Dodge/Data/Item/Combine.hs 135;" C +POWERLEGS src/Dodge/Data/Item/Combine.hs 136;" C PPLevelReset src/Dodge/Data/PressPlate.hs 16;" C PRISM src/Dodge/Combine/Data.hs 40;" C PRISM src/Dodge/Data/Item/Combine.hs 45;" C @@ -2003,7 +2006,7 @@ ProjectileCreate src/Dodge/Data/Ammo.hs 17;" t ProjectileCreate src/Dodge/Data/Item/Use/Consumption/Ammo.hs 21;" t ProjectileDraw src/Dodge/Data/Ammo.hs 14;" t ProjectileDraw src/Dodge/Data/Item/Use/Consumption/Ammo.hs 18;" t -ProjectileParams src/Dodge/Data/Item/Use.hs 82;" C +ProjectileParams src/Dodge/Data/Item/Use.hs 83;" C ProjectileUpdate src/Dodge/Data/Ammo.hs 20;" t ProjectileUpdate src/Dodge/Data/Item/Use/Consumption/Ammo.hs 24;" t Prop src/Dodge/Data/Prop.hs 18;" t @@ -2080,17 +2083,17 @@ 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 -REMOTELAUNCHER src/Dodge/Data/Item/Combine.hs 195;" C +REMOTELAUNCHER src/Dodge/Data/Item/Combine.hs 196;" C REPEATER src/Dodge/Combine/Data.hs 150;" C -REPEATER src/Dodge/Data/Item/Combine.hs 172;" C -REVOLVEMAG src/Dodge/Data/Item/Combine.hs 109;" C +REPEATER src/Dodge/Data/Item/Combine.hs 173;" C +REVOLVEMAG src/Dodge/Data/Item/Combine.hs 110;" 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 151;" C +REWINDWATCH src/Dodge/Data/Item/Combine.hs 152;" C RGBA src/Color/Data.hs 31;" t RIFLE src/Dodge/Combine/Data.hs 149;" C -RIFLE src/Dodge/Data/Item/Combine.hs 171;" C +RIFLE src/Dodge/Data/Item/Combine.hs 172;" C RLeaf src/TreeExtra.hs 49;" C ROSE src/Color/Data.hs 21;" C RPLinkStatus src/Dodge/Data/Room.hs 55;" t @@ -2207,33 +2210,33 @@ RunPast src/Dodge/Room/RunPast.hs 1;" m RunningSideEffect src/Dodge/Data/Universe.hs 65;" C SCRAPMETAL src/Dodge/Data/Item/Combine.hs 41;" C SCROLLATTACH src/Dodge/Data/Item/Combine.hs 98;" C -SCROLLWATCH src/Dodge/Data/Item/Combine.hs 152;" C +SCROLLWATCH src/Dodge/Data/Item/Combine.hs 153;" C SHARDGLASS src/Dodge/Combine/Data.hs 36;" C SHATTERGUN src/Dodge/Combine/Data.hs 186;" C -SHATTERGUN src/Dodge/Data/Item/Combine.hs 198;" C +SHATTERGUN src/Dodge/Data/Item/Combine.hs 199;" 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 113;" C +SHELLMAG src/Dodge/Data/Item/Combine.hs 114;" C SHRINKER src/Dodge/Combine/Data.hs 127;" C -SHRINKER src/Dodge/Data/Item/Combine.hs 155;" C +SHRINKER src/Dodge/Data/Item/Combine.hs 156;" C SIZEMODULE src/Dodge/Combine/Data.hs 74;" C SIZEMODULE src/Dodge/Data/Item/Combine.hs 78;" C SMG src/Dodge/Combine/Data.hs 140;" C -SMG src/Dodge/Data/Item/Combine.hs 164;" C +SMG src/Dodge/Data/Item/Combine.hs 165;" C SNIPERRIFLE src/Dodge/Combine/Data.hs 159;" C -SNIPERRIFLE src/Dodge/Data/Item/Combine.hs 179;" C +SNIPERRIFLE src/Dodge/Data/Item/Combine.hs 180;" C SOUNDSENSOR src/Dodge/Combine/Data.hs 55;" C SOUNDSENSOR src/Dodge/Data/Item/Combine.hs 61;" C SPARKGUN src/Dodge/Combine/Data.hs 166;" C -SPARKGUN src/Dodge/Data/Item/Combine.hs 186;" C +SPARKGUN src/Dodge/Data/Item/Combine.hs 187;" 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 156;" C +SPAWNER src/Dodge/Data/Item/Combine.hs 157;" C SPEEDLEGS src/Dodge/Combine/Data.hs 114;" C -SPEEDLEGS src/Dodge/Data/Item/Combine.hs 136;" C +SPEEDLEGS src/Dodge/Data/Item/Combine.hs 137;" C SPLITLAS src/Dodge/Combine/Data.hs 214;" C -SPLITLAS src/Dodge/Data/Item/Combine.hs 214;" C +SPLITLAS src/Dodge/Data/Item/Combine.hs 215;" C SPRING src/Dodge/Combine/Data.hs 30;" C SPRING src/Dodge/Data/Item/Combine.hs 33;" C SPic src/ShapePicture/Data.hs 4;" t @@ -2243,10 +2246,10 @@ SSSExtra src/Dodge/Data/SelectionList.hs 44;" t 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 -STATICLAS src/Dodge/Data/Item/Combine.hs 215;" C +STATICLAS src/Dodge/Data/Item/Combine.hs 216;" C STATICMODULE src/Dodge/Combine/Data.hs 65;" C STEELDRUM src/Dodge/Data/Item/Combine.hs 38;" C -STOPWATCH src/Dodge/Data/Item/Combine.hs 150;" C +STOPWATCH src/Dodge/Data/Item/Combine.hs 151;" C SameConstr src/SameConstr.hs 5;" m Save src/Dodge/Save.hs 1;" m SaveSlot src/Dodge/Data/SaveSlot.hs 9;" t @@ -2267,9 +2270,9 @@ ScreenPos src/Dodge/Data/ScreenPos.hs 9;" t ScreenPos src/Dodge/Data/ScreenPos.hs 3;" m ScreenPos src/Dodge/ScreenPos.hs 1;" m Scroll src/Dodge/Update/Scroll.hs 1;" m -ScrollAttachParams src/Dodge/Data/Item/Use.hs 89;" t +ScrollAttachParams src/Dodge/Data/Item/Use.hs 90;" t ScrollAttachParams src/Dodge/Data/Item/Use.hs 78;" C -ScrollAttachType src/Dodge/Data/Item/Combine.hs 104;" t +ScrollAttachType src/Dodge/Data/Item/Combine.hs 105;" t ScrollValue src/Dodge/ScrollValue.hs 1;" m SecretCabal src/Dodge/Data/Scenario.hs 44;" C SectionCursor src/Dodge/Data/SelectionList.hs 49;" t @@ -2484,9 +2487,9 @@ SwitchToItem src/Dodge/Data/ActionPlan.hs 38;" C Synonyms src/Dodge/SoundLogic/Synonyms.hs 1;" m TAPE src/Dodge/Data/Item/Combine.hs 35;" C TARGCR src/Dodge/Combine/Data.hs 207;" C -TARGET src/Dodge/Data/Item/Combine.hs 212;" C +TARGET src/Dodge/Data/Item/Combine.hs 213;" C TARGETATTACH src/Dodge/Data/Item/Combine.hs 99;" C -TARGETINGHAT src/Dodge/Data/Item/Combine.hs 133;" C +TARGETINGHAT src/Dodge/Data/Item/Combine.hs 134;" C TARGETLASER src/Dodge/Data/Item/Targeting.hs 12;" C TARGETMODULE src/Dodge/Data/Item/Combine.hs 80;" C TARGLAS src/Dodge/Combine/Data.hs 208;" C @@ -2494,7 +2497,7 @@ TARGPOS src/Dodge/Combine/Data.hs 209;" C TELEPORTMODULE src/Dodge/Combine/Data.hs 72;" C TELEPORTMODULE src/Dodge/Data/Item/Combine.hs 76;" C TESLAGUN src/Dodge/Combine/Data.hs 167;" C -TESLAGUN src/Dodge/Data/Item/Combine.hs 187;" C +TESLAGUN src/Dodge/Data/Item/Combine.hs 188;" C THERMOMETER src/Dodge/Combine/Data.hs 41;" C THERMOMETER src/Dodge/Data/Item/Combine.hs 64;" C THREELINES src/Dodge/Data/GenParams.hs 20;" C @@ -2502,17 +2505,17 @@ TIMEMODULE src/Dodge/Combine/Data.hs 73;" C TIMEMODULE src/Dodge/Data/Item/Combine.hs 77;" C TIN src/Dodge/Combine/Data.hs 33;" C TIN src/Dodge/Data/Item/Combine.hs 37;" C -TINMAG src/Dodge/Data/Item/Combine.hs 110;" C +TINMAG src/Dodge/Data/Item/Combine.hs 111;" 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 201;" C +TORCH src/Dodge/Data/Item/Combine.hs 202;" C TORQUEDAM src/Dodge/Data/DamageType.hs 22;" C TRACTORGUN src/Dodge/Combine/Data.hs 178;" C -TRACTORGUN src/Dodge/Data/Item/Combine.hs 192;" C +TRACTORGUN src/Dodge/Data/Item/Combine.hs 193;" C TRANSFORMER src/Dodge/Combine/Data.hs 39;" C TRANSFORMER src/Dodge/Data/Item/Combine.hs 44;" C TRANSMITTER src/Dodge/Combine/Data.hs 46;" C @@ -2701,13 +2704,13 @@ TweakTractionPower src/Dodge/Data/Item/Tweak.hs 22;" C TweakType src/Dodge/Data/Item/Tweak.hs 20;" t Tweakable src/Dodge/Data/Item/Tweak.hs 15;" C TwistGoal src/Dodge/Data/Scenario.hs 15;" C -TwoHandFlat src/Dodge/Data/Item/Use.hs 122;" C -TwoHandOver src/Dodge/Data/Item/Use.hs 121;" C -TwoHandUnder src/Dodge/Data/Item/Use.hs 120;" C +TwoHandFlat src/Dodge/Data/Item/Use.hs 123;" C +TwoHandOver src/Dodge/Data/Item/Use.hs 122;" C +TwoHandUnder src/Dodge/Data/Item/Use.hs 121;" C Type src/Dodge/Data/Damage/Type.hs 6;" m Typical src/Shape/Data.hs 36;" C UPtLayer src/Dodge/Picture/Layer/Data.hs 16;" C -UncomposableCI src/Dodge/Data/ComposedItem.hs 15;" C +UncomposableCI src/Dodge/Data/ComposedItem.hs 17;" C Uncursed src/Dodge/Data/Item/CurseStatus.hs 12;" C Uncursed src/Dodge/Item/Data.hs 8;" C UnderGround src/Dodge/Data/Scenario.hs 78;" C @@ -2768,7 +2771,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 169;" C +VOLLEYGUN src/Dodge/Data/Item/Combine.hs 170;" C VariableRate src/Dodge/Data/Item/HeldDelay.hs 18;" C VariableRate src/Dodge/Data/Item/Use/Delay.hs 16;" C VariableRate src/Dodge/Data/Item/UseDelay.hs 16;" C @@ -2795,15 +2798,15 @@ Vocalization src/Dodge/Creature/Vocalization.hs 1;" m Volition src/Dodge/Creature/Volition.hs 2;" m VolleyGunMod src/Dodge/Data/Item/HeldUse.hs 86;" C WALLDETECTOR src/Dodge/Combine/Data.hs 227;" C -WALLDETECTOR src/Dodge/Data/Item/Combine.hs 224;" C +WALLDETECTOR src/Dodge/Data/Item/Combine.hs 225;" C WASD src/Dodge/WASD.hs 1;" m WEPTELE src/Dodge/Combine/Data.hs 216;" C -WEPTELE src/Dodge/Data/Item/Combine.hs 216;" C +WEPTELE src/Dodge/Data/Item/Combine.hs 217;" C WHITE src/Color/Data.hs 27;" C WIRE src/Dodge/Combine/Data.hs 58;" C WIRE src/Dodge/Data/Item/Combine.hs 66;" C WRISTARMOUR src/Dodge/Combine/Data.hs 107;" C -WRISTARMOUR src/Dodge/Data/Item/Combine.hs 129;" C +WRISTARMOUR src/Dodge/Data/Item/Combine.hs 130;" 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 @@ -2870,6 +2873,7 @@ WdYouPos src/Dodge/Data/WorldEffect.hs 39;" C Weapon src/Dodge/Default/Weapon.hs 1;" m Weapon src/Dodge/Item/Weapon.hs 2;" m WeaponCI src/Dodge/Data/ComposedItem.hs 13;" C +WeaponScopeCI src/Dodge/Data/ComposedItem.hs 14;" C Weapons src/Dodge/Item/Held/Weapons.hs 1;" m West src/Dodge/Data/CardinalPoint.hs 7;" C WinScale src/Dodge/Base/WinScale.hs 1;" m @@ -2902,7 +2906,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 105;" C +ZOOMSCOPE src/Dodge/Data/Item/Combine.hs 106;" 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 @@ -2917,7 +2921,7 @@ Zoning src/Dodge/Zoning.hs 1;" m ZoomScope src/Dodge/Data/Item/Attachment.hs 30;" C ZoomScope src/Dodge/Item/Attachment/Data.hs 31;" C ZoomScope src/Dodge/Item/Weapon/ZoomScope.hs 1;" m -ZoomScrollParams src/Dodge/Data/Item/Use.hs 90;" C +ZoomScrollParams src/Dodge/Data/Item/Use.hs 91;" C __Just' src/MaybeHelp.hs 13;" f _actAction src/Dodge/Data/ActionPlan.hs 81;" f _actLabel src/Dodge/Data/ActionPlan.hs 80;" f @@ -2927,13 +2931,13 @@ _actionSound src/Dodge/Data/LoadAction.hs 11;" f _actionSound src/Dodge/Data/LoadAction.hs 14;" f _actionTime src/Dodge/Data/LoadAction.hs 11;" f _actionTime src/Dodge/Data/LoadAction.hs 14;" f -_aimHandlePos src/Dodge/Data/Item/Use.hs 107;" f -_aimMuzzles src/Dodge/Data/Item/Use.hs 108;" f -_aimRange src/Dodge/Data/Item/Use.hs 104;" f -_aimStance src/Dodge/Data/Item/Use.hs 106;" f -_aimTurnSpeed src/Dodge/Data/Item/Use.hs 103;" f -_aimWeight src/Dodge/Data/Item/Use.hs 102;" f -_aimZoom src/Dodge/Data/Item/Use.hs 105;" f +_aimHandlePos src/Dodge/Data/Item/Use.hs 108;" f +_aimMuzzles src/Dodge/Data/Item/Use.hs 109;" f +_aimRange src/Dodge/Data/Item/Use.hs 105;" f +_aimStance src/Dodge/Data/Item/Use.hs 107;" f +_aimTurnSpeed src/Dodge/Data/Item/Use.hs 104;" f +_aimWeight src/Dodge/Data/Item/Use.hs 103;" f +_aimZoom src/Dodge/Data/Item/Use.hs 106;" f _allocNewPos src/Dodge/Data/RightButtonOptions.hs 21;" f _allocNewPos src/Dodge/Data/RightButtonOptions.hs 24;" f _allocNewPos src/Dodge/Data/RightButtonOptions.hs 28;" f @@ -2958,11 +2962,11 @@ _amagLoadStatus src/Dodge/Data/Item/Use.hs 59;" f _amagParams src/Dodge/Data/Item/Use.hs 60;" f _amagType src/Dodge/Data/Item/Use.hs 61;" f _ambushTarget src/Dodge/Data/ActionPlan.hs 178;" f -_ampBullet src/Dodge/Data/Item/Use.hs 81;" f -_ampCreateGas src/Dodge/Data/Item/Use.hs 87;" f -_ampPayload src/Dodge/Data/Item/Use.hs 83;" f -_ampPjCreation src/Dodge/Data/Item/Use.hs 85;" f -_ampPjDraw src/Dodge/Data/Item/Use.hs 84;" f +_ampBullet src/Dodge/Data/Item/Use.hs 82;" f +_ampCreateGas src/Dodge/Data/Item/Use.hs 88;" f +_ampPayload src/Dodge/Data/Item/Use.hs 84;" f +_ampPjCreation src/Dodge/Data/Item/Use.hs 86;" f +_ampPjDraw src/Dodge/Data/Item/Use.hs 85;" f _amposDir src/Dodge/Item/AmmoPosition.hs 9;" f _amposPos src/Dodge/Item/AmmoPosition.hs 9;" f _apAction src/Dodge/Data/ActionPlan.hs 20;" f @@ -3471,8 +3475,8 @@ _impulseUseAheadPos src/Dodge/Data/ActionPlan.hs 56;" f _impulseUseTarget src/Dodge/Data/ActionPlan.hs 53;" f _impulseUseTargetCID src/Dodge/Data/ActionPlan.hs 50;" f _impulsesListList src/Dodge/Data/ActionPlan.hs 98;" f -_imtBulletTrajectoryType src/Dodge/Data/Item/Combine.hs 211;" f -_imtTargetType src/Dodge/Data/Item/Combine.hs 212;" f +_imtBulletTrajectoryType src/Dodge/Data/Item/Combine.hs 212;" f +_imtTargetType src/Dodge/Data/Item/Combine.hs 213;" f _inInventory src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 21;" f _inNearby src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 23;" f _input src/Dodge/Data/World.hs 43;" f @@ -3517,9 +3521,9 @@ _iyBase src/Dodge/Data/Item/Combine.hs 17;" f _iyModules src/Dodge/Combine/Data.hs 14;" f _iyModules src/Dodge/Data/Item/Combine.hs 18;" f _iyStack src/Dodge/Combine/Data.hs 15;" f -_izFac src/Dodge/Data/Item/Use.hs 131;" f -_izMax src/Dodge/Data/Item/Use.hs 129;" f -_izMin src/Dodge/Data/Item/Use.hs 130;" f +_izFac src/Dodge/Data/Item/Use.hs 132;" f +_izMax src/Dodge/Data/Item/Use.hs 130;" f +_izMin src/Dodge/Data/Item/Use.hs 131;" f _killTarget src/Dodge/Data/ActionPlan.hs 198;" f _lClock src/Dodge/Data/LWorld.hs 145;" f _lWorld src/Dodge/Data/CWorld.hs 26;" f @@ -3644,9 +3648,9 @@ _mvSpeed src/Dodge/Data/Creature/Misc.hs 39;" f _mvToPoint src/Dodge/Data/Creature.hs 98;" f _mvTurnJit src/Dodge/Data/Creature/Misc.hs 43;" f _mvTurnRad src/Dodge/Data/Creature/Misc.hs 42;" f -_mzInaccuracy src/Dodge/Data/Item/Use.hs 115;" f -_mzPos src/Dodge/Data/Item/Use.hs 113;" f -_mzRot src/Dodge/Data/Item/Use.hs 114;" f +_mzInaccuracy src/Dodge/Data/Item/Use.hs 116;" f +_mzPos src/Dodge/Data/Item/Use.hs 114;" f +_mzRot src/Dodge/Data/Item/Use.hs 115;" f _newArcStep src/Dodge/Data/Item/Params.hs 57;" f _newBeams src/Dodge/Data/LWorld.hs 114;" f _noClip src/Dodge/Debug/Flag/Data.hs 7;" f @@ -3670,9 +3674,9 @@ _opPlacement src/Dodge/Data/GenWorld.hs 129;" f _opPlacementID src/Dodge/Data/GenWorld.hs 130;" f _opSel src/Dodge/Data/RightButtonOptions.hs 15;" f _opTexture src/Dodge/Data/Wall.hs 42;" f -_opticDefaultZoom src/Dodge/Data/Item/Use.hs 96;" f -_opticPos src/Dodge/Data/Item/Use.hs 92;" f -_opticZoom src/Dodge/Data/Item/Use.hs 95;" f +_opticDefaultZoom src/Dodge/Data/Item/Use.hs 97;" f +_opticPos src/Dodge/Data/Item/Use.hs 93;" f +_opticZoom src/Dodge/Data/Item/Use.hs 96;" f _paramMID src/Dodge/Data/Item/Params.hs 60;" f _partialAction src/Dodge/Data/ActionPlan.hs 145;" f _pastWorlds src/Dodge/Data/World.hs 38;" f @@ -3944,7 +3948,7 @@ _scopeZoomChange src/Dodge/Item/Attachment/Data.hs 33;" f _screenTextureVAO src/Data/Preload/Render.hs 50;" f _scrollAmount src/Dodge/Data/Input.hs 24;" f _scrollAttachParams src/Dodge/Data/Item/Use.hs 78;" f -_scrollChar src/Dodge/Data/Item/Use.hs 99;" f +_scrollChar src/Dodge/Data/Item/Use.hs 100;" f _scrollItemLocation src/Dodge/Data/World.hs 65;" f _scrollItemLocation src/Dodge/Data/World.hs 74;" f _scrollItemLocation src/Dodge/Data/World.hs 78;" f @@ -4273,11 +4277,11 @@ _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 160;" f -_xNum src/Dodge/Data/Item/Combine.hs 167;" f -_xNum src/Dodge/Data/Item/Combine.hs 170;" f -_xNum src/Dodge/Data/Item/Combine.hs 191;" f -_xNum src/Dodge/Data/Item/Combine.hs 194;" f +_xNum src/Dodge/Data/Item/Combine.hs 161;" f +_xNum src/Dodge/Data/Item/Combine.hs 168;" f +_xNum src/Dodge/Data/Item/Combine.hs 171;" f +_xNum src/Dodge/Data/Item/Combine.hs 192;" f +_xNum src/Dodge/Data/Item/Combine.hs 195;" 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 +4310,6 @@ aTreeStrut src/Dodge/Tree/GenerateStructure.hs 37;" f aWallPulse src/Dodge/Item/Weapon/UseEffect.hs 21;" f accessTerminal src/Dodge/WorldEffect.hs 48;" f activeTargetCursorPic src/Dodge/Targeting/Draw.hs 48;" f -addAmmoClip src/Dodge/Item/Draw/SPic.hs 22;" 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 @@ -4386,7 +4389,7 @@ amr src/Dodge/Item/Weapon/BulletGun/Rod.hs 56;" f anItemFindPulse src/Dodge/Item/Weapon/UseEffect.hs 25;" f analyser src/Dodge/Placement/Instance/Analyser.hs 12;" f analyserByDoor src/Dodge/Room/LasTurret.hs 75;" f -andOrRegex src/Dodge/DisplayInventory.hs 78;" f +andOrRegex src/Dodge/DisplayInventory.hs 79;" f angleBetween src/Geometry.hs 145;" f angleVV src/Geometry/Vector.hs 57;" f angleVV3 src/Geometry/Vector3D.hs 122;" f @@ -4501,7 +4504,7 @@ baseAMRShape src/Dodge/Item/Draw/SPic.hs 445;" 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 -baseCI src/Dodge/Item/Grammar.hs 25;" f +baseCI src/Dodge/Item/Grammar.hs 27;" f baseCaneShape src/Dodge/Item/Draw/SPic.hs 251;" f baseComposedItem src/Dodge/Item/Grammar.hs 19;" f baseDebris src/Dodge/Block/Debris.hs 122;" f @@ -4614,6 +4617,7 @@ bulletBodyCraft src/Dodge/Item/Craftable.hs 24;" f bulletCombinations src/Dodge/Combine/Graph.hs 35;" f bulletMagazines src/Dodge/Combine/Combinations.hs 239;" f bulletSpawn src/Dodge/Bullet.hs 91;" f +bulletSynthesizer src/Dodge/Item/Ammo.hs 75;" f bulletTypes src/Dodge/TweakBullet.hs 26;" f bulletWeapons src/Dodge/Combine/Combinations.hs 247;" f burstRifle src/Dodge/Item/Held/Cane.hs 86;" f @@ -4665,7 +4669,7 @@ checkEndGame src/Dodge/Update.hs 577;" 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 17;" f +checkInvSlotsYou src/Dodge/Inventory/CheckSlots.hs 15;" f checkTermDist src/Dodge/Update.hs 281;" f checkWallLeft src/Dodge/LevelGen/StaticWalls/Deprecated.hs 29;" f checkWallRight src/Dodge/LevelGen/StaticWalls.hs 54;" f @@ -4821,7 +4825,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 39;" f +crInvSize src/Dodge/Inventory/CheckSlots.hs 37;" 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 @@ -4834,7 +4838,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 36;" f +crNumFreeSlots src/Dodge/Inventory/CheckSlots.hs 34;" f crOnWall src/Dodge/WallCreatureCollisions.hs 84;" f crReloadToggle src/Dodge/Reloading.hs 45;" f crSafeDistFromTarg src/Dodge/Creature/Test.hs 67;" f @@ -5131,7 +5135,7 @@ displayConfig src/Dodge/Menu.hs 196;" f displayControls src/Dodge/Menu.hs 206;" f displayEnergyBallType src/Dodge/Module/Info.hs 19;" f displayFrameTicks src/Dodge/Render/Picture.hs 27;" f -displayFreeSlots src/Dodge/DisplayInventory.hs 156;" f +displayFreeSlots src/Dodge/DisplayInventory.hs 159;" f displayTerminal src/Dodge/Render/HUD.hs 211;" f displayTerminalLineString src/Dodge/Update.hs 325;" f dist src/Geometry/Vector.hs 179;" f @@ -5382,7 +5386,7 @@ encircleCloseP src/Dodge/Creature/Boid.hs 35;" f encircleDistP src/Dodge/Creature/Boid.hs 21;" f encircleP src/Dodge/Creature/Boid.hs 27;" f energyBallCraft src/Dodge/Item/Craftable.hs 18;" f -enterCombineInv src/Dodge/DisplayInventory.hs 266;" f +enterCombineInv src/Dodge/DisplayInventory.hs 269;" f eqConstr src/SameConstr.hs 17;" f eqPosText src/Dodge/Equipment/Text.hs 6;" f equipAimSpeed src/Dodge/Creature/Action/Movement.hs 109;" f @@ -5446,7 +5450,7 @@ findBoundDists src/Dodge/Update/Camera.hs 256;" 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 27;" f +findItemSlot src/Dodge/Inventory/CheckSlots.hs 25;" f findReverseEdge src/Polyhedra.hs 49;" f findReverseEdgeList src/Polyhedra.hs 56;" f findWallFreeDropPoint src/Dodge/FloorItem.hs 47;" f @@ -5483,7 +5487,7 @@ flatShieldEquipSPic src/Dodge/Item/Draw/SPic.hs 489;" f flatV2 src/Picture/Data.hs 65;" f flatV3 src/Picture/Data.hs 68;" f flatV4 src/Picture/Data.hs 71;" f -flattenDT src/Dodge/Item/Grammar.hs 107;" f +flattenDT src/Dodge/Item/Grammar.hs 109;" f flattenIMIMIM src/Dodge/Base/Zone.hs 246;" f fleeFrom src/Dodge/CreatureEffect.hs 119;" f fleeFromTarget src/Dodge/CreatureEffect.hs 65;" f @@ -5671,7 +5675,7 @@ hatCombinations src/Dodge/Combine/Combinations.hs 33;" f head src/DoubleStack.hs 14;" f headLamp src/Dodge/Item/Equipment.hs 118;" f headLampShape src/Dodge/Item/Draw/SPic.hs 495;" f -headMap src/Dodge/Item/Grammar.hs 78;" f +headMap src/Dodge/Item/Grammar.hs 80;" f heal src/Dodge/Item/Consumable.hs 17;" f heal25 src/Dodge/Item/Consumable.hs 14;" f healS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 354;" f @@ -5709,9 +5713,9 @@ hvBulDams src/Dodge/Particle/Damage.hs 13;" f hvBulHitCr src/Dodge/Particle/Bullet/HitEffect.hs 17;" f hvBulHitWall src/Dodge/Particle/Bullet/HitEffect.hs 54;" f hvBulletAmmo src/Dodge/Item/Weapon/Bullet.hs 31;" f -iDTL src/Dodge/Item/Grammar.hs 92;" f -iDTR src/Dodge/Item/Grammar.hs 97;" f -iDTboth src/Dodge/Item/Grammar.hs 102;" f +iDTL src/Dodge/Item/Grammar.hs 94;" f +iDTR src/Dodge/Item/Grammar.hs 99;" f +iDTboth src/Dodge/Item/Grammar.hs 104;" f iShape src/Dodge/Placement/Instance/LightSource.hs 74;" f iShape src/Dodge/Placements/LightSource.hs 32;" f icosahedronPoints src/Polyhedra/Geodesic.hs 11;" f @@ -5731,8 +5735,8 @@ incBallAt src/Dodge/EnergyBall.hs 54;" f incendiaryModule src/Dodge/Item/Craftable.hs 21;" f incidenceToFunction src/Dodge/Graph.hs 26;" f indefiniteExceptions src/StringHelp.hs 29;" f -indentDoubleTreeWith src/Dodge/Item/Grammar.hs 87;" f -indentInv src/Dodge/Item/Grammar.hs 110;" f +indentDoubleTreeWith src/Dodge/Item/Grammar.hs 89;" f +indentInv src/Dodge/Item/Grammar.hs 120;" f initCrItemLocation src/Dodge/Item/Location/Initialize.hs 39;" f initCrItemLocations src/Dodge/Item/Location/Initialize.hs 34;" f initCrsItemLocations src/Dodge/Item/Location/Initialize.hs 14;" f @@ -5799,14 +5803,15 @@ intersectSegsSeg src/Geometry/Intersect.hs 232;" f intervalList src/Geometry.hs 315;" f interweave src/Justify.hs 17;" f intsToPos src/Dodge/Room/Modify/Girder.hs 160;" f -invDimColor src/Dodge/DisplayInventory.hs 137;" f +invDimColor src/Dodge/DisplayInventory.hs 140;" f invDimColor src/Dodge/Inventory/Color.hs 4;" f invDisplayParams src/Dodge/ListDisplayParams.hs 29;" f invHead src/Dodge/Render/HUD.hs 276;" f invSelectionItem src/Dodge/Inventory/SelectionList.hs 16;" f invShiftPointBy src/Dodge/ShiftPoint.hs 8;" f invSideEff src/Dodge/Creature/State.hs 232;" f -invSize src/Dodge/Inventory/CheckSlots.hs 42;" f +invSize src/Dodge/Inventory/CheckSlots.hs 40;" f +invTree src/Dodge/Item/Grammar.hs 116;" f inventoryX src/Dodge/Creature.hs 115;" f inverseShockwaveAt src/Dodge/WorldEvent/Shockwave.hs 43;" f invertEncircleDistP src/Dodge/Creature/Boid.hs 13;" f @@ -5860,15 +5865,14 @@ itemEquipPict src/Dodge/Item/Draw.hs 17;" f itemFromAmmoMag src/Dodge/Item.hs 29;" f itemFromAttachType src/Dodge/Item.hs 38;" f itemFromBase src/Dodge/Item.hs 19;" f -itemFromConsumableType src/Dodge/Item.hs 44;" f -itemFromEquipType src/Dodge/Item.hs 49;" f +itemFromConsumableType src/Dodge/Item.hs 45;" f +itemFromEquipType src/Dodge/Item.hs 50;" f itemFromHeldType src/Dodge/Item/Held.hs 25;" f -itemFromLeftType src/Dodge/Item.hs 71;" f -itemHeldAmmoPic src/Dodge/Item/Draw/SPic.hs 19;" f +itemFromLeftType src/Dodge/Item.hs 72;" f itemInfo src/Dodge/Item/Info.hs 10;" f itemInvColor src/Dodge/Item/InventoryColor.hs 7;" f itemInvSideEffect src/Dodge/Creature/State.hs 245;" f -itemNumberDisplay src/Dodge/Item/Display.hs 118;" f +itemNumberDisplay src/Dodge/Item/Display.hs 119;" f itemRooms src/Dodge/LockAndKey.hs 41;" f itemSPic src/Dodge/Item/Draw/SPic.hs 27;" f itemString src/Dodge/Item/Display.hs 72;" f @@ -5886,10 +5890,10 @@ 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 -joinItems src/Dodge/Item/Grammar.hs 29;" f -joinItems' src/Dodge/Item/Grammar.hs 42;" f -joinItems'' src/Dodge/Item/Grammar.hs 55;" f -joinItemsInList src/Dodge/Item/Grammar.hs 69;" f +joinItems src/Dodge/Item/Grammar.hs 31;" f +joinItems' src/Dodge/Item/Grammar.hs 44;" f +joinItems'' src/Dodge/Item/Grammar.hs 57;" f +joinItemsInList src/Dodge/Item/Grammar.hs 71;" f jps0' src/Dodge/LevelGen/Data.hs 60;" f jps0' src/Dodge/LevelGen/PlacementHelper.hs 60;" f jps0PushPS src/Dodge/LevelGen/Data.hs 63;" f @@ -5939,7 +5943,7 @@ lasTurret src/Dodge/Placement/Instance/Turret.hs 23;" f lasTurret src/Dodge/Placements/Turret.hs 29;" f lasWide src/Dodge/Item/Held/BatteryGuns.hs 97;" f lasWideRate src/Dodge/HeldUse.hs 353;" f -lastMap src/Dodge/Item/Grammar.hs 82;" f +lastMap src/Dodge/Item/Grammar.hs 84;" f latchkey src/Dodge/Item/Held/Utility.hs 23;" f latchkey src/Dodge/Item/PassKey.hs 14;" f launcher src/Dodge/Item/Held/Launcher.hs 10;" f @@ -6132,11 +6136,11 @@ maybeDestroyBlock src/Dodge/Wall/Damage.hs 26;" f maybeDestroyDoor src/Dodge/Wall/Damage.hs 31;" f maybeExitCombine src/Dodge/Update/Input/InGame.hs 258;" f maybeOpenTerminal src/Dodge/Update.hs 113;" f -maybeRateStatus src/Dodge/Item/Display.hs 198;" f +maybeRateStatus src/Dodge/Item/Display.hs 199;" 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 188;" f +maybeWarmupStatus src/Dodge/Item/Display.hs 189;" 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 @@ -6366,7 +6370,7 @@ optionScreenUpdate src/Dodge/Update/Input/ScreenLayer.hs 39;" f optionValueOffset src/Dodge/Menu/Option.hs 107;" f optionsOptions src/Dodge/Menu.hs 108;" f optionsToSelections src/Dodge/Menu/Option.hs 59;" f -orRegex src/Dodge/DisplayInventory.hs 81;" f +orRegex src/Dodge/DisplayInventory.hs 82;" f orange src/Color.hs 25;" f orderAround3 src/Geometry/Vector3D.hs 105;" f orderAroundFirst src/Geometry/Polygon.hs 74;" f @@ -6396,7 +6400,7 @@ overlapCircWalls src/Dodge/Base/Collide.hs 137;" f overlapCircWallsClosest src/Dodge/Base/Collide.hs 168;" f overlapSegCrs src/Dodge/Base/Collide.hs 58;" f overlapSegWalls src/Dodge/Base/Collide.hs 119;" f -overlapSelectionItems src/Dodge/DisplayInventory.hs 252;" f +overlapSelectionItems src/Dodge/DisplayInventory.hs 255;" f overrideInternal src/Dodge/Creature/ReaderUpdate.hs 172;" f overrideMeleeCloseTarget src/Dodge/Creature/ReaderUpdate.hs 33;" f overwriteLabel src/Dodge/Tree/Compose.hs 31;" f @@ -6490,7 +6494,7 @@ placeSpotRoomRand src/Dodge/Placement/PlaceSpot.hs 78;" f placeSpotUsingLink src/Dodge/Placement/PlaceSpot.hs 59;" f placeString src/Dodge/Render/MenuScreen.hs 54;" f placeWallPoly src/Dodge/Placement/PlaceSpot.hs 154;" f -plainRegex src/Dodge/DisplayInventory.hs 153;" f +plainRegex src/Dodge/DisplayInventory.hs 156;" f plainShellCollisionCheck src/Dodge/Projectile/Update.hs 45;" f plateCraft src/Dodge/Item/Craftable.hs 47;" f playIfFree src/Sound.hs 136;" f @@ -6604,6 +6608,7 @@ prependTwo src/Geometry.hs 165;" f pressedMBEffects src/Dodge/Update/UsingInput.hs 27;" f pressedMBEffectsNoInventory src/Dodge/Update/UsingInput.hs 40;" f pressedMBEffectsTopInventory src/Dodge/Creature/YourControl.hs 206;" f +prettyDT src/Dodge/Item/Grammar.hs 112;" f primeS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 422;" f printColumnTitles src/Dodge/Tree/Shift.hs 142;" f printColumns src/Dodge/Tree/Shift.hs 132;" f @@ -6775,7 +6780,7 @@ reflectInParam src/Geometry.hs 233;" f reflectLaserAlong src/Dodge/Item/Weapon/LaserPath.hs 13;" f refract src/Dodge/Item/Weapon/LaserPath.hs 40;" f refreshOptionsSelectionList src/Dodge/Menu/Option.hs 34;" f -regexCombs src/Dodge/DisplayInventory.hs 68;" f +regexCombs src/Dodge/DisplayInventory.hs 69;" f regexFocus src/Dodge/InputFocus.hs 46;" f regexIn src/Regex.hs 4;" f regexList src/Regex.hs 7;" f @@ -7137,17 +7142,17 @@ shoulderHeight src/Dodge/Item/HeldOffset.hs 60;" f shoulderSH src/Dodge/Creature/Picture.hs 170;" f shoulderSP src/Dodge/Creature/HandPos.hs 196;" f showAttachItem src/Dodge/Item/Display.hs 87;" f -showAutoRechargeProgress src/Dodge/Item/Display.hs 97;" f -showEquipItem src/Dodge/Item/Display.hs 92;" f -showEquipmentNumber src/Dodge/Item/Display.hs 134;" f +showAutoRechargeProgress src/Dodge/Item/Display.hs 98;" f +showEquipItem src/Dodge/Item/Display.hs 93;" f +showEquipmentNumber src/Dodge/Item/Display.hs 135;" f showInt src/Dodge/Item/Info.hs 30;" f showIntKMG src/Dodge/Item/Info.hs 47;" f showIntKMG' src/Dodge/Item/Info.hs 54;" f showIntsString src/Dodge/Tree/Compose.hs 129;" f -showLoadedAmount src/Dodge/Item/Display.hs 157;" f +showLoadedAmount src/Dodge/Item/Display.hs 158;" f showPhaseV src/Dodge/Tweak/Show.hs 16;" f showTerminalError src/Dodge/Debug/Terminal.hs 75;" f -showTimeFlow src/Dodge/TestString.hs 59;" f +showTimeFlow src/Dodge/TestString.hs 56;" f showTractionPower src/Dodge/Tweak/Show.hs 22;" f showTweak src/Dodge/Tweak/Show.hs 5;" f shrinkGun src/Dodge/Item/Weapon/Utility.hs 44;" f @@ -7285,7 +7290,7 @@ ssfold src/FoldableHelp.hs 104;" 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 268;" f +stackedInventory src/Dodge/Creature.hs 269;" f startCr src/Dodge/Creature.hs 91;" f startCrafts src/Dodge/Room/Start.hs 102;" f startInvList src/Dodge/Creature.hs 109;" f @@ -7399,7 +7404,7 @@ 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 244;" f +testInventory src/Dodge/Creature.hs 245;" f testPic src/Dodge/Render/ShapePicture.hs 153;" f testStringInit src/Dodge/TestString.hs 21;" f text src/Picture/Base.hs 192;" f @@ -7457,7 +7462,7 @@ toTopLeft src/Dodge/Render/List.hs 185;" f toV2 src/Geometry/Data.hs 36;" f toV3 src/Geometry/Data.hs 38;" f toV4 src/Geometry/Data.hs 40;" f -toggleCombineInv src/Dodge/DisplayInventory.hs 31;" f +toggleCombineInv src/Dodge/DisplayInventory.hs 32;" f toggleCommand src/Dodge/Terminal.hs 194;" f toggleEquipmentAt src/Dodge/Creature/Impulse/UseItem.hs 59;" f toggleJust src/MaybeHelp.hs 41;" f @@ -7626,14 +7631,14 @@ updateCamera src/Dodge/Update/Camera.hs 32;" f updateCloseObjects src/Dodge/Inventory.hs 166;" f updateCloud src/Dodge/Update.hs 605;" f updateClouds src/Dodge/Update.hs 454;" f -updateCombinePositioning src/Dodge/DisplayInventory.hs 36;" f -updateCombineSections src/Dodge/DisplayInventory.hs 41;" f +updateCombinePositioning src/Dodge/DisplayInventory.hs 37;" f +updateCombineSections src/Dodge/DisplayInventory.hs 42;" f updateCreature src/Dodge/Creature/Update.hs 10;" f updateCreatureGroups src/Dodge/Update.hs 391;" f updateCreatureSoundPositions src/Dodge/Update.hs 371;" f updateDebugMessageOffset src/Dodge/Update.hs 91;" f updateDelayedEvents src/Dodge/Update.hs 668;" f -updateDisplaySections src/Dodge/DisplayInventory.hs 91;" f +updateDisplaySections src/Dodge/DisplayInventory.hs 92;" f updateDistortion src/Dodge/Distortion.hs 5;" f updateDistortions src/Dodge/Update.hs 412;" f updateEnergyBall src/Dodge/EnergyBall.hs 46;" f @@ -7656,8 +7661,8 @@ updateInGameCamera src/Dodge/Update/Camera.hs 71;" f updateInitialPressInGame src/Dodge/Update/Input/InGame.hs 107;" f updateInstantBullets src/Dodge/Update.hs 531;" f updateInv src/Dodge/Creature/State.hs 224;" f -updateInventoryPositioning src/Dodge/DisplayInventory.hs 86;" f -updateInventorySectionItems src/Dodge/DisplayInventory.hs 141;" f +updateInventoryPositioning src/Dodge/DisplayInventory.hs 87;" f +updateInventorySectionItems src/Dodge/DisplayInventory.hs 144;" f updateKeyInGame src/Dodge/Update/Input/InGame.hs 101;" f updateKeysInTerminal src/Dodge/Update/Input/InGame.hs 90;" f updateLampoid src/Dodge/Lampoid.hs 13;" f @@ -7693,8 +7698,8 @@ updateRenderSplit appDodge/Main.hs 105;" f updateScopeZoom src/Dodge/Update/Camera.hs 131;" f updateScopeZoom' src/Dodge/Update/Camera.hs 136;" f updateScrollTestValue src/Dodge/ScrollValue.hs 6;" f -updateSection src/Dodge/DisplayInventory.hs 183;" f -updateSectionsPositioning src/Dodge/DisplayInventory.hs 162;" f +updateSection src/Dodge/DisplayInventory.hs 186;" f +updateSectionsPositioning src/Dodge/DisplayInventory.hs 165;" f updateSeenWalls src/Dodge/Update.hs 562;" f updateShockwave src/Dodge/Shockwave/Update.hs 12;" f updateShockwaves src/Dodge/Update.hs 436;" f