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

Cleanup

Browse Source
This commit is contained in:
justin
2024-10-01 02:25:04 +01:00
parent dc44d20baf
commit c4f3961672
5 changed files with 102 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ghcidOutput
+1 -1
View File
@@ -1 +1 @@
All good (605 modules, at 01:50:02)
All good (605 modules, at 02:23:18)
saveSlot/LevelStart0
+1 -1
View File
File diff suppressed because one or more lines are too long
src/Dodge/Render/HUD.hs
+47 -94
View File
@@ -1,9 +1,9 @@
{-# LANGUAGE LambdaCase #-}
module Dodge.Render.HUD (
drawHUD,
) where
import Dodge.Item.Grammar
import Dodge.Inventory.RBList
import Control.Lens
import Control.Monad
import qualified Data.Map.Strict as M
@@ -21,6 +21,7 @@ import Dodge.Default.SelectionList
import Dodge.Equipment.Text
import Dodge.Inventory
import Dodge.Item.Display
import Dodge.Item.Grammar
import Dodge.Item.Info
import Dodge.ListDisplayParams
import Dodge.Render.Connectors
@@ -55,8 +56,9 @@ drawHP cfig =
. (^?! cWorld . lWorld . creatures . ix 0 . crHP)
drawInventory :: SelectionSections () -> World -> Configuration -> Picture
drawInventory sss w cfig = drawSelectionSections sss (invDisplayParams w) cfig
<> iextra
drawInventory sss w cfig =
drawSelectionSections sss (invDisplayParams w) cfig
<> iextra
where
iextra = fromMaybe mempty $ do
inv <- w ^? cWorld . lWorld . creatures . ix 0 . crInv
@@ -69,7 +71,6 @@ drawSubInventory :: SubInventory -> Configuration -> World -> Picture
drawSubInventory subinv cfig w = case subinv of
LockedInventory -> mempty -- topInvCursor col cursPos cfig w
NoSubInventory -> drawRBOptions cfig w
--ExamineInventory mtweaki -> drawExamineInventory cfig mtweaki w
ExamineInventory -> drawExamineInventory cfig w
DisplayTerminal tid -> displayTerminal tid cfig (w ^. cWorld . lWorld)
CombineInventory{_ciSections = sss} -> drawCombineInventory cfig sss w
@@ -79,46 +80,16 @@ drawCombineInventory cfig sss w =
invHead cfig "COMBINE"
<> drawSelectionSections sss secondColumnParams cfig
<> combineInventoryExtra sss cfig w
--drawExamineInventory :: Configuration -> Maybe Int -> World -> Picture
--drawExamineInventory cfig mtweaki w =
-- invHead cfig "EXAMINE"
-- <> examineInventoryExtra mtweaki cfig
-- <> drawSelectionList
-- secondColumnParams
-- cfig
-- ( defaultSelectionList & slItems .~ tweakItems itm
-- ++ map
-- f
-- ( makeParagraph 55 $
-- yourAugmentedItem
-- itemInfo
-- (yourInfo (you w))
-- (closeObjectInfo (crNumFreeSlots (you w)))
-- w
-- )
-- )
-- where
-- itm = yourSelectedItem w
-- f str =
-- SelectionItem
-- { _siPictures = [str]
-- , _siHeight = 1
-- , _siIsSelectable = True
-- , _siColor = white
-- , _siOffX = 0
-- , _siPayload = ()
-- }
drawExamineInventory :: Configuration -> World -> Picture
drawExamineInventory cfig w =
invHead cfig "EXAMINE"
-- <> examineInventoryExtra mtweaki cfig
<> drawSelectionList
secondColumnParams
cfig
( defaultSelectionList & slItems .~ -- tweakItems itm
-- ++
map
( defaultSelectionList & slItems
.~ map -- tweakItems itm
-- ++
f
( makeParagraph 55 $
yourAugmentedItem
@@ -129,7 +100,7 @@ drawExamineInventory cfig w =
)
)
where
-- itm = yourSelectedItem w
-- itm = yourSelectedItem w
f str =
SelectionItem
{ _siPictures = [str]
@@ -169,13 +140,7 @@ drawRBOptions cfig w = fromMaybe mempty $ do
(i', j) <- sss ^? sssExtra . sssSelPos . _Just
curpos <- selSecYint i' j sss
let ytext = drawListElement 0 1 0 curpos . text
midstr = case ae of
DoNotMoveEquipment -> ""
PutOnEquipment{} -> " PUT ON"
MoveEquipment{} -> " MOVE TO"
SwapEquipment{} -> " MOVE TO"
ReplaceEquipment{} -> " PUT ON"
RemoveEquipment{} -> "TAKE OFF"
midstr = equipAllocString ae
extrastr = case ae of
SwapEquipment{_allocOldPos = oldp, _allocSwapID = sid} ->
"SWAPS " ++ otheritem sid ++ " ONTO " ++ eqPosText oldp
@@ -207,19 +172,27 @@ drawRBOptions cfig w = fromMaybe mempty $ do
itm <- you w ^? crInv . ix j
return $ itemBaseName itm
--examineInventoryExtra :: Maybe Int -> Configuration -> Picture
--examineInventoryExtra mtweaki cfig = fromMaybe mempty $ do
-- tweaki <- mtweaki
-- return $
-- toTopLeft cfig $
-- translate subInvX (-71) $
-- listCursorChooseBorderScale 0 1 [North, South, West] tweaki 0 white 10 1
equipAllocString :: EquipmentAllocation -> String
equipAllocString = \case
DoNotMoveEquipment -> ""
PutOnEquipment{} -> " PUT ON"
MoveEquipment{} -> " MOVE TO"
SwapEquipment{} -> " MOVE TO"
ReplaceEquipment{} -> " PUT ON"
RemoveEquipment{} -> "TAKE OFF"
inventoryExtra :: SelectionSections () -> Configuration -> World
-> IM.IntMap (Maybe (Int,Int),[Int],[Int]) -> Picture
inventoryExtra sss cfig w is = translate (negate 5) 0 $ IM.foldMapWithKey (inventoryExtraH sss cfig w) $ fmap (\(_,a,b) -> a<>b) is
inventoryExtra ::
SelectionSections () ->
Configuration ->
World ->
IM.IntMap (Maybe (Int, Int), [Int], [Int]) ->
Picture
inventoryExtra sss cfig w =
translate (negate 5) 0
. IM.foldMapWithKey (inventoryExtraH sss cfig w)
. fmap (\(_, a, b) -> a <> b)
inventoryExtraH :: SelectionSections () -> Configuration -> World -> Int -> [Int] -> Picture
inventoryExtraH :: SelectionSections () -> Configuration -> World -> Int -> [Int] -> Picture
inventoryExtraH sss cfig w i is = fromMaybe mempty $ do
p <- snum i
let ps = mapMaybe snum is
@@ -233,24 +206,21 @@ combineInventoryExtra sss cfig w = fromMaybe mempty $ do
cpos <- selSecYint i j sss
si <- sss ^? sssSections . ix i . ssItems . ix j
let col = _siColor si
return $
mconcat
[ fromMaybe mempty $ do
strs <- si ^? siPayload . ciInfo
return
. translate 160 0
-- it would be better to get the width of the selection list from elsewhere
. translateScreenPos cfig (secondColumnParams ^. ldpPos)
$ drawListYoff cpos $ map (color red . text) strs
, fromMaybe mempty $ do
lnks <- si ^? siPayload . ciInvIDs
return $
lnkMidPosInvSelsCol cfig w j col lnks
<> foldMap invcursor lnks
-- <> combineCounts cfig w lnks
]
mconcat
[ do
strs <- si ^? siPayload . ciInfo
return
. translate 160 0
-- it would be better to get the width of the selection list from elsewhere
. translateScreenPos cfig (secondColumnParams ^. ldpPos)
$ drawListYoff cpos $ map (color red . text) strs
, do
lnks <- si ^? siPayload . ciInvIDs
return (lnkMidPosInvSelsCol cfig w j col lnks)
<> foldMap invcursor lnks
]
where
invcursor i = fromMaybe mempty $ do
invcursor i = do
sss' <- w ^? hud . hudElement . diSections
let idp = invDisplayParams w & ldpCursorSides .~ [North, South, East, West]
return $
@@ -282,24 +252,6 @@ displayTerminal tid cfig w = fromMaybe mempty $ do
| hasfoc = clockCycle 10 (V.fromList ["_", "."]) w
| otherwise = []
--combineCounts :: Configuration -> World -> [Int] -> Picture
--combineCounts cfig w = foldMap f . group
-- where
---- f (i : is) = fromMaybe mempty $ do
---- _ <- yourInv w ^? ix i . itUse . useAmount
---- sss <- w ^? hud . hudElement . diSections
---- --p <- selNumTextEndPos cfig (invDisplayParams w) sss 0 i
---- col <- selSecSelCol 0 i sss
---- yint <- selSecYint 0 i sss
---- --return $ color col $ uncurryV translate p . scale 0.1 0.1 . text $ ('-' : show (length is + 1))
---- return
---- . translateScreenPos cfig (invDisplayParams w ^. ldpPos)
---- . color col
---- . drawListElement 0 1 15 yint
---- . text
---- $ ('-' : show (length is + 1))
-- f _ = mempty
lnkMidPosInvSelsCol :: Configuration -> World -> Int -> Color -> [Int] -> Picture
lnkMidPosInvSelsCol cfig w i col = foldMap f
where
@@ -389,8 +341,9 @@ selNumPos cfig ldp sss i j = do
indent <- sss ^? sssSections . ix i . ssItems . ix j . siOffX
return $
screenPosAbs cfig (ldp ^. ldpPos)
+ V2 (10 * s * fromIntegral indent)
(negate (20 * s + ygap) * (fromIntegral ipos + fromIntegral size * 0.5))
+ V2
(10 * s * fromIntegral indent)
(negate (20 * s + ygap) * (fromIntegral ipos + fromIntegral size * 0.5))
where
s = _ldpScale ldp
ygap = _ldpVerticalGap ldp
src/Dodge/TestString.hs
+2 -1
View File
@@ -20,7 +20,8 @@ import Dodge.Data.Universe
import qualified IntMapHelp as IM
testStringInit :: Universe -> [String]
testStringInit u = [maybe mempty show $ u ^? uvWorld . cWorld . lWorld . projectiles . ix 0 . prjUpdates . ix 3 . pjuControllerID]
testStringInit _ = [fromMaybe mempty (Just "A" <> Just "B")]
--testStringInit u = [maybe mempty show $ u ^? uvWorld . cWorld . lWorld . projectiles . ix 0 . prjUpdates . ix 3 . pjuControllerID]
--testStringInit u = (topTestPart u
-- <>) $ map showh $
---- (IM.toList . IM.filter (\itloc -> itloc ^? ilCrID == Just 0) $ (u ^. uvWorld . cWorld . lWorld . itemLocations)) <>
tags
+51 -50
View File
@@ -1101,7 +1101,7 @@ HOSE src/Dodge/Data/Item/Combine.hs 32;" C
HPtLayer src/Dodge/Picture/Layer/Data.hs 17;" C
HUD src/Dodge/Data/HUD.hs 35;" t
HUD src/Dodge/Data/HUD.hs 6;" m
HUD src/Dodge/Render/HUD.hs 1;" m
HUD src/Dodge/Render/HUD.hs 2;" m
HUDElement src/Dodge/Data/HUD.hs 16;" t
HalfRes src/Dodge/Config/Data.hs 54;" C
HalfRes src/Dodge/Data/Config.hs 95;" C
@@ -4364,7 +4364,7 @@ allHotkeys src/Dodge/Creature/YourControl.hs 52;" f
allVisibleWalls src/Dodge/Base/Collide.hs 131;" f
alongSegBy src/Geometry.hs 43;" f
ammoComposedItem' src/Dodge/Item/Grammar.hs 66;" f
ammoMagSPic src/Dodge/Item/Draw/SPic.hs 58;" f
ammoMagSPic src/Dodge/Item/Draw/SPic.hs 46;" f
amr src/Dodge/Item/Held/Rod.hs 46;" f
amr src/Dodge/Item/Weapon/BulletGun/Rod.hs 56;" f
anItemFindPulse src/Dodge/Item/Weapon/UseEffect.hs 25;" f
@@ -4473,10 +4473,10 @@ azure src/Color.hs 22;" f
bQuadToF src/Geometry/Bezier.hs 37;" f
bQuadToLine src/Geometry/Bezier.hs 30;" f
backpackCombinations src/Dodge/Combine/Combinations.hs 25;" f
backpackShape src/Dodge/Item/Draw/SPic.hs 107;" f
backpackShape src/Dodge/Item/Draw/SPic.hs 96;" f
backspaceInputted src/Dodge/Update/Input/Text.hs 26;" f
bangCone src/Dodge/Item/Held/Cone.hs 11;" f
bangConeShape src/Dodge/Item/Draw/SPic.hs 268;" f
bangConeShape src/Dodge/Item/Draw/SPic.hs 238;" f
bangEchoS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 370;" f
bangRod src/Dodge/Item/Held/Rod.hs 18;" f
bangRod src/Dodge/Item/Weapon/BulletGun/Rod.hs 18;" f
@@ -4486,20 +4486,20 @@ bangStick src/Dodge/Item/Weapon/BulletGun/Stick.hs 17;" f
bangStickSoundChoice src/Dodge/HeldUse/BulletWeapon.hs 226;" f
barPP src/Dodge/Room/Foreground.hs 236;" f
barrel src/Dodge/Creature/Inanimate.hs 17;" f
baseAMRShape src/Dodge/Item/Draw/SPic.hs 377;" f
baseAMRShape src/Dodge/Item/Draw/SPic.hs 348;" f
baseBlockPane src/Dodge/Placement/Instance/Wall.hs 86;" f
baseBlockPane src/Dodge/Placements/Wall.hs 63;" f
baseBlockPane src/Dodge/Room/Placement.hs 93;" f
baseCaneShape src/Dodge/Item/Draw/SPic.hs 288;" f
baseCaneShape src/Dodge/Item/Draw/SPic.hs 258;" f
baseDebris src/Dodge/Block/Debris.hs 122;" f
baseFloorTileSize src/Tile.hs 38;" f
basePartiallyComposedItem' src/Dodge/Item/Grammar.hs 39;" f
baseRifleShape src/Dodge/Item/Draw/SPic.hs 291;" f
baseRodShape src/Dodge/Item/Draw/SPic.hs 374;" f
baseSMGShape src/Dodge/Item/Draw/SPic.hs 358;" f
baseRifleShape src/Dodge/Item/Draw/SPic.hs 261;" f
baseRodShape src/Dodge/Item/Draw/SPic.hs 345;" f
baseSMGShape src/Dodge/Item/Draw/SPic.hs 328;" f
baseShoulder src/Dodge/Creature/Picture.hs 159;" f
baseStickShape src/Dodge/Item/Draw/SPic.hs 265;" f
baseStickShapeX src/Dodge/Item/Draw/SPic.hs 260;" f
baseStickShape src/Dodge/Item/Draw/SPic.hs 235;" f
baseStickShapeX src/Dodge/Item/Draw/SPic.hs 230;" f
baseStickSpread src/Dodge/Item/Held/Stick.hs 32;" f
baseStickSpread src/Dodge/Item/Weapon/BulletGun/Stick.hs 46;" f
baseWindowPane src/Dodge/Placements/Wall.hs 73;" f
@@ -4691,7 +4691,7 @@ clipZoom src/Dodge/Update/Camera.hs 219;" f
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 143;" f
closeObjectInfo src/Dodge/Render/HUD.hs 113;" f
closeObjectToSelectionItem src/Dodge/Inventory/SelectionList.hs 65;" f
closeObjectToTextPictures src/Dodge/Inventory/SelectionList.hs 80;" f
closestCreatureID src/Dodge/Debug.hs 91;" f
@@ -4735,7 +4735,7 @@ combineAwareness src/Dodge/Creature/Perception.hs 109;" f
combineBeamBeams src/Dodge/Update.hs 479;" f
combineBeams src/Dodge/Update.hs 470;" f
combineFloors src/Dodge/Room/Procedural.hs 171;" f
combineInventoryExtra src/Dodge/Render/HUD.hs 230;" f
combineInventoryExtra src/Dodge/Render/HUD.hs 198;" f
combineItemListYouX src/Dodge/Combine.hs 34;" f
combineList src/Dodge/Combine.hs 37;" f
combineRooms src/Dodge/Room/Procedural.hs 151;" f
@@ -4961,7 +4961,7 @@ dededumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 448;" f
dedumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 316;" f
defDamageMaterial src/Dodge/Material/Damage.hs 17;" f
defLSPic src/Dodge/LightSource/Draw.hs 11;" f
defSPic src/Dodge/Item/Draw/SPic.hs 274;" f
defSPic src/Dodge/Item/Draw/SPic.hs 244;" f
defaultAimMvType src/Dodge/Default/Creature.hs 122;" f
defaultAimParams src/Dodge/Default/Item/Held/AimParams.hs 4;" f
defaultAimParams src/Dodge/Default/Item/Use/AimParams.hs 6;" f
@@ -5080,7 +5080,7 @@ destroyMount src/Dodge/Block.hs 98;" f
destroyMounts src/Dodge/Block.hs 95;" f
destroyProjectile src/Dodge/Projectile/Update.hs 62;" f
detV src/Geometry/Vector.hs 93;" f
detectorColor src/Dodge/Item/Draw/SPic.hs 432;" f
detectorColor src/Dodge/Item/Draw/SPic.hs 404;" f
detectorEffect src/Dodge/Item/Weapon/Radar.hs 19;" f
detectorInfo src/Dodge/Item/Info.hs 195;" f
determineInvSelCursorWidth src/Dodge/ListDisplayParams.hs 54;" f
@@ -5104,7 +5104,7 @@ displayControls src/Dodge/Menu.hs 206;" f
displayEnergyBallType src/Dodge/Module/Info.hs 19;" f
displayFrameTicks src/Dodge/Render/Picture.hs 33;" f
displayFreeSlots src/Dodge/DisplayInventory.hs 158;" f
displayTerminal src/Dodge/Render/HUD.hs 260;" f
displayTerminal src/Dodge/Render/HUD.hs 228;" f
displayTerminalLineString src/Dodge/Update.hs 327;" f
dist src/Geometry/Vector.hs 179;" f
dist3 src/Geometry/Vector3D.hs 101;" f
@@ -5246,7 +5246,7 @@ drawDoubleLampCover src/Dodge/LightSources/Lamp.hs 139;" f
drawDoubleLampCover src/Dodge/Prop/Draw.hs 83;" f
drawEnergyBall src/Dodge/EnergyBall/Draw.hs 8;" f
drawEquipment src/Dodge/Creature/Picture.hs 174;" f
drawExamineInventory src/Dodge/Render/HUD.hs 112;" f
drawExamineInventory src/Dodge/Render/HUD.hs 83;" f
drawFarWallDetect src/Dodge/Debug/Picture.hs 232;" f
drawFlame src/Dodge/Flame/Draw.hs 7;" f
drawFlamelet src/Dodge/EnergyBall/Draw.hs 23;" f
@@ -5254,12 +5254,12 @@ drawFlare src/Dodge/Flare.hs 12;" f
drawFooterText src/Dodge/Render/MenuScreen.hs 65;" f
drawForceField src/Dodge/Wall/Draw.hs 11;" f
drawGib src/Dodge/Prop/Draw.hs 28;" f
drawHP src/Dodge/Render/HUD.hs 48;" f
drawHUD src/Dodge/Render/HUD.hs 40;" f
drawHP src/Dodge/Render/HUD.hs 49;" f
drawHUD src/Dodge/Render/HUD.hs 41;" f
drawInputMenu src/Dodge/Render/MenuScreen.hs 18;" f
drawInspectWall src/Dodge/Debug/Picture.hs 207;" f
drawInspectWalls src/Dodge/Debug/Picture.hs 195;" f
drawInventory src/Dodge/Render/HUD.hs 57;" f
drawInventory src/Dodge/Render/HUD.hs 58;" f
drawLabCrossCol src/Dodge/Render/Label.hs 8;" f
drawLampCover src/Dodge/LightSources/Lamp.hs 122;" f
drawLampCover src/Dodge/Prop/Draw.hs 44;" f
@@ -5287,7 +5287,7 @@ drawPointLabel src/Dodge/Render/Label.hs 13;" f
drawProjectile src/Dodge/Projectile/Draw.hs 13;" f
drawProp src/Dodge/Prop/Draw.hs 15;" f
drawProp' src/Dodge/Prop/Draw.hs 12;" f
drawRBOptions src/Dodge/Render/HUD.hs 161;" f
drawRBOptions src/Dodge/Render/HUD.hs 131;" f
drawRadarSweep src/Dodge/RadarSweep/Draw.hs 7;" f
drawRemoteShell src/Dodge/Projectile/Draw.hs 30;" f
drawSelectionCursor src/Dodge/Render/List.hs 40;" f
@@ -5301,7 +5301,7 @@ drawShell src/Dodge/Projectile/Draw.hs 20;" f
drawShockwave src/Dodge/Shockwave/Draw.hs 7;" f
drawSpark src/Dodge/Spark/Draw.hs 6;" f
drawStaticBall src/Dodge/EnergyBall/Draw.hs 14;" f
drawSubInventory src/Dodge/Render/HUD.hs 68;" f
drawSubInventory src/Dodge/Render/HUD.hs 69;" f
drawSweep src/Dodge/Render/ShapePicture.hs 57;" f
drawSwitch src/Dodge/Button/Draw.hs 15;" f
drawSwitchWire src/Dodge/LevelGen/Switch.hs 28;" f
@@ -5358,8 +5358,9 @@ enterCombineInv src/Dodge/DisplayInventory.hs 253;" f
eqConstr src/SameConstr.hs 17;" f
eqPosText src/Dodge/Equipment/Text.hs 6;" f
equipAimSpeed src/Dodge/Creature/Action/Movement.hs 109;" f
equipAllocString src/Dodge/Render/HUD.hs 172;" f
equipInfo src/Dodge/Item/Info.hs 107;" f
equipItemSPic src/Dodge/Item/Draw/SPic.hs 77;" f
equipItemSPic src/Dodge/Item/Draw/SPic.hs 66;" f
equipPosition src/Dodge/Item/Draw.hs 32;" f
equipPosition src/Dodge/Item/Equipment/Shape.hs 15;" f
equipSiteInfo src/Dodge/Item/Info.hs 225;" f
@@ -5444,12 +5445,12 @@ flameTorrent src/Dodge/Item/Held/SprayGuns.hs 40;" f
flameTorrent src/Dodge/Item/Weapon/SprayGuns.hs 38;" f
flameWall src/Dodge/Item/Held/SprayGuns.hs 56;" f
flameWall src/Dodge/Item/Weapon/SprayGuns.hs 54;" f
flamerPic src/Dodge/Item/Draw/SPic.hs 361;" f
flamerPic src/Dodge/Item/Draw/SPic.hs 331;" f
flareCircleAt src/Dodge/WorldEvent/Flash.hs 46;" f
flatItemCombinations src/Dodge/Combine/Combinations.hs 49;" f
flatLookupItems src/Dodge/Combine.hs 29;" f
flatShield src/Dodge/Item/Held/Utility.hs 9;" f
flatShieldEquipSPic src/Dodge/Item/Draw/SPic.hs 419;" f
flatShieldEquipSPic src/Dodge/Item/Draw/SPic.hs 391;" f
flattenIMIMIM src/Dodge/Base/Zone.hs 246;" f
fleeFrom src/Dodge/CreatureEffect.hs 120;" f
fleeFromTarget src/Dodge/CreatureEffect.hs 66;" f
@@ -5468,7 +5469,7 @@ flockPointTargetR src/Dodge/Creature/Boid.hs 266;" f
flockToPointUsing src/Dodge/Creature/Boid.hs 214;" f
flockToPointUsing' src/Dodge/Creature/Boid.hs 227;" f
floorHun src/Dodge/Base/Zone.hs 40;" f
floorItemPickupInfo src/Dodge/Render/HUD.hs 148;" f
floorItemPickupInfo src/Dodge/Render/HUD.hs 118;" f
floorItemSPic src/Dodge/Render/ShapePicture.hs 169;" f
floorWire src/Dodge/Wire.hs 13;" f
foamSpray src/Dodge/SoundLogic/Synonyms.hs 27;" f
@@ -5638,7 +5639,7 @@ hasLOSIndirect src/Dodge/Base/Collide.hs 214;" f
hat src/Dodge/Item/Equipment.hs 104;" f
head src/DoubleStack.hs 14;" f
headLamp src/Dodge/Item/Equipment.hs 117;" f
headLampShape src/Dodge/Item/Draw/SPic.hs 422;" f
headLampShape src/Dodge/Item/Draw/SPic.hs 394;" f
headMap src/Dodge/DoubleTree.hs 117;" f
heal src/Dodge/Item/Consumable.hs 17;" f
heal25 src/Dodge/Item/Consumable.hs 14;" f
@@ -5653,7 +5654,7 @@ heldEffect src/Dodge/HeldUse.hs 45;" f
heldEffectMuzzles src/Dodge/HeldUse.hs 48;" f
heldInfo src/Dodge/Item/Info.hs 48;" f
heldItemOffset src/Dodge/Item/HeldOffset.hs 24;" f
heldItemSPic src/Dodge/Item/Draw/SPic.hs 194;" f
heldItemSPic src/Dodge/Item/Draw/SPic.hs 175;" f
heldPositionInfo src/Dodge/Item/Info.hs 212;" f
helpCommand src/Dodge/Terminal.hs 64;" f
helpPoly3D src/Polyhedra.hs 124;" f
@@ -5767,7 +5768,7 @@ invAdj src/Dodge/Item/Grammar.hs 145;" f
invDimColor src/Dodge/DisplayInventory.hs 139;" f
invDimColor src/Dodge/Inventory/Color.hs 4;" f
invDisplayParams src/Dodge/ListDisplayParams.hs 29;" f
invHead src/Dodge/Render/HUD.hs 314;" f
invHead src/Dodge/Render/HUD.hs 282;" f
invIndentIM src/Dodge/Item/Grammar.hs 157;" f
invLDT' src/Dodge/Item/Grammar.hs 127;" f
invLDT'' src/Dodge/Item/Grammar.hs 122;" f
@@ -5778,8 +5779,8 @@ invShiftPointBy src/Dodge/ShiftPoint.hs 8;" f
invSideEff src/Dodge/Creature/State.hs 237;" f
invSize src/Dodge/Inventory/CheckSlots.hs 41;" f
invTrees src/Dodge/Item/Grammar.hs 162;" f
inventoryExtra src/Dodge/Render/HUD.hs 218;" f
inventoryExtraH src/Dodge/Render/HUD.hs 222;" f
inventoryExtra src/Dodge/Render/HUD.hs 181;" f
inventoryExtraH src/Dodge/Render/HUD.hs 190;" f
inventoryX src/Dodge/Creature.hs 115;" f
inverseShockwaveAt src/Dodge/WorldEvent/Shockwave.hs 43;" f
invertEncircleDistP src/Dodge/Creature/Boid.hs 13;" f
@@ -5842,10 +5843,10 @@ itemInvColor src/Dodge/Item/InventoryColor.hs 9;" f
itemInvSideEffect src/Dodge/Creature/State.hs 245;" f
itemNumberDisplay src/Dodge/Item/Display.hs 110;" f
itemRooms src/Dodge/LockAndKey.hs 39;" f
itemRotTreeSPic src/Dodge/Item/Draw/SPic.hs 39;" f
itemSPic src/Dodge/Item/Draw/SPic.hs 46;" f
itemRotTreeSPic src/Dodge/Item/Draw/SPic.hs 27;" f
itemSPic src/Dodge/Item/Draw/SPic.hs 34;" f
itemString src/Dodge/Item/Display.hs 57;" f
itemTreeSPic src/Dodge/Item/Draw/SPic.hs 35;" f
itemTreeSPic src/Dodge/Item/Draw/SPic.hs 22;" f
itemUpdate src/Dodge/Creature/State.hs 338;" f
itemUseEffect src/Dodge/Creature/Impulse/UseItem.hs 35;" f
iterateUntil src/MonadHelp.hs 23;" f
@@ -5881,7 +5882,7 @@ keyCard src/Dodge/Item/PassKey.hs 8;" f
keyCardAnalyserByDoor src/Dodge/Room/LasTurret.hs 69;" f
keyCardRoomRunPast src/Dodge/Room/LasTurret.hs 57;" f
keyCardRunPastRand src/Dodge/LockAndKey.hs 36;" f
keyPic src/Dodge/Item/Draw/SPic.hs 438;" f
keyPic src/Dodge/Item/Draw/SPic.hs 410;" f
keyholeCorridor src/Dodge/Room/Corridor.hs 39;" f
killBulletUpdate src/Dodge/WorldEvent/HitEffect.hs 30;" f
killParticleUpdate src/Dodge/Particle/Update.hs 9;" f
@@ -5901,7 +5902,7 @@ lasBeamCombine src/Dodge/Beam.hs 31;" f
lasCenSensEdge src/Dodge/Room/LasTurret.hs 112;" f
lasDronesPic src/Dodge/Item/Weapon/Drone.hs 22;" f
lasGun src/Dodge/Item/Held/BatteryGuns.hs 46;" f
lasGunPic src/Dodge/Item/Draw/SPic.hs 390;" f
lasGunPic src/Dodge/Item/Draw/SPic.hs 361;" f
lasRayAt src/Dodge/Beam.hs 62;" f
lasSensorTurretTest src/Dodge/Room/LasTurret.hs 105;" f
lasTunnel src/Dodge/Room/LasTurret.hs 124;" f
@@ -5913,7 +5914,7 @@ latchkey src/Dodge/Item/Held/Utility.hs 23;" f
latchkey src/Dodge/Item/PassKey.hs 14;" f
launcher src/Dodge/Item/Held/Launcher.hs 12;" f
launcherCrit src/Dodge/Creature/LauncherCrit.hs 12;" f
launcherPic src/Dodge/Item/Draw/SPic.hs 364;" f
launcherPic src/Dodge/Item/Draw/SPic.hs 334;" f
launcherSound src/Dodge/SoundLogic/Synonyms.hs 4;" f
launcherX src/Dodge/Item/Held/Launcher.hs 32;" f
layoutLevelFromSeed src/Dodge/LevelGen.hs 47;" f
@@ -5925,10 +5926,10 @@ ldtToIndentList src/Dodge/DoubleTree.hs 93;" f
left src/DoubleStack.hs 16;" f
leftInfo src/Dodge/Item/Info.hs 96;" f
leftIsParentCombine src/Dodge/Item/Grammar.hs 85;" f
leftItemSPic src/Dodge/Item/Draw/SPic.hs 110;" f
leftItemSPic src/Dodge/Item/Draw/SPic.hs 99;" f
leftPad src/Padding.hs 14;" f
leftRightCombine src/Dodge/Item/Grammar.hs 97;" f
legsSPic src/Dodge/Item/Draw/SPic.hs 456;" f
legsSPic src/Dodge/Item/Draw/SPic.hs 428;" f
liShape src/Dodge/Placement/Instance/LightSource.hs 99;" f
liShape src/Dodge/Placements/LightSource.hs 55;" f
light src/Color.hs 100;" f
@@ -5964,7 +5965,7 @@ litCorridor90 src/Dodge/Room/RoadBlock.hs 26;" f
lmt src/MatrixHelper.hs 43;" f
lnkBothAnd src/Dodge/Room/Procedural.hs 120;" f
lnkEff src/Dodge/Layout/Tree/Shift.hs 55;" f
lnkMidPosInvSelsCol src/Dodge/Render/HUD.hs 303;" f
lnkMidPosInvSelsCol src/Dodge/Render/HUD.hs 271;" f
lnkPosDir src/Dodge/RoomLink.hs 97;" f
loadConfig src/LoadConfig.hs 22;" f
loadDodgeConfig src/Dodge/Config/Load.hs 9;" f
@@ -6172,8 +6173,8 @@ miniGunCrit src/Dodge/Creature.hs 62;" f
miniGunUse src/Dodge/Item/Weapon/BulletGun/Cane.hs 113;" f
miniGunX src/Dodge/Item/Held/Cane.hs 83;" f
miniGunX src/Dodge/Item/Weapon/BulletGun/Cane.hs 120;" f
miniGunXPict src/Dodge/Item/Draw/SPic.hs 340;" f
miniGunXPictItem src/Dodge/Item/Draw/SPic.hs 334;" f
miniGunXPict src/Dodge/Item/Draw/SPic.hs 309;" f
miniGunXPictItem src/Dodge/Item/Draw/SPic.hs 304;" f
miniS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 510;" f
miniTree2 src/Dodge/Room/Room.hs 108;" f
minimumOn src/FoldlHelp.hs 12;" f
@@ -6942,9 +6943,9 @@ secondColumnParams src/Dodge/ListDisplayParams.hs 42;" f
seedStartMenu src/Dodge/Menu.hs 79;" f
seedStartOptions src/Dodge/Menu.hs 82;" f
segOnCirc src/Geometry.hs 116;" f
selNumPos src/Dodge/Render/HUD.hs 379;" f
selNumPos src/Dodge/Render/HUD.hs 347;" f
selSecDrawCursor src/Dodge/Render/List.hs 87;" f
selSecSelCol src/Dodge/Render/HUD.hs 398;" f
selSecSelCol src/Dodge/Render/HUD.hs 366;" f
selSecSelSize src/Dodge/SelectionSections.hs 124;" f
selSecYint src/Dodge/SelectionSections.hs 127;" f
selectCreatureDebugItem src/Dodge/Debug.hs 38;" f
@@ -7036,7 +7037,7 @@ shapeVerxAttributes src/Shape/Parameters.hs 13;" f
shapeVerxSize src/Shape/Parameters.hs 10;" f
shardShape src/Dodge/Block/Debris.hs 181;" f
shatterGun src/Dodge/Item/Held/Weapons.hs 8;" f
shatterGunSPic src/Dodge/Item/Draw/SPic.hs 277;" f
shatterGunSPic src/Dodge/Item/Draw/SPic.hs 247;" f
shatterWall src/Dodge/Item/Weapon/Shatter.hs 26;" f
shellCollisionCheck src/Dodge/Projectile/Update.hs 51;" f
shellCollisionEffect src/Dodge/Projectile/Update.hs 47;" f
@@ -7349,7 +7350,7 @@ terminalShape src/Dodge/Machine/Draw.hs 29;" f
terminalWheelEvent src/Dodge/Update/Scroll.hs 76;" f
teslaBeamCombine src/Dodge/Beam.hs 48;" f
teslaGun src/Dodge/Item/Held/BatteryGuns.hs 27;" f
teslaGunPic src/Dodge/Item/Draw/SPic.hs 380;" f
teslaGunPic src/Dodge/Item/Draw/SPic.hs 351;" f
teslaParams src/Dodge/Tesla/ItemParams.hs 6;" f
testCrossWalls src/Dodge/Room/Path.hs 47;" f
testEvent src/Dodge/Event/Test.hs 10;" f
@@ -7424,14 +7425,14 @@ topPrismEdgeIndices src/Shader/Poke.hs 327;" f
topPrismIndices src/Shader/Poke.hs 402;" f
topTestPart src/Dodge/TestString.hs 34;" f
torch src/Dodge/Item/Held/Utility.hs 26;" f
torchShape src/Dodge/Item/Draw/SPic.hs 241;" f
torchShape src/Dodge/Item/Draw/SPic.hs 216;" f
torqueCr src/Dodge/WorldEffect.hs 70;" f
torso src/Dodge/Creature/Picture.hs 133;" f
tractCr src/Dodge/TractorBeam/Update.hs 28;" f
tractFlIt src/Dodge/TractorBeam/Update.hs 23;" f
tractorBeamAt src/Dodge/HeldUse.hs 232;" f
tractorGun src/Dodge/Item/Held/BatteryGuns.hs 73;" f
tractorGunPic src/Dodge/Item/Draw/SPic.hs 416;" f
tractorGunPic src/Dodge/Item/Draw/SPic.hs 388;" f
tractorPullPos src/Dodge/TractorBeam/Update.hs 33;" f
tractorSPic src/Dodge/TractorBeam/Draw.hs 10;" f
tranRot src/Picture/Base.hs 124;" f
@@ -7758,7 +7759,7 @@ visionCheck src/Dodge/Creature/Perception.hs 152;" f
vocalizationTest src/Dodge/Creature/Vocalization.hs 8;" f
volleyGun src/Dodge/Item/Held/Cane.hs 32;" f
volleyGun src/Dodge/Item/Weapon/BulletGun/Cane.hs 43;" f
volleyGunShape src/Dodge/Item/Draw/SPic.hs 322;" f
volleyGunShape src/Dodge/Item/Draw/SPic.hs 292;" f
waistSP src/Dodge/Creature/HandPos.hs 199;" f
walkNozzle src/Dodge/HeldUse.hs 207;" f
walkableNodeNear src/Dodge/Path.hs 48;" f
@@ -7879,7 +7880,7 @@ you src/Dodge/Base/You.hs 18;" f
youBox' src/Dodge/Creature/ShadowBox.hs 8;" f
youDropItem src/Dodge/Creature/Action.hs 188;" f
youSil src/Dodge/Creature/ShadowBox.hs 15;" f
yourAugmentedItem src/Dodge/Render/HUD.hs 155;" f
yourAugmentedItem src/Dodge/Render/HUD.hs 125;" f
yourControl src/Dodge/Creature/YourControl.hs 22;" f
yourDefaultSpeed src/Dodge/Default/Creature.hs 134;" f
yourDefaultStrideLength src/Dodge/Default/Creature.hs 137;" f