From 2d536a31c99c6c5e349158e5f3890ea509791fa7 Mon Sep 17 00:00:00 2001 From: justin Date: Tue, 8 Oct 2024 10:17:50 +0100 Subject: [PATCH] Cleanup --- ghcidOutput | 2 +- src/Dodge/Data/HUD.hs | 8 +- src/Dodge/DisplayInventory.hs | 23 +- src/Dodge/Update.hs | 1 - tags | 435 +++++++++++++++++----------------- 5 files changed, 217 insertions(+), 252 deletions(-) diff --git a/ghcidOutput b/ghcidOutput index ce84523ae..2667beae9 100644 --- a/ghcidOutput +++ b/ghcidOutput @@ -1 +1 @@ -All good (597 modules, at 10:01:53) +All good (597 modules, at 10:13:32) diff --git a/src/Dodge/Data/HUD.hs b/src/Dodge/Data/HUD.hs index 6e2750d08..f599e4a4b 100644 --- a/src/Dodge/Data/HUD.hs +++ b/src/Dodge/Data/HUD.hs @@ -6,7 +6,6 @@ module Dodge.Data.HUD where import Control.Lens -import Data.IntMap.Strict (IntMap) import Dodge.Data.Button import Dodge.Data.Combine import Dodge.Data.FloorItem @@ -22,11 +21,8 @@ data HUDElement data SubInventory = NoSubInventory - | ExamineInventory -- {_subInvMSel :: Maybe Int} - | CombineInventory - { _ciCombinations :: IntMap (SelectionItem CombinableItem) - , _ciSections :: SelectionSections CombinableItem - } + | ExamineInventory + | CombineInventory { _ciSections :: SelectionSections CombinableItem } | LockedInventory | DisplayTerminal {_termID :: Int} diff --git a/src/Dodge/DisplayInventory.hs b/src/Dodge/DisplayInventory.hs index 07b14bac9..49ca82c4a 100644 --- a/src/Dodge/DisplayInventory.hs +++ b/src/Dodge/DisplayInventory.hs @@ -4,7 +4,6 @@ module Dodge.DisplayInventory ( toggleCombineInv, - -- updateInventorySectionItems, updateInventoryPositioning, updateCombinePositioning, ) where @@ -14,7 +13,6 @@ import Control.Lens import Dodge.Inventory.SelectionList 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 @@ -139,22 +137,6 @@ updateDisplaySections w cfig sss = invDimColor :: Color invDimColor = greyN 0.7 ----- this appears to be only for filtering ---updateInventorySectionItems :: World -> World ---updateInventorySectionItems w = --- w --- & hud . hudElement . diSections . sssSections . ix 0 . ssItems %~ f --- where --- cr = w ^?! cWorld . lWorld . creatures . ix 0 --- invitms = IM.mapWithKey (invSelectionItem' cr) --- $ fmap (^. _2 . locLDT . ldtValue) --- $ allInvLocs $ cr ^. crInv --- f olditems = fromMaybe olditems $ do --- --invitms <- IM.mapWithKey (invSelectionItem' cr) <$> cr ^? crInv --- return $ case w ^? hud . hudElement . diSections . sssExtra . sssFilters . ix (-1) . _Just of --- Just str -> IM.filter (plainRegex str) invitms --- _ -> invitms - plainRegex :: String -> SelectionItem a -> Bool plainRegex = flip $ andOrRegex (\si str -> regexList str (_siPictures si)) @@ -255,10 +237,7 @@ listSelectionColorPicture = foldMap f enterCombineInv :: Configuration -> World -> World enterCombineInv cfig w = - w & hud . hudElement . subInventory - .~ CombineInventory - cm' - sss + w & hud . hudElement . subInventory .~ CombineInventory sss where cm' = IM.fromAscList $ zip [0 ..] $ combineList w cm diff --git a/src/Dodge/Update.hs b/src/Dodge/Update.hs index bfb4c9a77..bcccc5d7d 100644 --- a/src/Dodge/Update.hs +++ b/src/Dodge/Update.hs @@ -106,7 +106,6 @@ updateWorldEventFlags u = updateWorldEventFlag :: WorldEventFlag -> Universe -> Universe updateWorldEventFlag wef = case wef of - --InventoryChange -> id -- TODO determine more precisely when the inventory does change InventoryChange -> updateInventoryPositioning CombineInventoryChange -> updateCombinePositioning diff --git a/tags b/tags index a568c5900..2900fb6ed 100644 --- a/tags +++ b/tags @@ -21,7 +21,7 @@ <$> src/Dodge/Data/Terminal.hs 129;" o AIUNIT src/Dodge/Data/Item/Combine.hs 52;" C AMMOMAG src/Dodge/Data/Item/Combine.hs 22;" C -AMR src/Dodge/Data/Item/Combine.hs 146;" C +AMR src/Dodge/Data/Item/Combine.hs 145;" C ANTIMATTER src/Dodge/Data/Item/Combine.hs 46;" C APItEffect src/Dodge/Data/Item/Use.hs 75;" C APLinkProjectile src/Dodge/Data/Item/Use.hs 73;" C @@ -29,10 +29,10 @@ APNothing src/Dodge/Data/Item/Use.hs 77;" C AQUAMARINE src/Color/Data.hs 24;" C ATTACH src/Dodge/Data/Item/Combine.hs 21;" C AUGMENTEDHUD src/Dodge/Data/Item/Combine.hs 83;" C -AUTOAMR src/Dodge/Data/Item/Combine.hs 147;" C +AUTOAMR src/Dodge/Data/Item/Combine.hs 146;" C AUTODETECTOR src/Dodge/Data/Item/Combine.hs 116;" C -AUTOPISTOL src/Dodge/Data/Item/Combine.hs 134;" C -AUTORIFLE src/Dodge/Data/Item/Combine.hs 142;" C +AUTOPISTOL src/Dodge/Data/Item/Combine.hs 133;" C +AUTORIFLE src/Dodge/Data/Item/Combine.hs 141;" C AZURE src/Color/Data.hs 23;" C AccessTerminal src/Dodge/Data/WorldEffect.hs 28;" C Action src/Dodge/Data/ActionPlan.hs 78;" t @@ -107,18 +107,18 @@ AutoTrigger src/Dodge/Data/Item/Use.hs 69;" C AuxAddition src/Shader/AuxAddition.hs 1;" m Awareness src/Dodge/Data/Creature/Perception.hs 65;" t Awareness src/Dodge/Creature/Picture/Awareness.hs 1;" m -BANGCONE src/Dodge/Data/Item/Combine.hs 136;" C -BANGROD src/Dodge/Data/Item/Combine.hs 144;" C -BANGSTICK src/Dodge/Data/Item/Combine.hs 131;" C +BANGCONE src/Dodge/Data/Item/Combine.hs 135;" C +BANGROD src/Dodge/Data/Item/Combine.hs 143;" C +BANGSTICK src/Dodge/Data/Item/Combine.hs 130;" C BATTERY src/Dodge/Data/Item/Combine.hs 91;" C BATTERYPACK src/Dodge/Data/Item/Combine.hs 115;" C BELTMAG src/Dodge/Data/Item/Combine.hs 89;" C BLACK src/Color/Data.hs 28;" C BLINKER src/Dodge/Data/Item/Combine.hs 124;" C BLINKERUNSAFE src/Dodge/Data/Item/Combine.hs 125;" C -BLOWTORCH src/Dodge/Data/Item/Combine.hs 153;" C +BLOWTORCH src/Dodge/Data/Item/Combine.hs 152;" C BLUE src/Color/Data.hs 17;" C -BLUNDERBUSS src/Dodge/Data/Item/Combine.hs 137;" C +BLUNDERBUSS src/Dodge/Data/Item/Combine.hs 136;" C BLUNT src/Dodge/Data/Damage/Type.hs 13;" C BOOSTER src/Dodge/Data/Item/Combine.hs 120;" C BQuad src/Geometry/Bezier.hs 9;" t @@ -127,7 +127,7 @@ BULLETBELTBRACER src/Dodge/Data/Item/Combine.hs 114;" C BULLETBELTPACK src/Dodge/Data/Item/Combine.hs 113;" C BULLETMOD src/Dodge/Data/Item/Combine.hs 24;" C BULLETSYNTHESIZER src/Dodge/Data/Item/Combine.hs 80;" C -BURSTRIFLE src/Dodge/Data/Item/Combine.hs 143;" C +BURSTRIFLE src/Dodge/Data/Item/Combine.hs 142;" 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 @@ -240,17 +240,17 @@ ButtonSimpleSwith src/Dodge/Data/Button.hs 40;" C ButtonState src/Dodge/Data/Button.hs 63;" t CAMERA src/Dodge/Data/Item/Combine.hs 53;" C CAN src/Dodge/Data/Item/Combine.hs 34;" C -CDoNothing src/Dodge/Data/Item/HeldUse.hs 25;" C +CDoNothing src/Dodge/Data/Item/HeldUse.hs 16;" C CHARTREUSE src/Color/Data.hs 25;" C CHEMFUELPOUCH src/Dodge/Data/Item/Combine.hs 92;" C -CHeal src/Dodge/Data/Item/HeldUse.hs 26;" C +CHeal src/Dodge/Data/Item/HeldUse.hs 17;" C CIRCLE src/Dodge/Data/GenParams.hs 20;" C CItem src/Dodge/Data/ComposedItem.hs 46;" C CME src/Dodge/Data/MuzzleEffect.hs 11;" C CONCUSSIVE src/Dodge/Data/Damage/Type.hs 22;" C CONSUMABLE src/Dodge/Data/Item/Combine.hs 19;" C CRAFT src/Dodge/Data/Item/Combine.hs 20;" C -CREATUREDETECTOR src/Dodge/Data/Item/Combine.hs 171;" C +CREATUREDETECTOR src/Dodge/Data/Item/Combine.hs 170;" C CREATURESENSOR src/Dodge/Data/Item/Combine.hs 63;" C CRUSHING src/Dodge/Data/Damage/Type.hs 16;" C CUTTING src/Dodge/Data/Damage/Type.hs 14;" C @@ -434,11 +434,11 @@ CumulativeMuzzleEffect src/Dodge/Data/MuzzleEffect.hs 11;" t CurseStatus src/Dodge/Data/Item/CurseStatus.hs 11;" t CurseStatus src/Dodge/Data/Item/CurseStatus.hs 6;" m CursorType src/Dodge/Data/SelectionList.hs 71;" t -Cuse src/Dodge/Data/Item/HeldUse.hs 24;" t +Cuse src/Dodge/Data/Item/HeldUse.hs 15;" t Cuse src/Dodge/Cuse.hs 1;" m Cylinder src/Shape/Data.hs 19;" C DPoint2 src/Geometry/Data.hs 34;" t -DRONELAUNCHER src/Dodge/Data/Item/Combine.hs 161;" C +DRONELAUNCHER src/Dodge/Data/Item/Combine.hs 160;" C DRUMMAG src/Dodge/Data/Item/Combine.hs 88;" C DS src/DoubleStack.hs 3;" t DT src/Dodge/Data/DoubleTree.hs 29;" C @@ -504,7 +504,7 @@ DestroyBullet src/Dodge/Data/Bullet.hs 37;" C 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/Data/Item/Combine.hs 169;" t +Detector src/Dodge/Data/Item/Combine.hs 168;" 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 @@ -594,20 +594,20 @@ DropSpecific src/Dodge/Data/Creature/State.hs 26;" C DudPayload src/Dodge/Data/Payload.hs 11;" C Dungeon src/Dodge/Data/Scenario.hs 66;" C Dust src/Dodge/Wall/Dust.hs 1;" m -EAmmoSource src/Dodge/Data/Item/HeldUse.hs 40;" C +EAmmoSource src/Dodge/Data/Item/HeldUse.hs 31;" C EBO src/Shader/Data.hs 88;" t -EBatterySource src/Dodge/Data/Item/HeldUse.hs 39;" C -ECamouflage src/Dodge/Data/Item/HeldUse.hs 35;" C -EDetector src/Dodge/Data/Item/HeldUse.hs 31;" C -EDoNothing src/Dodge/Data/Item/HeldUse.hs 30;" C -EFuelSource src/Dodge/Data/Item/HeldUse.hs 38;" C -EHeadLamp src/Dodge/Data/Item/HeldUse.hs 34;" C +EBatterySource src/Dodge/Data/Item/HeldUse.hs 30;" C +ECamouflage src/Dodge/Data/Item/HeldUse.hs 26;" C +EDetector src/Dodge/Data/Item/HeldUse.hs 22;" C +EDoNothing src/Dodge/Data/Item/HeldUse.hs 21;" C +EFuelSource src/Dodge/Data/Item/HeldUse.hs 29;" C +EHeadLamp src/Dodge/Data/Item/HeldUse.hs 25;" C ELECTRICAL src/Dodge/Data/Damage/Type.hs 20;" C -ELEPHANTGUN src/Dodge/Data/Item/Combine.hs 145;" C -EMagShield src/Dodge/Data/Item/HeldUse.hs 32;" C +ELEPHANTGUN src/Dodge/Data/Item/Combine.hs 144;" C +EMagShield src/Dodge/Data/Item/HeldUse.hs 23;" C ENTERREMENT src/Dodge/Data/Damage/Type.hs 24;" C EQUIP src/Dodge/Data/Item/Combine.hs 18;" C -EWristShield src/Dodge/Data/Item/HeldUse.hs 33;" C +EWristShield src/Dodge/Data/Item/HeldUse.hs 24;" C EXPLOSIVE src/Dodge/Data/Damage/Type.hs 21;" C EXPLOSIVES src/Dodge/Data/Item/Combine.hs 97;" C Ears src/Dodge/Data/Creature/Perception.hs 47;" C @@ -633,8 +633,8 @@ EnergyBall src/Dodge/EnergyBall.hs 1;" m EnergyBallType src/Dodge/Data/Bullet.hs 32;" t EnergyGeneratorSS src/Dodge/Data/Scenario.hs 109;" C EngineSS src/Dodge/Data/Scenario.hs 88;" C -EoffWristShield src/Dodge/Data/Item/HeldUse.hs 37;" C -EonWristShield src/Dodge/Data/Item/HeldUse.hs 36;" C +EoffWristShield src/Dodge/Data/Item/HeldUse.hs 28;" C +EonWristShield src/Dodge/Data/Item/HeldUse.hs 27;" C 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 @@ -651,7 +651,7 @@ EquipmentAllocation src/Dodge/Data/RightButtonOptions.hs 18;" t Escape src/Dodge/Data/Scenario.hs 10;" C EscapeMenuOption src/Dodge/Data/Universe.hs 72;" t Essential src/Shape/Data.hs 34;" C -Euse src/Dodge/Data/Item/HeldUse.hs 29;" t +Euse src/Dodge/Data/Item/HeldUse.hs 20;" t Euse src/Dodge/Euse.hs 1;" m Event src/Dodge/Button/Event.hs 1;" m Event src/Dodge/Event.hs 14;" m @@ -667,13 +667,13 @@ Eyes src/Dodge/Data/Creature/Perception.hs 41;" C FBO src/Shader/Data.hs 57;" t FLAKCRAFT src/Dodge/Data/Item/Combine.hs 70;" C FLAMESHIELD src/Dodge/Data/Item/Combine.hs 102;" C -FLAMESPITTER src/Dodge/Data/Item/Combine.hs 149;" C -FLAMETHROWER src/Dodge/Data/Item/Combine.hs 150;" C -FLAMETORRENT src/Dodge/Data/Item/Combine.hs 151;" C -FLAMEWALL src/Dodge/Data/Item/Combine.hs 152;" C +FLAMESPITTER src/Dodge/Data/Item/Combine.hs 148;" C +FLAMETHROWER src/Dodge/Data/Item/Combine.hs 149;" C +FLAMETORRENT src/Dodge/Data/Item/Combine.hs 150;" C +FLAMEWALL src/Dodge/Data/Item/Combine.hs 151;" C FLAMING src/Dodge/Data/Damage/Type.hs 18;" C FLASHMODULE src/Dodge/Data/Item/Combine.hs 68;" C -FLATSHIELD src/Dodge/Data/Item/Combine.hs 165;" C +FLATSHIELD src/Dodge/Data/Item/Combine.hs 164;" C FRAGCRAFT src/Dodge/Data/Item/Combine.hs 71;" C FRAGMODULE src/Dodge/Data/Item/Combine.hs 67;" C FRONTARMOUR src/Dodge/Data/Item/Combine.hs 103;" C @@ -753,7 +753,7 @@ GASINJECTOR src/Dodge/Data/Item/Combine.hs 69;" C GEqC src/SameConstr.hs 20;" c GLASSSHARD src/Dodge/Data/Item/Combine.hs 38;" C GLHelp src/GLHelp.hs 1;" m -GRAPECANNON src/Dodge/Data/Item/Combine.hs 138;" C +GRAPECANNON src/Dodge/Data/Item/Combine.hs 137;" C GRAVITYMODULE src/Dodge/Data/Item/Combine.hs 75;" C GREEN src/Color/Data.hs 16;" C GameOverOptions src/Dodge/Data/Universe.hs 68;" C @@ -810,7 +810,7 @@ HAT src/Dodge/Data/Item/Combine.hs 107;" C HEADLAMP src/Dodge/Data/Item/Combine.hs 108;" C HEATSENSOR src/Dodge/Data/Item/Combine.hs 60;" C HELD src/Dodge/Data/Item/Combine.hs 16;" C -HELDDETECTOR src/Dodge/Data/Item/Combine.hs 163;" C +HELDDETECTOR src/Dodge/Data/Item/Combine.hs 162;" C HOMINGMODULE src/Dodge/Data/Item/Combine.hs 82;" C HOSE src/Dodge/Data/Item/Combine.hs 32;" C HUD src/Dodge/Data/HUD.hs 35;" t @@ -832,7 +832,7 @@ HasHammer src/Dodge/Data/Hammer.hs 14;" C HeavySmokeFlare src/Dodge/Data/Item/Use.hs 134;" C Held src/Dodge/Item/Held.hs 1;" m HeldDelay src/Dodge/Data/Item/HeldDelay.hs 6;" m -HeldItemType src/Dodge/Data/Item/Combine.hs 130;" t +HeldItemType src/Dodge/Data/Item/Combine.hs 129;" t HeldOffset src/Dodge/Item/HeldOffset.hs 1;" m HeldParams src/Dodge/Data/Item/Use.hs 80;" t HeldScroll src/Dodge/HeldScroll.hs 1;" m @@ -864,7 +864,7 @@ HumanoidAI src/Dodge/Data/Creature/Misc.hs 48;" t ILink src/Dodge/Data/ComposedItem.hs 51;" C INVISIBILITYEQUIPMENT src/Dodge/Data/Item/Combine.hs 105;" C IRONBAR src/Dodge/Data/Item/Combine.hs 57;" C -ITEMDETECTOR src/Dodge/Data/Item/Combine.hs 170;" C +ITEMDETECTOR src/Dodge/Data/Item/Combine.hs 169;" C ImmediateEffect src/Loop/Data.hs 8;" C Importance src/Shape/Data.hs 34;" t Important src/Shape/Data.hs 35;" C @@ -933,11 +933,11 @@ ItCrWdWd src/Dodge/Data/WorldEffect.hs 18;" t ItDropEffect src/Dodge/Data/Item/Effect.hs 31;" t ItEffect src/Dodge/Data/Item/Effect.hs 12;" t ItEffect src/Dodge/ItEffect.hs 1;" m -ItID src/Dodge/Data/Item.hs 31;" t +ItID src/Dodge/Data/Item.hs 29;" t ItInvEffect src/Dodge/Data/Item/Effect.hs 19;" t -ItTargeting src/Dodge/Data/Item.hs 48;" C +ItTargeting src/Dodge/Data/Item.hs 45;" C ItZoom src/Dodge/Data/Item/Use.hs 181;" t -Item src/Dodge/Data/Item.hs 33;" t +Item src/Dodge/Data/Item.hs 31;" t Item src/Dodge/Data/Item.hs 4;" m Item src/Dodge/Default/Item.hs 1;" m Item src/Dodge/Item.hs 3;" m @@ -949,7 +949,7 @@ ItemParams src/Dodge/Data/Item/Params.hs 13;" t ItemParams src/Dodge/Tesla/ItemParams.hs 1;" m ItemScrollTimeFlow src/Dodge/Data/World.hs 62;" C ItemStructuralFunction src/Dodge/Data/ComposedItem.hs 29;" t -ItemTargeting src/Dodge/Data/Item.hs 47;" t +ItemTargeting src/Dodge/Data/Item.hs 44;" t ItemType src/Dodge/Data/Item/Combine.hs 15;" t ItemUse src/Dodge/Data/Item/Use.hs 35;" t ItmInt src/Dodge/Data/Item/Location.hs 24;" t @@ -959,14 +959,14 @@ 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/Data/Item/Combine.hs 166;" C +KEYCARD src/Dodge/Data/Item/Combine.hs 165;" C Kill src/Dodge/Data/ActionPlan.hs 198;" C LASERING src/Dodge/Data/Damage/Type.hs 19;" C -LASGUN src/Dodge/Data/Item/Combine.hs 156;" C -LAUNCHER src/Dodge/Data/Item/Combine.hs 158;" C -LAUNCHERX src/Dodge/Data/Item/Combine.hs 159;" C -LBlink src/Dodge/Data/Item/HeldUse.hs 53;" C -LBoost src/Dodge/Data/Item/HeldUse.hs 55;" C +LASGUN src/Dodge/Data/Item/Combine.hs 155;" C +LAUNCHER src/Dodge/Data/Item/Combine.hs 157;" C +LAUNCHERX src/Dodge/Data/Item/Combine.hs 158;" C +LBlink src/Dodge/Data/Item/HeldUse.hs 43;" C +LBoost src/Dodge/Data/Item/HeldUse.hs 45;" C LDT src/Dodge/Data/DoubleTree.hs 39;" C LDTBottomNode src/Dodge/Data/DoubleTree.hs 27;" C LDTComb src/Dodge/Item/Grammar.hs 114;" t @@ -974,20 +974,19 @@ LDTMidAboveNode src/Dodge/Data/DoubleTree.hs 25;" C LDTMidBelowNode src/Dodge/Data/DoubleTree.hs 26;" C LDTRootNode src/Dodge/Data/DoubleTree.hs 23;" C LDTTopNode src/Dodge/Data/DoubleTree.hs 24;" C -LDoNothing src/Dodge/Data/Item/HeldUse.hs 48;" C +LDoNothing src/Dodge/Data/Item/HeldUse.hs 39;" C LED src/Dodge/Data/Item/Combine.hs 55;" C LEFT src/Dodge/Data/Item/Combine.hs 17;" C LHS src/Geometry/LHS.hs 1;" m LIGHTER src/Dodge/Data/Item/Combine.hs 44;" C LIGHTSENSOR src/Dodge/Data/Item/Combine.hs 58;" C -LRewind src/Dodge/Data/Item/HeldUse.hs 49;" C +LRewind src/Dodge/Data/Item/HeldUse.hs 40;" C LS src/Dodge/Data/LightSource.hs 34;" C LSParam src/Dodge/Data/LightSource.hs 27;" t -LShrink src/Dodge/Data/Item/HeldUse.hs 52;" C LTest src/Dodge/Data/ComposedItem.hs 56;" C -LTimePause src/Dodge/Data/Item/HeldUse.hs 50;" C -LTimeScroll src/Dodge/Data/Item/HeldUse.hs 51;" C -LUnsafeBlink src/Dodge/Data/Item/HeldUse.hs 54;" C +LTimePause src/Dodge/Data/Item/HeldUse.hs 41;" C +LTimeScroll src/Dodge/Data/Item/HeldUse.hs 42;" C +LUnsafeBlink src/Dodge/Data/Item/HeldUse.hs 44;" C LUpdate src/Dodge/Data/ComposedItem.hs 61;" C LWorld src/Dodge/Data/LWorld.hs 96;" t LWorld src/Dodge/Data/LWorld.hs 6;" m @@ -1082,9 +1081,9 @@ Lorem src/Lorem.hs 1;" m LtAutoAI src/Dodge/Data/Creature/Misc.hs 54;" C LtAutoCrit src/Dodge/Creature/LtAutoCrit.hs 1;" m Lure src/Dodge/Data/ActionPlan.hs 179;" C -Luse src/Dodge/Data/Item/HeldUse.hs 47;" t +Luse src/Dodge/Data/Item/HeldUse.hs 38;" t Luse src/Dodge/Luse.hs 1;" m -MACHINEPISTOL src/Dodge/Data/Item/Combine.hs 133;" C +MACHINEPISTOL src/Dodge/Data/Item/Combine.hs 132;" C MAGENTA src/Color/Data.hs 20;" C MAGNET src/Dodge/Data/Item/Combine.hs 45;" C MAGSHIELD src/Dodge/Data/Item/Combine.hs 101;" C @@ -1095,7 +1094,7 @@ MEDKIT src/Dodge/Data/Item/Combine.hs 96;" C MICROCHIP src/Dodge/Data/Item/Combine.hs 49;" C MICROPHONE src/Dodge/Data/Item/Combine.hs 61;" C MINIDISPLAY src/Dodge/Data/Item/Combine.hs 54;" C -MINIGUNX src/Dodge/Data/Item/Combine.hs 139;" C +MINIGUNX src/Dodge/Data/Item/Combine.hs 138;" 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 @@ -1246,7 +1245,7 @@ NoHammer src/Dodge/Data/Hammer.hs 13;" C NoHoming src/Dodge/Data/Item/Use/Consumption/Ammo.hs 24;" C NoIntImp src/Dodge/Data/CreatureEffect.hs 20;" C NoInvEffect src/Dodge/Data/Item/Effect.hs 20;" C -NoItTargeting src/Dodge/Data/Item.hs 47;" C +NoItTargeting src/Dodge/Data/Item.hs 44;" C NoLighting src/Dodge/Data/Config.hs 102;" C NoMvType src/Dodge/Data/Creature/Misc.hs 38;" C NoNeedWeapon src/Dodge/Room/NoNeedWeapon.hs 2;" m @@ -1344,12 +1343,12 @@ P2ImpNo src/Dodge/Data/CreatureEffect.hs 28;" C P2NoAction src/Dodge/Data/CreatureEffect.hs 53;" C PIERCING src/Dodge/Data/Damage/Type.hs 12;" C PIPE src/Dodge/Data/Item/Combine.hs 28;" C -PISTOL src/Dodge/Data/Item/Combine.hs 132;" C +PISTOL src/Dodge/Data/Item/Combine.hs 131;" C PLANK src/Dodge/Data/Item/Combine.hs 37;" 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 -POISONSPRAYER src/Dodge/Data/Item/Combine.hs 160;" C +POISONSPRAYER src/Dodge/Data/Item/Combine.hs 159;" C PORTABLEFUSION src/Dodge/Data/Item/Combine.hs 66;" C POWERLEGS src/Dodge/Data/Item/Combine.hs 109;" C PPLevelReset src/Dodge/Data/PressPlate.hs 16;" C @@ -1521,7 +1520,7 @@ RED src/Color/Data.hs 15;" C REMOTESCREEN src/Dodge/Data/Item/Combine.hs 81;" C REWINDWATCH src/Dodge/Data/Item/Combine.hs 122;" C RGBA src/Color/Data.hs 31;" t -RIFLE src/Dodge/Data/Item/Combine.hs 141;" C +RIFLE src/Dodge/Data/Item/Combine.hs 140;" C ROSE src/Color/Data.hs 21;" C RPLinkStatus src/Dodge/Data/Room.hs 55;" t RProps src/Dodge/Layout/Generate.hs 13;" C @@ -1613,17 +1612,16 @@ RunPast src/Dodge/Room/RunPast.hs 1;" m RunningSideEffect src/Dodge/Data/Universe.hs 65;" C SCRAPMETAL src/Dodge/Data/Item/Combine.hs 39;" C SCROLLWATCH src/Dodge/Data/Item/Combine.hs 123;" C -SHATTERGUN src/Dodge/Data/Item/Combine.hs 162;" C +SHATTERGUN src/Dodge/Data/Item/Combine.hs 161;" C SHATTERING src/Dodge/Data/Damage/Type.hs 17;" C SHELLMAG src/Dodge/Data/Item/Combine.hs 90;" C -SHRINKER src/Dodge/Data/Item/Combine.hs 126;" C SIZEMODULE src/Dodge/Data/Item/Combine.hs 74;" C -SMG src/Dodge/Data/Item/Combine.hs 135;" C -SNIPERRIFLE src/Dodge/Data/Item/Combine.hs 148;" C +SMG src/Dodge/Data/Item/Combine.hs 134;" C +SNIPERRIFLE src/Dodge/Data/Item/Combine.hs 147;" C SOUNDSENSOR src/Dodge/Data/Item/Combine.hs 59;" C -SPARKGUN src/Dodge/Data/Item/Combine.hs 154;" C +SPARKGUN src/Dodge/Data/Item/Combine.hs 153;" C SPARKING src/Dodge/Data/Damage/Type.hs 15;" C -SPAWNER src/Dodge/Data/Item/Combine.hs 127;" C +SPAWNER src/Dodge/Data/Item/Combine.hs 126;" C SPEEDLEGS src/Dodge/Data/Item/Combine.hs 110;" C SPRING src/Dodge/Data/Item/Combine.hs 31;" C SPic src/ShapePicture/Data.hs 7;" t @@ -1665,7 +1663,7 @@ SelectionItem src/Dodge/Data/SelectionList.hs 75;" t SelectionList src/Dodge/Data/SelectionList.hs 26;" t SelectionList src/Dodge/Data/SelectionList.hs 6;" m SelectionList src/Dodge/Default/SelectionList.hs 1;" m -SelectionList src/Dodge/Inventory/SelectionList.hs 1;" m +SelectionList src/Dodge/Inventory/SelectionList.hs 2;" m SelectionList src/Dodge/SelectionList.hs 1;" m SelectionSection src/Dodge/Data/SelectionList.hs 55;" t SelectionSections src/Dodge/Data/SelectionList.hs 36;" t @@ -1814,7 +1812,7 @@ TAPE src/Dodge/Data/Item/Combine.hs 33;" C TARGETING src/Dodge/Data/Item/Combine.hs 23;" C TARGETLASER src/Dodge/Data/Item/Targeting.hs 12;" C TELEPORTMODULE src/Dodge/Data/Item/Combine.hs 72;" C -TESLAGUN src/Dodge/Data/Item/Combine.hs 155;" C +TESLAGUN src/Dodge/Data/Item/Combine.hs 154;" C THERMOMETER src/Dodge/Data/Item/Combine.hs 62;" C THREELINES src/Dodge/Data/GenParams.hs 20;" C TIMEMODULE src/Dodge/Data/Item/Combine.hs 73;" C @@ -1825,8 +1823,8 @@ 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/Data/Item/Combine.hs 164;" C -TRACTORGUN src/Dodge/Data/Item/Combine.hs 157;" C +TORCH src/Dodge/Data/Item/Combine.hs 163;" C +TRACTORGUN src/Dodge/Data/Item/Combine.hs 156;" C TRANSFORMER 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 @@ -2023,7 +2021,7 @@ VAO src/Shader/Data.hs 64;" t VBO src/Shader/Data.hs 81;" t VF src/Polyhedra/Data.hs 21;" t VIOLET src/Color/Data.hs 22;" C -VOLLEYGUN src/Dodge/Data/Item/Combine.hs 140;" C +VOLLEYGUN src/Dodge/Data/Item/Combine.hs 139;" C VariableSelectionWidth src/Dodge/Data/SelectionList.hs 68;" C Vector src/Geometry/Vector.hs 3;" m Vector3D src/Geometry/Vector3D.hs 2;" m @@ -2039,7 +2037,7 @@ Vision src/Dodge/Data/Creature/Perception.hs 41;" t 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/Data/Item/Combine.hs 172;" C +WALLDETECTOR src/Dodge/Data/Item/Combine.hs 171;" C WASD src/Dodge/WASD.hs 1;" m WHITE src/Color/Data.hs 27;" C WIRE src/Dodge/Data/Item/Combine.hs 64;" C @@ -2479,15 +2477,15 @@ _emoMenuOption src/Dodge/Data/Universe.hs 73;" f _energyBalls src/Dodge/Data/LWorld.hs 107;" f _eparamID src/Dodge/Data/Item/Use/Equipment.hs 30;" f _eparamInt src/Dodge/Data/Item/Use/Equipment.hs 31;" f -_euseAmmoAmount src/Dodge/Data/Item/HeldUse.hs 41;" f -_euseAmmoLink src/Dodge/Data/Item/HeldUse.hs 43;" f -_euseAmmoMax src/Dodge/Data/Item/HeldUse.hs 42;" f -_euseBatteryAmount src/Dodge/Data/Item/HeldUse.hs 39;" f -_euseBatteryMax src/Dodge/Data/Item/HeldUse.hs 39;" f -_euseCamouflageStatus src/Dodge/Data/Item/HeldUse.hs 35;" f -_euseDetector src/Dodge/Data/Item/HeldUse.hs 31;" f -_euseFuelAmount src/Dodge/Data/Item/HeldUse.hs 38;" f -_euseFuelMax src/Dodge/Data/Item/HeldUse.hs 38;" f +_euseAmmoAmount src/Dodge/Data/Item/HeldUse.hs 32;" f +_euseAmmoLink src/Dodge/Data/Item/HeldUse.hs 34;" f +_euseAmmoMax src/Dodge/Data/Item/HeldUse.hs 33;" f +_euseBatteryAmount src/Dodge/Data/Item/HeldUse.hs 30;" f +_euseBatteryMax src/Dodge/Data/Item/HeldUse.hs 30;" f +_euseCamouflageStatus src/Dodge/Data/Item/HeldUse.hs 26;" f +_euseDetector src/Dodge/Data/Item/HeldUse.hs 22;" f +_euseFuelAmount src/Dodge/Data/Item/HeldUse.hs 29;" f +_euseFuelMax src/Dodge/Data/Item/HeldUse.hs 29;" f _fbo2 src/Data/Preload/Render.hs 29;" f _fbo3 src/Data/Preload/Render.hs 30;" f _fboBase src/Data/Preload/Render.hs 33;" f @@ -2616,20 +2614,19 @@ _ipPlacement src/Dodge/Data/GenWorld.hs 134;" f _ipPlacementID src/Dodge/Data/GenWorld.hs 135;" f _isLooping src/Sound/Data.hs 19;" f _ispCloseObject src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 30;" f -_itAmmoSlots src/Dodge/Data/Item.hs 40;" f -_itCurseStatus src/Dodge/Data/Item.hs 43;" f -_itDimension src/Dodge/Data/Item.hs 42;" f -_itEffect src/Dodge/Data/Item.hs 38;" f -_itID src/Dodge/Data/Item.hs 36;" f -_itInvSize src/Dodge/Data/Item.hs 41;" f -_itLocation src/Dodge/Data/Item.hs 37;" f -_itParams src/Dodge/Data/Item.hs 44;" f -_itTargeting src/Dodge/Data/Item.hs 39;" f -_itTgActive src/Dodge/Data/Item.hs 51;" f -_itTgID src/Dodge/Data/Item.hs 50;" f -_itTgPos src/Dodge/Data/Item.hs 49;" f -_itType src/Dodge/Data/Item.hs 35;" f -_itUse src/Dodge/Data/Item.hs 34;" f +_itAmmoSlots src/Dodge/Data/Item.hs 38;" f +_itDimension src/Dodge/Data/Item.hs 40;" f +_itEffect src/Dodge/Data/Item.hs 36;" f +_itID src/Dodge/Data/Item.hs 34;" f +_itInvSize src/Dodge/Data/Item.hs 39;" f +_itLocation src/Dodge/Data/Item.hs 35;" f +_itParams src/Dodge/Data/Item.hs 41;" f +_itTargeting src/Dodge/Data/Item.hs 37;" f +_itTgActive src/Dodge/Data/Item.hs 48;" f +_itTgID src/Dodge/Data/Item.hs 47;" f +_itTgPos src/Dodge/Data/Item.hs 46;" f +_itType src/Dodge/Data/Item.hs 33;" f +_itUse src/Dodge/Data/Item.hs 32;" f _itemLocations src/Dodge/Data/LWorld.hs 99;" f _izFac src/Dodge/Data/Item/Use.hs 184;" f _izMax src/Dodge/Data/Item/Use.hs 182;" f @@ -3256,9 +3253,9 @@ _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 -_xNum src/Dodge/Data/Item/Combine.hs 131;" f -_xNum src/Dodge/Data/Item/Combine.hs 138;" f -_xNum src/Dodge/Data/Item/Combine.hs 159;" f +_xNum src/Dodge/Data/Item/Combine.hs 130;" f +_xNum src/Dodge/Data/Item/Combine.hs 137;" f +_xNum src/Dodge/Data/Item/Combine.hs 158;" f aDroneWithItemParams src/Dodge/Item/Weapon/Drone.hs 30;" f aFlame src/Dodge/Gas.hs 18;" f aFlameParticle src/Dodge/Flame.hs 22;" f @@ -3273,7 +3270,6 @@ aTreeStrut src/Dodge/Tree/GenerateStructure.hs 37;" f accessTerminal src/Dodge/WorldEffect.hs 54;" f activeTargetCursorPic src/Dodge/Targeting/Draw.hs 24;" f addArmour src/Dodge/Creature.hs 83;" f -addBoostShockwave src/Dodge/Luse.hs 119;" f addBranchAt src/Dodge/Tree/GenerateStructure.hs 17;" f addButtonSlowDoor src/Dodge/Room/LongDoor.hs 95;" f addCrGibs src/Dodge/Prop/Gib.hs 31;" f @@ -3312,11 +3308,11 @@ addToTrunk src/TreeHelp.hs 156;" f addWarningTerminal src/Dodge/Room/Warning.hs 37;" f addZ src/Geometry/Vector3D.hs 89;" f adjustIMZone src/Dodge/Base.hs 77;" f -advanceScrollAmount src/Dodge/Update.hs 297;" f +advanceScrollAmount src/Dodge/Update.hs 296;" f advanceSmoothScroll src/Dodge/SmoothScroll.hs 29;" f advanceStepCounter src/Dodge/Creature/Impulse/Movement.hs 45;" f aimDelaySweep src/Dodge/Render/ShapePicture.hs 44;" f -aimStanceInfo src/Dodge/Item/Info.hs 214;" f +aimStanceInfo src/Dodge/Item/Info.hs 213;" f aimTurn src/Dodge/Creature/YourControl.hs 143;" f aimingMuzzleLength src/Dodge/Creature/HandPos.hs 46;" f aimingMuzzlePos src/Dodge/Creature/HandPos.hs 41;" f @@ -3331,13 +3327,14 @@ airlockDoubleDoor src/Dodge/Room/Airlock.hs 54;" f airlockSimple src/Dodge/Room/Airlock.hs 66;" f airlockZ src/Dodge/Room/Airlock.hs 91;" f allHotkeys src/Dodge/Creature/YourControl.hs 51;" f +allInvLocs src/Dodge/Item/Grammar.hs 204;" f allVisibleWalls src/Dodge/Base/Collide.hs 131;" f alongSegBy src/Geometry.hs 43;" f ammoMagSPic src/Dodge/Item/Draw/SPic.hs 45;" f amr src/Dodge/Item/Held/Rod.hs 46;" f analyser src/Dodge/Placement/Instance/Analyser.hs 12;" f analyserByDoor src/Dodge/Room/LasTurret.hs 75;" f -andOrRegex src/Dodge/DisplayInventory.hs 79;" f +andOrRegex src/Dodge/DisplayInventory.hs 78;" f angleBetween src/Geometry.hs 145;" f angleVV src/Geometry/Vector.hs 57;" f angleVV3 src/Geometry/Vector3D.hs 122;" f @@ -3466,7 +3463,7 @@ blinkAcrossChallenge src/Dodge/Room/BlinkAcross.hs 14;" f blinkActionFail src/Dodge/Creature/Action/Blink.hs 85;" f blinkActionMousePos src/Dodge/Creature/Action/Blink.hs 19;" f blinkDistortions src/Dodge/Creature/Action/Blink.hs 40;" f -blinkGun src/Dodge/Item/Weapon/Utility.hs 51;" f +blinkGun src/Dodge/Item/Weapon/Utility.hs 42;" f blinkShockwave src/Dodge/Creature/Action/Blink.hs 76;" f blipAt src/Dodge/RadarSweep.hs 59;" f blockLine src/Dodge/Placement/Instance/Wall.hs 41;" f @@ -3485,8 +3482,7 @@ blood8S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 330;" f blowTorch src/Dodge/Item/Held/SprayGuns.hs 51;" f blue src/Color.hs 16;" f blunderbuss src/Dodge/Item/Held/Cone.hs 29;" f -boostPoint src/Dodge/Luse.hs 104;" f -boostSelfL src/Dodge/Luse.hs 72;" f +boostSelfL src/Dodge/Luse.hs 56;" f boosterGun src/Dodge/Item/Equipment/Booster.hs 9;" f bossKeyItems src/Dodge/LockAndKey.hs 11;" f bossRoom src/Dodge/Room/Boss.hs 59;" f @@ -3553,12 +3549,12 @@ chaseCritPerceptionUpdate src/Dodge/Creature/Perception.hs 30;" f chaseCritVocalization src/Dodge/Creature/ChaseCrit.hs 46;" f checkBlockHP src/Dodge/Block.hs 46;" f checkDeath src/Dodge/Creature/State.hs 74;" f -checkEndGame src/Dodge/Update.hs 579;" f +checkEndGame src/Dodge/Update.hs 578;" f checkErrorGL src/Shader/Compile.hs 255;" f checkFBO src/Framebuffer/Check.hs 6;" f checkGLError src/GLHelp.hs 17;" f checkInvSlotsYou src/Dodge/Inventory/CheckSlots.hs 16;" f -checkTermDist src/Dodge/Update.hs 281;" f +checkTermDist src/Dodge/Update.hs 280;" 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 @@ -3579,7 +3575,7 @@ circle src/Picture/Base.hs 180;" f circleDecoration src/Dodge/Placement/TopDecoration.hs 56;" f circleSolid src/Picture/Base.hs 164;" f circleSolidCol src/Picture/Base.hs 168;" f -clClSpringVel src/Dodge/Update.hs 632;" f +clClSpringVel src/Dodge/Update.hs 631;" f clZoneSize src/Dodge/Zone/Size.hs 3;" f clZoneSize src/Dodge/Zoning/Cloud.hs 21;" f clampPath src/Dodge/Room/Procedural.hs 165;" f @@ -3600,13 +3596,13 @@ 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 68;" f -closeObjectToTextPictures src/Dodge/Inventory/SelectionList.hs 83;" f +closeObjectToSelectionItem src/Dodge/Inventory/SelectionList.hs 54;" f +closeObjectToTextPictures src/Dodge/Inventory/SelectionList.hs 69;" f closestCreatureID src/Dodge/Debug.hs 91;" f closestPointOnLine src/Geometry/Intersect.hs 251;" f closestPointOnLineParam src/Geometry/Intersect.hs 267;" f closestPointOnSeg src/Geometry/Intersect.hs 282;" f -cloudEffect src/Dodge/Update.hs 602;" f +cloudEffect src/Dodge/Update.hs 601;" f cloudPoisonDamage src/Dodge/Update/Cloud.hs 9;" f clsNearCirc src/Dodge/Zoning/Cloud.hs 18;" f clsNearPoint src/Dodge/Zoning/Cloud.hs 9;" f @@ -3658,7 +3654,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 134;" f +consumableInfo src/Dodge/Item/Info.hs 133;" f contToIDCont src/Dodge/LevelGen/PlacementHelper.hs 57;" f convexHull src/Geometry/Polygon.hs 96;" f convexHullSafe src/Geometry/Polygon.hs 103;" f @@ -3676,7 +3672,7 @@ crAdd src/Dodge/Room/RezBox.hs 102;" f crAwayFromPost src/Dodge/Creature/Test.hs 77;" f crBlips src/Dodge/RadarSweep.hs 69;" f crCanSeeCr src/Dodge/Creature/Test.hs 48;" f -crCrSpring src/Dodge/Update.hs 650;" f +crCrSpring src/Dodge/Update.hs 649;" f crCurrentEquipment src/Dodge/Creature/Statistics.hs 28;" f crDisplayAwareness src/Dodge/Creature/Picture/Awareness.hs 37;" f crDisplayVigilance src/Dodge/Creature/Picture/Awareness.hs 51;" f @@ -3696,13 +3692,13 @@ crNearPoint src/Dodge/Creature/Test.hs 135;" f crNumFreeSlots src/Dodge/Inventory/CheckSlots.hs 35;" f crOnWall src/Dodge/WallCreatureCollisions.hs 84;" f crSafeDistFromTarg src/Dodge/Creature/Test.hs 67;" f -crSpring src/Dodge/Update.hs 645;" f +crSpring src/Dodge/Update.hs 644;" f crStratConMatches src/Dodge/Creature/Test.hs 72;" f crUpdate src/Dodge/Creature/State.hs 61;" f crUpdateInvidLocations src/Dodge/Inventory/Location.hs 54;" f crUpdateItemLocations src/Dodge/Inventory/Location.hs 48;" f crZoneSize src/Dodge/Zoning/Creature.hs 39;" f -craftInfo src/Dodge/Item/Info.hs 139;" f +craftInfo src/Dodge/Item/Info.hs 138;" f crankSlowS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 420;" f createArc src/Dodge/Tesla/Arc.hs 67;" f createBarrelSpark src/Dodge/Spark.hs 44;" f @@ -3838,7 +3834,7 @@ defaultBangCane src/Dodge/Item/Held/Cane.hs 19;" f defaultBlock src/Dodge/Default/Block.hs 5;" f defaultBounds src/Dodge/Data/Bounds.hs 20;" f defaultBullet src/Dodge/Item/Weapon/Bullet.hs 10;" f -defaultBulletWeapon src/Dodge/Default/Item.hs 48;" f +defaultBulletWeapon src/Dodge/Default/Item.hs 47;" f defaultButton src/Dodge/Default.hs 51;" f defaultCOSection src/Dodge/Default/World.hs 204;" f defaultCWCam src/Dodge/Default/World.hs 65;" f @@ -3847,9 +3843,9 @@ defaultCWorld src/Dodge/Default/World.hs 80;" f defaultChaseMvType src/Dodge/Default/Creature.hs 113;" f defaultClusterStatus src/Dodge/Default/Room.hs 38;" f defaultConfig src/Dodge/Data/Config.hs 125;" f -defaultConsumable src/Dodge/Default/Item.hs 53;" f +defaultConsumable src/Dodge/Default/Item.hs 52;" f defaultCorpse src/Dodge/Corpse/Make.hs 29;" f -defaultCraftItem src/Dodge/Default/Item.hs 42;" f +defaultCraftItem src/Dodge/Default/Item.hs 41;" f defaultCreature src/Dodge/Default/Creature.hs 12;" f defaultCreatureMemory src/Dodge/Default/Creature.hs 72;" f defaultCreatureSkin src/Dodge/Default/Creature.hs 66;" f @@ -3877,13 +3873,13 @@ defaultIntention src/Dodge/Default/Creature.hs 105;" f defaultInvSection src/Dodge/Default/World.hs 217;" f defaultInvSections src/Dodge/Default/World.hs 175;" f defaultInvSize src/Dodge/Default/Creature.hs 79;" f -defaultItEffect src/Dodge/Default/Item.hs 56;" f +defaultItEffect src/Dodge/Default/Item.hs 55;" f defaultItEffect src/Dodge/Default/Item/Effect.hs 5;" f defaultItZoom src/Dodge/Default/Item/Use/AimParams.hs 30;" f defaultItemDimension src/Dodge/Default/Item.hs 17;" f defaultLS src/Dodge/Default/LightSource.hs 6;" f defaultLWorld src/Dodge/Default/World.hs 92;" f -defaultLeftItem src/Dodge/Default/Item.hs 39;" f +defaultLeftItem src/Dodge/Default/Item.hs 38;" f defaultLeftLoadable src/Dodge/Default/Item/Use/Consumption.hs 8;" f defaultLeftUse src/Dodge/Default/Item/Use.hs 14;" f defaultListDisplayParams src/Dodge/ListDisplayParams.hs 18;" f @@ -3931,7 +3927,7 @@ destroyProjectile src/Dodge/Projectile/Update.hs 62;" f detV src/Geometry/Vector.hs 93;" f detectorColor src/Dodge/Item/Draw/SPic.hs 391;" f detectorEffect src/Dodge/Item/Weapon/Radar.hs 20;" f -detectorInfo src/Dodge/Item/Info.hs 194;" f +detectorInfo src/Dodge/Item/Info.hs 193;" f determineInvSelCursorWidth src/Dodge/ListDisplayParams.hs 54;" f determineProjectileTracking src/Dodge/HeldUse.hs 482;" f diagonalLinesRect src/Dodge/Room/Foreground.hs 52;" f @@ -3948,9 +3944,9 @@ disconnectTerminal src/Dodge/Terminal.hs 215;" f displayConfig src/Dodge/Menu.hs 196;" f displayControls src/Dodge/Menu.hs 206;" f displayFrameTicks src/Dodge/Render/Picture.hs 33;" f -displayFreeSlots src/Dodge/DisplayInventory.hs 156;" f +displayFreeSlots src/Dodge/DisplayInventory.hs 143;" f displayTerminal src/Dodge/Render/HUD.hs 230;" f -displayTerminalLineString src/Dodge/Update.hs 325;" f +displayTerminalLineString src/Dodge/Update.hs 324;" f dist src/Geometry/Vector.hs 179;" f dist3 src/Geometry/Vector3D.hs 101;" f divTo src/Geometry/Zone.hs 6;" f @@ -3990,7 +3986,7 @@ doInputScreenInput src/Dodge/Update/Input/ScreenLayer.hs 25;" f doIntImp src/Dodge/CreatureEffect.hs 24;" f doInvEffect src/Dodge/ItEffect.hs 10;" f doItCrWdWd src/Dodge/WorldEffect.hs 49;" f -doItemTimeScroll src/Dodge/Update.hs 180;" f +doItemTimeScroll src/Dodge/Update.hs 179;" f doLoop src/Loop.hs 60;" f doMCrAc src/Dodge/CreatureEffect.hs 57;" f doMP2Ac src/Dodge/CreatureEffect.hs 73;" f @@ -4023,7 +4019,7 @@ doTestDrawing src/Dodge/Render.hs 42;" f doTextInputOver src/Dodge/Update/Input/Text.hs 15;" f doTextInputOverUniverse src/Dodge/Update/Input/Text.hs 12;" f doThrust src/Dodge/Projectile/Update.hs 73;" f -doTimeScroll src/Dodge/Update.hs 185;" f +doTimeScroll src/Dodge/Update.hs 184;" f doTmTm src/Dodge/TmTm.hs 6;" f doTmWdWd src/Dodge/WorldEffect.hs 109;" f doWallRotate src/Dodge/Update/Camera.hs 188;" f @@ -4033,7 +4029,7 @@ doWdCrCr src/Dodge/CreatureEffect.hs 12;" f doWdP2f src/Dodge/WdP2f.hs 8;" f doWdWd src/Dodge/WorldEffect.hs 26;" f doWeaponRepetitions src/Dodge/HeldUse.hs 54;" f -doWorldEvents src/Dodge/Update.hs 307;" f +doWorldEvents src/Dodge/Update.hs 306;" f doWorldPos src/Dodge/WorldPos.hs 7;" f door src/Dodge/Room/Door.hs 13;" f doorBetween src/Dodge/Placement/Instance/Door.hs 39;" f @@ -4177,14 +4173,14 @@ encircle src/Dodge/Creature/Boid.hs 115;" f encircleCloseP src/Dodge/Creature/Boid.hs 35;" f encircleDistP src/Dodge/Creature/Boid.hs 21;" f encircleP src/Dodge/Creature/Boid.hs 27;" f -enterCombineInv src/Dodge/DisplayInventory.hs 251;" f +enterCombineInv src/Dodge/DisplayInventory.hs 238;" f eqConstr src/SameConstr.hs 17;" f eqPosText src/Dodge/Equipment/Text.hs 6;" f equipAllocString src/Dodge/Render/HUD.hs 175;" f -equipInfo src/Dodge/Item/Info.hs 107;" f +equipInfo src/Dodge/Item/Info.hs 106;" f equipItemSPic src/Dodge/Item/Draw/SPic.hs 65;" f equipPosition src/Dodge/Item/Draw.hs 29;" f -equipSiteInfo src/Dodge/Item/Info.hs 224;" f +equipSiteInfo src/Dodge/Item/Info.hs 223;" f equipSiteToPositions src/Dodge/Inventory/RBList.hs 77;" f equipSpeed src/Dodge/Creature/Impulse/Movement.hs 99;" f equipmentEffects src/Dodge/Creature/State.hs 156;" f @@ -4305,7 +4301,7 @@ fromV3 src/Geometry/Data.hs 43;" f frontArmour src/Dodge/Item/Equipment.hs 41;" f fstV2 src/Geometry/Data.hs 50;" f fuelPack src/Dodge/Item/Equipment.hs 64;" f -functionalUpdate src/Dodge/Update.hs 230;" f +functionalUpdate src/Dodge/Update.hs 229;" f fuseFunc src/Dodge/Path.hs 150;" f fusePairs src/Dodge/Path.hs 153;" f fusePoint src/Dodge/LevelGen/StaticWalls.hs 158;" f @@ -4379,7 +4375,7 @@ glassWallDamage src/Dodge/Wall/DamageEffect.hs 48;" f glushortSize src/Shader/Parameters.hs 25;" f goToPostStrat src/Dodge/Creature/Strategy.hs 10;" f goToTarget src/Dodge/Creature/ReaderUpdate.hs 136;" f -gotoTerminal src/Dodge/Update.hs 118;" f +gotoTerminal src/Dodge/Update.hs 117;" f grahamEliminate src/Geometry/Polygon.hs 117;" f grahamScan src/Geometry/Polygon.hs 108;" f grapeCannon src/Dodge/Item/Held/Cone.hs 38;" f @@ -4387,7 +4383,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 40;" f +gravityModule src/Dodge/Item/Craftable.hs 39;" f green src/Color.hs 15;" f greyN src/Color.hs 124;" f gridInPolygon src/Grid.hs 12;" f @@ -4442,7 +4438,7 @@ heldInfo src/Dodge/Item/Info.hs 48;" f heldItemOffset src/Dodge/Item/HeldOffset.hs 58;" f heldItemRelativeOrient src/Dodge/Item/HeldOffset.hs 26;" f heldItemSPic src/Dodge/Item/Draw/SPic.hs 173;" f -heldPositionInfo src/Dodge/Item/Info.hs 211;" f +heldPositionInfo src/Dodge/Item/Info.hs 210;" f helpCommand src/Dodge/Terminal.hs 64;" f helpPoly3D src/Polyhedra.hs 124;" f heron src/Geometry.hs 221;" f @@ -4459,7 +4455,7 @@ homingDrawType src/Dodge/Projectile/Create.hs 12;" f homingModule src/Dodge/Item/Scope.hs 43;" f horPipe src/Dodge/Placement/Instance/Pipe.hs 9;" f hotkeyToScancode src/Dodge/Creature/YourControl.hs 54;" f -hotkeyToString src/Dodge/Inventory/SelectionList.hs 53;" f +hotkeyToString src/Dodge/Inventory/SelectionList.hs 39;" f humanoidAIList src/Dodge/Humanoid.hs 181;" f hvBulletAmmo src/Dodge/Item/Weapon/Bullet.hs 31;" f iShape src/Dodge/Placement/Instance/LightSource.hs 74;" f @@ -4542,15 +4538,14 @@ invHead src/Dodge/Render/HUD.hs 266;" f invIndentIM src/Dodge/Item/Grammar.hs 183;" f invLDT src/Dodge/Item/Grammar.hs 155;" f invRootMap src/Dodge/Item/Grammar.hs 164;" f -invRootTrees src/Dodge/Item/Grammar.hs 213;" f -invSelectionItem src/Dodge/Inventory/SelectionList.hs 36;" f -invSelectionItem' src/Dodge/Inventory/SelectionList.hs 18;" f +invRootTrees src/Dodge/Item/Grammar.hs 217;" f +invSelectionItem src/Dodge/Inventory/SelectionList.hs 22;" f +invSelectionItem' src/Dodge/Inventory/SelectionList.hs 19;" f invShiftPointBy src/Dodge/ShiftPoint.hs 8;" f invSideEff src/Dodge/Creature/State.hs 161;" f invSize src/Dodge/Inventory/CheckSlots.hs 41;" f invTrees src/Dodge/Item/Grammar.hs 191;" f invTrees' src/Dodge/Item/Grammar.hs 195;" f -invTrees'' src/Dodge/Item/Grammar.hs 204;" f inventoryExtra src/Dodge/Render/HUD.hs 184;" f inventoryExtraH src/Dodge/Render/HUD.hs 195;" f inventoryX src/Dodge/Creature.hs 115;" f @@ -4602,7 +4597,7 @@ itemFromEquipType src/Dodge/Item.hs 56;" f itemFromHeldType src/Dodge/Item/Held.hs 25;" f itemFromLeftType src/Dodge/Item.hs 76;" f itemInfo src/Dodge/Item/Info.hs 12;" f -itemInvColor src/Dodge/Item/InventoryColor.hs 10;" f +itemInvColor src/Dodge/Item/InventoryColor.hs 9;" f itemNumberDisplay src/Dodge/Item/Display.hs 95;" f itemRooms src/Dodge/LockAndKey.hs 39;" f itemRotTreeSPic src/Dodge/Item/Draw/SPic.hs 27;" f @@ -4617,9 +4612,9 @@ itemUseEffect' src/Dodge/Creature/Impulse/UseItem.hs 34;" 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 221;" f +itmEquipSiteInfo src/Dodge/Item/Info.hs 220;" f itmSpaceInfo src/Dodge/Item/Info.hs 17;" f -itmUsageInfo src/Dodge/Item/Info.hs 200;" f +itmUsageInfo src/Dodge/Item/Info.hs 199;" f jShape src/Dodge/Placement/Instance/LightSource.hs 86;" f jaggedShape src/Dodge/Block/Debris.hs 191;" f joinItemsInList src/Dodge/Item/Grammar.hs 146;" f @@ -4705,7 +4700,7 @@ listConfig src/Dodge/Menu.hs 199;" f listControls src/Dodge/Menu.hs 212;" f listCursorChooseBorderScale src/Dodge/Render/List.hs 105;" f listGuard src/Dodge/Creature/ReaderUpdate.hs 188;" f -listSelectionColorPicture src/Dodge/DisplayInventory.hs 243;" f +listSelectionColorPicture src/Dodge/DisplayInventory.hs 230;" f litCorridor90 src/Dodge/Room/RoadBlock.hs 26;" f llleft src/Dodge/Item/Grammar.hs 97;" f llright src/Dodge/Item/Grammar.hs 100;" f @@ -4823,13 +4818,12 @@ 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 14;" f +makeTypeCraft src/Dodge/Item/Craftable.hs 13;" f makeTypeCraftNum src/Dodge/Item/Craftable.hs 7;" f mapOverlay src/Dodge/Render/HUD/Carte.hs 24;" f -markWallSeen src/Dodge/Update.hs 565;" f +markWallSeen src/Dodge/Update.hs 564;" f maxDamageType src/Dodge/Damage.hs 37;" f maxShowX src/Dodge/Combine/Graph.hs 43;" f -maxT src/Dodge/Luse.hs 138;" f maxViewDistance src/Dodge/Viewpoints.hs 26;" f maybeBlockedPassage src/Dodge/Room/RezBox.hs 67;" f maybeClearDoorPath src/Dodge/Placement/PlaceSpot/TriggerDoor.hs 71;" f @@ -4839,7 +4833,7 @@ maybeClearPaths src/Dodge/Block.hs 69;" f maybeDestroyBlock src/Dodge/Wall/Damage.hs 26;" f maybeDestroyDoor src/Dodge/Wall/Damage.hs 31;" f maybeExitCombine src/Dodge/Update/Input/InGame.hs 259;" f -maybeOpenTerminal src/Dodge/Update.hs 113;" f +maybeOpenTerminal src/Dodge/Update.hs 112;" f maybeReadFile src/Dodge/LoadSeed.hs 10;" f maybeTakeOne src/RandomHelp.hs 107;" f maybeWarmupStatus src/Dodge/Item/Display.hs 120;" f @@ -4959,7 +4953,7 @@ mvBullet src/Dodge/Bullet.hs 33;" f mvButton src/Dodge/Placement/PlaceSpot.hs 174;" f mvCr src/Dodge/Placement/PlaceSpot.hs 184;" f mvFS src/Dodge/Placement/PlaceSpot.hs 187;" f -mvGust src/Dodge/Update.hs 593;" f +mvGust src/Dodge/Update.hs 592;" f mvLS src/Dodge/Placement/PlaceSpot.hs 215;" f mvP src/Dodge/Wall/Move.hs 54;" f mvPP src/Dodge/Placement/PlaceSpot.hs 181;" f @@ -5021,7 +5015,7 @@ optionScreenUpdate src/Dodge/Update/Input/ScreenLayer.hs 39;" f optionValueOffset src/Dodge/Menu/Option.hs 106;" f optionsOptions src/Dodge/Menu.hs 108;" f optionsToSelections src/Dodge/Menu/Option.hs 59;" f -orRegex src/Dodge/DisplayInventory.hs 82;" f +orRegex src/Dodge/DisplayInventory.hs 81;" f orange src/Color.hs 25;" f orderAround3 src/Geometry/Vector3D.hs 105;" f orderAroundFirst src/Geometry/Polygon.hs 74;" f @@ -5071,7 +5065,7 @@ pauseGame src/Dodge/Update/Input/InGame.hs 213;" f pauseMenu src/Dodge/Menu.hs 53;" f pauseMenuOptions src/Dodge/Menu.hs 58;" f pauseSound src/Dodge/SoundLogic.hs 41;" f -pauseTime src/Dodge/Update.hs 171;" f +pauseTime src/Dodge/Update.hs 170;" f pciToCI src/Dodge/Item/Grammar.hs 86;" f peZoneSize src/Dodge/Zoning/Pathing.hs 46;" f pedestalRoom src/Dodge/Room/Containing.hs 49;" f @@ -5098,7 +5092,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 43;" f +pipe src/Dodge/Item/Craftable.hs 42;" f pistol src/Dodge/Item/Held/Stick.hs 35;" f pistolCrit src/Dodge/Creature/PistolCrit.hs 13;" f pistolerRoom src/Dodge/Room/Room.hs 323;" f @@ -5124,8 +5118,8 @@ placeSpotRoomRand src/Dodge/Placement/PlaceSpot.hs 79;" f 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 153;" f -plateCraft src/Dodge/Item/Craftable.hs 46;" f +plainRegex src/Dodge/DisplayInventory.hs 140;" f +plateCraft src/Dodge/Item/Craftable.hs 45;" f playIfFree src/Sound.hs 136;" f playPositionalSoundQueue src/Sound.hs 144;" f playSoundAndUpdate src/Sound.hs 54;" f @@ -5217,17 +5211,17 @@ positionRoomsFromTree src/Dodge/Tree/Shift.hs 35;" f postGenerationProcessing src/Dodge/LevelGen.hs 33;" f 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 +powerFakeout src/Dodge/Room/Start.hs 26;" f +powerFakeout' src/Dodge/Room/Start.hs 23;" f powerLegs src/Dodge/Item/Equipment.hs 107;" f powlist src/Multiset.hs 55;" f powlistUpToN src/Multiset.hs 20;" f powlistUpToN' src/Multiset.hs 9;" f powlistUpToN'' src/Multiset.hs 27;" f ppDraw src/Dodge/Render/ShapePicture.hs 148;" f -ppEvents src/Dodge/Update.hs 558;" f +ppEvents src/Dodge/Update.hs 557;" f ppLevelReset src/Dodge/PressPlate.hs 13;" f -preCritStart src/Dodge/Room/Start.hs 92;" f +preCritStart src/Dodge/Room/Start.hs 81;" f preloadRender src/Preload/Render.hs 30;" f premapMaybe src/FoldlHelp.hs 24;" f prependTwo src/Geometry.hs 165;" f @@ -5319,7 +5313,7 @@ randOnHemisphere src/RandomHelp.hs 88;" f randOnUnitSphere src/RandomHelp.hs 81;" f randProb src/RandomHelp.hs 64;" f randSpark src/Dodge/Spark.hs 74;" f -randomChallenges src/Dodge/Room/Start.hs 72;" f +randomChallenges src/Dodge/Room/Start.hs 61;" f randomCompass src/Dodge/Layout.hs 59;" f randomFourCornerRoom src/Dodge/Room/Procedural.hs 265;" f randomFourCornerRoomCrsIts src/Dodge/Room/Procedural.hs 277;" f @@ -5350,7 +5344,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 69;" f +regexCombs src/Dodge/DisplayInventory.hs 68;" f regexFocus src/Dodge/InputFocus.hs 46;" f regexIn src/Regex.hs 4;" f regexList src/Regex.hs 7;" f @@ -5391,10 +5385,10 @@ retreatActionsPistol src/Dodge/Humanoid.hs 248;" f retreatFireLauncher src/Dodge/Humanoid.hs 269;" f retreatPointForFrom src/Dodge/Creature/Impulse/Flee.hs 7;" f reversePair src/Dodge/LevelGen.hs 82;" f -rewindWatch src/Dodge/Item/Weapon/Utility.hs 37;" f +rewindWatch src/Dodge/Item/Weapon/Utility.hs 36;" f rezBox src/Dodge/Room/RezBox.hs 22;" f rezBox' src/Dodge/Room/RezBox.hs 30;" f -rezBoxStart src/Dodge/Room/Start.hs 87;" f +rezBoxStart src/Dodge/Room/Start.hs 76;" f rezBoxes src/Dodge/Room/RezBox.hs 105;" f rezBoxesWp src/Dodge/Room/RezBox.hs 44;" f rezBoxesWpCrit src/Dodge/Room/RezBox.hs 77;" f @@ -5469,7 +5463,7 @@ rprBool src/Dodge/PlacementSpot.hs 72;" f rprBoolShift src/Dodge/PlacementSpot.hs 111;" f rprShift src/Dodge/PlacementSpot.hs 102;" f rsObjectColor src/Dodge/RadarSweep/Draw.hs 23;" f -runPastStart src/Dodge/Room/Start.hs 81;" f +runPastStart src/Dodge/Room/Start.hs 70;" f runTerminalString src/Dodge/Terminal/ReturnEffect.hs 22;" f sPS src/Dodge/LevelGen/PlacementHelper.hs 27;" f safeAngleVV src/Geometry/Vector.hs 68;" f @@ -5509,9 +5503,9 @@ scrollCommands src/Dodge/Update/Scroll.hs 131;" f scrollDebugInfoInt src/Dodge/Debug.hs 46;" f scrollRBOption src/Dodge/Update/Scroll.hs 108;" f scrollSelectionSections src/Dodge/SelectionSections.hs 17;" f -scrollTimeBack src/Dodge/Update.hs 195;" f -scrollTimeForward src/Dodge/Update.hs 214;" f -scrollWatch src/Dodge/Item/Weapon/Utility.hs 31;" f +scrollTimeBack src/Dodge/Update.hs 194;" f +scrollTimeForward src/Dodge/Update.hs 213;" f +scrollWatch src/Dodge/Item/Weapon/Utility.hs 30;" f seagullBarkS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 406;" f seagullChatter1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 476;" f seagullChatterS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 390;" f @@ -5564,7 +5558,7 @@ setLinkTypePD src/Dodge/RoomLink.hs 67;" f setMinInvSize src/Dodge/Creature/Action.hs 150;" f setMusicVolume src/Sound.hs 161;" f setMvPos src/Dodge/Creature/ReaderUpdate.hs 51;" f -setOldPos src/Dodge/Update.hs 349;" f +setOldPos src/Dodge/Update.hs 348;" f setOutLinks src/Dodge/RoomLink.hs 48;" f setOutLinksByType src/Dodge/RoomLink.hs 57;" f setOutLinksPD src/Dodge/RoomLink.hs 77;" f @@ -5662,7 +5656,6 @@ showIntsString src/Dodge/Tree/Compose.hs 129;" f showManObj src/Dodge/TestString.hs 40;" f showTerminalError src/Dodge/Debug/Terminal.hs 76;" f showTimeFlow src/Dodge/TestString.hs 87;" f -shrinkGun src/Dodge/Item/Weapon/Utility.hs 44;" f shrinkPolyOnEdges src/Geometry/Polygon.hs 128;" f shrinkVert src/Geometry/Polygon.hs 132;" f shuffle src/RandomHelp.hs 46;" f @@ -5670,20 +5663,20 @@ shuffleLinks src/Dodge/Room/Link.hs 30;" f shuffleRoomPos src/Dodge/Layout.hs 78;" f shuffleTail src/RandomHelp.hs 55;" f sigmoid src/Dodge/Base.hs 129;" f -simpleCrSprings src/Dodge/Update.hs 641;" f +simpleCrSprings src/Dodge/Update.hs 640;" f simpleDamFL src/Dodge/Flame.hs 41;" f simpleTermMessage src/Dodge/Terminal.hs 249;" f sineRaisePitchOneSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 486;" f sineRaisePitchTwoSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 340;" f -singleAmmo src/Dodge/Default/Item.hs 45;" f +singleAmmo src/Dodge/Default/Item.hs 44;" f singleBlock src/Dodge/Placement/Instance/Wall.hs 30;" f singleDT src/Dodge/DoubleTree.hs 9;" f singleLDT src/Dodge/DoubleTree.hs 12;" f singleton src/DoubleStack.hs 11;" f singletonTrie src/SimpleTrie.hs 18;" f sizeFBOs src/Framebuffer/Update.hs 22;" f -sizeModule src/Dodge/Item/Craftable.hs 37;" f -sizeSelf src/Dodge/Creature/Action.hs 200;" f +sizeModule src/Dodge/Item/Craftable.hs 36;" f +sizeSelf src/Dodge/Creature/Action.hs 197;" f skwareFadeTwoSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 366;" f slideDoorS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 492;" f slideWindow src/ListHelp.hs 80;" f @@ -5771,11 +5764,11 @@ stackPicturesAtOff src/Dodge/Render/List.hs 84;" f stackText src/Picture/Base.hs 188;" f stackedInventory src/Dodge/Creature.hs 282;" f startCr src/Dodge/Creature.hs 91;" f -startCrafts src/Dodge/Room/Start.hs 102;" f +startCrafts src/Dodge/Room/Start.hs 91;" f startInvList src/Dodge/Creature.hs 109;" f startInventory src/Dodge/Creature.hs 112;" f startNewGameInSlot src/Dodge/StartNewGame.hs 15;" f -startRoom src/Dodge/Room/Start.hs 62;" f +startRoom src/Dodge/Room/Start.hs 51;" f startSeedGame src/Dodge/StartNewGame.hs 20;" f startSeedGameConc src/Dodge/StartNewGame.hs 27;" f statsModifier src/Dodge/Creature/Info.hs 14;" f @@ -5789,7 +5782,7 @@ stoneWallDamage src/Dodge/Wall/DamageEffect.hs 24;" f stopAllSounds src/Sound.hs 124;" f stopPushing src/Dodge/Block.hs 103;" f stopSoundFrom src/Dodge/SoundLogic.hs 206;" f -stopWatch src/Dodge/Item/Weapon/Utility.hs 14;" f +stopWatch src/Dodge/Item/Weapon/Utility.hs 13;" f strFromEquipment src/Dodge/Creature/Statistics.hs 19;" f strFromHeldItem src/Dodge/Creature/Statistics.hs 37;" f strengthFactor src/Dodge/Creature/Impulse/Movement.hs 32;" f @@ -5837,7 +5830,7 @@ targetYouWhenCognizant src/Dodge/Creature/SetTarget.hs 9;" f targetingScope src/Dodge/Item/Scope.hs 23;" f telRoomLev src/Dodge/Room/Teleport.hs 14;" f teleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 378;" f -teleportModule src/Dodge/Item/Craftable.hs 31;" f +teleportModule src/Dodge/Item/Craftable.hs 30;" f termButton src/Dodge/Placement/Instance/Terminal.hs 51;" f termSoundLine src/Dodge/Terminal.hs 109;" f termTextColor src/Dodge/Terminal.hs 112;" f @@ -5880,8 +5873,8 @@ threeLineDecoration src/Dodge/Placement/TopDecoration.hs 61;" 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 158;" f -timeModule src/Dodge/Item/Craftable.hs 34;" f +timeFlowUpdate src/Dodge/Update.hs 157;" f +timeModule src/Dodge/Item/Craftable.hs 33;" f timerTLS src/Dodge/LightSource/Update.hs 22;" f tinMag src/Dodge/Item/Ammo.hs 15;" f tinitusS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 402;" f @@ -5889,7 +5882,7 @@ titleOptionsMenu src/Dodge/Menu.hs 99;" f titleOptionsNoWrite src/Dodge/Menu.hs 102;" f tlsTimeRadColPos src/Dodge/LightSource.hs 69;" f tlsTimeRadFunPos src/Dodge/LightSource.hs 26;" f -tmUpdate src/Dodge/Update.hs 329;" f +tmUpdate src/Dodge/Update.hs 328;" f toBothLnk src/Dodge/RoomLink.hs 121;" f toClosestMultiple src/HelpNum.hs 3;" f toColor8 src/Color.hs 148;" f @@ -5903,7 +5896,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 32;" f +toggleCombineInv src/Dodge/DisplayInventory.hs 31;" f toggleCommand src/Dodge/Terminal.hs 194;" f toggleEquipmentAt src/Dodge/Creature/Impulse/UseItem.hs 75;" f toggleJust src/MaybeHelp.hs 41;" f @@ -6010,7 +6003,7 @@ unitVectorAtAngle src/Geometry/Vector.hs 100;" f unlockInv src/Dodge/Inventory/Lock.hs 9;" f unpause src/Dodge/Menu.hs 192;" f unsafeBlinkAction src/Dodge/Creature/Action/Blink.hs 52;" f -unsafeBlinkGun src/Dodge/Item/Weapon/Utility.hs 61;" f +unsafeBlinkGun src/Dodge/Item/Weapon/Utility.hs 52;" f unsafeSwapKeys src/IntMapHelp.hs 76;" f unshadowBlock src/Dodge/Block.hs 38;" f untilJust src/MonadHelp.hs 7;" f @@ -6031,60 +6024,59 @@ updateBarreloid src/Dodge/Barreloid.hs 13;" f updateBounds src/Dodge/Update/Camera.hs 245;" f updateBulVel src/Dodge/Bullet.hs 50;" f updateBullet src/Dodge/Bullet.hs 28;" f -updateBullets src/Dodge/Update.hs 424;" f +updateBullets src/Dodge/Update.hs 423;" f updateCamera src/Dodge/Update/Camera.hs 31;" f updateCloseObjects src/Dodge/Inventory.hs 112;" f -updateCloud src/Dodge/Update.hs 607;" f -updateClouds src/Dodge/Update.hs 453;" f -updateCombinePositioning src/Dodge/DisplayInventory.hs 37;" f -updateCombineSections src/Dodge/DisplayInventory.hs 42;" f +updateCloud src/Dodge/Update.hs 606;" f +updateClouds src/Dodge/Update.hs 452;" f +updateCombinePositioning src/Dodge/DisplayInventory.hs 36;" f +updateCombineSections src/Dodge/DisplayInventory.hs 41;" f updateCreature src/Dodge/Creature/Update.hs 10;" f -updateCreatureGroups src/Dodge/Update.hs 393;" f -updateCreatureSoundPositions src/Dodge/Update.hs 371;" f +updateCreatureGroups src/Dodge/Update.hs 392;" f +updateCreatureSoundPositions src/Dodge/Update.hs 370;" f updateDebugMessageOffset src/Dodge/Update.hs 91;" f -updateDelayedEvents src/Dodge/Update.hs 670;" f -updateDisplaySections src/Dodge/DisplayInventory.hs 92;" f +updateDelayedEvents src/Dodge/Update.hs 669;" f +updateDisplaySections src/Dodge/DisplayInventory.hs 91;" f updateDistortion src/Dodge/Distortion.hs 5;" f -updateDistortions src/Dodge/Update.hs 414;" f +updateDistortions src/Dodge/Update.hs 413;" f updateEnergyBall src/Dodge/EnergyBall.hs 46;" f -updateEnergyBalls src/Dodge/Update.hs 441;" f +updateEnergyBalls src/Dodge/Update.hs 440;" f updateEnterRegex src/Dodge/Update/Input/InGame.hs 188;" f updateExpBarrel src/Dodge/Barreloid.hs 19;" f updateFBOTO src/Framebuffer/Update.hs 97;" f updateFBOTO3 src/Framebuffer/Update.hs 131;" f updateFlame src/Dodge/Flame.hs 71;" f -updateFlames src/Dodge/Update.hs 438;" f +updateFlames src/Dodge/Update.hs 437;" f updateFlare src/Dodge/Flare.hs 7;" f updateFloatingCamera src/Dodge/Update/Camera.hs 36;" f -updateGusts src/Dodge/Update.hs 590;" f +updateGusts src/Dodge/Update.hs 589;" f updateHeldRootItem src/Dodge/Creature/State.hs 166;" f updateHumanoid src/Dodge/Humanoid.hs 12;" f -updateIMl src/Dodge/Update.hs 385;" f -updateIMl' src/Dodge/Update.hs 389;" f +updateIMl src/Dodge/Update.hs 384;" f +updateIMl' src/Dodge/Update.hs 388;" f updateInGameCamera src/Dodge/Update/Camera.hs 70;" f updateInitialPressInGame src/Dodge/Update/Input/InGame.hs 108;" f -updateInstantBullets src/Dodge/Update.hs 530;" f +updateInstantBullets src/Dodge/Update.hs 529;" f updateInv src/Dodge/Creature/State.hs 151;" f -updateInventoryPositioning src/Dodge/DisplayInventory.hs 87;" f -updateInventorySectionItems src/Dodge/DisplayInventory.hs 141;" f +updateInventoryPositioning src/Dodge/DisplayInventory.hs 86;" f updateItemTargeting src/Dodge/Creature/State.hs 264;" f updateItemWithOrientation src/Dodge/Creature/State.hs 193;" f updateKeyInGame src/Dodge/Update/Input/InGame.hs 102;" f updateKeysInTerminal src/Dodge/Update/Input/InGame.hs 91;" f updateLampoid src/Dodge/Lampoid.hs 12;" f updateLaser src/Dodge/Laser/Update.hs 13;" f -updateLasers src/Dodge/Update.hs 314;" f -updateLightSources src/Dodge/Update.hs 417;" f +updateLasers src/Dodge/Update.hs 313;" f +updateLightSources src/Dodge/Update.hs 416;" f updateLinearShockwave src/Dodge/LinearShockwave/Update.hs 8;" f updateLongPressInGame src/Dodge/Update/Input/InGame.hs 128;" f -updateMIM src/Dodge/Update.hs 543;" f +updateMIM src/Dodge/Update.hs 542;" f updateMachine src/Dodge/Machine/Update.hs 16;" f updateMovement src/Dodge/Creature/State.hs 328;" f -updateObjCatMaybes src/Dodge/Update.hs 405;" f -updateObjMapMaybe src/Dodge/Update.hs 398;" f -updatePastWorlds src/Dodge/Update.hs 303;" f +updateObjCatMaybes src/Dodge/Update.hs 404;" f +updateObjMapMaybe src/Dodge/Update.hs 397;" f +updatePastWorlds src/Dodge/Update.hs 302;" f updatePosEvent src/Dodge/PosEvent.hs 11;" f -updatePosEvents src/Dodge/Update.hs 450;" f +updatePosEvents src/Dodge/Update.hs 449;" f updatePreload src/Preload/Update.hs 20;" f updatePressedButtonsCarte src/Dodge/Update/Input/InGame.hs 66;" f updatePressedButtonsCarte' src/Dodge/Update/Input/InGame.hs 69;" f @@ -6092,42 +6084,42 @@ updateProjectile src/Dodge/Projectile/Update.hs 22;" f updateProp src/Dodge/Prop/Update.hs 11;" f updateRBList src/Dodge/Inventory/RBList.hs 16;" f updateRadarBlip src/Dodge/RadarBlip.hs 8;" f -updateRadarBlips src/Dodge/Update.hs 420;" f +updateRadarBlips src/Dodge/Update.hs 419;" f updateRadarSweep src/Dodge/RadarSweep.hs 25;" f -updateRadarSweeps src/Dodge/Update.hs 444;" f +updateRadarSweeps src/Dodge/Update.hs 443;" f updateRandNode src/TreeHelp.hs 108;" f updateRenderSplit appDodge/Main.hs 105;" f updateRootItemID src/Dodge/Inventory/Location.hs 41;" f updateScopeZoom src/Dodge/Update/Camera.hs 127;" f updateScopeZoom' src/Dodge/Update/Camera.hs 132;" f updateScrollTestValue src/Dodge/ScrollValue.hs 6;" f -updateSection src/Dodge/DisplayInventory.hs 183;" f -updateSectionsPositioning src/Dodge/DisplayInventory.hs 162;" f -updateSeenWalls src/Dodge/Update.hs 561;" f +updateSection src/Dodge/DisplayInventory.hs 170;" f +updateSectionsPositioning src/Dodge/DisplayInventory.hs 149;" f +updateSeenWalls src/Dodge/Update.hs 560;" f updateShockwave src/Dodge/Shockwave/Update.hs 12;" f -updateShockwaves src/Dodge/Update.hs 435;" f +updateShockwaves src/Dodge/Update.hs 434;" f updateSingleNodes src/TreeHelp.hs 97;" f updateSound src/Sound.hs 71;" f updateSounds src/Sound.hs 66;" f updateSpark src/Dodge/Spark.hs 19;" f -updateSparks src/Dodge/Update.hs 447;" f +updateSparks src/Dodge/Update.hs 446;" f updateTempLightSource src/Dodge/LightSource/Update.hs 7;" f updateTeslaArc src/Dodge/Tesla/Arc.hs 29;" f -updateTeslaArcs src/Dodge/Update.hs 429;" f +updateTeslaArcs src/Dodge/Update.hs 428;" f updateTractorBeam src/Dodge/TractorBeam/Update.hs 9;" f -updateTractorBeams src/Dodge/Update.hs 432;" f +updateTractorBeams src/Dodge/Update.hs 431;" f updateTurret src/Dodge/Machine/Update.hs 31;" f updateUniverse src/Dodge/Update.hs 71;" f updateUniverseFirst src/Dodge/Update.hs 82;" f -updateUniverseLast src/Dodge/Update.hs 123;" f -updateUniverseMid src/Dodge/Update.hs 142;" f +updateUniverseLast src/Dodge/Update.hs 122;" f +updateUniverseMid src/Dodge/Update.hs 141;" f updateUseInputInGame src/Dodge/Update/Input/InGame.hs 31;" f updateUseInputOnScreen src/Dodge/Update/Input/ScreenLayer.hs 20;" f updateWalkCycle src/Dodge/Creature/State/WalkCycle.hs 12;" f updateWallDamages src/Dodge/Update/WallDamage.hs 10;" f updateWheelEvent src/Dodge/Update/Scroll.hs 20;" f -updateWheelEvents src/Dodge/Update.hs 290;" f -updateWorldEventFlag src/Dodge/Update.hs 108;" f +updateWheelEvents src/Dodge/Update.hs 289;" f +updateWorldEventFlag src/Dodge/Update.hs 107;" f updateWorldEventFlags src/Dodge/Update.hs 102;" f upperBody src/Dodge/Creature/Picture.hs 133;" f upperBox src/Shape.hs 154;" f @@ -6159,7 +6151,7 @@ useHotKey src/Dodge/Creature/YourControl.hs 48;" f useItemHotkey src/Dodge/Creature/Impulse/UseItem.hs 145;" f useItemLeftClick src/Dodge/Creature/Impulse/UseItem.hs 120;" f useItemLeftClick' src/Dodge/Creature/Impulse/UseItem.hs 133;" f -useL src/Dodge/Luse.hs 13;" f +useL src/Dodge/Luse.hs 14;" f useLnkRoomPos src/Dodge/PlacementSpot.hs 244;" f useLoadedAmmo src/Dodge/HeldUse.hs 207;" f useMagShield src/Dodge/Euse.hs 69;" f @@ -6169,7 +6161,6 @@ useRewindGun src/Dodge/Luse.hs 41;" f useRoomPosCond src/Dodge/PlacementSpot.hs 178;" f useRoomPosRoomCond src/Dodge/PlacementSpot.hs 181;" f useRootItem src/Dodge/Creature/Impulse/UseItem.hs 25;" f -useShrinkGun src/Dodge/Luse.hs 59;" f useStopWatch src/Dodge/Luse.hs 24;" f useTimeCheck src/Dodge/Item/Weapon/TriggerType.hs 127;" f useTimeScrollGun src/Dodge/Luse.hs 32;" f @@ -6297,9 +6288,9 @@ zipCount src/Dodge/Tree/Shift.hs 129;" f zipCountDown src/Dodge/Room/Procedural.hs 117;" f zipWithDefaults src/Dodge/Item/Display.hs 21;" f zoneCloud src/Dodge/Zoning/Cloud.hs 27;" f -zoneClouds src/Dodge/Update.hs 322;" f +zoneClouds src/Dodge/Update.hs 321;" f zoneCreature src/Dodge/Zoning/Creature.hs 52;" f -zoneCreatures src/Dodge/Update.hs 366;" f +zoneCreatures src/Dodge/Update.hs 365;" f zoneExtract src/Dodge/Zoning/Base.hs 50;" f zoneMonoid src/Dodge/Zoning/Base.hs 80;" f zoneOfCirc src/Dodge/Zoning/Base.hs 22;" f