From f1c63abdc3d16e00ace4ba39213bdb033499acf2 Mon Sep 17 00:00:00 2001 From: justin Date: Fri, 2 Jan 2026 21:45:12 +0000 Subject: [PATCH] Simplify some attachment use types --- src/Dodge/Item/Ammo.hs | 1 + src/Dodge/Item/Scope.hs | 12 +++--- tags | 91 ++++++++++++++++++++--------------------- 3 files changed, 51 insertions(+), 53 deletions(-) diff --git a/src/Dodge/Item/Ammo.hs b/src/Dodge/Item/Ammo.hs index a8063cae4..359b9bf69 100644 --- a/src/Dodge/Item/Ammo.hs +++ b/src/Dodge/Item/Ammo.hs @@ -31,6 +31,7 @@ drumMag :: Item drumMag = tinMag & itType . ibtAmmoMag .~ DRUMMAG + & itUse .~ UseNothing & itConsumables ?~ 30 beltMag :: Item diff --git a/src/Dodge/Item/Scope.hs b/src/Dodge/Item/Scope.hs index 45a130af4..ee925c41b 100644 --- a/src/Dodge/Item/Scope.hs +++ b/src/Dodge/Item/Scope.hs @@ -159,30 +159,28 @@ joystick :: Item joystick = defHeldItem & itType .~ ATTACH JOYSTICK - & itUse .~ UseAttach APNothing - --- & itUse . uaParams .~ APLinkProjectile Nothing + & itUse .~ UseNothing gimbal :: Item gimbal = defHeldItem & itType .~ ATTACH GIMBAL - & itUse .~ UseAttach APNothing + & itUse .~ UseNothing gyroscope :: Item gyroscope = defHeldItem & itType .~ ATTACH GYROSCOPE - & itUse .~ UseAttach APNothing + & itUse .~ UseNothing underBarrelSlot :: Item underBarrelSlot = defHeldItem & itType .~ ATTACH UNDERBARRELSLOT - & itUse .~ UseAttach APNothing + & itUse .~ UseNothing smokeReducer :: Item smokeReducer = defHeldItem & itType .~ ATTACH SMOKEREDUCER - & itUse .~ UseAttach APNothing + & itUse .~ UseNothing diff --git a/tags b/tags index 9c128c0c8..d5b11630c 100644 --- a/tags +++ b/tags @@ -2612,7 +2612,7 @@ applyToSubtree src/TreeHelp.hs 71;" f applyTorqueCME src/Dodge/HeldUse.hs 573;" f applyWorldConfig src/Dodge/Config.hs 55;" f aquamarine src/Color.hs 50;" f -arHUD src/Dodge/Item/Scope.hs 134;" f +arHUD src/Dodge/Item/Scope.hs 140;" f arc src/Picture/Base.hs 282;" f arcFull src/Picture/Arc.hs 9;" f arcPart src/Picture/Arc.hs 22;" f @@ -2648,7 +2648,7 @@ autoAmr src/Dodge/Item/Held/Rod.hs 39;" f autoBS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 739;" f autoCrit src/Dodge/Creature/AutoCrit.hs 10;" f autoGunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 551;" f -autoPistol src/Dodge/Item/Held/Stick.hs 49;" f +autoPistol src/Dodge/Item/Held/Stick.hs 21;" f autoRifle src/Dodge/Item/Held/Cane.hs 27;" f awakeLevelPerception src/Dodge/Creature/Perception.hs 161;" f axisInt src/Geometry/Intersect.hs 248;" f @@ -2688,13 +2688,13 @@ basicCrShape src/Dodge/Creature/Picture.hs 36;" f basicItemDisplay src/Dodge/Item/Display.hs 23;" f basicMachineApplyDamage src/Dodge/Machine/Damage.hs 6;" f basicMuzFlare src/Dodge/HeldUse.hs 713;" f -battery src/Dodge/Item/Ammo.hs 63;" f +battery src/Dodge/Item/Ammo.hs 58;" f batteryPack src/Dodge/Item/Equipment.hs 38;" f -beltMag src/Dodge/Item/Ammo.hs 39;" f +beltMag src/Dodge/Item/Ammo.hs 36;" f bfsThenReturn src/Dodge/Creature/ReaderUpdate.hs 226;" f bgateCalc src/Dodge/Inventory/SelectionList.hs 115;" f bgunSound src/Dodge/HeldUse.hs 517;" f -bingate src/Dodge/Item/Scope.hs 109;" f +bingate src/Dodge/Item/Scope.hs 115;" f black src/Color.hs 54;" f blinkAcrossChallenge src/Dodge/Room/BlinkAcross.hs 14;" f blinkActionFail src/Dodge/Creature/Action/Blink.hs 87;" f @@ -2755,9 +2755,9 @@ bufferPokedVBO src/Shader/Bind.hs 19;" f bufferShaderLayers src/Shader/Bind.hs 32;" f bulletBeltBracer src/Dodge/Item/Equipment.hs 56;" f bulletBeltPack src/Dodge/Item/Equipment.hs 50;" f -bulletModule src/Dodge/Item/Scope.hs 117;" f -bulletPayloadModule src/Dodge/Item/Scope.hs 131;" f -bulletSynthesizer src/Dodge/Item/Ammo.hs 82;" f +bulletModule src/Dodge/Item/Scope.hs 122;" f +bulletPayloadModule src/Dodge/Item/Scope.hs 137;" f +bulletSynthesizer src/Dodge/Item/Ammo.hs 80;" f bulletWeapons src/Dodge/Combine/Combinations.hs 248;" f burstRifle src/Dodge/Item/Held/Cane.hs 30;" f buttonFlip src/Dodge/Button/Event.hs 17;" f @@ -2770,7 +2770,7 @@ calcTexCoord src/Tile.hs 19;" f canSee src/Dodge/Base/Collide.hs 328;" f canSeeIndirect src/Dodge/Base/Collide.hs 335;" f cancelExamineInventory src/Dodge/Item/BackgroundEffect.hs 23;" f -capacitor src/Dodge/Item/Ammo.hs 69;" f +capacitor src/Dodge/Item/Ammo.hs 65;" f card8Vec src/Dodge/Base/CardinalPoint.hs 17;" f cardList src/Dodge/Base/CardinalPoint.hs 7;" f cardVec src/Dodge/Base/CardinalPoint.hs 10;" f @@ -2814,7 +2814,7 @@ checkTermDist src/Dodge/Update.hs 365;" f checkWallLeft src/Dodge/LevelGen/StaticWalls/Deprecated.hs 29;" f checkWallRight src/Dodge/LevelGen/StaticWalls.hs 54;" f checkWallRight src/Dodge/LevelGen/StaticWalls/Deprecated.hs 59;" f -chemFuelPouch src/Dodge/Item/Ammo.hs 75;" f +chemFuelPouch src/Dodge/Item/Ammo.hs 72;" f chestPQ src/Dodge/Creature/HandPos.hs 125;" f chooseCursorBorders src/Dodge/Render/List.hs 141;" f chooseEquipPosition src/Dodge/Inventory/RBList.hs 41;" f @@ -2847,7 +2847,7 @@ cleatLabel src/Dodge/Cleat.hs 30;" f cleatOnward src/Dodge/Cleat.hs 24;" f cleatSide src/Dodge/Cleat.hs 27;" f click1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 783;" f -clicker src/Dodge/Item/Scope.hs 82;" f +clicker src/Dodge/Item/Scope.hs 88;" f clipV src/Geometry/Vector.hs 48;" f clipZoom src/Dodge/Update/Camera.hs 237;" f clockCycle src/Dodge/Clock.hs 7;" f @@ -2917,7 +2917,7 @@ convexHullSafe src/Geometry/Polygon.hs 149;" f convexPolysOverlap src/Geometry/ConvexPoly.hs 46;" f coolMachinePistol src/Dodge/Creature/State.hs 102;" f coolMinigun src/Dodge/Creature/State.hs 95;" f -copier src/Dodge/Item/Scope.hs 88;" f +copier src/Dodge/Item/Scope.hs 94;" f copierItemUpdate src/Dodge/Creature/State.hs 131;" f copyItemToFloor src/Dodge/FloorItem.hs 14;" f corDoor src/Dodge/Room/Room.hs 393;" f @@ -3094,8 +3094,10 @@ dedaS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 557;" f dededaS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 677;" f dededumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 759;" f dedumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 789;" f +defCraftItem src/Dodge/Default/Item.hs 25;" f defDamageMaterial src/Dodge/Material/Damage.hs 30;" f defEquipment src/Dodge/Default.hs 24;" f +defHeldItem src/Dodge/Default/Item.hs 9;" f defLSPic src/Dodge/LightSource/Draw.hs 10;" f defSPic src/Dodge/Item/Draw/SPic.hs 310;" f defaultAimMvType src/Dodge/Creature/MoveType.hs 16;" f @@ -3112,7 +3114,6 @@ defaultCWorld src/Dodge/Default/World.hs 87;" f defaultChaseMvType src/Dodge/Creature/MoveType.hs 25;" f defaultClusterStatus src/Dodge/Default/Room.hs 37;" f defaultConfig src/Dodge/Data/Config.hs 151;" f -defaultCraftItem src/Dodge/Default/Item.hs 25;" f defaultCreature src/Dodge/Default/Creature.hs 12;" f defaultCreatureMemory src/Dodge/Default/Creature.hs 65;" f defaultCrystalWall src/Dodge/Default/Wall.hs 35;" f @@ -3125,7 +3126,6 @@ defaultDrawButton src/Dodge/Button/Draw.hs 29;" f defaultFlIt src/Dodge/Default.hs 27;" f defaultForeground src/Dodge/Default/ForegroundShape.hs 5;" f defaultHUD src/Dodge/Default/World.hs 169;" f -defaultHeldItem src/Dodge/Default/Item.hs 9;" f defaultInanimate src/Dodge/Default/Creature.hs 62;" f defaultInput src/Dodge/Default/World.hs 12;" f defaultIntention src/Dodge/Default/Creature.hs 98;" f @@ -3401,8 +3401,8 @@ drawZoneNearPointCursor src/Dodge/Debug/Picture.hs 286;" f dropAll src/Dodge/Creature/Update.hs 120;" f dropInventoryPath src/Dodge/HeldUse.hs 1346;" f dropItem src/Dodge/Creature/Action.hs 155;" f -dropper src/Dodge/Item/Scope.hs 76;" f -drumMag src/Dodge/Item/Ammo.hs 34;" f +dropper src/Dodge/Item/Scope.hs 82;" f +drumMag src/Dodge/Item/Ammo.hs 30;" f dsZoneSize src/Dodge/Zoning/Cloud.hs 51;" f dssNearCirc src/Dodge/Zoning/Cloud.hs 48;" f dssNearPoint src/Dodge/Zoning/Cloud.hs 39;" f @@ -3629,7 +3629,7 @@ getVolleyBurst src/Dodge/HeldUse.hs 128;" f getWallPathing src/Dodge/Wall/Pathing.hs 7;" f getWallSPic src/Dodge/Render/Walls.hs 61;" f getWindowSize src/Dodge/WindowSize.hs 6;" f -gimbal src/Dodge/Item/Scope.hs 153;" f +gimbal src/Dodge/Item/Scope.hs 166;" f girder src/Dodge/Room/Foreground.hs 206;" f girderV src/Dodge/Room/Foreground.hs 177;" f girderV' src/Dodge/Room/Foreground.hs 153;" f @@ -3668,7 +3668,7 @@ gut3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 683;" f gut4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 695;" f gut5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 673;" f gut6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 721;" f -gyroscope src/Dodge/Item/Scope.hs 156;" f +gyroscope src/Dodge/Item/Scope.hs 172;" f hackBoldText src/Picture/Base.hs 193;" f hackDropShadow src/Picture/Base.hs 196;" f hackInvertText src/Picture/Base.hs 189;" f @@ -3732,7 +3732,7 @@ hitEffFromBul src/Dodge/Bullet.hs 156;" f hitS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 753;" f holdForm src/Dodge/Creature/Boid.hs 139;" f holsterWeapon src/Dodge/Creature/Volition.hs 15;" f -homingModule src/Dodge/Item/Scope.hs 48;" f +homingModule src/Dodge/Item/Scope.hs 50;" f horPipe src/Dodge/Placement/Instance/Pipe.hs 9;" f hotkeyToChar src/Dodge/Inventory/SelectionList.hs 185;" f hotkeyToScancode src/Dodge/Creature/YourControl.hs 82;" f @@ -3798,7 +3798,7 @@ intersectSegSurface src/Geometry/Intersect.hs 40;" f intersectSegsSeg src/Geometry/Intersect.hs 253;" f intervalList src/Geometry.hs 312;" f interweave src/Justify.hs 17;" f -introScan src/Dodge/Item/Scope.hs 57;" f +introScan src/Dodge/Item/Scope.hs 62;" f introScanValue src/Dodge/Inventory/SelectionList.hs 77;" f intsToPos src/Dodge/Room/Modify/Girder.hs 160;" f invAdj src/Dodge/Item/Grammar.hs 236;" f @@ -3891,7 +3891,7 @@ itemMuzzles src/Dodge/HeldUse.hs 164;" f itemRooms src/Dodge/LockAndKey.hs 39;" f itemRotTreeSPic src/Dodge/Item/Draw/SPicTree.hs 16;" f itemSPic src/Dodge/Item/Draw/SPic.hs 17;" f -itemScan src/Dodge/Item/Scope.hs 63;" f +itemScan src/Dodge/Item/Scope.hs 68;" f itemScroll src/Dodge/Update/Scroll.hs 53;" f itemScrollDisplay src/Dodge/Inventory/SelectionList.hs 121;" f itemScrollValue src/Dodge/Inventory/SelectionList.hs 148;" f @@ -3914,7 +3914,7 @@ itmSpaceInfo src/Dodge/Item/Info.hs 25;" f itmUsageInfo src/Dodge/Item/Info.hs 230;" f jShape src/Dodge/Placement/Instance/LightSource.hs 66;" f joinItemsInList src/Dodge/Item/Grammar.hs 207;" f -joystick src/Dodge/Item/Scope.hs 149;" f +joystick src/Dodge/Item/Scope.hs 158;" f jps0' src/Dodge/LevelGen/PlacementHelper.hs 61;" f jps0PushPS src/Dodge/LevelGen/PlacementHelper.hs 64;" f jsps src/Dodge/LevelGen/PlacementHelper.hs 36;" f @@ -4053,7 +4053,7 @@ lsPosRad src/Dodge/LightSource.hs 18;" f ltAutoCrit src/Dodge/Creature/LtAutoCrit.hs 12;" f m src/ShortShow.hs 48;" f mAT src/Dodge/Item/MagAmmoType.hs 20;" f -machinePistol src/Dodge/Item/Held/Stick.hs 52;" f +machinePistol src/Dodge/Item/Held/Stick.hs 24;" f magAmmoParams src/Dodge/HeldUse.hs 930;" f magAmmoType src/Dodge/Item/MagAmmoType.hs 12;" f magMax src/Dodge/Item/MagAmmoType.hs 29;" f @@ -4066,7 +4066,6 @@ main appDodge/Main.hs 28;" f main bench/Bench.hs 15;" f main test/Spec.hs 12;" f makeArc src/Picture/Base.hs 149;" f -makeAttach src/Dodge/Item/Attach.hs 10;" f makeBlip src/Dodge/RadarSweep.hs 70;" f makeBlockDebris src/Dodge/Block/Debris.hs 36;" f makeBullet src/Dodge/HeldUse.hs 974;" f @@ -4108,9 +4107,9 @@ makeTermPara src/Dodge/Terminal.hs 118;" f makeTeslaArc src/Dodge/Tesla.hs 29;" f makeTeslaExplosionAt src/Dodge/WorldEvent/Explosion.hs 39;" f makeTileFromPoly src/Tile.hs 34;" f -makeTypeCraft src/Dodge/Item/Craftable.hs 18;" f +makeTypeCraft src/Dodge/Item/Craftable.hs 15;" f makeTypeCraftNum src/Dodge/Item/Craftable.hs 12;" f -mapper src/Dodge/Item/Scope.hs 70;" f +mapper src/Dodge/Item/Scope.hs 76;" f marimbaB6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 615;" f marimbaC5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 585;" f marimbaE5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 623;" f @@ -4149,9 +4148,9 @@ mcShootLaser src/Dodge/HeldUse.hs 1157;" f mcTypeUpdate src/Dodge/Machine/Update.hs 33;" f mcUseHeld src/Dodge/HeldUse.hs 1081;" f mcUseItem src/Dodge/Machine/Update.hs 111;" f -megaBattery src/Dodge/Item/Ammo.hs 55;" f -megaShellMag src/Dodge/Item/Ammo.hs 44;" f -megaTinMag src/Dodge/Item/Ammo.hs 23;" f +megaBattery src/Dodge/Item/Ammo.hs 52;" f +megaShellMag src/Dodge/Item/Ammo.hs 42;" f +megaTinMag src/Dodge/Item/Ammo.hs 20;" f meleeHeadingMove src/Dodge/Creature/Boid.hs 295;" f memoBoxEdgeIndices src/Shader/Poke.hs 352;" f memoBoxSurfaces src/Shader/Poke.hs 286;" f @@ -4172,7 +4171,7 @@ metal4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 523;" f metal5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 655;" f metal6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 779;" f metal7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 685;" f -metalPlate src/Dodge/Item/Craftable.hs 35;" f +metalPlate src/Dodge/Item/Craftable.hs 32;" f mglCreate src/GLHelp.hs 8;" f mglDelete src/GLHelp.hs 14;" f midBarDecoration src/Dodge/Placement/TopDecoration.hs 23;" f @@ -4282,7 +4281,7 @@ normalizeColor src/Color.hs 103;" f normalizeV src/Geometry/Vector.hs 44;" f normalizeV3 src/Geometry/Vector3D.hs 84;" f notLink src/Dodge/Data/Room.hs 72;" f -nulgate src/Dodge/Item/Scope.hs 95;" f +nulgate src/Dodge/Item/Scope.hs 101;" f numDrawableVertices src/Shader/Parameters.hs 34;" f numGLuint src/Shader/Parameters.hs 29;" f numLayers src/Picture/Data.hs 26;" f @@ -4376,8 +4375,8 @@ pincerP src/Dodge/Creature/Boid.hs 63;" f pincerP' src/Dodge/Creature/Boid.hs 96;" f pincerP'' src/Dodge/Creature/Boid.hs 106;" f pincerP''' src/Dodge/Creature/Boid.hs 77;" f -pipe src/Dodge/Item/Craftable.hs 32;" f -pistol src/Dodge/Item/Held/Stick.hs 40;" f +pipe src/Dodge/Item/Craftable.hs 29;" f +pistol src/Dodge/Item/Held/Stick.hs 18;" f pistolerRoom src/Dodge/Room/Room.hs 338;" f pjRemoteSetDirection src/Dodge/Projectile/Update.hs 196;" f plBlock src/Dodge/Placement/PlaceSpot/Block.hs 24;" f @@ -4636,8 +4635,8 @@ reloadFailS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 799;" f reloadLevelStart src/Dodge/Save.hs 71;" f reloadS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 531;" f rememberSounds src/Dodge/Creature/Perception.hs 176;" f -remoteDetonator src/Dodge/Item/Scope.hs 144;" f -remoteScreen src/Dodge/Item/Scope.hs 139;" f +remoteDetonator src/Dodge/Item/Scope.hs 152;" f +remoteScreen src/Dodge/Item/Scope.hs 146;" f removeAimPosture src/Dodge/Creature/YourControl.hs 159;" f removeAmmoFromMag src/Dodge/HeldUse.hs 905;" f removeDot src/ShortShow.hs 44;" f @@ -4889,8 +4888,8 @@ shellExplosionCheck src/Dodge/Projectile/Update.hs 50;" f shellHitCreature src/Dodge/Projectile/Update.hs 84;" f shellHitFloor src/Dodge/Projectile/Update.hs 98;" f shellHitWall src/Dodge/Projectile/Update.hs 60;" f -shellMag src/Dodge/Item/Ammo.hs 49;" f -shellModule src/Dodge/Item/Scope.hs 123;" f +shellMag src/Dodge/Item/Ammo.hs 45;" f +shellModule src/Dodge/Item/Scope.hs 128;" f shellShape src/Dodge/Projectile/Draw.hs 35;" f shieldWall src/Dodge/Item/BackgroundEffect.hs 91;" f shiftByV2 src/Dodge/PlacementSpot.hs 250;" f @@ -4978,7 +4977,7 @@ slideDoorS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 629;" f slideWindow src/ListHelp.hs 81;" f slowDoorRoom src/Dodge/Room/LongDoor.hs 140;" f slowDoorRoomRunPast src/Dodge/Room/LongDoor.hs 157;" f -smallBattery src/Dodge/Item/Ammo.hs 60;" f +smallBattery src/Dodge/Item/Ammo.hs 55;" f smallBranch src/Dodge/Tree/GenerateStructure.hs 32;" f smallChaseCrit src/Dodge/Creature/ChaseCrit.hs 14;" f smallDrawTree src/Dodge/LevelGen.hs 91;" f @@ -4989,8 +4988,8 @@ smallGlass4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 607;" f smallPillar src/Dodge/Room/Pillar.hs 37;" f smallRoom src/Dodge/Room/RunPast.hs 31;" f smallSnailInt2 src/Dodge/Path.hs 81;" f -smg src/Dodge/Item/Held/Stick.hs 58;" f -smokeReducer src/Dodge/Item/Scope.hs 162;" f +smg src/Dodge/Item/Held/Stick.hs 30;" f +smokeReducer src/Dodge/Item/Scope.hs 184;" f snailAround src/Dodge/Path.hs 78;" f snapToGrid src/Dodge/Path.hs 129;" f sndV2 src/Geometry/Data.hs 73;" f @@ -5078,7 +5077,7 @@ startSeedGame src/Dodge/StartNewGame.hs 21;" f startSeedGameConc src/Dodge/StartNewGame.hs 46;" f statsModifier src/Dodge/Creature/Info.hs 16;" f stickHitSound src/Dodge/Projectile/Update.hs 77;" f -stickyMod src/Dodge/Item/Scope.hs 51;" f +stickyMod src/Dodge/Item/Scope.hs 56;" f stone1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 589;" f stone2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 767;" f stone3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 537;" f @@ -5192,7 +5191,7 @@ tilesToLine src/Shader/AuxAddition.hs 66;" f timeFlowUpdate src/Dodge/Update.hs 182;" f timeScroller src/Dodge/Item/Held/Utility.hs 42;" f timeStopper src/Dodge/Item/Held/Utility.hs 39;" f -tinMag src/Dodge/Item/Ammo.hs 28;" f +tinMag src/Dodge/Item/Ammo.hs 23;" f ting1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 609;" f ting2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 675;" f ting3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 717;" f @@ -5241,7 +5240,7 @@ torso src/Dodge/Creature/Picture.hs 103;" f tractCr src/Dodge/TractorBeam/Update.hs 28;" f tractFlIt src/Dodge/TractorBeam/Update.hs 23;" f tractorBeamAt src/Dodge/HeldUse.hs 831;" f -tractorGun src/Dodge/Item/Held/BatteryGuns.hs 53;" f +tractorGun src/Dodge/Item/Held/BatteryGuns.hs 46;" f tractorGunPic src/Dodge/Item/Draw/SPic.hs 417;" f tractorPullPos src/Dodge/TractorBeam/Update.hs 33;" f tractorSPic src/Dodge/TractorBeam/Draw.hs 10;" f @@ -5326,9 +5325,9 @@ twoStepSlowS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 649;" f ubyteSize src/Shader/Parameters.hs 13;" f ugateCalc src/Dodge/Inventory/SelectionList.hs 109;" f uncurryV src/Geometry/Data.hs 66;" f -underBarrelSlot src/Dodge/Item/Scope.hs 159;" f +underBarrelSlot src/Dodge/Item/Scope.hs 178;" f unfoldrMID src/MonadHelp.hs 33;" f -unigate src/Dodge/Item/Scope.hs 102;" f +unigate src/Dodge/Item/Scope.hs 108;" f unitVectorAtAngle src/Geometry/Vector.hs 101;" f unlockInv src/Dodge/Inventory/Lock.hs 12;" f unpause src/Dodge/Menu.hs 205;" f @@ -5666,5 +5665,5 @@ zonesExtract src/Dodge/Zoning/Base.hs 62;" f zoomFloatingCamera src/Dodge/Update/Camera.hs 76;" f zoomInLongGun src/Dodge/Update/Scroll.hs 101;" f zoomOutLongGun src/Dodge/Update/Scroll.hs 109;" f -zoomScope src/Dodge/Item/Scope.hs 33;" f +zoomScope src/Dodge/Item/Scope.hs 32;" f zoomSpeed src/Dodge/Update/Scroll.hs 98;" f