diff --git a/src/Dodge/Data/Universe.hs b/src/Dodge/Data/Universe.hs index dabef57c1..027f25df0 100644 --- a/src/Dodge/Data/Universe.hs +++ b/src/Dodge/Data/Universe.hs @@ -49,8 +49,7 @@ data Universe = Universe } data DebugItem = DebugItem - { _debugPic :: Picture - , _debugMessage :: [String] + { _debugMessage :: [String] , _debugInfo :: DebugInfo } diff --git a/src/Dodge/Debug.hs b/src/Dodge/Debug.hs index 6e828d7d7..a3c535607 100644 --- a/src/Dodge/Debug.hs +++ b/src/Dodge/Debug.hs @@ -1,8 +1,6 @@ {-# LANGUAGE LambdaCase #-} -module Dodge.Debug (debugEvents) where - ---import Dodge.Render.InfoBox +module Dodge.Debug (debugEvents,drawDebug) where import AesonHelp import Control.Lens @@ -26,8 +24,6 @@ import Picture.Base import qualified SDL import ShortShow ---import Data.Foldable (fold) - debugEvents :: Universe -> Universe debugEvents u = case dbools ^. at Enable_debug of Nothing -> u @@ -36,42 +32,38 @@ debugEvents u = case dbools ^. at Enable_debug of dbools = u ^. uvConfig . debug_booleans debugEvent :: DebugBool -> Universe -> Universe -debugEvent db u = u & uvDebug . at db .~ debugItem db u +debugEvent db u = u & uvDebug . at db ?~ debugItem db u -debugItem :: DebugBool -> Universe -> Maybe [DebugItem] +debugItem :: DebugBool -> Universe -> [DebugItem] debugItem = \case - Collision_test -> constDPic (drawCollisionTest . _uvWorld) - Circ_collision_test -> constDPic (drawCircCollisionTest . _uvWorld) - Select_creature -> Just . return . selectCreatureDebugItem - Show_walls_near_point_cursor -> constDPic (drawWallsNearCursor . _uvWorld) - Show_walls_near_segment -> constDPic (drawWallsNearSegment . _uvWorld) - Enable_debug -> const Nothing - Noclip -> const Nothing - Remove_LOS -> const Nothing - Cull_more_lights -> const Nothing - Close_shape_culling -> const Nothing - Bound_box_screen -> const Nothing - Show_ms_frame -> const Nothing - View_boundaries -> constDPic (viewBoundaries . _uvWorld) - Show_bound_box -> constDPic (drawBoundingBox . _uvWorld) - Show_wall_search_rays -> constDPic $ drawWallSearchRays . _uvWorld - Show_dda_test -> constDPic $ drawDDATest . _uvWorld - Show_far_wall_detect -> constDPic $ drawFarWallDetect . _uvWorld - Show_walls_near_point_you -> constDPic $ drawWallsNearYou . _uvWorld - Show_zone_near_point_cursor -> constDPic $ drawZoneNearPointCursor . _uvWorld - Show_zone_circ -> constDPic $ drawZoneCirc . _uvWorld - Inspect_wall -> constDPic $ drawInspectWalls . _uvWorld - Cr_awareness -> constDPic $ drawCreatureDisplayTexts . _uvWorld - Show_sound -> constDPic $ \u -> - fold (M.map (soundPic (u ^. uvConfig) (u ^. uvWorld)) $ u ^. uvWorld . playingSounds) - Cr_status -> Just . drawCrInfo - Mouse_position -> constDPic $ drawMousePosition . _uvWorld - Walls_info -> constDPic $ drawWlIDs . _uvWorld - Pathing -> constDPic $ \u -> drawPathing (u ^. uvConfig) (u ^. uvWorld) - Show_path_between -> constDPic $ drawPathBetween . _uvWorld - -constDPic :: (Universe -> Picture) -> Universe -> Maybe [DebugItem] -constDPic p u = Just [DebugItem (p u) mempty NoDebugInfo] + Collision_test -> mempty + Circ_collision_test -> mempty + Select_creature -> return . selectCreatureDebugItem + Show_walls_near_point_cursor -> mempty + Show_walls_near_segment -> mempty + Enable_debug -> mempty + Noclip -> mempty + Remove_LOS -> mempty + Cull_more_lights -> mempty + Close_shape_culling -> mempty + Bound_box_screen -> mempty + Show_ms_frame -> mempty + View_boundaries -> mempty + Show_bound_box -> mempty + Show_wall_search_rays -> mempty + Show_dda_test -> mempty + Show_far_wall_detect -> mempty + Show_walls_near_point_you -> mempty + Show_zone_near_point_cursor -> mempty + Show_zone_circ -> mempty + Inspect_wall -> mempty + Cr_awareness -> mempty + Show_sound -> mempty + Cr_status -> drawCrInfo + Mouse_position -> mempty + Walls_info -> mempty + Pathing -> mempty + Show_path_between -> mempty drawCrInfo :: Universe -> [DebugItem] drawCrInfo u = mapMaybe f . IM.elems $ w ^. cWorld . lWorld . creatures @@ -84,7 +76,6 @@ drawCrInfo u = mapMaybe f . IM.elems $ w ^. cWorld . lWorld . creatures && cr ^. crID /= 0 Just $ DebugItem - mempty ( catMaybes [ g show "crID" $ cr ^? crID , g show "crHP" $ cr ^? crHP . _HP @@ -132,8 +123,7 @@ drawCrInfo u = mapMaybe f . IM.elems $ w ^. cWorld . lWorld . creatures selectCreatureDebugItem :: Universe -> DebugItem selectCreatureDebugItem u = DebugItem - { _debugPic = mempty - , _debugMessage = debugSelectCreatureMessage u + { _debugMessage = debugSelectCreatureMessage u , _debugInfo = scrollDebugInfoInt (length $ debugSelectCreatureList 0 u) u $ clickGetCreature u } @@ -194,3 +184,35 @@ closestCreatureID u = $ _uvWorld u where mwp = mouseWorldPos (u ^. uvWorld . input) (u ^. uvWorld . wCam) + +drawDebug :: Universe -> DebugBool -> Picture +drawDebug u = \case + Collision_test -> drawCollisionTest $ _uvWorld u + Circ_collision_test -> drawCircCollisionTest $ _uvWorld u + Select_creature -> mempty + Show_walls_near_point_cursor -> drawWallsNearCursor $ _uvWorld u + Show_walls_near_segment -> drawWallsNearSegment $ _uvWorld u + Enable_debug -> mempty + Noclip -> mempty + Remove_LOS -> mempty + Cull_more_lights -> mempty + Close_shape_culling -> mempty + Bound_box_screen -> mempty + Show_ms_frame -> mempty + View_boundaries -> viewBoundaries $ _uvWorld u + Show_bound_box -> drawBoundingBox $ _uvWorld u + Show_wall_search_rays -> drawWallSearchRays $ _uvWorld u + Show_dda_test -> drawDDATest $ _uvWorld u + Show_far_wall_detect -> drawFarWallDetect $ _uvWorld u + Show_walls_near_point_you -> drawWallsNearYou $ _uvWorld u + Show_zone_near_point_cursor -> drawZoneNearPointCursor $ _uvWorld u + Show_zone_circ -> drawZoneCirc $ _uvWorld u + Inspect_wall -> drawInspectWalls $ _uvWorld u + Cr_awareness -> drawCreatureDisplayTexts $ _uvWorld u + Show_sound -> fold + $ M.map (soundPic (u ^. uvConfig) (u ^. uvWorld)) $ u ^. uvWorld . playingSounds + Cr_status -> mempty + Mouse_position -> drawMousePosition $ _uvWorld u + Walls_info -> drawWlIDs $ _uvWorld u + Pathing -> drawPathing (u ^. uvConfig) (u ^. uvWorld) + Show_path_between -> drawPathBetween $ _uvWorld u diff --git a/src/Dodge/Render/ShapePicture.hs b/src/Dodge/Render/ShapePicture.hs index 32be35492..ea62c1281 100644 --- a/src/Dodge/Render/ShapePicture.hs +++ b/src/Dodge/Render/ShapePicture.hs @@ -1,5 +1,8 @@ +{-# LANGUAGE LambdaCase #-} module Dodge.Render.ShapePicture (worldSPic) where +import Dodge.Debug +import qualified Data.Map.Strict as M import Control.Lens import Data.Foldable import Data.Strict.Tuple @@ -110,8 +113,7 @@ extraPics cfig u = <> _flares lw <> foldMap drawLightSource (_lightSources lw) <> viewClipBounds cfig w --- <> showEnabledDebugs cfig - <> foldMap (foldMap _debugPic) (_uvDebug u) -- debug messages are in fixed coord pics + <> foldMap (drawDebug u) (M.keys $ _uvDebug u) where w = u ^. uvWorld lw = w ^. cWorld . lWorld @@ -124,14 +126,10 @@ floorItemSPic itm flit = (itemSPic itm) btSPic :: Button -> SPic -btSPic bt = - uncurryV translateSPxy (_btPos bt) $ - rotateSP (_btRot bt) (drawButton bt) +btSPic bt = uncurryV translateSPxy (_btPos bt) $ rotateSP (_btRot bt) (drawButton bt) mcSPic :: CWorld -> Machine -> SPic -mcSPic cw mc = - uncurryV translateSPxy (_mcPos mc) $ - rotateSP (_mcDir mc) (drawMachine cw mc) +mcSPic cw mc = uncurryV translateSPxy (_mcPos mc) $ rotateSP (_mcDir mc) (drawMachine cw mc) drawBullet :: Bullet -> Picture drawBullet pt = diff --git a/tags b/tags index 0f5060aa8..e2db055e2 100644 --- a/tags +++ b/tags @@ -148,7 +148,7 @@ BloomLayer src/Picture/Data.hs 25;" C BloomNoZWrite src/Picture/Data.hs 26;" C Blunt src/Dodge/Data/Damage.hs 21;" C Boosting src/Dodge/Data/Creature/Stance.hs 32;" C -BottomMenuOption src/Dodge/Data/Universe.hs 77;" C +BottomMenuOption src/Dodge/Data/Universe.hs 76;" C BounceBullet src/Dodge/Data/Bullet.hs 30;" C Bound_box_screen src/Dodge/Data/Config.hs 81;" C BoundaryCursor src/Dodge/Data/SelectionList.hs 20;" C @@ -326,13 +326,13 @@ Debris src/Dodge/Data/Prop.hs 48;" t DebrisChunk src/Dodge/Data/Prop.hs 48;" C DebrisType src/Dodge/Data/Prop.hs 42;" t DebugBool src/Dodge/Data/Config.hs 66;" t -DebugInfo src/Dodge/Data/Universe.hs 57;" t -DebugIntMInt src/Dodge/Data/Universe.hs 62;" C +DebugInfo src/Dodge/Data/Universe.hs 56;" t +DebugIntMInt src/Dodge/Data/Universe.hs 61;" C DebugItem src/Dodge/Data/Universe.hs 51;" t DebugLayer src/Picture/Data.hs 27;" C -DebugMInt src/Dodge/Data/Universe.hs 61;" C -DebugV2 src/Dodge/Data/Universe.hs 60;" C -DebugV3 src/Dodge/Data/Universe.hs 59;" C +DebugMInt src/Dodge/Data/Universe.hs 60;" C +DebugV2 src/Dodge/Data/Universe.hs 59;" C +DebugV3 src/Dodge/Data/Universe.hs 58;" C DecorationShape src/Dodge/Data/GenParams.hs 20;" t DefaultCrGroupUpdate src/Dodge/Data/CrGroupParams.hs 22;" C DefaultForceField src/Dodge/Data/Item/Use/Consumption/Ammo.hs 11;" C @@ -424,7 +424,7 @@ Explosive src/Dodge/Data/Damage.hs 29;" C ExplosiveBall src/Dodge/Data/EnergyBall/Type.hs 16;" C ExplosiveBarrel src/Dodge/Data/Creature/Misc.hs 89;" C ExplosivePutty src/Dodge/Data/AmmoType.hs 13;" C -ExtraMenuOption src/Dodge/Data/Universe.hs 76;" t +ExtraMenuOption src/Dodge/Data/Universe.hs 75;" t Eyes src/Dodge/Data/Creature/Perception.hs 41;" C FBO src/Shader/Data.hs 57;" t FLAMESHIELD src/Dodge/Data/Item/Combine.hs 122;" C @@ -497,7 +497,7 @@ GStuckCreature src/Dodge/Data/Projectile.hs 50;" C GStuckWall src/Dodge/Data/Projectile.hs 51;" C GYROSCOPE src/Dodge/Data/Item/Combine.hs 97;" C GadgetPlatformSF src/Dodge/Data/ComposedItem.hs 18;" C -GameOverOptions src/Dodge/Data/Universe.hs 72;" C +GameOverOptions src/Dodge/Data/Universe.hs 71;" C GameRoom src/Dodge/GameRoom.hs 15;" t GasAmmo src/Dodge/Data/AmmoType.hs 11;" C GasCloud src/Dodge/Data/Cloud.hs 26;" C @@ -540,7 +540,7 @@ HP src/Dodge/Data/Creature.hs 71;" C HUD src/Dodge/Data/HUD.hs 31;" t HalfRes src/Dodge/Data/Config.hs 97;" C HammerTrigger src/Dodge/Data/TriggerType.hs 10;" C -HardQuit src/Dodge/Data/Universe.hs 70;" C +HardQuit src/Dodge/Data/Universe.hs 69;" C HeavySmokeFlare src/Dodge/Data/Muzzle.hs 33;" C HeldItemType src/Dodge/Data/Item/Combine.hs 139;" t HeldPlatformSF src/Dodge/Data/ComposedItem.hs 14;" C @@ -597,11 +597,11 @@ InanimateAI src/Dodge/Data/Creature/Misc.hs 41;" C IncendiaryBall src/Dodge/Data/EnergyBall/Type.hs 13;" C InheritFloor src/Data/Tile.hs 12;" C Input src/Dodge/Data/Input.hs 33;" t -InputScreen src/Dodge/Data/Universe.hs 92;" C +InputScreen src/Dodge/Data/Universe.hs 91;" C Inspect_wall src/Dodge/Data/Config.hs 92;" C Institution src/Dodge/Data/Scenario.hs 42;" t Int2 src/Geometry/Data.hs 21;" t -IntID src/Dodge/Data/Universe.hs 110;" t +IntID src/Dodge/Data/Universe.hs 109;" t IntImp src/Dodge/Data/CreatureEffect.hs 20;" t Intention src/Dodge/Data/Creature.hs 76;" t IntersectingRoomClipBoundaries src/Dodge/Data/Config.hs 107;" C @@ -698,7 +698,7 @@ ListDisplayParams src/Dodge/Data/SelectionList.hs 13;" t LiveLongAndProsper src/Dodge/Data/ActionPlan.hs 198;" C LivingComplex src/Dodge/Data/Scenario.hs 68;" C LoadingBaySS src/Dodge/Data/Scenario.hs 93;" C -LoadingScreen src/Dodge/Data/Universe.hs 73;" C +LoadingScreen src/Dodge/Data/Universe.hs 72;" C LocDT src/Dodge/Data/DoubleTree.hs 101;" C LocLDT src/Dodge/Data/DoubleTree.hs 61;" C LocationDT src/Dodge/Data/DoubleTree.hs 101;" t @@ -722,9 +722,9 @@ MICROCHIP src/Dodge/Data/Item/Combine.hs 72;" C MICROPHONE src/Dodge/Data/Item/Combine.hs 83;" C MINIDISPLAY src/Dodge/Data/Item/Combine.hs 77;" C MINIGUNX src/Dodge/Data/Item/Combine.hs 151;" 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 +MODBlockedString src/Dodge/Data/Universe.hs 95;" C +MODString src/Dodge/Data/Universe.hs 94;" C +MODStringOption src/Dodge/Data/Universe.hs 96;" C MOTOR src/Dodge/Data/Item/Combine.hs 64;" C MP2Ac src/Dodge/Data/CreatureEffect.hs 56;" t MP2NoAction src/Dodge/Data/CreatureEffect.hs 56;" C @@ -774,8 +774,8 @@ Medium src/Shape/Data.hs 30;" C Melee src/Dodge/Data/ActionPlan.hs 41;" C MeleeStrike src/Dodge/Data/ActionPlan.hs 192;" C Memory src/Dodge/Data/Creature/Memory.hs 13;" t -MenuOption src/Dodge/Data/Universe.hs 99;" t -MenuOptionDisplay src/Dodge/Data/Universe.hs 94;" t +MenuOption src/Dodge/Data/Universe.hs 98;" t +MenuOptionDisplay src/Dodge/Data/Universe.hs 93;" t MetaBranch src/Dodge/Data/MetaTree.hs 18;" t MetaNode src/Dodge/Data/MetaTree.hs 14;" t MetaTree src/Dodge/Data/MetaTree.hs 11;" t @@ -842,7 +842,7 @@ NeverUsable src/Dodge/Data/UseCondition.hs 8;" C NewInt src/NewInt.hs 17;" t NewIntMap src/NewInt.hs 23;" t NewIntSet src/NewInt.hs 20;" t -NewSideEffect src/Dodge/Data/Universe.hs 65;" C +NewSideEffect src/Dodge/Data/Universe.hs 64;" C NoAction src/Dodge/Data/ActionPlan.hs 152;" C NoAmmoRequired src/Dodge/Data/Muzzle.hs 25;" C NoBeamCombine src/Dodge/Data/Beam.hs 43;" C @@ -850,8 +850,8 @@ NoConcurrentEffect src/Loop/Data.hs 7;" C NoCrImp src/Dodge/Data/CreatureEffect.hs 24;" C NoCrWdImp src/Dodge/Data/CreatureEffect.hs 14;" C NoCreatureEffect src/Dodge/Data/CreatureEffect.hs 11;" C -NoDebugInfo src/Dodge/Data/Universe.hs 58;" C -NoExtraMenuOption src/Dodge/Data/Universe.hs 79;" C +NoDebugInfo src/Dodge/Data/Universe.hs 57;" C +NoExtraMenuOption src/Dodge/Data/Universe.hs 78;" C NoFaction src/Dodge/Data/Creature/State.hs 20;" C NoFlare src/Dodge/Data/Muzzle.hs 29;" C NoHoming src/Dodge/Data/Projectile.hs 42;" C @@ -878,7 +878,7 @@ NodeMTree src/Dodge/Data/MetaTree.hs 16;" C NodeTree src/Dodge/Data/MetaTree.hs 15;" C NonDrawnCreature src/Dodge/Data/Creature/Misc.hs 84;" C NonInf src/Dodge/Data/CardinalPoint.hs 36;" C -NormalOptions src/Dodge/Data/Universe.hs 72;" C +NormalOptions src/Dodge/Data/Universe.hs 71;" C NormalSpark src/Dodge/Data/Spark.hs 22;" C NormalTimeFlow src/Dodge/Data/World.hs 63;" C North src/Dodge/Data/CardinalPoint.hs 6;" C @@ -951,8 +951,8 @@ OnwardCluster src/Dodge/Data/RoomCluster.hs 13;" C Opacity src/Dodge/Data/Wall.hs 40;" t Opaque src/Dodge/Data/Wall.hs 44;" C OpticScope src/Dodge/Data/Item/Scope.hs 14;" C -OptionScreen src/Dodge/Data/Universe.hs 82;" C -OptionScreenFlag src/Dodge/Data/Universe.hs 72;" t +OptionScreen src/Dodge/Data/Universe.hs 81;" C +OptionScreenFlag src/Dodge/Data/Universe.hs 71;" t OutAction src/Dodge/Creature/Action.hs 47;" t OutLink src/Dodge/Data/Room.hs 44;" C OutsideTerminal src/Dodge/Data/Input.hs 29;" C @@ -1166,7 +1166,7 @@ RoomProperties src/Dodge/Layout/Generate.hs 13;" t RoomType src/Dodge/Data/Room.hs 31;" t RoomWire src/Dodge/Data/Room.hs 53;" t RoundedFaces src/Shape/Data.hs 18;" C -RunningSideEffect src/Dodge/Data/Universe.hs 69;" C +RunningSideEffect src/Dodge/Data/Universe.hs 68;" C SCRAPMETAL src/Dodge/Data/Item/Combine.hs 62;" C SHATTERGUN src/Dodge/Data/Item/Combine.hs 174;" C SHELLMAG src/Dodge/Data/Item/Combine.hs 110;" C @@ -1187,7 +1187,7 @@ STICKYMOD src/Dodge/Data/Item/Combine.hs 24;" C SaveSlot src/Dodge/Data/SaveSlot.hs 9;" t SaveSlotNum src/Dodge/Data/SaveSlot.hs 12;" C Scope src/Dodge/Data/Item/Scope.hs 13;" t -ScreenLayer src/Dodge/Data/Universe.hs 81;" t +ScreenLayer src/Dodge/Data/Universe.hs 80;" t ScreenPos src/Dodge/Data/ScreenPos.hs 12;" t Search src/Dodge/Data/ActionPlan.hs 193;" C SecretCabal src/Dodge/Data/Scenario.hs 44;" C @@ -1245,7 +1245,7 @@ ShrapnelBomb src/Dodge/Data/Payload.hs 12;" C ShrinkGunStatus src/Dodge/Data/Item/Params.hs 28;" t Shrunk src/Dodge/Data/Item/Params.hs 28;" C SideCluster src/Dodge/Data/RoomCluster.hs 13;" C -SideEffect src/Dodge/Data/Universe.hs 64;" t +SideEffect src/Dodge/Data/Universe.hs 63;" t SixteenthRes src/Dodge/Data/Config.hs 97;" C Size src/Shape/Data.hs 28;" t SkiffBaySS src/Dodge/Data/Scenario.hs 108;" C @@ -1280,7 +1280,7 @@ Sparking src/Dodge/Data/Damage.hs 22;" C Spatial src/Dodge/Data/Scenario.hs 73;" C SpatialInfluence src/Dodge/Data/Scenario.hs 81;" t SpawnedBy src/Dodge/Data/Creature/State.hs 19;" C -SplashOptions src/Dodge/Data/Universe.hs 72;" C +SplashOptions src/Dodge/Data/Universe.hs 71;" C SplitBeamCombine src/Dodge/Data/Beam.hs 42;" C SpreadGunAI src/Dodge/Data/Creature/Misc.hs 42;" C StabOrthReduce src/Dodge/Projectile/Create.hs 17;" C @@ -1378,12 +1378,12 @@ ToPlaySound src/Sound/Data.hs 35;" t ToStart src/Sound/Data.hs 26;" C ToStartMenu src/Sound/Data.hs 29;" C ToStop src/Sound/Data.hs 28;" C -Toggle src/Dodge/Data/Universe.hs 100;" C -Toggle2 src/Dodge/Data/Universe.hs 104;" C +Toggle src/Dodge/Data/Universe.hs 99;" C +Toggle2 src/Dodge/Data/Universe.hs 103;" C ToggleSF src/Dodge/Data/ComposedItem.hs 38;" C TopDT src/Dodge/Data/DoubleTree.hs 85;" C TopLDT src/Dodge/Data/DoubleTree.hs 43;" C -TopMenuOption src/Dodge/Data/Universe.hs 78;" C +TopMenuOption src/Dodge/Data/Universe.hs 77;" C TorchSF src/Dodge/Data/ComposedItem.hs 45;" C TorpedoBaySS src/Dodge/Data/Scenario.hs 99;" C TorqueCr src/Dodge/Data/WorldEffect.hs 31;" C @@ -1650,8 +1650,8 @@ _cdtParent src/Dodge/Data/DoubleTree.hs 89;" f _cdtParent src/Dodge/Data/DoubleTree.hs 97;" f _cdtUp src/Dodge/Data/DoubleTree.hs 87;" f _cdtUp src/Dodge/Data/DoubleTree.hs 94;" f -_ceSideEffect src/Dodge/Data/Universe.hs 66;" f -_ceString src/Dodge/Data/Universe.hs 67;" f +_ceSideEffect src/Dodge/Data/Universe.hs 65;" f +_ceString src/Dodge/Data/Universe.hs 66;" f _chasmShader src/Data/Preload/Render.hs 46;" f _chasmVBO src/Data/Preload/Render.hs 45;" f _chasms src/Dodge/Data/CWorld.hs 30;" f @@ -1748,13 +1748,12 @@ _dbSpin src/Dodge/Data/Prop.hs 53;" f _dbType src/Dodge/Data/Prop.hs 50;" f _dbVel src/Dodge/Data/Prop.hs 51;" f _debris src/Dodge/Data/LWorld.hs 103;" f -_debugInfo src/Dodge/Data/Universe.hs 54;" f -_debugInt src/Dodge/Data/Universe.hs 62;" f -_debugMInt src/Dodge/Data/Universe.hs 61;" f -_debugMessage src/Dodge/Data/Universe.hs 53;" f -_debugPic src/Dodge/Data/Universe.hs 52;" f -_debugV2 src/Dodge/Data/Universe.hs 60;" f -_debugV3 src/Dodge/Data/Universe.hs 59;" f +_debugInfo src/Dodge/Data/Universe.hs 53;" f +_debugInt src/Dodge/Data/Universe.hs 61;" f +_debugMInt src/Dodge/Data/Universe.hs 60;" f +_debugMessage src/Dodge/Data/Universe.hs 52;" f +_debugV2 src/Dodge/Data/Universe.hs 59;" f +_debugV3 src/Dodge/Data/Universe.hs 58;" f _debug_booleans src/Dodge/Data/Config.hs 57;" f _debug_view_clip_bounds src/Dodge/Data/Config.hs 56;" f _delayedEvents src/Dodge/Data/LWorld.hs 132;" f @@ -1831,7 +1830,7 @@ _ebType src/Dodge/Data/EnergyBall.hs 21;" f _ebVel src/Dodge/Data/EnergyBall.hs 18;" f _eboName src/Shader/Data.hs 89;" f _eboPtr src/Shader/Data.hs 90;" f -_emoMenuOption src/Dodge/Data/Universe.hs 77;" f +_emoMenuOption src/Dodge/Data/Universe.hs 76;" f _energyBalls src/Dodge/Data/LWorld.hs 107;" f _fbSize src/Dodge/Data/EnergyBall/Type.hs 14;" f _fbo2 src/Data/Preload/Render.hs 29;" f @@ -2052,13 +2051,13 @@ _meleeCooldown src/Dodge/Data/Creature/Misc.hs 70;" f _meleeTarget src/Dodge/Data/ActionPlan.hs 187;" f _mgField src/Dodge/Data/Magnet.hs 25;" f _mgPos src/Dodge/Data/Magnet.hs 24;" f -_moEff src/Dodge/Data/Universe.hs 101;" f -_moEff1 src/Dodge/Data/Universe.hs 105;" f -_moEff2 src/Dodge/Data/Universe.hs 106;" f -_moString src/Dodge/Data/Universe.hs 102;" f -_moString src/Dodge/Data/Universe.hs 107;" f -_modOption src/Dodge/Data/Universe.hs 97;" f -_modString src/Dodge/Data/Universe.hs 95;" f +_moEff src/Dodge/Data/Universe.hs 100;" f +_moEff1 src/Dodge/Data/Universe.hs 104;" f +_moEff2 src/Dodge/Data/Universe.hs 105;" f +_moString src/Dodge/Data/Universe.hs 101;" f +_moString src/Dodge/Data/Universe.hs 106;" f +_modOption src/Dodge/Data/Universe.hs 96;" f +_modString src/Dodge/Data/Universe.hs 94;" f _modifications src/Dodge/Data/LWorld.hs 130;" f _mouseButtons src/Dodge/Data/Input.hs 38;" f _mouseButtonsReleased src/Dodge/Data/Input.hs 39;" f @@ -2270,15 +2269,15 @@ _rsPos src/Dodge/Data/RadarSweep.hs 20;" f _rsRad src/Dodge/Data/RadarSweep.hs 21;" f _rsSource src/Dodge/Data/RadarSweep.hs 26;" f _rsTimer src/Dodge/Data/RadarSweep.hs 23;" f -_scAvailableLines src/Dodge/Data/Universe.hs 89;" f -_scDisplayTime src/Dodge/Data/Universe.hs 90;" f -_scInput src/Dodge/Data/Universe.hs 92;" f -_scOffset src/Dodge/Data/Universe.hs 85;" f -_scOptionFlag src/Dodge/Data/Universe.hs 87;" f -_scOptions src/Dodge/Data/Universe.hs 84;" f -_scPositionedMenuOption src/Dodge/Data/Universe.hs 86;" f -_scSelectionList src/Dodge/Data/Universe.hs 88;" f -_scTitle src/Dodge/Data/Universe.hs 83;" f +_scAvailableLines src/Dodge/Data/Universe.hs 88;" f +_scDisplayTime src/Dodge/Data/Universe.hs 89;" f +_scInput src/Dodge/Data/Universe.hs 91;" f +_scOffset src/Dodge/Data/Universe.hs 84;" f +_scOptionFlag src/Dodge/Data/Universe.hs 86;" f +_scOptions src/Dodge/Data/Universe.hs 83;" f +_scPositionedMenuOption src/Dodge/Data/Universe.hs 85;" f +_scSelectionList src/Dodge/Data/Universe.hs 87;" f +_scTitle src/Dodge/Data/Universe.hs 82;" f _screenTextureVAO src/Data/Preload/Render.hs 52;" f _scrollAmount src/Dodge/Data/Input.hs 40;" f _scrollItemID src/Dodge/Data/World.hs 68;" f @@ -2591,7 +2590,7 @@ adjustIMZone src/Dodge/Base.hs 81;" f advanceScrollAmount src/Dodge/Update.hs 404;" f advanceSmoothScroll src/Dodge/SmoothScroll.hs 33;" f advanceStepCounter src/Dodge/Creature/Impulse/Movement.hs 46;" f -aimDelaySweep src/Dodge/Render/Picture.hs 275;" f +aimDelaySweep src/Dodge/Render/Picture.hs 276;" f aimStanceInfo src/Dodge/Item/Info.hs 243;" f aimTurn src/Dodge/Creature/YourControl.hs 181;" f airlock src/Dodge/Room/Airlock.hs 23;" f @@ -2701,7 +2700,7 @@ bangS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 668;" f bangStick src/Dodge/Item/Held/Stick.hs 15;" f barPP src/Dodge/Room/Foreground.hs 236;" f barrel src/Dodge/Creature/Inanimate.hs 17;" f -barrelShape src/Dodge/Render/ShapePicture.hs 76;" f +barrelShape src/Dodge/Render/ShapePicture.hs 78;" f baseAMRShape src/Dodge/Item/Draw/SPic.hs 406;" f baseBlockPane src/Dodge/Placement/Instance/Wall.hs 86;" f baseCI src/Dodge/Item/Grammar.hs 158;" f @@ -2785,7 +2784,7 @@ branchRectWith src/Dodge/Room/Branch.hs 15;" f branchWith src/Dodge/Room/Room.hs 69;" f bright src/Color.hs 120;" f brightX src/Color.hs 116;" f -btSPic src/Dodge/Render/ShapePicture.hs 126;" f +btSPic src/Dodge/Render/ShapePicture.hs 127;" f btText src/Dodge/Inventory/SelectionList.hs 237;" f bufferEBO src/Shader/Bind.hs 28;" f bufferPokedVBO src/Shader/Bind.hs 19;" f @@ -2887,7 +2886,7 @@ cleatLabel src/Dodge/Cleat.hs 30;" f cleatOnward src/Dodge/Cleat.hs 24;" f cleatSide src/Dodge/Cleat.hs 27;" f click1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 582;" f -clickGetCreature src/Dodge/Debug.hs 189;" f +clickGetCreature src/Dodge/Debug.hs 174;" f clicker src/Dodge/Item/Scope.hs 82;" f clipV src/Geometry/Vector.hs 48;" f clipZoom src/Dodge/Update/Camera.hs 230;" f @@ -2896,7 +2895,7 @@ closeButtonToSelectionItem src/Dodge/Inventory/SelectionList.hs 223;" f closeItemToSelectionItem src/Dodge/Inventory/SelectionList.hs 208;" f closeItemToTextPictures src/Dodge/Inventory/SelectionList.hs 243;" f closeObjectInfo src/Dodge/Render/HUD.hs 226;" f -closestCreatureID src/Dodge/Debug.hs 198;" f +closestCreatureID src/Dodge/Debug.hs 183;" f closestPointOnLine src/Geometry/Intersect.hs 272;" f closestPointOnLineParam src/Geometry/Intersect.hs 288;" f closestPointOnSeg src/Geometry/Intersect.hs 303;" f @@ -2954,7 +2953,7 @@ conEffects src/Dodge/Concurrent.hs 12;" f conLDTToConDT src/Dodge/DoubleTree.hs 22;" f concurrentIS src/Dodge/Update/Input/InGame.hs 287;" f connectItemS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 722;" f -constDPic src/Dodge/Debug.hs 71;" f +constDPic src/Dodge/Debug.hs 69;" f constructEdges src/Polyhedra.hs 34;" f constructEdgesList src/Polyhedra.hs 43;" f contToIDCont src/Dodge/LevelGen/PlacementHelper.hs 57;" f @@ -3055,7 +3054,7 @@ crsNearRect src/Dodge/Zoning/Creature.hs 39;" f crsNearSeg src/Dodge/Zoning/Creature.hs 24;" f crystalLine src/Dodge/Placement/Instance/Wall.hs 55;" f cubeShape src/Dodge/Block/Debris.hs 103;" f -cullPoint src/Dodge/Render/ShapePicture.hs 92;" f +cullPoint src/Dodge/Render/ShapePicture.hs 94;" f cullPretty src/AesonHelp.hs 14;" f cutPoly src/Dodge/LevelGen/StaticWalls.hs 77;" f cutWall src/Dodge/LevelGen/StaticWalls.hs 124;" f @@ -3110,15 +3109,15 @@ deadUpperBody src/Dodge/Creature/Picture.hs 113;" f debrisS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 684;" f debrisSPic src/Dodge/Prop/Draw.hs 20;" f debrisSize src/Dodge/Block/Debris.hs 77;" f -debugEvent src/Dodge/Debug.hs 35;" f -debugEvents src/Dodge/Debug.hs 28;" f -debugItem src/Dodge/Debug.hs 38;" f -debugList src/Dodge/Debug.hs 185;" f +debugEvent src/Dodge/Debug.hs 34;" f +debugEvents src/Dodge/Debug.hs 27;" f +debugItem src/Dodge/Debug.hs 37;" f +debugList src/Dodge/Debug.hs 171;" f debugMenu src/Dodge/Menu.hs 125;" f debugMenuOptions src/Dodge/Menu.hs 131;" f debugOn src/Dodge/Data/Config.hs 151;" f -debugSelectCreatureList src/Dodge/Debug.hs 168;" f -debugSelectCreatureMessage src/Dodge/Debug.hs 159;" f +debugSelectCreatureList src/Dodge/Debug.hs 149;" f +debugSelectCreatureMessage src/Dodge/Debug.hs 140;" f decodeSensorType src/Dodge/Terminal.hs 72;" f decomposeSelfTree src/Dodge/Tree/Compose.hs 61;" f decomposeTree src/Dodge/Tree/Compose.hs 58;" f @@ -3218,7 +3217,7 @@ dirtPoly src/Dodge/Room/RoadBlock.hs 74;" f disconnectItemS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 650;" f displayConfig src/Dodge/Menu.hs 231;" f displayControls src/Dodge/Menu.hs 242;" f -displayFrameTicks src/Dodge/Render/Picture.hs 48;" f +displayFrameTicks src/Dodge/Render/Picture.hs 49;" f displayFreeSlots src/Dodge/DisplayInventory.hs 192;" f displayIndents src/Dodge/DisplayInventory.hs 110;" f displayPulse src/Dodge/Inventory/SelectionList.hs 179;" f @@ -3324,44 +3323,44 @@ doublePairSet src/Geometry.hs 166;" f doubleTreeToIndentList src/Dodge/DoubleTree.hs 129;" f doubleV2 src/Geometry.hs 169;" f drawARHUD src/Dodge/Creature/State.hs 193;" f -drawAimSweep src/Dodge/Render/Picture.hs 282;" f +drawAimSweep src/Dodge/Render/Picture.hs 283;" f drawAllShadows src/Dodge/Shadows.hs 5;" f -drawArrowDown src/Dodge/Render/Picture.hs 209;" f +drawArrowDown src/Dodge/Render/Picture.hs 210;" f drawBaseMachine src/Dodge/Machine/Draw.hs 68;" f drawBeam src/Dodge/Beam/Draw.hs 6;" f drawBlip src/Dodge/RadarBlip.hs 16;" f drawBlock src/Dodge/Block/Draw.hs 7;" f drawBoundingBox src/Dodge/Debug/Picture.hs 348;" f -drawBullet src/Dodge/Render/ShapePicture.hs 136;" f +drawBullet src/Dodge/Render/ShapePicture.hs 137;" f drawButton src/Dodge/Button/Draw.hs 10;" f drawCPUShadows src/Dodge/Render/Shadow.hs 19;" f -drawChasm src/Dodge/Render/ShapePicture.hs 48;" f +drawChasm src/Dodge/Render/ShapePicture.hs 50;" f drawCircCollisionTest src/Dodge/Debug/Picture.hs 118;" f -drawCliff src/Dodge/Render/ShapePicture.hs 51;" f +drawCliff src/Dodge/Render/ShapePicture.hs 53;" f drawCollisionTest src/Dodge/Debug/Picture.hs 103;" f -drawCombFilter src/Dodge/Render/Picture.hs 257;" f +drawCombFilter src/Dodge/Render/Picture.hs 258;" f drawCombineInventory src/Dodge/Render/HUD.hs 182;" f -drawConcurrentMessage src/Dodge/Render/Picture.hs 71;" f +drawConcurrentMessage src/Dodge/Render/Picture.hs 72;" f drawCoord src/Dodge/Debug/Picture.hs 376;" f -drawCrInfo src/Dodge/Debug.hs 112;" f -drawCrInfo' src/Dodge/Debug.hs 74;" f -drawCreature src/Dodge/Render/ShapePicture.hs 67;" f +drawCrInfo src/Dodge/Debug.hs 72;" f +drawCreature src/Dodge/Render/ShapePicture.hs 69;" f drawCreatureDisplayTexts src/Dodge/Debug/Picture.hs 198;" f drawCross src/Dodge/Render/Label.hs 24;" f drawCrossCol src/Dodge/Render/Label.hs 21;" f drawCursorAt src/Dodge/Render/List.hs 72;" f -drawCursorByTerminalStatus src/Dodge/Render/Picture.hs 127;" f +drawCursorByTerminalStatus src/Dodge/Render/Picture.hs 128;" f drawDDATest src/Dodge/Debug/Picture.hs 303;" f drawDamSensor src/Dodge/Machine/Draw.hs 27;" f +drawDebug src/Dodge/Debug.hs 192;" f drawDoorPaths src/Dodge/Debug/Picture.hs 253;" f drawDoubleLampCover src/Dodge/Prop/Draw.hs 95;" f -drawDrag src/Dodge/Render/Picture.hs 188;" f -drawDragDrop src/Dodge/Render/Picture.hs 217;" f -drawDragPickup src/Dodge/Render/Picture.hs 226;" f -drawDragSelect src/Dodge/Render/Picture.hs 185;" f +drawDrag src/Dodge/Render/Picture.hs 189;" f +drawDragDrop src/Dodge/Render/Picture.hs 218;" f +drawDragPickup src/Dodge/Render/Picture.hs 227;" f +drawDragSelect src/Dodge/Render/Picture.hs 186;" f drawDragSelected src/Dodge/Render/HUD.hs 136;" f drawDragSelecting src/Dodge/Render/HUD.hs 153;" f -drawEmptySet src/Dodge/Render/Picture.hs 141;" f +drawEmptySet src/Dodge/Render/Picture.hs 142;" f drawEnergyBall src/Dodge/EnergyBall/Draw.hs 7;" f drawEquipment src/Dodge/Creature/Picture.hs 127;" f drawExamineInventory src/Dodge/Render/HUD.hs 198;" f @@ -3370,7 +3369,7 @@ drawFarWallDetect src/Dodge/Debug/Picture.hs 270;" f drawFlame src/Dodge/Flame/Draw.hs 8;" f drawFlamelet src/Dodge/EnergyBall/Draw.hs 37;" f drawForceField src/Dodge/Wall/Draw.hs 11;" f -drawGapPlus src/Dodge/Render/Picture.hs 268;" f +drawGapPlus src/Dodge/Render/Picture.hs 269;" f drawGib src/Dodge/Prop/Draw.hs 39;" f drawHUD src/Dodge/Render/HUD.hs 51;" f drawInputMenu src/Dodge/Render/MenuScreen.hs 19;" f @@ -3379,7 +3378,7 @@ drawInspectWalls src/Dodge/Debug/Picture.hs 233;" f drawInventory src/Dodge/Render/HUD.hs 58;" f drawItemChildrenConnect src/Dodge/Render/HUD.hs 329;" f drawItemConnections src/Dodge/Render/HUD.hs 319;" f -drawJumpDown src/Dodge/Render/Picture.hs 180;" f +drawJumpDown src/Dodge/Render/Picture.hs 181;" f drawLabCrossCol src/Dodge/Render/Label.hs 8;" f drawLabelledList src/Dodge/Render/List.hs 212;" f drawLampCover src/Dodge/Prop/Draw.hs 55;" f @@ -3393,11 +3392,11 @@ drawListYoff src/Dodge/Render/List.hs 93;" f drawMachine src/Dodge/Machine/Draw.hs 16;" f drawMapperAR src/Dodge/Targeting/Draw.hs 12;" f drawMapperInventory src/Dodge/Render/HUD.hs 173;" f -drawMenuClick src/Dodge/Render/Picture.hs 156;" f -drawMenuCursor src/Dodge/Render/Picture.hs 168;" f -drawMenuOrHUD src/Dodge/Render/Picture.hs 66;" f +drawMenuClick src/Dodge/Render/Picture.hs 157;" f +drawMenuCursor src/Dodge/Render/Picture.hs 169;" f +drawMenuOrHUD src/Dodge/Render/Picture.hs 67;" f drawMenuScreen src/Dodge/Render/MenuScreen.hs 14;" f -drawMouseCursor src/Dodge/Render/Picture.hs 82;" f +drawMouseCursor src/Dodge/Render/Picture.hs 83;" f drawMouseOver src/Dodge/Render/HUD.hs 109;" f drawMousePosition src/Dodge/Debug/Picture.hs 366;" f drawMovingShape src/Dodge/Prop/Draw.hs 81;" f @@ -3406,21 +3405,21 @@ drawOptions src/Dodge/Render/MenuScreen.hs 22;" f drawPathBetween src/Dodge/Debug/Picture.hs 201;" f drawPathEdge src/Dodge/Debug/Picture.hs 258;" f drawPathing src/Dodge/Debug/Picture.hs 398;" f -drawPlus src/Dodge/Render/Picture.hs 153;" f +drawPlus src/Dodge/Render/Picture.hs 154;" f drawPointLabel src/Dodge/Render/Label.hs 13;" f drawProjectile src/Dodge/Projectile/Draw.hs 13;" f drawProp src/Dodge/Prop/Draw.hs 26;" f drawProxSensor src/Dodge/Machine/Draw.hs 37;" f -drawPulseBall src/Dodge/Render/ShapePicture.hs 59;" f -drawQuitTerminal src/Dodge/Render/Picture.hs 135;" f +drawPulseBall src/Dodge/Render/ShapePicture.hs 61;" f +drawQuitTerminal src/Dodge/Render/Picture.hs 136;" f drawRBOptions src/Dodge/Render/HUD.hs 251;" f drawRadarSweep src/Dodge/RadarSweep/Draw.hs 14;" f drawRemoteShell src/Dodge/Projectile/Draw.hs 38;" f -drawReturn src/Dodge/Render/Picture.hs 144;" f +drawReturn src/Dodge/Render/Picture.hs 145;" f drawRootCursor src/Dodge/Render/HUD.hs 76;" f drawSSCursor src/Dodge/SelectionSections/Draw.hs 35;" f drawSSMultiCursor src/Dodge/SelectionSections/Draw.hs 46;" f -drawSelect src/Dodge/Render/Picture.hs 245;" f +drawSelect src/Dodge/Render/Picture.hs 246;" f drawSelectionList src/Dodge/Render/List.hs 36;" f drawSelectionListBackground src/Dodge/Render/List.hs 52;" f drawSelectionSections src/Dodge/SelectionSections/Draw.hs 16;" f @@ -3442,7 +3441,7 @@ drawTitle src/Dodge/Render/MenuScreen.hs 35;" f drawTitleBackground src/Dodge/Render/List.hs 45;" f drawTractorBeam src/Dodge/TractorBeam/Draw.hs 7;" f drawTurret src/Dodge/Machine/Draw.hs 76;" f -drawVerticalDoubleArrow src/Dodge/Render/Picture.hs 200;" f +drawVerticalDoubleArrow src/Dodge/Render/Picture.hs 201;" f drawVerticalLampCover src/Dodge/Prop/Draw.hs 71;" f drawWall src/Dodge/Wall/Draw.hs 7;" f drawWallFace src/Dodge/Debug/Picture.hs 73;" f @@ -3539,7 +3538,7 @@ explosionS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 556;" f explosiveBarrel src/Dodge/Creature/Inanimate.hs 25;" f extTrigLitPos src/Dodge/Placement/Instance/Button.hs 84;" f extendConeToScreenEdge src/Dodge/Debug/Picture.hs 82;" f -extraPics src/Dodge/Render/ShapePicture.hs 97;" f +extraPics src/Dodge/Render/ShapePicture.hs 99;" f extraWeaponLinks src/Dodge/Item/Grammar.hs 90;" f extraWeaponLinksBelow src/Dodge/Item/Grammar.hs 99;" f extractRoomPos src/Dodge/RoomPos.hs 6;" f @@ -3567,7 +3566,7 @@ fireS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 464;" f firstBreather src/Dodge/Room/Breather.hs 9;" f firstTrie src/SimpleTrie.hs 51;" f firstWorldLoad appDodge/Main.hs 77;" f -fixedCoordPictures src/Dodge/Render/Picture.hs 20;" f +fixedCoordPictures src/Dodge/Render/Picture.hs 19;" f fixedSizePicClampArrow src/Dodge/Picture/SizeInvariant.hs 57;" f flFlicker src/Dodge/Flame.hs 38;" f flameMuzzles src/Dodge/HeldUse.hs 325;" f @@ -3598,7 +3597,7 @@ flockPointTargetR src/Dodge/Creature/Boid.hs 268;" f flockToPointUsing src/Dodge/Creature/Boid.hs 216;" f flockToPointUsing' src/Dodge/Creature/Boid.hs 229;" f floorItemPickupInfo src/Dodge/Render/HUD.hs 231;" f -floorItemSPic src/Dodge/Render/ShapePicture.hs 119;" f +floorItemSPic src/Dodge/Render/ShapePicture.hs 120;" f floorWire src/Dodge/Wire.hs 13;" f foamSprayFadeOutS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 558;" f foamSprayLoopS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 554;" f @@ -3616,7 +3615,7 @@ forceField src/Dodge/Wall/ForceField.hs 7;" f forceFoldable src/StrictHelp.hs 7;" f forceSpine src/StrictHelp.hs 4;" f fourEmbossDecoration src/Dodge/Placement/TopDecoration.hs 29;" f -fpsText src/Dodge/Render/Picture.hs 56;" f +fpsText src/Dodge/Render/Picture.hs 57;" f fractionLoadedAmmo src/Dodge/Item/Draw/SPic.hs 145;" f frag src/Shader/Data.hs 102;" f freeShaderPointers' src/Shader.hs 37;" f @@ -4002,7 +4001,7 @@ lShape src/Dodge/Placement/Instance/LightSource.hs 90;" f lamp src/Dodge/Creature/Lamp.hs 21;" f lampCover src/Dodge/Placement/Instance/LightSource/Cover.hs 8;" f lampCoverWhen src/Dodge/Placement/Instance/LightSource/Cover.hs 19;" f -lampCrSPic src/Dodge/Render/ShapePicture.hs 81;" f +lampCrSPic src/Dodge/Render/ShapePicture.hs 83;" f lasCenSensEdge src/Dodge/Room/LasTurret.hs 141;" f lasGunPic src/Dodge/Item/Draw/SPic.hs 412;" f lasPulseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 526;" f @@ -4212,7 +4211,7 @@ mcProxSensorTriggerUpdate src/Dodge/Machine/Update.hs 104;" f mcProxSensorUpdate src/Dodge/Machine/Update.hs 139;" f mcProxTest src/Dodge/Machine/Update.hs 203;" f mcProximitySensorUpdate src/Dodge/Machine/Update.hs 171;" f -mcSPic src/Dodge/Render/ShapePicture.hs 131;" f +mcSPic src/Dodge/Render/ShapePicture.hs 132;" f mcShootAuto src/Dodge/HeldUse.hs 1169;" f mcShootLaser src/Dodge/HeldUse.hs 1162;" f mcTriggerVal src/Dodge/Machine/Update.hs 110;" f @@ -4280,7 +4279,7 @@ mntLightLnkCond src/Dodge/Placement/Instance/LightSource.hs 177;" f mntLightLnkCond' src/Dodge/Placement/Instance/LightSource.hs 182;" f modTo src/Geometry/Zone.hs 10;" f mouseClickOptionsList src/Dodge/Update/Input/ScreenLayer.hs 60;" f -mouseCursorType src/Dodge/Render/Picture.hs 89;" f +mouseCursorType src/Dodge/Render/Picture.hs 90;" f mouseWorldPos src/Dodge/Base/Coordinate.hs 25;" f moveBullet src/Dodge/Bullet.hs 196;" f moveCombineSel src/Dodge/Update/Scroll.hs 121;" f @@ -4884,7 +4883,7 @@ screenPosAbs src/Dodge/ScreenPos.hs 15;" f screenToWorldPos src/Dodge/Base/Coordinate.hs 28;" f scrollAugInvSel src/Dodge/Inventory.hs 191;" f scrollAugNextInSection src/Dodge/Inventory.hs 204;" f -scrollDebugInfoInt src/Dodge/Debug.hs 153;" f +scrollDebugInfoInt src/Dodge/Debug.hs 134;" f scrollRBOption src/Dodge/Update/Scroll.hs 202;" f scrollSelectionSections src/Dodge/SelectionSections.hs 28;" f scrollTimeBack src/Dodge/Update.hs 206;" f @@ -4912,7 +4911,7 @@ selSecDrawCursorAt src/Dodge/Render/List.hs 105;" f selSecSelCol src/Dodge/Render/HUD.hs 501;" f selSecSelSize src/Dodge/SelectionSections.hs 143;" f selSecYint src/Dodge/SelectionSections.hs 152;" f -selectCreatureDebugItem src/Dodge/Debug.hs 145;" f +selectCreatureDebugItem src/Dodge/Debug.hs 127;" f selectedItemScroll src/Dodge/Update/Scroll.hs 51;" f sensAboveDoor src/Dodge/Room/SensorDoor.hs 53;" f sensInsideDoor src/Dodge/Room/SensorDoor.hs 59;" f @@ -5000,7 +4999,7 @@ shellShape src/Dodge/Projectile/Draw.hs 35;" f shieldWall src/Dodge/Item/BackgroundEffect.hs 78;" f shiftByV2 src/Dodge/PlacementSpot.hs 250;" f shiftChildren src/Dodge/Tree/Compose.hs 44;" f -shiftDraw src/Dodge/Render/ShapePicture.hs 86;" f +shiftDraw src/Dodge/Render/ShapePicture.hs 88;" f shiftInBy src/Dodge/PlacementSpot.hs 247;" f shiftInvItems src/Dodge/Update/Input/InGame.hs 305;" f shiftInvItemsDown src/Dodge/Update/Input/InGame.hs 350;" f @@ -5039,7 +5038,6 @@ shotgunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 708;" f shoulderHeight src/Dodge/Item/HeldOffset.hs 68;" f shoulderSH src/Dodge/Creature/Picture.hs 124;" f showAttachItem src/Dodge/Item/Display.hs 92;" f -showEnabledDebugs src/Dodge/Debug/Picture.hs 156;" f showEquipItem src/Dodge/Item/Display.hs 107;" f showInt src/Dodge/Item/Info.hs 75;" f showIntsString src/Dodge/Tree/Compose.hs 129;" f @@ -5683,7 +5681,7 @@ wlsNearRect src/Dodge/Zoning/Wall.hs 46;" f wlsNearSeg src/Dodge/Zoning/Wall.hs 42;" f wordsBy src/ListHelp.hs 116;" f worldPosToScreen src/Dodge/Base/Coordinate.hs 18;" f -worldSPic src/Dodge/Render/ShapePicture.hs 20;" f +worldSPic src/Dodge/Render/ShapePicture.hs 22;" f worldToGenWorld src/Dodge/LevelGen/LevelStructure.hs 14;" f wpAdd src/Dodge/Room/RezBox.hs 148;" f wrench1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 546;" f