From 1a0e115c7de9cc8c682cc2a9a34fa0976c47563e Mon Sep 17 00:00:00 2001 From: justin Date: Thu, 5 Jun 2025 11:11:14 +0100 Subject: [PATCH] Cleanup UseDelay --- src/Dodge/Data.hs | 2 + src/Dodge/Data/Item/HeldDelay.hs | 25 ----- src/Dodge/Data/Item/Use.hs | 4 +- src/Dodge/HeldUse.hs | 1 + tags | 176 ++++++++++++++++--------------- 5 files changed, 97 insertions(+), 111 deletions(-) delete mode 100644 src/Dodge/Data/Item/HeldDelay.hs diff --git a/src/Dodge/Data.hs b/src/Dodge/Data.hs index 352cfce5a..460373325 100644 --- a/src/Dodge/Data.hs +++ b/src/Dodge/Data.hs @@ -21,8 +21,10 @@ module Dodge.Data ( module Dodge.Data.MountedObject, module Dodge.Data.AimStance, module Dodge.Data.TriggerType, + module Dodge.Data.UseDelay, ) where +import Dodge.Data.UseDelay import Dodge.Data.TriggerType import Dodge.Data.AimStance import Dodge.Data.Config diff --git a/src/Dodge/Data/Item/HeldDelay.hs b/src/Dodge/Data/Item/HeldDelay.hs deleted file mode 100644 index 07da63ce5..000000000 --- a/src/Dodge/Data/Item/HeldDelay.hs +++ /dev/null @@ -1,25 +0,0 @@ -{-# LANGUAGE DeriveGeneric #-} -{-# LANGUAGE DeriveAnyClass #-} -{-# LANGUAGE StrictData #-} -{-# LANGUAGE TemplateHaskell #-} - -module Dodge.Data.Item.HeldDelay where - -import Sound.Data -import Control.Lens -import Data.Aeson -import Data.Aeson.TH - -data UseDelay -- should just be Delay - = NoDelay - | FixedRate - { _rateMax :: Int - } - | WarmUpNoDelay - { _warmMax :: Int - , _warmSound :: SoundID - } - deriving (Eq, Ord, Show, Read) --Generic, Flat) - -makeLenses ''UseDelay -deriveJSON defaultOptions ''UseDelay diff --git a/src/Dodge/Data/Item/Use.hs b/src/Dodge/Data/Item/Use.hs index e273476a8..158b76e7a 100644 --- a/src/Dodge/Data/Item/Use.hs +++ b/src/Dodge/Data/Item/Use.hs @@ -7,7 +7,7 @@ module Dodge.Data.Item.Use ( module Dodge.Data.Item.Use, module Dodge.Data.Item.Use.Equipment, module Dodge.Data.Item.HeldUse, - module Dodge.Data.Item.HeldDelay, +-- module Dodge.Data.Item.HeldDelay, module Dodge.Data.Item.Use.Consumption, module Dodge.Data.Item.Targeting, module Dodge.Data.GenFloat, @@ -21,7 +21,7 @@ import Data.Aeson.TH import qualified Data.Set as S import Dodge.Data.GenFloat import Dodge.Data.Item.BulletMod -import Dodge.Data.Item.HeldDelay +--import Dodge.Data.Item.HeldDelay import Dodge.Data.Item.HeldUse import Dodge.Data.Item.Scope import Dodge.Data.Item.Targeting diff --git a/src/Dodge/HeldUse.hs b/src/Dodge/HeldUse.hs index be1724cef..eef49fe53 100644 --- a/src/Dodge/HeldUse.hs +++ b/src/Dodge/HeldUse.hs @@ -10,6 +10,7 @@ module Dodge.HeldUse ( heldEffectMuzzles, ) where +import Dodge.Data.UseDelay import Dodge.Item.UseDelay import Dodge.Base import Color diff --git a/tags b/tags index dc76e53ef..6401df1c1 100644 --- a/tags +++ b/tags @@ -288,7 +288,7 @@ CardinalPoint src/Dodge/Base/CardinalPoint.hs 1;" m CardinalPoint src/Dodge/Data/CardinalPoint.hs 1;" m Carriage src/Dodge/Data/Creature/Stance.hs 20;" t Carte src/Dodge/Render/HUD/Carte.hs 1;" m -ChainEffect src/Dodge/HeldUse.hs 75;" t +ChainEffect src/Dodge/HeldUse.hs 76;" t ChainEffect src/Dodge/Item/Weapon/TriggerType.hs 43;" t ChainUpdates src/Dodge/Creature/ChainUpdates.hs 1;" m ChangePosture src/Dodge/Data/ActionPlan.hs 42;" C @@ -679,6 +679,7 @@ FetchItem src/Dodge/Data/Scenario.hs 11;" C Fixated src/Dodge/Data/Creature/Perception.hs 62;" C FixedCoordLayer src/Picture/Data.hs 28;" C FixedRate src/Dodge/Data/Item/HeldDelay.hs 15;" C +FixedRate src/Dodge/Data/UseDelay.hs 13;" C FixedSelectionWidth src/Dodge/Data/SelectionList.hs 40;" C FlIt src/Dodge/Data/FloorItem.hs 16;" C Flame src/Dodge/Data/Flame.hs 14;" t @@ -967,6 +968,7 @@ ItemStructuralFunction src/Dodge/Data/ComposedItem.hs 39;" t ItemTargeting src/Dodge/Data/Item.hs 61;" t ItemType src/Dodge/Data/Item/Combine.hs 15;" t ItemUse src/Dodge/Data/Item/Use.hs 32;" t +ItemUseDelay src/Dodge/Data/UseDelay.hs 11;" t ItemUseToggle src/Dodge/Data/Item/Effect.hs 30;" C ItmCrWdWd src/Dodge/Data/Item/Use/Equipment.hs 28;" t ItmCrWdWdDoNothing src/Dodge/Data/Item/Use/Equipment.hs 29;" C @@ -1269,6 +1271,7 @@ NoCreatureEffect src/Dodge/Data/CreatureEffect.hs 11;" C NoDamageEffect src/Dodge/Data/Damage.hs 29;" C NoDebugInfo src/Dodge/Data/Universe.hs 58;" C NoDelay src/Dodge/Data/Item/HeldDelay.hs 14;" C +NoDelay src/Dodge/Data/UseDelay.hs 12;" C NoDropEffect src/Dodge/Data/Item/Effect.hs 37;" C NoEquipParams src/Dodge/Data/Item/Use/Equipment.hs 36;" C NoEscapeMenuOption src/Dodge/Data/Universe.hs 79;" C @@ -2073,7 +2076,8 @@ UseAttach src/Dodge/Data/Item/Use.hs 39;" C UseBulletMod src/Dodge/Data/Item/Use.hs 44;" C UseCondition src/Dodge/Data/Item/Use.hs 57;" t UseDelay src/Dodge/Data/Item/HeldDelay.hs 13;" t -UseDelay src/Dodge/Item/UseDelay.hs 2;" m +UseDelay src/Dodge/Data/UseDelay.hs 6;" m +UseDelay src/Dodge/Item/UseDelay.hs 3;" m UseEquip src/Dodge/Data/Item/Use.hs 38;" C UseExactly src/Dodge/Data/Item/Use.hs 107;" C UseFocus src/Dodge/Data/Item/Use.hs 52;" t @@ -2151,6 +2155,7 @@ Walls_info src/Dodge/Data/Config.hs 75;" C War src/Dodge/Data/Scenario.hs 28;" C WarmTime src/Dodge/Data/Item/Params.hs 22;" C WarmUpNoDelay src/Dodge/Data/Item/HeldDelay.hs 18;" C +WarmUpNoDelay src/Dodge/Data/UseDelay.hs 16;" C Warning src/Dodge/Room/Warning.hs 2;" m WarningCry src/Dodge/Data/ActionPlan.hs 185;" C WasLeftForward src/Dodge/Data/Creature/Stance.hs 34;" C @@ -2948,6 +2953,7 @@ _radarBlips src/Dodge/Data/LWorld.hs 113;" f _radarSweeps src/Dodge/Data/LWorld.hs 108;" f _randGen src/Dodge/Data/World.hs 39;" f _rateMax src/Dodge/Data/Item/HeldDelay.hs 16;" f +_rateMax src/Dodge/Data/UseDelay.hs 14;" f _rbColor src/Dodge/Data/RadarBlip.hs 15;" f _rbMaxTime src/Dodge/Data/RadarBlip.hs 17;" f _rbOptions src/Dodge/Data/World.hs 44;" f @@ -3276,7 +3282,9 @@ _walls src/Dodge/Data/LWorld.hs 122;" f _wanID src/Dodge/Data/LWorld.hs 163;" f _wanPos src/Dodge/Data/LWorld.hs 162;" f _warmMax src/Dodge/Data/Item/HeldDelay.hs 19;" f +_warmMax src/Dodge/Data/UseDelay.hs 17;" f _warmSound src/Dodge/Data/Item/HeldDelay.hs 20;" f +_warmSound src/Dodge/Data/UseDelay.hs 18;" f _windowPosX src/Dodge/Data/Config.hs 53;" f _windowPosY src/Dodge/Data/Config.hs 54;" f _windowShader src/Data/Preload/Render.hs 19;" f @@ -3380,7 +3388,7 @@ airlockZ src/Dodge/Room/Airlock.hs 91;" f allInvLocs src/Dodge/Item/Grammar.hs 313;" f allVisibleWalls src/Dodge/Base/Collide.hs 131;" f alongSegBy src/Geometry.hs 40;" f -alteRifle src/Dodge/Item/Held/Cane.hs 43;" f +alteRifle src/Dodge/Item/Held/Cane.hs 42;" f ammoMagInfo src/Dodge/Item/Info.hs 46;" f ammoMagSPic src/Dodge/Item/Draw/SPic.hs 124;" f amr src/Dodge/Item/Held/Rod.hs 34;" f @@ -3393,24 +3401,24 @@ angleVV3 src/Geometry/Vector3D.hs 122;" f annoToRoomTree src/Dodge/Annotation.hs 17;" f anyUnusedSpot src/Dodge/PlacementSpot.hs 66;" f anythingHitCirc src/Dodge/Base/Collide.hs 246;" f -applyCME src/Dodge/HeldUse.hs 361;" f +applyCME src/Dodge/HeldUse.hs 362;" f applyCreatureDamage src/Dodge/Creature/Damage.hs 14;" f applyDamageEffect src/Dodge/Creature/Damage.hs 31;" f applyEventIO src/Loop.hs 89;" f applyGravityPU src/Dodge/Projectile/Update.hs 56;" f applyIndividualDamage src/Dodge/Creature/Damage.hs 49;" f applyIndividualDamage' src/Dodge/Creature/Damage.hs 52;" f -applyInvLock src/Dodge/HeldUse.hs 420;" f +applyInvLock src/Dodge/HeldUse.hs 421;" f applyMagnetsToBul src/Dodge/Bullet.hs 28;" f applyNoDamage src/Dodge/Creature/Damage.hs 11;" f applyPastDamages src/Dodge/Creature/State.hs 142;" f applyPiercingDamage src/Dodge/Creature/Damage.hs 57;" f applyPosition src/Sound.hs 111;" f -applyRecoil src/Dodge/HeldUse.hs 452;" f +applyRecoil src/Dodge/HeldUse.hs 453;" f applyResFactor src/Dodge/Data/Config.hs 110;" f applySetTerminalString src/Dodge/Debug/Terminal.hs 81;" f -applySidePush src/Dodge/HeldUse.hs 551;" f -applySoundCME src/Dodge/HeldUse.hs 442;" f +applySidePush src/Dodge/HeldUse.hs 552;" f +applySoundCME src/Dodge/HeldUse.hs 443;" f applyTerminalCommand src/Dodge/Debug/Terminal.hs 28;" f applyTerminalCommandArguments src/Dodge/Debug/Terminal.hs 42;" f applyTerminalString src/Dodge/Debug/Terminal.hs 22;" f @@ -3418,7 +3426,7 @@ applyToNode src/TreeHelp.hs 64;" f applyToRandomNode src/TreeHelp.hs 150;" f applyToSubforest src/TreeHelp.hs 77;" f applyToSubtree src/TreeHelp.hs 70;" f -applyTorqueCME src/Dodge/HeldUse.hs 562;" f +applyTorqueCME src/Dodge/HeldUse.hs 563;" f applyWorldConfig src/Dodge/Config/Update.hs 38;" f aquamarine src/Color.hs 23;" f arHUD src/Dodge/Item/Scope.hs 135;" f @@ -3459,8 +3467,8 @@ autoCrit src/Dodge/Creature/AutoCrit.hs 12;" f autoDetector src/Dodge/Item/Weapon/Radar.hs 11;" f autoEffect src/Dodge/Item/Weapon/ExtraEffect.hs 18;" f autoGunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 532;" f -autoPistol src/Dodge/Item/Held/Stick.hs 50;" f -autoRifle src/Dodge/Item/Held/Cane.hs 49;" f +autoPistol src/Dodge/Item/Held/Stick.hs 49;" f +autoRifle src/Dodge/Item/Held/Cane.hs 48;" f awakeLevelPerception src/Dodge/Creature/Perception.hs 162;" f axisInt src/Geometry/Intersect.hs 227;" f azure src/Color.hs 22;" f @@ -3474,7 +3482,7 @@ bangConeShape src/Dodge/Item/Draw/SPic.hs 288;" f bangEchoS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 394;" f bangRod src/Dodge/Item/Held/Rod.hs 18;" f bangS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 512;" f -bangStick src/Dodge/Item/Held/Stick.hs 16;" 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 baseAMRShape src/Dodge/Item/Draw/SPic.hs 402;" f @@ -3489,7 +3497,7 @@ baseSMGShape src/Dodge/Item/Draw/SPic.hs 379;" f baseShoulder src/Dodge/Creature/Picture.hs 131;" f baseStickShape src/Dodge/Item/Draw/SPic.hs 285;" f baseStickShapeX src/Dodge/Item/Draw/SPic.hs 278;" f -baseStickSpread src/Dodge/HeldUse.hs 279;" f +baseStickSpread src/Dodge/HeldUse.hs 280;" f baseTriggerType src/Dodge/BaseTriggerType.hs 12;" f baseTriggerType src/Dodge/Item/TriggerType.hs 5;" f basicAttentionUpdate src/Dodge/Creature/Perception.hs 127;" f @@ -3501,7 +3509,7 @@ basicDrawBeam src/Dodge/Beam/Draw.hs 11;" f basicItemDisplay src/Dodge/Item/Display.hs 22;" f basicMachineApplyDamage src/Dodge/Machine/Damage.hs 6;" f basicMachineUpdate src/Dodge/Machine.hs 13;" f -basicMuzFlare src/Dodge/HeldUse.hs 706;" f +basicMuzFlare src/Dodge/HeldUse.hs 707;" f basicTerminal src/Dodge/Terminal.hs 35;" f battery src/Dodge/Item/Ammo.hs 87;" f batteryPack src/Dodge/Item/Equipment.hs 55;" f @@ -3510,7 +3518,7 @@ beltMag src/Dodge/Item/Ammo.hs 47;" f bfsNodePoints src/Dodge/Path.hs 58;" f bfsThenReturn src/Dodge/Creature/ReaderUpdate.hs 216;" f bgateCalc src/Dodge/Inventory/SelectionList.hs 112;" f -bgunSound src/Dodge/HeldUse.hs 505;" f +bgunSound src/Dodge/HeldUse.hs 506;" f bindFBO src/Render.hs 244;" f bingate src/Dodge/Item/Scope.hs 110;" f black src/Color.hs 27;" f @@ -3567,7 +3575,7 @@ bulletModule src/Dodge/Item/Scope.hs 118;" f bulletPayloadModule src/Dodge/Item/Scope.hs 132;" f bulletSynthesizer src/Dodge/Item/Ammo.hs 117;" f bulletWeapons src/Dodge/Combine/Combinations.hs 247;" f -burstRifle src/Dodge/Item/Held/Cane.hs 54;" f +burstRifle src/Dodge/Item/Held/Cane.hs 53;" f buzzS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 538;" f cFilledRect src/Dodge/CharacterEnums.hs 6;" f cWireRect src/Dodge/CharacterEnums.hs 10;" f @@ -3772,14 +3780,14 @@ createItemYou src/Dodge/Inventory/Add.hs 95;" f createLightMap src/Render.hs 26;" f createNewArc src/Dodge/Tesla/Arc.hs 90;" f createPathGrid src/Dodge/Room/Path.hs 21;" f -createProjectile src/Dodge/HeldUse.hs 1255;" f -createProjectileR src/Dodge/HeldUse.hs 1220;" f +createProjectile src/Dodge/HeldUse.hs 1256;" f +createProjectileR src/Dodge/HeldUse.hs 1221;" f createShell src/Dodge/Projectile/Create.hs 22;" f createShieldWall src/Dodge/Euse.hs 107;" f createUnusedLinkPos src/Dodge/Tree/Shift.hs 117;" f createWall src/Dodge/Wall/Create.hs 8;" f creatureDisplayText src/Dodge/Creature/Picture/Awareness.hs 10;" f -creatureShootLaser src/Dodge/HeldUse.hs 819;" f +creatureShootLaser src/Dodge/HeldUse.hs 820;" f creatureTurnTo src/Dodge/Creature/Impulse/Movement.hs 52;" f creatureTurnToward src/Dodge/Creature/Impulse/Movement.hs 73;" f creatureTurnTowardDir src/Dodge/Creature/Impulse/Movement.hs 62;" f @@ -3847,7 +3855,7 @@ dark src/Color.hs 108;" f darkenBackground src/Dodge/Render/MenuScreen.hs 52;" f dbArg src/Dodge/Base.hs 165;" f dbArgChain src/Dodge/Base.hs 170;" f -dbwMuzzles src/Dodge/HeldUse.hs 282;" f +dbwMuzzles src/Dodge/HeldUse.hs 283;" f deZoneIX src/Dodge/Zoning/Base.hs 87;" f deZoneWall src/Dodge/Zoning/Wall.hs 70;" f deadEndRoom src/Dodge/Room/Room.hs 235;" f @@ -3890,7 +3898,7 @@ defaultArcStep src/Dodge/Tesla/Arc.hs 140;" f defaultArcStep src/Dodge/Tesla/Arc/Default.hs 15;" f defaultAudition src/Dodge/Default/Creature.hs 94;" f defaultAutoWall src/Dodge/Default/Door.hs 15;" f -defaultBangCane src/Dodge/Item/Held/Cane.hs 16;" f +defaultBangCane src/Dodge/Item/Held/Cane.hs 15;" f defaultBlock src/Dodge/Default/Block.hs 5;" f defaultBounds src/Dodge/Data/Bounds.hs 20;" f defaultBullet src/Dodge/Item/Weapon/Bullet.hs 10;" f @@ -3971,7 +3979,7 @@ detector src/Dodge/Item/Held/Utility.hs 35;" f detectorColor src/Dodge/Item/Draw/SPic.hs 448;" f detectorEffect src/Dodge/Item/Weapon/Radar.hs 20;" f detectorInfo src/Dodge/Item/Info.hs 221;" f -determineProjectileTracking src/Dodge/HeldUse.hs 1203;" f +determineProjectileTracking src/Dodge/HeldUse.hs 1204;" f diagonalLinesRect src/Dodge/Room/Foreground.hs 52;" f did src/Dodge/Item/InvSize.hs 54;" f diffAngles src/Geometry.hs 204;" f @@ -4036,9 +4044,9 @@ doDrag src/Dodge/Update/Input/InGame.hs 107;" f doDrawing src/Dodge/Render.hs 35;" f doDrawing' src/Dodge/Render.hs 46;" f doFloatFloat src/Dodge/FloatFunction.hs 5;" f -doGenFloat src/Dodge/HeldUse.hs 1161;" f +doGenFloat src/Dodge/HeldUse.hs 1162;" f doGravityPU src/Dodge/Projectile/Update.hs 50;" f -doHeldUseEffect src/Dodge/HeldUse.hs 307;" f +doHeldUseEffect src/Dodge/HeldUse.hs 308;" f doInPlacements src/Dodge/Layout.hs 92;" f doIndividualPlacements src/Dodge/Layout.hs 117;" f doInputScreenInput src/Dodge/Update/Input/ScreenLayer.hs 28;" f @@ -4231,7 +4239,7 @@ drawZoneNearPointCursor src/Dodge/Debug/Picture.hs 279;" f droneLauncher src/Dodge/Item/Weapon/Drone.hs 11;" f dropByState src/Dodge/Creature/State.hs 130;" f dropExcept src/Dodge/Creature/Action.hs 167;" f -dropInventoryPath src/Dodge/HeldUse.hs 1333;" f +dropInventoryPath src/Dodge/HeldUse.hs 1334;" f dropItem src/Dodge/Creature/Action.hs 173;" f dropper src/Dodge/Item/Scope.hs 76;" f drumMag src/Dodge/Item/Ammo.hs 42;" f @@ -4329,14 +4337,14 @@ fixedCoordPictures src/Dodge/Render/Picture.hs 17;" f fixedSizePicClampArrow src/Dodge/Picture/SizeInvariant.hs 57;" f flDamageInArea src/Dodge/Flame.hs 109;" f flFlicker src/Dodge/Flame.hs 123;" f -flameMuzzles src/Dodge/HeldUse.hs 285;" f +flameMuzzles src/Dodge/HeldUse.hs 286;" f flameShield src/Dodge/Item/Equipment.hs 34;" f flameSpitter src/Dodge/Item/Held/SprayGuns.hs 23;" f flameThrower src/Dodge/Item/Held/SprayGuns.hs 64;" f flameTorrent src/Dodge/Item/Held/SprayGuns.hs 32;" f flameWall src/Dodge/Item/Held/SprayGuns.hs 48;" f flamerPic src/Dodge/Item/Draw/SPic.hs 382;" f -flareCircleAt src/Dodge/HeldUse.hs 687;" f +flareCircleAt src/Dodge/HeldUse.hs 688;" f flatItemCombinations src/Dodge/Combine/Combinations.hs 50;" f flatLookupItems src/Dodge/Combine.hs 38;" f flatShield src/Dodge/Item/Held/Utility.hs 18;" f @@ -4398,14 +4406,14 @@ fuseWallsWith src/Dodge/LevelGen/StaticWalls.hs 172;" f g src/ShortShow.hs 33;" f gLauncher src/Dodge/Item/Held/Launcher.hs 24;" f gRandify src/Dodge/Randify.hs 11;" f -gadgetEffect src/Dodge/HeldUse.hs 43;" f +gadgetEffect src/Dodge/HeldUse.hs 44;" f gameOverMenu src/Dodge/Menu.hs 187;" f gameRoomFromRoom src/Dodge/Layout.hs 161;" f gameRoomViewpoints src/Dodge/Viewpoints.hs 35;" f gameRoomsFromRooms src/Dodge/Layout.hs 158;" f gameplayMenu src/Dodge/Menu.hs 134;" f gameplayMenuOptions src/Dodge/Menu.hs 137;" f -gasType src/Dodge/HeldUse.hs 1117;" f +gasType src/Dodge/HeldUse.hs 1118;" f generateGenParams src/Dodge/LevelGen/LevelStructure.hs 22;" f generateGraphs src/Dodge/LevelGen.hs 39;" f generateLayout src/Dodge/Layout/Generate.hs 10;" f @@ -4420,10 +4428,10 @@ getAimZoom src/Dodge/Update/Camera.hs 134;" f getAmmoLinks src/Dodge/Item/Grammar.hs 137;" f getArguments src/Dodge/Update/Scroll.hs 177;" f getArguments' src/Dodge/Update/Scroll.hs 165;" f -getAttachedSFLink src/Dodge/HeldUse.hs 757;" f +getAttachedSFLink src/Dodge/HeldUse.hs 758;" f getAutoSpringLinks src/Dodge/Item/Grammar.hs 116;" f getAvailableListLines src/Dodge/SelectionList.hs 10;" f -getBulletType src/Dodge/HeldUse.hs 877;" f +getBulletType src/Dodge/HeldUse.hs 878;" f getCloseObj src/Dodge/Update/Input/InGame.hs 515;" f getCommands src/Dodge/Terminal.hs 117;" f getCommandsHelp src/Dodge/Terminal.hs 75;" f @@ -4433,17 +4441,17 @@ getCrMoveSpeed src/Dodge/Creature/Statistics.hs 15;" f getDamageCoding src/Dodge/Terminal.hs 177;" f getDistortions src/Dodge/Render.hs 383;" f getEquipmentAllocation src/Dodge/Inventory/RBList.hs 45;" f -getGrenadeHitEffect src/Dodge/HeldUse.hs 1248;" f +getGrenadeHitEffect src/Dodge/HeldUse.hs 1249;" f getInventoryPath src/Dodge/Inventory/Path.hs 8;" f getItemValue src/Dodge/Inventory/SelectionList.hs 141;" f -getLaserColor src/Dodge/HeldUse.hs 703;" f -getLaserDamage src/Dodge/HeldUse.hs 700;" f -getLaserPhaseV src/Dodge/HeldUse.hs 697;" f +getLaserColor src/Dodge/HeldUse.hs 704;" f +getLaserDamage src/Dodge/HeldUse.hs 701;" f +getLaserPhaseV src/Dodge/HeldUse.hs 698;" f getLinksOfType src/Dodge/RoomLink.hs 39;" f getMaxLinesTM src/Dodge/Terminal/Type.hs 11;" f getMenuMouseContext src/Dodge/Update.hs 385;" f getNodePos src/Dodge/Path.hs 31;" f -getPJStabiliser src/Dodge/HeldUse.hs 1240;" f +getPJStabiliser src/Dodge/HeldUse.hs 1241;" f getPretty src/AesonHelp.hs 8;" f getPromptTM src/Dodge/Terminal/Type.hs 8;" f getRootItemBounds src/Dodge/Render/HUD.hs 94;" f @@ -4502,7 +4510,7 @@ hackOutline src/Dodge/Render/Outline.hs 5;" f halfHeight src/Dodge/Base/Window.hs 48;" f halfWidth src/Dodge/Base/Window.hs 48;" f haltSound src/Dodge/SoundLogic.hs 38;" f -hammerCheck src/Dodge/HeldUse.hs 82;" f +hammerCheck src/Dodge/HeldUse.hs 83;" f handleEvent src/Dodge/Event.hs 27;" f handleHotkeys src/Dodge/Creature/YourControl.hs 43;" f handleKeyboardEvent src/Dodge/Event/Input.hs 22;" f @@ -4532,25 +4540,25 @@ healthTest src/Dodge/Room/LasTurret.hs 95;" f heightWallPS src/Dodge/Placement/Instance/Wall.hs 13;" f heldAimStance src/Dodge/Item/AimStance.hs 17;" f heldAimZoom src/Dodge/Update/Camera.hs 139;" f -heldEffect src/Dodge/HeldUse.hs 63;" f -heldEffectMuzzles src/Dodge/HeldUse.hs 142;" f -heldEffectNoHammerCheck src/Dodge/HeldUse.hs 71;" f +heldEffect src/Dodge/HeldUse.hs 64;" f +heldEffectMuzzles src/Dodge/HeldUse.hs 143;" f +heldEffectNoHammerCheck src/Dodge/HeldUse.hs 72;" f heldHandlePos src/Dodge/Item/HeldOffset.hs 94;" f heldInfo src/Dodge/Item/Info.hs 88;" f heldItemBulkiness src/Dodge/Creature/YourControl.hs 175;" f -heldItemInvLock src/Dodge/HeldUse.hs 435;" f -heldItemMuzVel src/Dodge/HeldUse.hs 1004;" f -heldItemMuzzles src/Dodge/HeldUse.hs 165;" f +heldItemInvLock src/Dodge/HeldUse.hs 436;" f +heldItemMuzVel src/Dodge/HeldUse.hs 1005;" f +heldItemMuzzles src/Dodge/HeldUse.hs 166;" f heldItemOffset src/Dodge/Item/HeldOffset.hs 71;" f heldItemOrient2D src/Dodge/Item/HeldOffset.hs 28;" f heldItemRelativeOrient src/Dodge/Item/HeldOffset.hs 33;" f -heldItemRifling src/Dodge/HeldUse.hs 1048;" f +heldItemRifling src/Dodge/HeldUse.hs 1049;" f heldItemSPic src/Dodge/Item/Draw/SPic.hs 220;" f heldItemWeight src/Dodge/Creature/Statistics.hs 41;" f heldPositionInfo src/Dodge/Item/Info.hs 237;" f -heldTorqueAmount src/Dodge/HeldUse.hs 578;" f +heldTorqueAmount src/Dodge/HeldUse.hs 579;" f heldTriggerType src/Dodge/BaseTriggerType.hs 17;" f -heldUseDelay src/Dodge/Item/UseDelay.hs 13;" f +heldUseDelay src/Dodge/Item/UseDelay.hs 15;" f helpCommand src/Dodge/Terminal.hs 66;" f helpPoly3D src/Polyhedra.hs 125;" f heron src/Geometry.hs 217;" f @@ -4666,7 +4674,7 @@ invertIntMap src/Multiset.hs 67;" f invertInventoryToMap src/Dodge/Combine.hs 56;" f invisibleChaseCrit src/Dodge/Creature/ChaseCrit.hs 23;" f invisibleWall src/Dodge/Placement/Instance/Wall.hs 16;" f -isAmmoIntLink src/Dodge/HeldUse.hs 713;" f +isAmmoIntLink src/Dodge/HeldUse.hs 714;" f isAnimate src/Dodge/Creature/Test.hs 140;" f isCognizant src/Dodge/Creature/Perception.hs 105;" f isConnected src/Dodge/Inventory/Swap.hs 74;" f @@ -4700,7 +4708,7 @@ itemBlips src/Dodge/RadarSweep.hs 93;" f itemBulkiness src/Dodge/Creature/YourControl.hs 170;" f itemCombinations src/Dodge/Combine/Combinations.hs 55;" f itemCombinationsEdges src/Dodge/Combine/Graph.hs 60;" f -itemDetectorEffect src/Dodge/HeldUse.hs 763;" f +itemDetectorEffect src/Dodge/HeldUse.hs 764;" f itemDisplay src/Dodge/Inventory/SelectionList.hs 47;" f itemEquipPict src/Dodge/Item/Draw.hs 16;" f itemExternalValue src/Dodge/Inventory/SelectionList.hs 82;" f @@ -4712,9 +4720,9 @@ itemFromHeldType src/Dodge/Item/Held.hs 25;" f itemInfo src/Dodge/Item/Info.hs 18;" f itemInternalValue src/Dodge/Item/Display.hs 33;" f itemInvColor src/Dodge/Item/InventoryColor.hs 9;" f -itemInvLock src/Dodge/HeldUse.hs 430;" f -itemMuzzles src/Dodge/HeldUse.hs 156;" f -itemRandomOffset src/Dodge/HeldUse.hs 941;" f +itemInvLock src/Dodge/HeldUse.hs 431;" f +itemMuzzles src/Dodge/HeldUse.hs 157;" f +itemRandomOffset src/Dodge/HeldUse.hs 942;" f itemRooms src/Dodge/LockAndKey.hs 39;" f itemRotTreeSPic src/Dodge/Item/Draw/SPic.hs 27;" f itemSPic src/Dodge/Item/Draw/SPic.hs 34;" f @@ -4722,7 +4730,7 @@ itemScan src/Dodge/Item/Scope.hs 63;" f itemScroll src/Dodge/Update/Scroll.hs 50;" f itemScrollDisplay src/Dodge/Inventory/SelectionList.hs 118;" f itemScrollValue src/Dodge/Inventory/SelectionList.hs 145;" f -itemSidePush src/Dodge/HeldUse.hs 376;" f +itemSidePush src/Dodge/HeldUse.hs 377;" f itemString src/Dodge/Item/Display.hs 55;" f itemToBreakLists src/Dodge/Item/Grammar.hs 63;" f itemToFunction src/Dodge/Item/Grammar.hs 143;" f @@ -4823,7 +4831,7 @@ lnkMidPosInvSelsCol src/Dodge/Render/HUD.hs 393;" f lnkPosDir src/Dodge/RoomLink.hs 97;" f loadDodgeConfig src/Dodge/Config/Load.hs 9;" f loadMusic src/Dodge/SoundLogic/LoadSound.hs 27;" f -loadMuzzle src/Dodge/HeldUse.hs 623;" f +loadMuzzle src/Dodge/HeldUse.hs 624;" f loadSaveSlot src/Dodge/Save.hs 74;" f loadSeed src/Dodge/LoadSeed.hs 7;" f loadSound src/Dodge/SoundLogic/LoadSound.hs 11;" f @@ -4862,7 +4870,7 @@ lsPosRad src/Dodge/LightSource.hs 17;" f ltAutoCrit src/Dodge/Creature/LtAutoCrit.hs 12;" f m src/ShortShow.hs 33;" f machineAddSound src/Dodge/Machine.hs 49;" f -machinePistol src/Dodge/Item/Held/Stick.hs 53;" f +machinePistol src/Dodge/Item/Held/Stick.hs 52;" f machineUpdateDeathEff src/Dodge/Machine.hs 34;" f machineUpdateLiveDieEff src/Dodge/Machine.hs 16;" f magShield src/Dodge/Item/Equipment.hs 27;" f @@ -4878,8 +4886,8 @@ makeAttach src/Dodge/Item/Attach.hs 10;" f makeBlip src/Dodge/RadarSweep.hs 69;" f makeBlockDebris src/Dodge/Block/Debris.hs 28;" f makeBoolOption src/Dodge/Menu/OptionType.hs 8;" f -makeBullet src/Dodge/HeldUse.hs 985;" f -makeBullet' src/Dodge/HeldUse.hs 927;" f +makeBullet src/Dodge/HeldUse.hs 986;" f +makeBullet' src/Dodge/HeldUse.hs 928;" f makeButton src/Dodge/LevelGen/Switch.hs 16;" f makeByteStringShaderUsingVAO src/Shader/Compile.hs 128;" f makeCloudAt src/Dodge/WorldEvent/Cloud.hs 18;" f @@ -4905,7 +4913,7 @@ makeFragBullets src/Dodge/Bullet.hs 122;" f makeGasCloud src/Dodge/WorldEvent/SpawnParticle.hs 80;" f makeGrid src/Grid.hs 46;" f makeIntInterval src/Dodge/Zoning/Base.hs 34;" f -makeMuzzleFlare src/Dodge/HeldUse.hs 645;" f +makeMuzzleFlare src/Dodge/HeldUse.hs 646;" f makeParagraph src/Justify.hs 6;" f makePathBetween src/Dodge/Path.hs 35;" f makePathBetweenPs src/Dodge/Path.hs 54;" f @@ -4961,11 +4969,11 @@ mcProximitySensorUpdate src/Dodge/Machine/Update.hs 124;" f mcSPic src/Dodge/Render/ShapePicture.hs 120;" f mcSensorTriggerUpdate src/Dodge/Machine/Update.hs 87;" f mcSensorUpdate src/Dodge/Machine/Update.hs 119;" f -mcShootAuto src/Dodge/HeldUse.hs 1172;" f -mcShootLaser src/Dodge/HeldUse.hs 1165;" f +mcShootAuto src/Dodge/HeldUse.hs 1173;" f +mcShootLaser src/Dodge/HeldUse.hs 1166;" f mcTriggerVal src/Dodge/Machine/Update.hs 93;" f mcTypeUpdate src/Dodge/Machine/Update.hs 27;" f -mcUseHeld src/Dodge/HeldUse.hs 1092;" f +mcUseHeld src/Dodge/HeldUse.hs 1093;" f mcUseItem src/Dodge/Machine/Update.hs 79;" f medkit src/Dodge/Item/Consumable.hs 8;" f megaBattery src/Dodge/Item/Ammo.hs 76;" f @@ -5006,7 +5014,7 @@ minCrIXOn src/Dodge/Zoning/Creature.hs 46;" f minOn src/FoldableHelp.hs 35;" f mini1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 346;" f miniGunCrit src/Dodge/Creature.hs 62;" f -miniGunX src/Dodge/Item/Held/Cane.hs 61;" f +miniGunX src/Dodge/Item/Held/Cane.hs 60;" f miniGunXPict src/Dodge/Item/Draw/SPic.hs 360;" f miniGunXPictItem src/Dodge/Item/Draw/SPic.hs 354;" f miniS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 548;" f @@ -5058,7 +5066,7 @@ multiArrow src/Picture/Composite.hs 11;" f multiLookupTrie src/SimpleTrie.hs 34;" f multiLookupTrieI src/SimpleTrie.hs 43;" f muout src/Dodge/RoomLink.hs 129;" f -muzFlareAt src/Dodge/HeldUse.hs 673;" f +muzFlareAt src/Dodge/HeldUse.hs 674;" f mvButton src/Dodge/Placement/PlaceSpot.hs 176;" f mvCr src/Dodge/Placement/PlaceSpot.hs 186;" f mvFS src/Dodge/Placement/PlaceSpot.hs 189;" f @@ -5202,7 +5210,7 @@ pincerP'' src/Dodge/Creature/Boid.hs 103;" f pincerP''' src/Dodge/Creature/Boid.hs 74;" f pingPongBetween src/Render.hs 220;" f pipe src/Dodge/Item/Craftable.hs 32;" f -pistol src/Dodge/Item/Held/Stick.hs 41;" f +pistol src/Dodge/Item/Held/Stick.hs 40;" f pistolCrit src/Dodge/Creature/PistolCrit.hs 12;" f pistolerRoom src/Dodge/Room/Room.hs 321;" f pjRemoteSetDirection src/Dodge/Projectile/Update.hs 200;" f @@ -5447,7 +5455,7 @@ randsOnCirc src/RandomHelp.hs 127;" f randsSpread src/RandomHelp.hs 120;" f ratIntersectLineLine src/Geometry/Intersect.hs 195;" f readSaveSlot src/Dodge/Save.hs 45;" f -recoilAmount src/Dodge/HeldUse.hs 457;" f +recoilAmount src/Dodge/HeldUse.hs 458;" f rectNSWE src/Geometry/Polygon.hs 13;" f rectVV src/Geometry/Polygon.hs 38;" f rectWH src/Geometry/Polygon.hs 17;" f @@ -5474,7 +5482,7 @@ rememberSounds src/Dodge/Creature/Perception.hs 177;" f remoteDetonator src/Dodge/Item/Scope.hs 145;" f remoteScreen src/Dodge/Item/Scope.hs 140;" f removeAimPosture src/Dodge/Creature/YourControl.hs 145;" f -removeAmmoFromMag src/Dodge/HeldUse.hs 864;" f +removeAmmoFromMag src/Dodge/HeldUse.hs 865;" f removeDot src/ShortShow.hs 29;" f removeInverseWalls src/Dodge/LevelGen/StaticWalls.hs 25;" f removeShieldWall src/Dodge/Euse.hs 125;" f @@ -5516,7 +5524,7 @@ rezInvBox src/Dodge/Room/RezBox.hs 134;" f rezText src/Dodge/Story.hs 4;" f rezText' src/Dodge/Story.hs 17;" f rhombus src/Polyhedra.hs 72;" f -rifle src/Dodge/Item/Held/Cane.hs 39;" f +rifle src/Dodge/Item/Held/Cane.hs 38;" f right src/DoubleStack.hs 16;" f rightIsParentCombine src/Dodge/Item/Grammar.hs 243;" f rightPad src/Padding.hs 19;" f @@ -5753,14 +5761,14 @@ shiftRoomShiftToLink src/Dodge/Room/Link.hs 70;" f shiftedGrid src/Grid.hs 25;" f shineTargetLaser src/Dodge/Creature/State.hs 308;" f shineTorch src/Dodge/Creature/State.hs 350;" f -shootBullet src/Dodge/HeldUse.hs 917;" f +shootBullet src/Dodge/HeldUse.hs 918;" f shootFirstMiss src/Dodge/Creature/Volition.hs 33;" f -shootLaser src/Dodge/HeldUse.hs 843;" f +shootLaser src/Dodge/HeldUse.hs 844;" f shootOutPassage src/Dodge/Room/RezBox.hs 74;" f shootShatter src/Dodge/Item/Weapon/Shatter.hs 11;" f -shootTeslaArc src/Dodge/HeldUse.hs 1191;" f +shootTeslaArc src/Dodge/HeldUse.hs 1192;" f shootTillEmpty src/Dodge/Creature/Volition.hs 18;" f -shootTractorBeam src/Dodge/HeldUse.hs 796;" f +shootTractorBeam src/Dodge/HeldUse.hs 797;" f shootersRoom src/Dodge/Room/Room.hs 315;" f shootersRoom' src/Dodge/Room/Room.hs 280;" f shootersRoom1 src/Dodge/Room/Room.hs 305;" f @@ -5816,7 +5824,7 @@ smallGlass3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 396;" f smallGlass4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 358;" f smallPillar src/Dodge/Room/Pillar.hs 37;" f smallRoom src/Dodge/Room/RunPast.hs 31;" f -smg src/Dodge/Item/Held/Stick.hs 62;" f +smg src/Dodge/Item/Held/Stick.hs 61;" f smokeCloudAt src/Dodge/WorldEvent/Cloud.hs 41;" f smokeReducer src/Dodge/Item/Scope.hs 163;" f sndV2 src/Geometry/Data.hs 52;" f @@ -6056,12 +6064,12 @@ topPrismIndices src/Shader/Poke.hs 410;" f topTestPart src/Dodge/TestString.hs 62;" f torch src/Dodge/Item/Held/Utility.hs 27;" f torchShape src/Dodge/Item/Draw/SPic.hs 264;" f -torqueAmount src/Dodge/HeldUse.hs 573;" f +torqueAmount src/Dodge/HeldUse.hs 574;" f torqueCr src/Dodge/WorldEffect.hs 74;" f torso src/Dodge/Creature/Picture.hs 105;" f tractCr src/Dodge/TractorBeam/Update.hs 28;" f tractFlIt src/Dodge/TractorBeam/Update.hs 23;" f -tractorBeamAt src/Dodge/HeldUse.hs 808;" f +tractorBeamAt src/Dodge/HeldUse.hs 809;" f tractorGun src/Dodge/Item/Held/BatteryGuns.hs 60;" f tractorGunPic src/Dodge/Item/Draw/SPic.hs 432;" f tractorPullPos src/Dodge/TractorBeam/Update.hs 33;" f @@ -6301,28 +6309,28 @@ useBreakListsLinkTest src/Dodge/Item/Grammar.hs 40;" f useBulletPayload src/Dodge/Bullet.hs 111;" f useC src/Dodge/Cuse.hs 8;" f useC' src/Dodge/Cuse.hs 13;" f -useDelay src/Dodge/Item/UseDelay.hs 8;" f +useDelay src/Dodge/Item/UseDelay.hs 9;" f useE src/Dodge/Euse.hs 34;" f -useGasParams src/Dodge/HeldUse.hs 1097;" f +useGasParams src/Dodge/HeldUse.hs 1098;" f useHotkey src/Dodge/Creature/YourControl.hs 68;" f -useInventoryPath src/Dodge/HeldUse.hs 1358;" f +useInventoryPath src/Dodge/HeldUse.hs 1359;" f useItem src/Dodge/Creature/Impulse/UseItem.hs 20;" f useItemLoc src/Dodge/Creature/Impulse/UseItem.hs 27;" f useLnkRoomPos src/Dodge/PlacementSpot.hs 244;" f -useLoadedAmmo src/Dodge/HeldUse.hs 717;" f +useLoadedAmmo src/Dodge/HeldUse.hs 718;" f useLocation src/Dodge/Creature/Impulse/UseItem.hs 66;" f useMagShield src/Dodge/Euse.hs 46;" f useNormalCamera src/Dodge/Camera.hs 6;" f usePayload src/Dodge/Payload.hs 18;" f -useRewindGun src/Dodge/HeldUse.hs 1324;" f +useRewindGun src/Dodge/HeldUse.hs 1325;" f useRewindGun src/Dodge/Luse.hs 40;" f useRoomPosCond src/Dodge/PlacementSpot.hs 178;" f useRoomPosRoomCond src/Dodge/PlacementSpot.hs 181;" f -useStopWatch src/Dodge/HeldUse.hs 1305;" f +useStopWatch src/Dodge/HeldUse.hs 1306;" f useStopWatch src/Dodge/Luse.hs 21;" f -useTimeCheck src/Dodge/HeldUse.hs 112;" f +useTimeCheck src/Dodge/HeldUse.hs 113;" f useTimeCheck src/Dodge/Item/Weapon/TriggerType.hs 127;" f -useTimeScrollGun src/Dodge/HeldUse.hs 1313;" f +useTimeScrollGun src/Dodge/HeldUse.hs 1314;" f useTimeScrollGun src/Dodge/Luse.hs 29;" f useUnusedLnk src/Dodge/PlacementSpot.hs 169;" f usedRoomInLinkPoss src/Dodge/PlacementSpot.hs 196;" f @@ -6346,7 +6354,7 @@ verticalLampCover src/Dodge/Placement/Instance/LightSource/Cover.hs 38;" f verticalPipe src/Dodge/Picture.hs 19;" f verticalPipe src/Dodge/Placement/Instance/Pipe.hs 6;" f verticalWire src/Dodge/Wire.hs 24;" f -vgunMuzzles src/Dodge/HeldUse.hs 296;" f +vgunMuzzles src/Dodge/HeldUse.hs 297;" f viewBoundaries src/Dodge/Debug/Picture.hs 304;" f viewClipBounds src/Dodge/Debug/Picture.hs 313;" f viewDistanceFromItems src/Dodge/Update/Camera.hs 185;" f @@ -6355,10 +6363,10 @@ violet src/Color.hs 21;" f visibleWalls src/Dodge/Base/Collide.hs 123;" f visionCheck src/Dodge/Creature/Perception.hs 152;" f vocalizationTest src/Dodge/Creature/Vocalization.hs 8;" f -volleyGun src/Dodge/Item/Held/Cane.hs 24;" f +volleyGun src/Dodge/Item/Held/Cane.hs 23;" f volleyGunShape src/Dodge/Item/Draw/SPic.hs 342;" f waistSP src/Dodge/Creature/HandPos.hs 173;" f -walkNozzle src/Dodge/HeldUse.hs 778;" f +walkNozzle src/Dodge/HeldUse.hs 779;" f walkableNodeNear src/Dodge/Path.hs 48;" f wallBlips src/Dodge/RadarSweep.hs 98;" f wallBuffer src/Dodge/WallCreatureCollisions.hs 51;" f