justin/loop
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Tweak inventory display

Browse Source
This commit is contained in:
justin
2025-12-26 11:05:34 +00:00
parent 2cb9fb153a
commit 2f935a0d41
5 changed files with 71 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Dodge/Data/SelectionList.hs
+2
View File
@@ -56,6 +56,8 @@ data SIDisplayMod
= NoSIDisplayMod = NoSIDisplayMod
| HighlightSI | HighlightSI
| DropShadowSI | DropShadowSI
| InventoryHeadSI
| InventoryHeadFilterSI
makeLenses ''LDParams makeLenses ''LDParams
makeLenses ''SelectionItem makeLenses ''SelectionItem
src/Dodge/DisplayInventory.hs
+8 -5
View File
@@ -65,7 +65,7 @@ updateCombineSections w cfig =
sclose' sclose'
| null sclose = | null sclose =
IM.singleton 0 $ IM.singleton 0 $
SelItem ["NONE"] 1 25 False white 2 Nothing NoSIDisplayMod SelItem ["NONE"] 1 25 False white 2 Nothing DropShadowSI
| otherwise = sclose | otherwise = sclose
regexCombs :: IM.IntMap Item -> SelectionItem CombItem -> String -> Bool regexCombs :: IM.IntMap Item -> SelectionItem CombItem -> String -> Bool
@@ -124,7 +124,7 @@ updateDisplaySections w cfig =
[ sfinv [ sfinv
, sinv , sinv
, IM.singleton 0 $ , IM.singleton 0 $
SelItem [displayFreeSlots (crNumFreeSlots (w ^. cWorld . lWorld . items) cr)] 1 15 True invDimColor 2 Nothing NoSIDisplayMod SelItem [displayFreeSlots (crNumFreeSlots (w ^. cWorld . lWorld . items) cr)] 1 15 True invDimColor 2 Nothing DropShadowSI
, sfclose1 , sfclose1
, sclose , sclose
, interfaceshead , interfaceshead
@@ -147,7 +147,7 @@ updateDisplaySections w cfig =
btitems = btitems =
IM.fromDistinctAscList . zip [0 ..] $ IM.fromDistinctAscList . zip [0 ..] $
mapMaybe (closeButtonToSelectionItem w) (w ^. hud . closeButtons) mapMaybe (closeButtonToSelectionItem w) (w ^. hud . closeButtons)
makehead str = IM.singleton 0 $ SelItem [str] 1 15 False white 0 Nothing NoSIDisplayMod makehead str = IM.singleton 0 $ SelItem [str] 1 15 False white 0 Nothing InventoryHeadSI
cr = you w cr = you w
closeitms = closeitms =
IM.fromDistinctAscList . zip [0 ..] $ IM.fromDistinctAscList . zip [0 ..] $
@@ -168,7 +168,7 @@ filterSectionsPair infocus filtfn itms s mfilt = (x, itms')
where where
filtcurs = if infocus then cFilledRect else cWireRect filtcurs = if infocus then cFilledRect else cWireRect
x = IM.singleton 0 $ x = IM.singleton 0 $
fromMaybe (SelItem [s] 1 (length s) False white 0 Nothing NoSIDisplayMod) $ do fromMaybe (SelItem [s] 1 (length s) False white 0 Nothing InventoryHeadSI) $ do
str <- mfilt str <- mfilt
return $ return $
SelItem SelItem
@@ -179,7 +179,7 @@ filterSectionsPair infocus filtfn itms s mfilt = (x, itms')
white white
0 0
Nothing Nothing
NoSIDisplayMod InventoryHeadFilterSI
f y = y f y = y
-- | null y = -- | null y =
-- IM.singleton 0 $ SelItem ["(NONE)"] 1 (length s) True (greyN 0.5) 0 Nothing -- IM.singleton 0 $ SelItem ["(NONE)"] 1 (length s) True (greyN 0.5) 0 Nothing
@@ -303,6 +303,9 @@ listSelectionColorPicture si = (g <$> _siPictures si, Sum $ _siHeight si)
NoSIDisplayMod -> docolor . text NoSIDisplayMod -> docolor . text
HighlightSI -> docolor . hackBoldText HighlightSI -> docolor . hackBoldText
DropShadowSI -> hackDropShadow (si ^. siColor) black DropShadowSI -> hackDropShadow (si ^. siColor) black
InventoryHeadSI -> hackInvertText black white . dopad
InventoryHeadFilterSI -> docolor . text
dopad s = " "<>s<>" "
docolor = color (si ^. siColor) docolor = color (si ^. siColor)
lindent = 100 * fromIntegral (_siOffX si) lindent = 100 * fromIntegral (_siOffX si)
src/Dodge/Inventory/SelectionList.hs
+2 -2
View File
@@ -221,7 +221,7 @@ closeItemToSelectionItem w i = do
, _siColor = col , _siColor = col
, _siOffX = 0 , _siOffX = 0
, _siPayload = Nothing , _siPayload = Nothing
, _siDisplayMod = NoSIDisplayMod , _siDisplayMod = DropShadowSI
} }
closeButtonToSelectionItem :: World -> Int -> Maybe (SelectionItem ()) closeButtonToSelectionItem :: World -> Int -> Maybe (SelectionItem ())
@@ -236,7 +236,7 @@ closeButtonToSelectionItem w i = do
, _siColor = yellow , _siColor = yellow
, _siOffX = 0 , _siOffX = 0
, _siPayload = Nothing , _siPayload = Nothing
, _siDisplayMod = NoSIDisplayMod , _siDisplayMod = DropShadowSI
} }
btText :: Button -> String btText :: Button -> String
src/Picture/Base.hs
+5
View File
@@ -27,6 +27,7 @@ module Picture.Base (
text, text,
hackBoldText, hackBoldText,
hackDropShadow, hackDropShadow,
hackInvertText,
textRight, textRight,
textJustifyLeft, textJustifyLeft,
textJustifyRight, textJustifyRight,
@@ -196,6 +197,10 @@ text :: String -> Picture
{-# INLINE text #-} {-# INLINE text #-}
text = drawText 0 text = drawText 0
hackInvertText :: Color -> Color -> String -> Picture
hackInvertText c1 c2 s = color c2 (polygon $ rectNSWE 200 0 0 (fromIntegral (length s) * 100))
<> color c1 (text s)
hackBoldText :: String -> Picture hackBoldText :: String -> Picture
hackBoldText s = text s <> translate 10 0 (text s) hackBoldText s = text s <> translate 10 0 (text s)
tags
+54 -51
View File
@@ -585,6 +585,8 @@ IntroScanType src/Dodge/Data/Item/Combine.hs 44;" t
InvInt src/Dodge/Data/Item/Location.hs 16;" t InvInt src/Dodge/Data/Item/Location.hs 16;" t
InventoryChange src/Dodge/Data/World.hs 31;" C InventoryChange src/Dodge/Data/World.hs 31;" C
InventoryConnectSound src/Dodge/Data/SoundOrigin.hs 12;" C InventoryConnectSound src/Dodge/Data/SoundOrigin.hs 12;" C
InventoryHeadFilterSI src/Dodge/Data/SelectionList.hs 60;" C
InventoryHeadSI src/Dodge/Data/SelectionList.hs 59;" C
InventoryPathing src/Dodge/Data/Item/Combine.hs 38;" t InventoryPathing src/Dodge/Data/Item/Combine.hs 38;" t
InventorySound src/Dodge/Data/SoundOrigin.hs 11;" C InventorySound src/Dodge/Data/SoundOrigin.hs 11;" C
Investigate src/Dodge/Data/ActionPlan.hs 136;" C Investigate src/Dodge/Data/ActionPlan.hs 136;" C
@@ -2514,7 +2516,7 @@ addArmour src/Dodge/Creature.hs 82;" f
addBranchAt src/Dodge/Tree/GenerateStructure.hs 18;" f addBranchAt src/Dodge/Tree/GenerateStructure.hs 18;" f
addButtonSlowDoor src/Dodge/Room/LongDoor.hs 96;" f addButtonSlowDoor src/Dodge/Room/LongDoor.hs 96;" f
addCrGibs src/Dodge/Prop/Gib.hs 17;" f addCrGibs src/Dodge/Prop/Gib.hs 17;" f
addDepth src/Picture/Base.hs 135;" f addDepth src/Picture/Base.hs 136;" f
addDoorAtNthLinkToggleTerminal src/Dodge/Room/Warning.hs 40;" f addDoorAtNthLinkToggleTerminal src/Dodge/Room/Warning.hs 40;" f
addDoorToggleTerminal src/Dodge/Room/Warning.hs 37;" f addDoorToggleTerminal src/Dodge/Room/Warning.hs 37;" f
addGib4 src/Dodge/Prop/Gib.hs 52;" f addGib4 src/Dodge/Prop/Gib.hs 52;" f
@@ -2600,10 +2602,10 @@ applyTorqueCME src/Dodge/HeldUse.hs 570;" f
applyWorldConfig src/Dodge/Config.hs 55;" f applyWorldConfig src/Dodge/Config.hs 55;" f
aquamarine src/Color.hs 50;" f aquamarine src/Color.hs 50;" f
arHUD src/Dodge/Item/Scope.hs 134;" f arHUD src/Dodge/Item/Scope.hs 134;" f
arc src/Picture/Base.hs 295;" f arc src/Picture/Base.hs 302;" f
arcFull src/Picture/Arc.hs 11;" f arcFull src/Picture/Arc.hs 11;" f
arcPart src/Picture/Arc.hs 24;" f arcPart src/Picture/Arc.hs 24;" f
arcSolid src/Picture/Base.hs 284;" f arcSolid src/Picture/Base.hs 291;" f
arcStepwise src/Geometry.hs 326;" f arcStepwise src/Geometry.hs 326;" f
arcStepwisePositive src/Geometry.hs 340;" f arcStepwisePositive src/Geometry.hs 340;" f
arcTest src/Picture/Test.hs 9;" f arcTest src/Picture/Test.hs 9;" f
@@ -2687,7 +2689,7 @@ bgunSound src/Dodge/HeldUse.hs 514;" f
bindFBO src/Render.hs 235;" f bindFBO src/Render.hs 235;" f
bingate src/Dodge/Item/Scope.hs 109;" f bingate src/Dodge/Item/Scope.hs 109;" f
black src/Color.hs 54;" f black src/Color.hs 54;" f
blank src/Picture/Base.hs 61;" f blank src/Picture/Base.hs 62;" f
blinkAcrossChallenge src/Dodge/Room/BlinkAcross.hs 14;" f blinkAcrossChallenge src/Dodge/Room/BlinkAcross.hs 14;" f
blinkActionFail src/Dodge/Creature/Action/Blink.hs 87;" f blinkActionFail src/Dodge/Creature/Action/Blink.hs 87;" f
blinkActionMousePos src/Dodge/Creature/Action/Blink.hs 24;" f blinkActionMousePos src/Dodge/Creature/Action/Blink.hs 24;" f
@@ -2770,7 +2772,7 @@ cardinalVectors src/Dodge/FloorItem.hs 24;" f
cdtPropagateFold src/Dodge/DoubleTree.hs 407;" f cdtPropagateFold src/Dodge/DoubleTree.hs 407;" f
ceilingTo src/Geometry/Zone.hs 15;" f ceilingTo src/Geometry/Zone.hs 15;" f
cenLasTur src/Dodge/Room/LasTurret.hs 34;" f cenLasTur src/Dodge/Room/LasTurret.hs 34;" f
centerText src/Picture/Base.hs 186;" f centerText src/Picture/Base.hs 187;" f
centerVaultExplosiveExit src/Dodge/Room/NoNeedWeapon.hs 20;" f centerVaultExplosiveExit src/Dodge/Room/NoNeedWeapon.hs 20;" f
centerVaultRoom src/Dodge/Room/Procedural.hs 269;" f centerVaultRoom src/Dodge/Room/Procedural.hs 269;" f
centroid src/Geometry/Polygon.hs 169;" f centroid src/Geometry/Polygon.hs 169;" f
@@ -2779,7 +2781,7 @@ chainPairs src/Geometry.hs 360;" f
changeSwapOther src/Dodge/Inventory.hs 141;" f changeSwapOther src/Dodge/Inventory.hs 141;" f
changeSwapSel src/Dodge/Inventory.hs 134;" f changeSwapSel src/Dodge/Inventory.hs 134;" f
changeSwapWith src/Dodge/Inventory.hs 175;" f changeSwapWith src/Dodge/Inventory.hs 175;" f
charToTuple src/Picture/Base.hs 325;" f charToTuple src/Picture/Base.hs 332;" f
charToTupleGrad src/Picture/Text.hs 18;" f charToTupleGrad src/Picture/Text.hs 18;" f
chartreuse src/Color.hs 51;" f chartreuse src/Color.hs 51;" f
chaseCrit src/Dodge/Creature/ChaseCrit.hs 27;" f chaseCrit src/Dodge/Creature/ChaseCrit.hs 27;" f
@@ -2819,10 +2821,10 @@ circOnAnyCr src/Dodge/Base/Collide.hs 292;" f
circOnSeg src/Geometry.hs 101;" f circOnSeg src/Geometry.hs 101;" f
circOnSegNoEndpoints src/Geometry.hs 91;" f circOnSegNoEndpoints src/Geometry.hs 91;" f
circOnSomeWall src/Dodge/Base/Collide.hs 286;" f circOnSomeWall src/Dodge/Base/Collide.hs 286;" f
circle src/Picture/Base.hs 182;" f circle src/Picture/Base.hs 183;" f
circleDecoration src/Dodge/Placement/TopDecoration.hs 62;" f circleDecoration src/Dodge/Placement/TopDecoration.hs 62;" f
circleSolid src/Picture/Base.hs 166;" f circleSolid src/Picture/Base.hs 167;" f
circleSolidCol src/Picture/Base.hs 170;" f circleSolidCol src/Picture/Base.hs 171;" f
clAlt src/Dodge/Cloud.hs 5;" f clAlt src/Dodge/Cloud.hs 5;" f
clColor src/Shader/Poke/Cloud.hs 39;" f clColor src/Shader/Poke/Cloud.hs 39;" f
clZoneSize src/Dodge/Zoning/Cloud.hs 24;" f clZoneSize src/Dodge/Zoning/Cloud.hs 24;" f
@@ -2873,7 +2875,7 @@ collideCircWalls src/Dodge/Base/Collide.hs 253;" f
collidePoint src/Dodge/Base/Collide.hs 52;" f collidePoint src/Dodge/Base/Collide.hs 52;" f
collidePointTestFilter src/Dodge/Base/Collide.hs 188;" f collidePointTestFilter src/Dodge/Base/Collide.hs 188;" f
collidePointWallsFilter src/Dodge/Base/Collide.hs 202;" f collidePointWallsFilter src/Dodge/Base/Collide.hs 202;" f
color src/Picture/Base.hs 110;" f color src/Picture/Base.hs 111;" f
colorLamp src/Dodge/Creature/Lamp.hs 10;" f colorLamp src/Dodge/Creature/Lamp.hs 10;" f
colorSH src/Shape.hs 233;" f colorSH src/Shape.hs 233;" f
combinationsDotGraph src/Dodge/Combine/Graph.hs 93;" f combinationsDotGraph src/Dodge/Combine/Graph.hs 93;" f
@@ -3376,7 +3378,7 @@ drawTargetingAR src/Dodge/Targeting/Draw.hs 20;" f
drawTerminalCursorLink src/Dodge/Render/HUD.hs 385;" f drawTerminalCursorLink src/Dodge/Render/HUD.hs 385;" f
drawTerminalDisplay src/Dodge/Render/HUD.hs 351;" f drawTerminalDisplay src/Dodge/Render/HUD.hs 351;" f
drawTeslaArc src/Dodge/Tesla/Draw.hs 9;" f drawTeslaArc src/Dodge/Tesla/Draw.hs 9;" f
drawText src/Picture/Base.hs 228;" f drawText src/Picture/Base.hs 235;" f
drawTitle src/Dodge/Render/MenuScreen.hs 49;" f drawTitle src/Dodge/Render/MenuScreen.hs 49;" f
drawTitleBackground src/Dodge/Render/List.hs 60;" f drawTitleBackground src/Dodge/Render/List.hs 60;" f
drawTractorBeam src/Dodge/TractorBeam/Draw.hs 7;" f drawTractorBeam src/Dodge/TractorBeam/Draw.hs 7;" f
@@ -3440,7 +3442,7 @@ endArcPos src/Dodge/Tesla.hs 87;" f
endCombineRegex src/Dodge/Update/Input/InGame.hs 276;" f endCombineRegex src/Dodge/Update/Input/InGame.hs 276;" f
endRegex src/Dodge/Update/Input/InGame.hs 270;" f endRegex src/Dodge/Update/Input/InGame.hs 270;" f
energyReleaseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 624;" f energyReleaseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 624;" f
enterCombineInv src/Dodge/DisplayInventory.hs 318;" f enterCombineInv src/Dodge/DisplayInventory.hs 320;" f
enumOption src/Dodge/Menu/OptionType.hs 17;" f enumOption src/Dodge/Menu/OptionType.hs 17;" f
epText src/Dodge/Inventory/SelectionList.hs 79;" f epText src/Dodge/Inventory/SelectionList.hs 79;" f
eqConstr src/SameConstr.hs 17;" f eqConstr src/SameConstr.hs 17;" f
@@ -3666,8 +3668,9 @@ gut4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 492;" f
gut5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 726;" f gut5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 726;" f
gut6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 682;" f gut6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 682;" f
gyroscope src/Dodge/Item/Scope.hs 156;" f gyroscope src/Dodge/Item/Scope.hs 156;" f
hackBoldText src/Picture/Base.hs 199;" f hackBoldText src/Picture/Base.hs 204;" f
hackDropShadow src/Picture/Base.hs 202;" f hackDropShadow src/Picture/Base.hs 207;" f
hackInvertText src/Picture/Base.hs 200;" f
hackOutline src/Dodge/Render/Outline.hs 5;" f hackOutline src/Dodge/Render/Outline.hs 5;" f
halfHeight src/Dodge/Base/Window.hs 49;" f halfHeight src/Dodge/Base/Window.hs 49;" f
halfWidth src/Dodge/Base/Window.hs 49;" f halfWidth src/Dodge/Base/Window.hs 49;" f
@@ -3983,14 +3986,14 @@ lightSensor src/Dodge/Placement/Instance/Sensor.hs 40;" f
lightsToRender src/Dodge/Render/Lights.hs 14;" f lightsToRender src/Dodge/Render/Lights.hs 14;" f
lightx4 src/Color.hs 155;" f lightx4 src/Color.hs 155;" f
linGrad src/Geometry/Intersect.hs 241;" f linGrad src/Geometry/Intersect.hs 241;" f
line src/Picture/Base.hs 234;" f line src/Picture/Base.hs 241;" f
lineCol src/Picture/Base.hs 238;" f lineCol src/Picture/Base.hs 245;" f
lineGeom src/Dodge/Base.hs 32;" f lineGeom src/Dodge/Base.hs 32;" f
lineOnScreenCone src/Dodge/Debug/Picture.hs 60;" f lineOnScreenCone src/Dodge/Debug/Picture.hs 60;" f
lineOrth src/Dodge/Creature/Boid.hs 128;" f lineOrth src/Dodge/Creature/Boid.hs 128;" f
lineOutputTerminal src/Dodge/Room/Warning.hs 68;" f lineOutputTerminal src/Dodge/Room/Warning.hs 68;" f
lineSplit src/Justify.hs 26;" f lineSplit src/Justify.hs 26;" f
lineThick src/Picture/Base.hs 242;" f lineThick src/Picture/Base.hs 249;" f
lineUp src/Dodge/Creature/Boid.hs 150;" f lineUp src/Dodge/Creature/Boid.hs 150;" f
linksDAGToPath src/Dodge/Room/Path.hs 13;" f linksDAGToPath src/Dodge/Room/Path.hs 13;" f
linksOnPath src/Dodge/Room/CheckConsistency.hs 6;" f linksOnPath src/Dodge/Room/CheckConsistency.hs 6;" f
@@ -4067,7 +4070,7 @@ magenta src/Color.hs 46;" f
main appDodge/Main.hs 28;" f main appDodge/Main.hs 28;" f
main bench/Bench.hs 15;" f main bench/Bench.hs 15;" f
main test/Spec.hs 12;" f main test/Spec.hs 12;" f
makeArc src/Picture/Base.hs 159;" f makeArc src/Picture/Base.hs 160;" f
makeAttach src/Dodge/Item/Attach.hs 10;" f makeAttach src/Dodge/Item/Attach.hs 10;" f
makeBlip src/Dodge/RadarSweep.hs 70;" f makeBlip src/Dodge/RadarSweep.hs 70;" f
makeBlockDebris src/Dodge/Block/Debris.hs 36;" f makeBlockDebris src/Dodge/Block/Debris.hs 36;" f
@@ -4197,8 +4200,8 @@ miniS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 756;" f
miniTree2 src/Dodge/Room/Room.hs 121;" f miniTree2 src/Dodge/Room/Room.hs 121;" f
minimumOn src/FoldlHelp.hs 14;" f minimumOn src/FoldlHelp.hs 14;" f
mirrorXAxis src/Geometry/Polygon.hs 68;" f mirrorXAxis src/Geometry/Polygon.hs 68;" f
mirrorxz src/Picture/Base.hs 343;" f mirrorxz src/Picture/Base.hs 350;" f
mirroryz src/Picture/Base.hs 348;" f mirroryz src/Picture/Base.hs 355;" f
missileLaunchS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 714;" f missileLaunchS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 714;" f
mixColors src/Color.hs 113;" f mixColors src/Color.hs 113;" f
mixColorsFrac src/Color.hs 109;" f mixColorsFrac src/Color.hs 109;" f
@@ -4325,13 +4328,13 @@ orthogonalPointOnSeg src/Geometry/Intersect.hs 312;" f
outLink src/Dodge/RoomLink.hs 120;" f outLink src/Dodge/RoomLink.hs 120;" f
outsideScreenPolygon src/Dodge/Debug/Picture.hs 44;" f outsideScreenPolygon src/Dodge/Debug/Picture.hs 44;" f
outwardIntegers src/Dodge/Base.hs 181;" f outwardIntegers src/Dodge/Base.hs 181;" f
overCol src/Picture/Base.hs 316;" f overCol src/Picture/Base.hs 323;" f
overColObj src/Shape.hs 269;" f overColObj src/Shape.hs 269;" f
overColSH src/Shape.hs 237;" f overColSH src/Shape.hs 237;" f
overDebugEvent src/Dodge/Debug.hs 31;" f overDebugEvent src/Dodge/Debug.hs 31;" f
overLnkPosDir src/Dodge/RoomLink.hs 115;" f overLnkPosDir src/Dodge/RoomLink.hs 115;" f
overLnkType src/Dodge/RoomLink.hs 105;" f overLnkType src/Dodge/RoomLink.hs 105;" f
overPos src/Picture/Base.hs 311;" f overPos src/Picture/Base.hs 318;" f
overPosObj src/Shape.hs 273;" f overPosObj src/Shape.hs 273;" f
overPosSH src/Shape.hs 257;" f overPosSH src/Shape.hs 257;" f
overPosSP src/ShapePicture.hs 41;" f overPosSP src/ShapePicture.hs 41;" f
@@ -4374,7 +4377,7 @@ performPathTo src/Dodge/Creature/Action.hs 116;" f
performTurnToA src/Dodge/Creature/Action.hs 128;" f performTurnToA src/Dodge/Creature/Action.hs 128;" f
perspectiveMatrixb src/MatrixHelper.hs 11;" f perspectiveMatrixb src/MatrixHelper.hs 11;" f
picFormat src/Polyhedra.hs 23;" f picFormat src/Polyhedra.hs 23;" f
picMap src/Picture/Base.hs 69;" f picMap src/Picture/Base.hs 70;" f
pickUpItem src/Dodge/Inventory/Add.hs 70;" f pickUpItem src/Dodge/Inventory/Add.hs 70;" f
pickUpItemAt src/Dodge/Inventory/Add.hs 75;" f pickUpItemAt src/Dodge/Inventory/Add.hs 75;" f
pickUpS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 660;" f pickUpS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 660;" f
@@ -4456,8 +4459,8 @@ pokeVerxs src/Shader/Poke.hs 32;" f
pokeW src/Shader/Poke.hs 91;" f pokeW src/Shader/Poke.hs 91;" f
pokeWall src/Shader/Poke.hs 80;" f pokeWall src/Shader/Poke.hs 80;" f
pokeWallsWindows src/Shader/Poke.hs 52;" f pokeWallsWindows src/Shader/Poke.hs 52;" f
poly3 src/Picture/Base.hs 86;" f poly3 src/Picture/Base.hs 87;" f
poly3Col src/Picture/Base.hs 90;" f poly3Col src/Picture/Base.hs 91;" f
polyChasm src/Dodge/Room/Tutorial.hs 182;" f polyChasm src/Dodge/Room/Tutorial.hs 182;" f
polyChasmC src/Dodge/Room/Tutorial.hs 191;" f polyChasmC src/Dodge/Room/Tutorial.hs 191;" f
polyCirc src/Shape.hs 47;" f polyCirc src/Shape.hs 47;" f
@@ -4472,9 +4475,9 @@ polyToPics src/Polyhedra.hs 122;" f
polyToTris src/Geometry/Triangulate.hs 7;" f polyToTris src/Geometry/Triangulate.hs 7;" f
polyToTris' src/Geometry.hs 172;" f polyToTris' src/Geometry.hs 172;" f
polyToTris'' src/Geometry/Triangulate.hs 15;" f polyToTris'' src/Geometry/Triangulate.hs 15;" f
polygon src/Picture/Base.hs 74;" f polygon src/Picture/Base.hs 75;" f
polygonCol src/Picture/Base.hs 80;" f polygonCol src/Picture/Base.hs 81;" f
polygonWire src/Picture/Base.hs 65;" f polygonWire src/Picture/Base.hs 66;" f
polysToPic src/Polyhedra.hs 130;" f polysToPic src/Polyhedra.hs 130;" f
popScreen src/Dodge/Menu/PushPop.hs 6;" f popScreen src/Dodge/Menu/PushPop.hs 6;" f
posRms src/Dodge/Tree/Shift.hs 44;" f posRms src/Dodge/Tree/Shift.hs 44;" f
@@ -4630,7 +4633,7 @@ reflectPulseLaserAlong src/Dodge/Item/Weapon/LaserPath.hs 65;" f
refract src/Dodge/Item/Weapon/LaserPath.hs 39;" f refract src/Dodge/Item/Weapon/LaserPath.hs 39;" f
refreshOptionsSelectionList src/Dodge/Menu/Option.hs 35;" f refreshOptionsSelectionList src/Dodge/Menu/Option.hs 35;" f
regexCombs src/Dodge/DisplayInventory.hs 71;" f regexCombs src/Dodge/DisplayInventory.hs 71;" f
regexList src/Dodge/DisplayInventory.hs 309;" f regexList src/Dodge/DisplayInventory.hs 311;" f
reload1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 634;" f reload1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 634;" f
reloadLevelStart src/Dodge/Save.hs 71;" f reloadLevelStart src/Dodge/Save.hs 71;" f
reloadS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 632;" f reloadS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 632;" f
@@ -4724,7 +4727,7 @@ rose src/Color.hs 47;" f
rotD src/Padding.hs 44;" f rotD src/Padding.hs 44;" f
rotMatr src/MatrixHelper.hs 79;" f rotMatr src/MatrixHelper.hs 79;" f
rotU src/Padding.hs 39;" f rotU src/Padding.hs 39;" f
rotate src/Picture/Base.hs 155;" f rotate src/Picture/Base.hs 156;" f
rotate3 src/Geometry/Vector3D.hs 48;" f rotate3 src/Geometry/Vector3D.hs 48;" f
rotate3x src/Geometry/Vector3D.hs 60;" f rotate3x src/Geometry/Vector3D.hs 60;" f
rotate3y src/Geometry/Vector3D.hs 66;" f rotate3y src/Geometry/Vector3D.hs 66;" f
@@ -4773,8 +4776,8 @@ saveSlotPath src/Dodge/Save.hs 63;" f
saveWorldInSlot src/Dodge/Save.hs 68;" f saveWorldInSlot src/Dodge/Save.hs 68;" f
sawtoothFailS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 754;" f sawtoothFailS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 754;" f
scToTS src/Dodge/Event/Input.hs 34;" f scToTS src/Dodge/Event/Input.hs 34;" f
scale src/Picture/Base.hs 151;" f scale src/Picture/Base.hs 152;" f
scale3 src/Picture/Base.hs 147;" f scale3 src/Picture/Base.hs 148;" f
scaleMat src/MatrixHelper.hs 71;" f scaleMat src/MatrixHelper.hs 71;" f
scaleMatrix src/MatrixHelper.hs 68;" f scaleMatrix src/MatrixHelper.hs 68;" f
scaleSH src/Shape.hs 265;" f scaleSH src/Shape.hs 265;" f
@@ -4833,14 +4836,14 @@ setChannelPos src/Sound.hs 151;" f
setClickWorldPos src/Dodge/Update.hs 102;" f setClickWorldPos src/Dodge/Update.hs 102;" f
setClip src/Dodge/Debug.hs 193;" f setClip src/Dodge/Debug.hs 193;" f
setClusterID src/Dodge/Combine/Graph.hs 114;" f setClusterID src/Dodge/Combine/Graph.hs 114;" f
setDepth src/Picture/Base.hs 130;" f setDepth src/Picture/Base.hs 131;" f
setDirPS src/Dodge/PlacementSpot.hs 49;" f setDirPS src/Dodge/PlacementSpot.hs 49;" f
setFallback src/Dodge/PlacementSpot.hs 125;" f setFallback src/Dodge/PlacementSpot.hs 125;" f
setInLinks src/Dodge/RoomLink.hs 53;" f setInLinks src/Dodge/RoomLink.hs 53;" f
setInLinksByType src/Dodge/RoomLink.hs 72;" f setInLinksByType src/Dodge/RoomLink.hs 72;" f
setInLinksPD src/Dodge/RoomLink.hs 92;" f setInLinksPD src/Dodge/RoomLink.hs 92;" f
setInvPosFromSS src/Dodge/Inventory/Location.hs 92;" f setInvPosFromSS src/Dodge/Inventory/Location.hs 92;" f
setLayer src/Picture/Base.hs 141;" f setLayer src/Picture/Base.hs 142;" f
setLinkType src/Dodge/RoomLink.hs 78;" f setLinkType src/Dodge/RoomLink.hs 78;" f
setLinkTypePD src/Dodge/RoomLink.hs 85;" f setLinkTypePD src/Dodge/RoomLink.hs 85;" f
setMusicVolume src/Sound.hs 163;" f setMusicVolume src/Sound.hs 163;" f
@@ -5049,7 +5052,7 @@ ssSetCursor src/Dodge/SelectionSections.hs 59;" f
ssfold src/FoldableHelp.hs 105;" f ssfold src/FoldableHelp.hs 105;" f
stackPicturesAt src/Dodge/Render/List.hs 95;" f stackPicturesAt src/Dodge/Render/List.hs 95;" f
stackPicturesAtOff src/Dodge/Render/List.hs 98;" f stackPicturesAtOff src/Dodge/Render/List.hs 98;" f
stackText src/Picture/Base.hs 190;" f stackText src/Picture/Base.hs 191;" f
stackedInventory src/Dodge/Creature.hs 309;" f stackedInventory src/Dodge/Creature.hs 309;" f
startCr src/Dodge/Creature.hs 90;" f startCr src/Dodge/Creature.hs 90;" f
startCrafts src/Dodge/Room/Start.hs 93;" f startCrafts src/Dodge/Room/Start.hs 93;" f
@@ -5079,7 +5082,7 @@ strFromHeldItem src/Dodge/Creature/Statistics.hs 67;" f
strengthFactor src/Dodge/Creature/Impulse/Movement.hs 51;" f strengthFactor src/Dodge/Creature/Impulse/Movement.hs 51;" f
strictify src/MaybeHelp.hs 35;" f strictify src/MaybeHelp.hs 35;" f
strideRot src/Dodge/Item/HeldOffset.hs 71;" f strideRot src/Dodge/Item/HeldOffset.hs 71;" f
stringToList src/Picture/Base.hs 321;" f stringToList src/Picture/Base.hs 328;" f
stringToListGrad src/Picture/Text.hs 12;" f stringToListGrad src/Picture/Text.hs 12;" f
stripZ src/Geometry/Vector3D.hs 97;" f stripZ src/Geometry/Vector3D.hs 97;" f
subInvX src/Dodge/ListDisplayParams.hs 47;" f subInvX src/Dodge/ListDisplayParams.hs 47;" f
@@ -5139,26 +5142,26 @@ teslaParams src/Dodge/Item/Held/BatteryGuns.hs 25;" f
testEvent src/Dodge/Event/Test.hs 11;" f testEvent src/Dodge/Event/Test.hs 11;" f
testInventory src/Dodge/Creature.hs 290;" f testInventory src/Dodge/Creature.hs 290;" f
testStringInit src/Dodge/TestString.hs 34;" f testStringInit src/Dodge/TestString.hs 34;" f
text src/Picture/Base.hs 195;" f text src/Picture/Base.hs 196;" f
textGrad src/Picture/Text.hs 5;" f textGrad src/Picture/Text.hs 5;" f
textInputBlurb src/Dodge/Terminal.hs 37;" f textInputBlurb src/Dodge/Terminal.hs 37;" f
textInputFocus src/Dodge/InputFocus.hs 11;" f textInputFocus src/Dodge/InputFocus.hs 11;" f
textJustifyCenter src/Picture/Base.hs 220;" f textJustifyCenter src/Picture/Base.hs 227;" f
textJustifyLeft src/Picture/Base.hs 216;" f textJustifyLeft src/Picture/Base.hs 223;" f
textJustifyRight src/Picture/Base.hs 206;" f textJustifyRight src/Picture/Base.hs 213;" f
textRight src/Picture/Base.hs 211;" f textRight src/Picture/Base.hs 218;" f
textTerminal src/Dodge/Terminal.hs 34;" f textTerminal src/Dodge/Terminal.hs 34;" f
textVMirror src/Picture/Base.hs 224;" f textVMirror src/Picture/Base.hs 231;" f
tflat2 src/Picture/Data.hs 56;" f tflat2 src/Picture/Data.hs 56;" f
tflat3 src/Picture/Data.hs 60;" f tflat3 src/Picture/Data.hs 60;" f
tflat4 src/Picture/Data.hs 64;" f tflat4 src/Picture/Data.hs 64;" f
theCleanup appDodge/Main.hs 65;" f theCleanup appDodge/Main.hs 65;" f
theColumns src/Dodge/Tree/Shift.hs 146;" f theColumns src/Dodge/Tree/Shift.hs 146;" f
theUpdateStep appDodge/Main.hs 101;" f theUpdateStep appDodge/Main.hs 101;" f
thickArc src/Picture/Base.hs 306;" f thickArc src/Picture/Base.hs 313;" f
thickCircle src/Picture/Base.hs 280;" f thickCircle src/Picture/Base.hs 287;" f
thickLine src/Picture/Base.hs 252;" f thickLine src/Picture/Base.hs 259;" f
thickLineCol src/Picture/Base.hs 263;" f thickLineCol src/Picture/Base.hs 270;" f
thinHighBar src/Dodge/Room/Foreground.hs 77;" f thinHighBar src/Dodge/Room/Foreground.hs 77;" f
thingHit src/Dodge/WorldEvent/ThingsHit.hs 118;" f thingHit src/Dodge/WorldEvent/ThingsHit.hs 118;" f
thingHitFilt src/Dodge/WorldEvent/ThingsHit.hs 106;" f thingHitFilt src/Dodge/WorldEvent/ThingsHit.hs 106;" f
@@ -5201,7 +5204,7 @@ toTopLeft src/Dodge/Render/List.hs 212;" f
toV2 src/Geometry/Data.hs 54;" f toV2 src/Geometry/Data.hs 54;" f
toV3 src/Geometry/Data.hs 57;" f toV3 src/Geometry/Data.hs 57;" f
toV4 src/Geometry/Data.hs 60;" f toV4 src/Geometry/Data.hs 60;" f
toggleCombineInv src/Dodge/DisplayInventory.hs 312;" f toggleCombineInv src/Dodge/DisplayInventory.hs 314;" f
toggleCommands src/Dodge/Terminal.hs 81;" f toggleCommands src/Dodge/Terminal.hs 81;" f
toggleEquipmentAt src/Dodge/Creature/Impulse/UseItem.hs 67;" f toggleEquipmentAt src/Dodge/Creature/Impulse/UseItem.hs 67;" f
toggleExamineInv src/Dodge/Creature/Impulse/UseItem.hs 105;" f toggleExamineInv src/Dodge/Creature/Impulse/UseItem.hs 105;" f
@@ -5226,14 +5229,14 @@ tractorGun src/Dodge/Item/Held/BatteryGuns.hs 53;" f
tractorGunPic src/Dodge/Item/Draw/SPic.hs 416;" f tractorGunPic src/Dodge/Item/Draw/SPic.hs 416;" f
tractorPullPos src/Dodge/TractorBeam/Update.hs 33;" f tractorPullPos src/Dodge/TractorBeam/Update.hs 33;" f
tractorSPic src/Dodge/TractorBeam/Draw.hs 10;" f tractorSPic src/Dodge/TractorBeam/Draw.hs 10;" f
tranRot src/Picture/Base.hs 126;" f tranRot src/Picture/Base.hs 127;" f
transMat src/MatrixHelper.hs 87;" f transMat src/MatrixHelper.hs 87;" f
transToHandle src/Dodge/Item/HeldOffset.hs 26;" f transToHandle src/Dodge/Item/HeldOffset.hs 26;" f
translate src/Picture/Base.hs 118;" f translate src/Picture/Base.hs 119;" f
translate3 src/Picture/Base.hs 122;" f translate3 src/Picture/Base.hs 123;" f
translateFloatingCamera src/Dodge/Update/Camera.hs 48;" f translateFloatingCamera src/Dodge/Update/Camera.hs 48;" f
translateFloatingCameraKeys src/Dodge/Update/Camera.hs 66;" f translateFloatingCameraKeys src/Dodge/Update/Camera.hs 66;" f
translateH src/Picture/Base.hs 114;" f translateH src/Picture/Base.hs 115;" f
translatePointToLeftHand src/Dodge/Creature/HandPos.hs 75;" f translatePointToLeftHand src/Dodge/Creature/HandPos.hs 75;" f
translatePointToRightHand src/Dodge/Creature/HandPos.hs 36;" f translatePointToRightHand src/Dodge/Creature/HandPos.hs 36;" f
translateSH src/Shape.hs 241;" f translateSH src/Shape.hs 241;" f