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-11-25 23:17:54 +00:00
parent f91a5cebb5
commit 145ab77859
3 changed files with 38 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Dodge/InputFocus.hs
-2
View File
@@ -1,6 +1,4 @@
module Dodge.InputFocus (
-- inInvRegex,
-- inCloseRegex,
inTextInputFocus,
) where
src/Dodge/Update/Scroll.hs
+2 -2
View File
@@ -33,8 +33,8 @@ updateWheelEvent yi w = case w ^. hud . hudElement of
EquipOptions{} -> w & rbOptions . opSel %~ scrollRBOption yi rbscrollmax
NoRightButtonOptions -> w
| bdown ButtonLeft -> w & wCam . camZoom +~ y
| invKeyDown -> changeSwapSel yi $ w-- & hud . hudElement . diSelectionExtra .~ mempty
| otherwise -> scrollAugInvSel yi $ w-- & hud . hudElement . diSelectionExtra .~ mempty
| invKeyDown -> changeSwapSel yi w
| otherwise -> scrollAugInvSel yi w
DisplayInventory{_subInventory = ExamineInventory}
| invKeyDown -> scrollAugInvSel yi w
| otherwise -> w
tags
+36 -40
View File
@@ -3625,7 +3625,7 @@ colCrsWalls src/Dodge/WallCreatureCollisions.hs 17;" f
colSpark src/Dodge/Spark.hs 47;" f
colSparkRandDir src/Dodge/Spark.hs 101;" f
collectDamageTypes src/Dodge/Damage.hs 32;" f
collectInvItems src/Dodge/Update/Input/InGame.hs 245;" f
collectInvItems src/Dodge/Update/Input/InGame.hs 241;" f
collideCircWalls src/Dodge/Base/Collide.hs 149;" f
collidePoint src/Dodge/Base/Collide.hs 48;" f
collidePointTestFilter src/Dodge/Base/Collide.hs 93;" f
@@ -3659,7 +3659,7 @@ composeTree src/Dodge/Tree/Compose.hs 46;" f
computerBeepingS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 472;" f
conEffects src/Dodge/Concurrent.hs 13;" f
concBall src/Dodge/WorldEvent/SpawnParticle.hs 27;" f
concurrentIS src/Dodge/Update/Input/InGame.hs 237;" f
concurrentIS src/Dodge/Update/Input/InGame.hs 233;" f
connectItemS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 532;" f
connectionBlurb src/Dodge/Terminal.hs 102;" f
connectionBlurbLines src/Dodge/Terminal.hs 47;" f
@@ -4004,7 +4004,7 @@ doPropUpdates src/Dodge/Prop/Update.hs 36;" f
doQuickload src/Dodge/Save.hs 82;" f
doQuicksave src/Dodge/Save.hs 77;" f
doRandImpulse src/Dodge/RandImpulse.hs 7;" f
doRegexInput src/Dodge/Update/Input/InGame.hs 384;" f
doRegexInput src/Dodge/Update/Input/InGame.hs 380;" f
doRoomInPlacements src/Dodge/Layout.hs 97;" f
doRoomOutPlacements src/Dodge/Layout.hs 107;" f
doRoomPlacements src/Dodge/Layout.hs 122;" f
@@ -4482,13 +4482,9 @@ icosohedronFaces src/Polyhedra/Geodesic.hs 19;" f
ifConfigWallRotate src/Dodge/Update/Camera.hs 171;" f
ildtPropagate src/Dodge/DoubleTree.hs 57;" f
impulsiveAIBefore src/Dodge/Creature/Impulse.hs 22;" f
inCloseRegex src/Dodge/InputFocus.hs 85;" f
inInputFocus src/Dodge/InputFocus.hs 51;" f
inInvRegex src/Dodge/InputFocus.hs 82;" f
inLink src/Dodge/RoomLink.hs 113;" f
inSegArea src/Geometry/Intersect.hs 298;" f
inSubInvRegex src/Dodge/InputFocus.hs 88;" f
inTopRegex src/Dodge/InputFocus.hs 77;" f
inTextInputFocus src/Dodge/InputFocus.hs 12;" f
incBallAt src/Dodge/EnergyBall.hs 54;" f
incidenceToFunction src/Dodge/Graph.hs 26;" f
indefiniteExceptions src/StringHelp.hs 29;" f
@@ -4515,8 +4511,7 @@ initializeOptionMenu src/Dodge/Menu/Option.hs 17;" f
initializeOptionMenuBO src/Dodge/Menu/Option.hs 33;" f
initializeTexture2D src/Framebuffer/Update.hs 221;" f
inorderNumberTree src/TreeHelp.hs 189;" f
inputFocus src/Dodge/InputFocus.hs 57;" f
inputFocusI src/Dodge/InputFocus.hs 54;" f
inputFocusI src/Dodge/InputFocus.hs 15;" f
insertAt src/Padding.hs 60;" f
insertIMInZone src/Dodge/Base.hs 59;" f
insertInTrie src/SimpleTrie.hs 23;" f
@@ -4582,7 +4577,7 @@ isConnected src/Dodge/Inventory/Swap.hs 90;" f
isElectrical src/Dodge/Data/Damage.hs 42;" f
isFrictionless src/Dodge/Creature/State.hs 341;" f
isGas src/Dodge/Euse.hs 64;" f
isGroupSelectableSection src/Dodge/Update/Input/InGame.hs 163;" f
isGroupSelectableSection src/Dodge/Update/Input/InGame.hs 159;" f
isInLnk src/Dodge/PlacementSpot.hs 160;" f
isJust' src/MaybeHelp.hs 29;" f
isLHS src/Geometry/LHS.hs 8;" f
@@ -4855,7 +4850,7 @@ maybeClearPath src/Dodge/Block.hs 77;" f
maybeClearPaths src/Dodge/Block.hs 74;" f
maybeDestroyBlock src/Dodge/Wall/Damage.hs 26;" f
maybeDestroyDoor src/Dodge/Wall/Damage.hs 31;" f
maybeExitCombine src/Dodge/Update/Input/InGame.hs 560;" f
maybeExitCombine src/Dodge/Update/Input/InGame.hs 556;" f
maybeOpenTerminal src/Dodge/Update.hs 124;" f
maybeReadFile src/Dodge/LoadSeed.hs 10;" f
maybeTakeOne src/RandomHelp.hs 111;" f
@@ -5079,7 +5074,7 @@ parseNum src/Dodge/Debug/Terminal.hs 73;" f
pathConnected src/Dodge/Room/CheckConsistency.hs 14;" f
pathEdgeObstructed src/Dodge/Path.hs 43;" f
pauseAndFloatCam src/Dodge/Camera.hs 10;" f
pauseGame src/Dodge/Update/Input/InGame.hs 480;" f
pauseGame src/Dodge/Update/Input/InGame.hs 476;" f
pauseMenu src/Dodge/Menu.hs 53;" f
pauseMenuOptions src/Dodge/Menu.hs 58;" f
pauseSound src/Dodge/SoundLogic.hs 41;" f
@@ -5538,7 +5533,7 @@ sectionsSizes src/Dodge/DisplayInventory.hs 222;" f
seedStartMenu src/Dodge/Menu.hs 79;" f
seedStartOptions src/Dodge/Menu.hs 82;" f
segOnCirc src/Geometry.hs 116;" f
selCloseObj src/Dodge/Update/Input/InGame.hs 503;" f
selCloseObj src/Dodge/Update/Input/InGame.hs 499;" f
selNumPos src/Dodge/Render/HUD.hs 445;" f
selNumPosCardinal src/Dodge/Render/HUD.hs 468;" f
selSecDrawCursor src/Dodge/Render/List.hs 130;" f
@@ -5583,7 +5578,7 @@ setOutLinks src/Dodge/RoomLink.hs 48;" f
setOutLinksByType src/Dodge/RoomLink.hs 57;" f
setOutLinksPD src/Dodge/RoomLink.hs 77;" f
setRBCreatureTargeting src/Dodge/Creature/State.hs 292;" f
setSelWhileDragging src/Dodge/Update/Input/InGame.hs 280;" f
setSelWhileDragging src/Dodge/Update/Input/InGame.hs 276;" f
setSelectionListRestriction src/Dodge/Update/Input/ScreenLayer.hs 85;" f
setShaderSource src/Shader/Compile.hs 290;" f
setShadowLimits src/Dodge/Shadows.hs 11;" f
@@ -5634,9 +5629,9 @@ shiftChildren src/Dodge/Tree/Compose.hs 43;" f
shiftDraw src/Dodge/Render/ShapePicture.hs 66;" f
shiftDraw' src/Dodge/Render/ShapePicture.hs 72;" f
shiftInBy src/Dodge/PlacementSpot.hs 236;" f
shiftInvItems src/Dodge/Update/Input/InGame.hs 255;" f
shiftInvItemsDown src/Dodge/Update/Input/InGame.hs 293;" f
shiftInvItemsUp src/Dodge/Update/Input/InGame.hs 287;" f
shiftInvItems src/Dodge/Update/Input/InGame.hs 251;" f
shiftInvItemsDown src/Dodge/Update/Input/InGame.hs 289;" f
shiftInvItemsUp src/Dodge/Update/Input/InGame.hs 283;" f
shiftLinkBy src/Dodge/Room/Link.hs 87;" f
shiftPSBy src/Dodge/Placement/Shift.hs 12;" f
shiftPathBy src/Dodge/Room/Link.hs 92;" f
@@ -5735,7 +5730,7 @@ soundToVol src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 4;" f
soundWithStatus src/Dodge/SoundLogic.hs 98;" f
soundWithStatusVolume src/Dodge/SoundLogic.hs 48;" f
southPillarsRoom src/Dodge/Room/LongDoor.hs 85;" f
spaceAction src/Dodge/Update/Input/InGame.hs 483;" f
spaceAction src/Dodge/Update/Input/InGame.hs 479;" f
spanColLightBlackI src/Dodge/Placement/Instance/LightSource.hs 186;" f
spanColLightI src/Dodge/Placement/Instance/LightSource.hs 179;" f
spanLS src/Dodge/Placement/Instance/LightSource.hs 171;" f
@@ -5791,7 +5786,7 @@ stackText src/Picture/Base.hs 188;" f
stackedInventory src/Dodge/Creature.hs 281;" f
startCr src/Dodge/Creature.hs 91;" f
startCrafts src/Dodge/Room/Start.hs 92;" f
startDrag src/Dodge/Update/Input/InGame.hs 221;" f
startDrag src/Dodge/Update/Input/InGame.hs 217;" f
startInvList src/Dodge/Creature.hs 109;" f
startInventory src/Dodge/Creature.hs 112;" f
startNewGameInSlot src/Dodge/StartNewGame.hs 15;" f
@@ -5880,6 +5875,7 @@ testInventory src/Dodge/Creature.hs 257;" f
testStringInit src/Dodge/TestString.hs 26;" f
text src/Picture/Base.hs 193;" f
textGrad src/Picture/Text.hs 5;" f
textInputFocus src/Dodge/InputFocus.hs 18;" f
textJustifyCenter src/Picture/Base.hs 212;" f
textJustifyLeft src/Picture/Base.hs 208;" f
textJustifyRight src/Picture/Base.hs 198;" f
@@ -5930,8 +5926,8 @@ toggleCombineInv src/Dodge/DisplayInventory.hs 35;" f
toggleCommand src/Dodge/Terminal.hs 196;" f
toggleEquipmentAt src/Dodge/Creature/Impulse/UseItem.hs 79;" f
toggleJust src/MaybeHelp.hs 41;" f
toggleMap src/Dodge/Update/Input/InGame.hs 524;" f
toggleTweakInv src/Dodge/Update/Input/InGame.hs 537;" f
toggleMap src/Dodge/Update/Input/InGame.hs 520;" f
toggleTweakInv src/Dodge/Update/Input/InGame.hs 533;" f
togglesToEffects src/Dodge/Terminal.hs 248;" f
tone440S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 474;" f
tone440sawtoothS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 444;" f
@@ -6002,13 +5998,13 @@ trunkDepth src/TreeHelp.hs 161;" f
tryAssignHotkey src/Dodge/Creature/YourControl.hs 85;" f
tryAttachBulletBelt src/Dodge/Euse.hs 40;" f
tryChargeBattery src/Dodge/Euse.hs 43;" f
tryCombine src/Dodge/Update/Input/InGame.hs 546;" f
tryDropSelected src/Dodge/Update/Input/InGame.hs 108;" f
tryCombine src/Dodge/Update/Input/InGame.hs 542;" f
tryDropSelected src/Dodge/Update/Input/InGame.hs 104;" f
tryGetChannel src/Sound.hs 96;" f
tryGetRootAttachedFromInvID src/Dodge/Inventory/Location.hs 20;" f
tryGetRootItemInvID src/Dodge/Inventory/Location.hs 29;" f
tryMeleeAttack src/Dodge/Creature/ReaderUpdate.hs 36;" f
tryPickupSelected src/Dodge/Update/Input/InGame.hs 115;" f
tryPickupSelected src/Dodge/Update/Input/InGame.hs 111;" f
tryPlay src/Sound.hs 83;" f
tryPutFloorItemIDInInv src/Dodge/Inventory/Add.hs 26;" f
tryPutItemInInv src/Dodge/Inventory/Add.hs 42;" f
@@ -6051,7 +6047,7 @@ updateAllNodes src/TreeHelp.hs 85;" f
updateArc src/Dodge/Tesla/Arc.hs 86;" f
updateAttachedItems src/Dodge/Creature/State.hs 173;" f
updateAutoRecharge src/Dodge/Creature/State.hs 324;" f
updateBackspaceRegex src/Dodge/Update/Input/InGame.hs 418;" f
updateBackspaceRegex src/Dodge/Update/Input/InGame.hs 414;" f
updateBarrel src/Dodge/Barreloid.hs 45;" f
updateBarreloid src/Dodge/Barreloid.hs 13;" f
updateBounds src/Dodge/Update/Camera.hs 245;" f
@@ -6074,43 +6070,43 @@ updateDistortion src/Dodge/Distortion.hs 5;" f
updateDistortions src/Dodge/Update.hs 529;" f
updateEnergyBall src/Dodge/EnergyBall.hs 46;" f
updateEnergyBalls src/Dodge/Update.hs 556;" f
updateEnterRegex src/Dodge/Update/Input/InGame.hs 459;" f
updateEnterRegex src/Dodge/Update/Input/InGame.hs 455;" f
updateExpBarrel src/Dodge/Barreloid.hs 19;" f
updateFBOTO src/Framebuffer/Update.hs 97;" f
updateFBOTO3 src/Framebuffer/Update.hs 131;" f
updateFlame src/Dodge/Flame.hs 71;" f
updateFlames src/Dodge/Update.hs 553;" f
updateFloatingCamera src/Dodge/Update/Camera.hs 36;" f
updateFunctionKey src/Dodge/Update/Input/InGame.hs 310;" f
updateFunctionKeys src/Dodge/Update/Input/InGame.hs 303;" f
updateFunctionKey src/Dodge/Update/Input/InGame.hs 306;" f
updateFunctionKeys src/Dodge/Update/Input/InGame.hs 299;" f
updateGusts src/Dodge/Update.hs 707;" f
updateHeldRootItem src/Dodge/Creature/State.hs 167;" f
updateHumanoid src/Dodge/Humanoid.hs 12;" f
updateIMl src/Dodge/Update.hs 498;" f
updateIMl' src/Dodge/Update.hs 503;" f
updateInGameCamera src/Dodge/Update/Camera.hs 70;" f
updateInitialPressInGame src/Dodge/Update/Input/InGame.hs 363;" f
updateInitialPressInGame src/Dodge/Update/Input/InGame.hs 359;" f
updateInstantBullets src/Dodge/Update.hs 645;" f
updateInv src/Dodge/Creature/State.hs 152;" f
updateInventoryPositioning src/Dodge/DisplayInventory.hs 87;" f
updateItemTargeting src/Dodge/Creature/State.hs 268;" f
updateItemWithOrientation src/Dodge/Creature/State.hs 194;" f
updateKeyInGame src/Dodge/Update/Input/InGame.hs 357;" f
updateKeysInTerminal src/Dodge/Update/Input/InGame.hs 345;" f
updateKeyInGame src/Dodge/Update/Input/InGame.hs 353;" f
updateKeysInTerminal src/Dodge/Update/Input/InGame.hs 341;" f
updateLampoid src/Dodge/Lampoid.hs 12;" f
updateLaser src/Dodge/Laser/Update.hs 13;" f
updateLasers src/Dodge/Update.hs 427;" f
updateLightSources src/Dodge/Update.hs 532;" f
updateLinearShockwave src/Dodge/LinearShockwave/Update.hs 8;" f
updateLongPressInGame src/Dodge/Update/Input/InGame.hs 378;" f
updateLongPressInGame src/Dodge/Update/Input/InGame.hs 374;" f
updateMIM src/Dodge/Update.hs 658;" f
updateMachine src/Dodge/Machine/Update.hs 19;" f
updateMouseClickInGame src/Dodge/Update/Input/InGame.hs 169;" f
updateMouseClickInGame src/Dodge/Update/Input/InGame.hs 165;" f
updateMouseContext src/Dodge/Update.hs 310;" f
updateMouseContextGame src/Dodge/Update.hs 315;" f
updateMouseHeldInGame src/Dodge/Update/Input/InGame.hs 90;" f
updateMouseInGame src/Dodge/Update/Input/InGame.hs 82;" f
updateMouseReleaseInGame src/Dodge/Update/Input/InGame.hs 136;" f
updateMouseHeldInGame src/Dodge/Update/Input/InGame.hs 86;" f
updateMouseInGame src/Dodge/Update/Input/InGame.hs 78;" f
updateMouseReleaseInGame src/Dodge/Update/Input/InGame.hs 132;" f
updateMovement src/Dodge/Creature/State.hs 331;" f
updateObjCatMaybes src/Dodge/Update.hs 520;" f
updateObjMapMaybe src/Dodge/Update.hs 513;" f
@@ -6118,8 +6114,8 @@ updatePastWorlds src/Dodge/Update.hs 415;" f
updatePosEvent src/Dodge/PosEvent.hs 11;" f
updatePosEvents src/Dodge/Update.hs 565;" f
updatePreload src/Preload/Update.hs 20;" f
updatePressedButtonsCarte src/Dodge/Update/Input/InGame.hs 320;" f
updatePressedButtonsCarte' src/Dodge/Update/Input/InGame.hs 323;" f
updatePressedButtonsCarte src/Dodge/Update/Input/InGame.hs 316;" f
updatePressedButtonsCarte' src/Dodge/Update/Input/InGame.hs 319;" f
updateProjectile src/Dodge/Projectile/Update.hs 23;" f
updateProp src/Dodge/Prop/Update.hs 11;" f
updateRBList src/Dodge/Inventory/RBList.hs 16;" f
@@ -6153,7 +6149,7 @@ updateUniverse src/Dodge/Update.hs 72;" f
updateUniverseFirst src/Dodge/Update.hs 84;" f
updateUniverseLast src/Dodge/Update.hs 134;" f
updateUniverseMid src/Dodge/Update.hs 156;" f
updateUseInputInGame src/Dodge/Update/Input/InGame.hs 39;" f
updateUseInputInGame src/Dodge/Update/Input/InGame.hs 38;" f
updateUseInputOnScreen src/Dodge/Update/Input/ScreenLayer.hs 21;" f
updateWalkCycle src/Dodge/Creature/State/WalkCycle.hs 12;" f
updateWallDamages src/Dodge/Update/WallDamage.hs 10;" f