From 61c0ba925153f7a689d49478c8d9824fed6be2c1 Mon Sep 17 00:00:00 2001 From: justin Date: Thu, 28 Nov 2024 21:48:25 +0000 Subject: [PATCH] Cleanup, remove spawngun --- src/Dodge/Bullet.hs | 8 +-- src/Dodge/Creature.hs | 1 - src/Dodge/Creature/HandPos.hs | 1 - src/Dodge/HeldUse.hs | 1 + src/Dodge/Item/Weapon.hs | 2 - src/Dodge/Item/Weapon/Spawn.hs | 34 ---------- tags | 114 ++++++++++++++++----------------- 7 files changed, 59 insertions(+), 102 deletions(-) delete mode 100644 src/Dodge/Item/Weapon/Spawn.hs diff --git a/src/Dodge/Bullet.hs b/src/Dodge/Bullet.hs index 9a78b35fc..3f9317628 100644 --- a/src/Dodge/Bullet.hs +++ b/src/Dodge/Bullet.hs @@ -1,17 +1,12 @@ module Dodge.Bullet ( updateBullet, --- shootBullet, ) where ---import Dodge.Data.ComposedItem ---import Dodge.Data.DoubleTree import Linear import Dodge.Item.Weapon.Bullet import System.Random import Data.Foldable import Data.Maybe ---import Dodge.Base.Coordinate ---import Dodge.Creature.HandPos import Dodge.Creature.Test import Dodge.Data.World import Dodge.EnergyBall @@ -50,7 +45,8 @@ applyMagnetsToBul bu = updateBulVel :: Bullet -> Bullet updateBulVel bt = case _buTrajectory bt of BasicBulletTrajectory -> bt & buVel .*.*~ _buDrag bt - MagnetTrajectory tpos -> bt & buVel %~ (clipV 20 . (+.+ 5 *.* normalizeV (tpos -.- _buPos bt))) + MagnetTrajectory tpos -> bt + & buVel %~ (clipV 20 . (+.+ 5 *.* normalizeV (tpos -.- _buPos bt))) FlechetteTrajectory tpos -> bt & buVel %~ vecTurnTo 0.2 (_buPos bt) tpos BezierTrajectory spos tpos xpos -> let bf tm = bQuadToF (spos, xpos, tpos) $ (100 - tm) * 0.05 diff --git a/src/Dodge/Creature.hs b/src/Dodge/Creature.hs index df2e5d712..a81d87357 100644 --- a/src/Dodge/Creature.hs +++ b/src/Dodge/Creature.hs @@ -320,7 +320,6 @@ stackedInventory = , beltMag , boosterGun , flatShield - , spawnGun (lamp 5) -- , lasWide 20 , poisonSprayer , bulletBeltPack diff --git a/src/Dodge/Creature/HandPos.hs b/src/Dodge/Creature/HandPos.hs index 1289d69a1..3c91f3440 100644 --- a/src/Dodge/Creature/HandPos.hs +++ b/src/Dodge/Creature/HandPos.hs @@ -20,7 +20,6 @@ import Dodge.Data.Creature import Geometry import ShapePicture - translatePointToRightHand :: Creature -> Point3 -> Point3 translatePointToRightHand cr = translatePointToRightHand' cr . mirrorV3xz diff --git a/src/Dodge/HeldUse.hs b/src/Dodge/HeldUse.hs index ad23b6001..ff877138d 100644 --- a/src/Dodge/HeldUse.hs +++ b/src/Dodge/HeldUse.hs @@ -191,6 +191,7 @@ flareCircleAt col alphax tranv = circleSolidCol (withAlpha 0 0) (withAlpha alphax col) 50 ) +-- previous phaseV parameters: 0.2, 1, 5 getLaserPhaseV :: LabelDoubleTree ComposeLinkType Item -> Float getLaserPhaseV = const 1 diff --git a/src/Dodge/Item/Weapon.hs b/src/Dodge/Item/Weapon.hs index fe4910eaa..7d66de146 100644 --- a/src/Dodge/Item/Weapon.hs +++ b/src/Dodge/Item/Weapon.hs @@ -2,7 +2,6 @@ module Dodge.Item.Weapon ( module Dodge.Item.Weapon.TriggerType, module Dodge.Item.Weapon.ExtraEffect, - module Dodge.Item.Weapon.Spawn, module Dodge.Item.Weapon.Radar, module Dodge.Item.Weapon.Utility, -- module Dodge.Item.Weapon.BatteryGuns, @@ -13,6 +12,5 @@ module Dodge.Item.Weapon ( import Dodge.Item.Weapon.Drone import Dodge.Item.Weapon.ExtraEffect import Dodge.Item.Weapon.Radar -import Dodge.Item.Weapon.Spawn import Dodge.Item.Weapon.TriggerType import Dodge.Item.Weapon.Utility diff --git a/src/Dodge/Item/Weapon/Spawn.hs b/src/Dodge/Item/Weapon/Spawn.hs deleted file mode 100644 index b9b86aff1..000000000 --- a/src/Dodge/Item/Weapon/Spawn.hs +++ /dev/null @@ -1,34 +0,0 @@ -module Dodge.Item.Weapon.Spawn where - -import Dodge.Default.Item -import Control.Lens -import Dodge.Data.World -import Geometry -import qualified IntMapHelp as IM - -{- | -Creates a creature next to the creature using the item. --} -spawnGun :: Creature -> Item -spawnGun _ = - defaultHeldItem - & itUse . heldDelay . rateMax .~ 100 --- & itUse . heldUse .~ HeldDoNothing --(\_ -> spawnCrNextTo cr) --- & itUse . heldMods .~ DoNothingMod - & itType .~ LEFT SPAWNER - -spawnCrNextTo :: - -- | Creature to spawn - Creature -> - -- | existing creature that will be spawned next to - Creature -> - World -> - World -spawnCrNextTo cr sCr w = w & cWorld . lWorld . creatures %~ IM.insert k newCr - where - k = IM.newKey $ w ^?! cWorld . lWorld . creatures -- _creatures (_cWorld w) - newCr = - cr - & crID .~ k - & crPos .~ _crPos sCr +.+ unitVectorAtAngle (_crDir sCr) - & crOldPos .~ _crPos sCr +.+ unitVectorAtAngle (_crDir sCr) diff --git a/tags b/tags index dd0c77df0..c2274aba2 100644 --- a/tags +++ b/tags @@ -3308,10 +3308,8 @@ advanceStepCounter src/Dodge/Creature/Impulse/Movement.hs 45;" f aimDelaySweep src/Dodge/Render/Picture.hs 239;" f aimStanceInfo src/Dodge/Item/Info.hs 211;" f aimTurn src/Dodge/Creature/YourControl.hs 143;" f -aimingMuzzleLength src/Dodge/Creature/HandPos.hs 46;" f -aimingMuzzlePos src/Dodge/Creature/HandPos.hs 41;" f -aimingWeaponHandlePos src/Dodge/Creature/HandPos.hs 28;" f -aimingWeaponZeroPos src/Dodge/Creature/HandPos.hs 36;" f +aimingWeaponHandlePos src/Dodge/Item/HeldOffset.hs 69;" f +aimingWeaponZeroPos src/Dodge/Item/HeldOffset.hs 63;" f airlock src/Dodge/Room/Airlock.hs 19;" f airlock0 src/Dodge/Room/Airlock.hs 25;" f airlock90 src/Dodge/Room/Airlock.hs 122;" f @@ -3443,7 +3441,7 @@ basicDrawBeam src/Dodge/Beam/Draw.hs 11;" f basicItemDisplay src/Dodge/Item/Display.hs 34;" f basicMachineApplyDamage src/Dodge/Machine/Damage.hs 6;" f basicMachineUpdate src/Dodge/Machine.hs 13;" f -basicMuzFlare src/Dodge/HeldUse.hs 202;" f +basicMuzFlare src/Dodge/HeldUse.hs 203;" f basicTerminal src/Dodge/Terminal.hs 35;" f battery src/Dodge/Item/Ammo.hs 96;" f batteryPack src/Dodge/Item/Equipment.hs 56;" f @@ -3710,7 +3708,7 @@ createItemYou src/Dodge/Inventory/Add.hs 94;" f createLightMap src/Render.hs 26;" f createNewArc src/Dodge/Tesla/Arc.hs 76;" f createPathGrid src/Dodge/Room/Path.hs 21;" f -createProjectile src/Dodge/HeldUse.hs 503;" f +createProjectile src/Dodge/HeldUse.hs 507;" f createShell src/Dodge/Projectile/Create.hs 19;" f createShieldWall src/Dodge/Euse.hs 133;" f createUnusedLinkPos src/Dodge/Tree/Shift.hs 117;" f @@ -3913,7 +3911,7 @@ detV src/Geometry/Vector.hs 93;" f detectorColor src/Dodge/Item/Draw/SPic.hs 391;" f detectorEffect src/Dodge/Item/Weapon/Radar.hs 20;" f detectorInfo src/Dodge/Item/Info.hs 191;" f -determineProjectileTracking src/Dodge/HeldUse.hs 492;" f +determineProjectileTracking src/Dodge/HeldUse.hs 496;" f diagonalLinesRect src/Dodge/Room/Foreground.hs 52;" f did src/Dodge/Item/InvSize.hs 53;" f diffAngles src/Geometry.hs 196;" f @@ -3967,7 +3965,7 @@ doDrag src/Dodge/Update/Input/InGame.hs 98;" 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 448;" f +doGenFloat src/Dodge/HeldUse.hs 451;" f doInPlacements src/Dodge/Layout.hs 92;" f doIndividualPlacements src/Dodge/Layout.hs 117;" f doInputScreenInput src/Dodge/Update/Input/ScreenLayer.hs 26;" f @@ -4254,7 +4252,7 @@ flameThrower src/Dodge/Item/Held/SprayGuns.hs 72;" f flameTorrent src/Dodge/Item/Held/SprayGuns.hs 40;" f flameWall src/Dodge/Item/Held/SprayGuns.hs 56;" f flamerPic src/Dodge/Item/Draw/SPic.hs 328;" f -flareCircleAt src/Dodge/HeldUse.hs 184;" f +flareCircleAt src/Dodge/HeldUse.hs 185;" f flatItemCombinations src/Dodge/Combine/Combinations.hs 49;" f flatLookupItems src/Dodge/Combine.hs 38;" f flatShield src/Dodge/Item/Held/Utility.hs 9;" f @@ -4321,7 +4319,7 @@ gameRoomViewpoints src/Dodge/Viewpoints.hs 35;" f gameRoomsFromRooms src/Dodge/Layout.hs 158;" f gameplayMenu src/Dodge/Menu.hs 131;" f gameplayMenuOptions src/Dodge/Menu.hs 134;" f -gasCreate src/Dodge/HeldUse.hs 445;" f +gasCreate src/Dodge/HeldUse.hs 448;" f generateGenParams src/Dodge/LevelGen/LevelStructure.hs 22;" f generateGraphs src/Dodge/LevelGen.hs 39;" f generateLayout src/Dodge/Layout/Generate.hs 10;" f @@ -4336,8 +4334,8 @@ getAmmoLinks src/Dodge/Item/Grammar.hs 81;" f getArguments src/Dodge/Update/Scroll.hs 152;" f getArguments' src/Dodge/Update/Scroll.hs 140;" f getAvailableListLines src/Dodge/SelectionList.hs 10;" f -getBulletTrajectory src/Dodge/HeldUse.hs 351;" f -getBulletType src/Dodge/HeldUse.hs 325;" f +getBulletTrajectory src/Dodge/HeldUse.hs 353;" f +getBulletType src/Dodge/HeldUse.hs 327;" f getCommands src/Dodge/Terminal.hs 117;" f getCommandsHelp src/Dodge/Terminal.hs 75;" f getCrDexterity src/Dodge/Creature/Statistics.hs 13;" f @@ -4347,9 +4345,9 @@ getDamageCoding src/Dodge/Terminal.hs 177;" f getDistortions src/Dodge/Render.hs 383;" f getEquipmentAllocation src/Dodge/Inventory/RBList.hs 47;" f getItem src/Dodge/Item/Location.hs 15;" f -getLaserColor src/Dodge/HeldUse.hs 199;" f -getLaserDamage src/Dodge/HeldUse.hs 196;" f -getLaserPhaseV src/Dodge/HeldUse.hs 193;" f +getLaserColor src/Dodge/HeldUse.hs 200;" f +getLaserDamage src/Dodge/HeldUse.hs 197;" f +getLaserPhaseV src/Dodge/HeldUse.hs 194;" f getLinksOfType src/Dodge/RoomLink.hs 39;" f getMaxLinesTM src/Dodge/Terminal/Type.hs 11;" f getMenuMouseContext src/Dodge/Update.hs 367;" f @@ -4444,9 +4442,9 @@ heightWallPS src/Dodge/Placement/Instance/Wall.hs 13;" f heldEffect src/Dodge/HeldUse.hs 34;" f heldEffectMuzzles src/Dodge/HeldUse.hs 44;" f heldInfo src/Dodge/Item/Info.hs 49;" f -heldItemOffset src/Dodge/Item/HeldOffset.hs 64;" f -heldItemOrient2D src/Dodge/Item/HeldOffset.hs 27;" f -heldItemRelativeOrient src/Dodge/Item/HeldOffset.hs 32;" f +heldItemOffset src/Dodge/Item/HeldOffset.hs 78;" f +heldItemOrient2D src/Dodge/Item/HeldOffset.hs 26;" f +heldItemRelativeOrient src/Dodge/Item/HeldOffset.hs 31;" f heldItemSPic src/Dodge/Item/Draw/SPic.hs 173;" f heldPositionInfo src/Dodge/Item/Info.hs 208;" f helpCommand src/Dodge/Terminal.hs 66;" f @@ -4562,7 +4560,7 @@ invertIntMap src/Multiset.hs 67;" f invertInventoryToMap src/Dodge/Combine.hs 56;" f invisibleChaseCrit src/Dodge/Creature/ChaseCrit.hs 25;" f invisibleWall src/Dodge/Placement/Instance/Wall.hs 16;" f -isAmmoIntLink src/Dodge/HeldUse.hs 210;" f +isAmmoIntLink src/Dodge/HeldUse.hs 211;" f isAnimate src/Dodge/Creature/Test.hs 136;" f isCognizant src/Dodge/Creature/Perception.hs 105;" f isConnected src/Dodge/Inventory/Swap.hs 90;" f @@ -4597,7 +4595,7 @@ itemBaseName src/Dodge/Item/Display.hs 45;" f itemBlips src/Dodge/RadarSweep.hs 75;" f itemCombinations src/Dodge/Combine/Combinations.hs 54;" f itemCombinationsEdges src/Dodge/Combine/Graph.hs 60;" f -itemDetectorEffect src/Dodge/HeldUse.hs 235;" f +itemDetectorEffect src/Dodge/HeldUse.hs 236;" f itemDisplay src/Dodge/Item/Display.hs 16;" f itemDisplayPad src/Dodge/Item/Display.hs 29;" f itemEquipPict src/Dodge/Item/Draw.hs 17;" f @@ -4655,7 +4653,7 @@ lampCrSPic src/Dodge/Render/ShapePicture.hs 57;" f lasCenSensEdge src/Dodge/Room/LasTurret.hs 112;" f lasDronesPic src/Dodge/Item/Weapon/Drone.hs 22;" f lasGunPic src/Dodge/Item/Draw/SPic.hs 351;" f -lasRayAt src/Dodge/HeldUse.hs 302;" f +lasRayAt src/Dodge/HeldUse.hs 304;" f lasSensorTurretTest src/Dodge/Room/LasTurret.hs 105;" f lasTunnel src/Dodge/Room/LasTurret.hs 124;" f lasTunnelRunPast src/Dodge/Room/LasTurret.hs 165;" f @@ -4775,7 +4773,7 @@ makeAttach src/Dodge/Item/Attach.hs 10;" f makeBlip src/Dodge/RadarSweep.hs 51;" f makeBlockDebris src/Dodge/Block/Debris.hs 28;" f makeBoolOption src/Dodge/Menu/OptionType.hs 8;" f -makeBullet src/Dodge/HeldUse.hs 383;" f +makeBullet src/Dodge/HeldUse.hs 386;" f makeButton src/Dodge/LevelGen/Switch.hs 16;" f makeByteStringShaderUsingVAO src/Shader/Compile.hs 128;" f makeCloudAt src/Dodge/WorldEvent/Cloud.hs 18;" f @@ -4856,10 +4854,10 @@ mcProximitySensorUpdate src/Dodge/Machine/Update.hs 124;" f mcSPic src/Dodge/Render/ShapePicture.hs 131;" f mcSensorTriggerUpdate src/Dodge/Machine/Update.hs 87;" f mcSensorUpdate src/Dodge/Machine/Update.hs 119;" f -mcShootLaser src/Dodge/HeldUse.hs 472;" f +mcShootLaser src/Dodge/HeldUse.hs 475;" f mcTriggerVal src/Dodge/Machine/Update.hs 93;" f mcTypeUpdate src/Dodge/Machine/Update.hs 27;" f -mcUseHeld src/Dodge/HeldUse.hs 411;" f +mcUseHeld src/Dodge/HeldUse.hs 412;" f mcUseItem src/Dodge/Machine/Update.hs 79;" f medkit src/Dodge/Item/Consumable.hs 8;" f megaBattery src/Dodge/Item/Ammo.hs 84;" f @@ -4904,7 +4902,7 @@ miniGunXPictItem src/Dodge/Item/Draw/SPic.hs 301;" f miniS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 528;" f miniTree2 src/Dodge/Room/Room.hs 106;" f minimumOn src/FoldlHelp.hs 12;" f -mirrorV3xz src/Dodge/Creature/HandPos.hs 52;" f +mirrorV3xz src/Dodge/Creature/HandPos.hs 27;" f mirrorXAxis src/Geometry/Polygon.hs 49;" f mirrorxz src/Picture/Base.hs 335;" f mirroryz src/Picture/Base.hs 340;" f @@ -4952,7 +4950,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 170;" f +muzFlareAt src/Dodge/HeldUse.hs 171;" f mvBullet src/Dodge/Bullet.hs 33;" f mvButton src/Dodge/Placement/PlaceSpot.hs 176;" f mvCr src/Dodge/Placement/PlaceSpot.hs 186;" f @@ -5360,7 +5358,7 @@ reloadS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 440;" f rememberSounds src/Dodge/Creature/Perception.hs 177;" f remoteScreen src/Dodge/Item/Scope.hs 50;" f remoteShellShape src/Dodge/Projectile/Draw.hs 42;" f -removeAmmoFromMag src/Dodge/HeldUse.hs 312;" f +removeAmmoFromMag src/Dodge/HeldUse.hs 314;" f removeDot src/ShortShow.hs 30;" f removeHotkey src/Dodge/Hotkey.hs 41;" f removeInverseWalls src/Dodge/LevelGen/StaticWalls.hs 25;" f @@ -5639,15 +5637,15 @@ shiftRoomShiftToLink src/Dodge/Room/Link.hs 70;" f shiftedGrid src/Grid.hs 25;" f shineTargetLaser src/Dodge/Creature/State.hs 283;" f shineTorch src/Dodge/Creature/State.hs 325;" f -shootBullet src/Dodge/HeldUse.hs 370;" f +shootBullet src/Dodge/HeldUse.hs 373;" f shootFirstMiss src/Dodge/Creature/Volition.hs 33;" f shootL src/Dodge/Item/Weapon/TriggerType.hs 165;" f -shootLaser src/Dodge/HeldUse.hs 283;" f +shootLaser src/Dodge/HeldUse.hs 284;" f shootOutPassage src/Dodge/Room/RezBox.hs 74;" f -shootShatter src/Dodge/Item/Weapon/Shatter.hs 12;" f -shootTeslaArc src/Dodge/HeldUse.hs 481;" f +shootShatter src/Dodge/Item/Weapon/Shatter.hs 11;" f +shootTeslaArc src/Dodge/HeldUse.hs 484;" f shootTillEmpty src/Dodge/Creature/Volition.hs 18;" f -shootTractorBeam src/Dodge/HeldUse.hs 262;" f +shootTractorBeam src/Dodge/HeldUse.hs 263;" 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 @@ -5655,9 +5653,9 @@ shootingRange src/Dodge/Room/Room.hs 332;" f shortPoint2 src/Dodge/ShortShow.hs 4;" f shortShow src/ShortShow.hs 10;" f shotgunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 526;" f -shoulderHeight src/Dodge/Item/HeldOffset.hs 67;" f +shoulderHeight src/Dodge/Item/HeldOffset.hs 81;" f shoulderSH src/Dodge/Creature/Picture.hs 137;" f -shoulderSP src/Dodge/Creature/HandPos.hs 196;" f +shoulderSP src/Dodge/Creature/HandPos.hs 171;" f showAttachItem src/Dodge/Item/Display.hs 61;" f showAutoRechargeProgress src/Dodge/Item/Display.hs 74;" f showEquipItem src/Dodge/Item/Display.hs 69;" f @@ -5802,7 +5800,7 @@ strFromEquipment src/Dodge/Creature/Statistics.hs 19;" f strFromHeldItem src/Dodge/Creature/Statistics.hs 37;" f strengthFactor src/Dodge/Creature/Impulse/Movement.hs 32;" f strictify src/MaybeHelp.hs 37;" f -strideRot src/Dodge/Item/HeldOffset.hs 70;" f +strideRot src/Dodge/Item/HeldOffset.hs 84;" f stringToList src/Picture/Base.hs 313;" f stringToListGrad src/Picture/Text.hs 12;" f stripZ src/Geometry/Vector3D.hs 97;" f @@ -5933,23 +5931,23 @@ torqueCr src/Dodge/WorldEffect.hs 72;" f 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 272;" f +tractorBeamAt src/Dodge/HeldUse.hs 273;" f tractorGun src/Dodge/Item/Held/BatteryGuns.hs 60;" f tractorGunPic src/Dodge/Item/Draw/SPic.hs 375;" f tractorPullPos src/Dodge/TractorBeam/Update.hs 33;" f tractorSPic src/Dodge/TractorBeam/Draw.hs 10;" f tranRot src/Picture/Base.hs 124;" f transMat src/MatrixHelper.hs 73;" f -transToHandle src/Dodge/Item/HeldOffset.hs 22;" f +transToHandle src/Dodge/Item/HeldOffset.hs 21;" f translate src/Picture/Base.hs 116;" f translate3 src/Picture/Base.hs 120;" f translateFloatingCamera src/Dodge/Update/Camera.hs 47;" f translateFloatingCameraKeys src/Dodge/Update/Camera.hs 59;" f translateH src/Picture/Base.hs 112;" f -translatePointToHead src/Dodge/Creature/HandPos.hs 173;" f -translatePointToLeftHand src/Dodge/Creature/HandPos.hs 101;" f -translatePointToRightHand src/Dodge/Creature/HandPos.hs 49;" f -translatePointToRightHand' src/Dodge/Creature/HandPos.hs 55;" f +translatePointToHead src/Dodge/Creature/HandPos.hs 148;" f +translatePointToLeftHand src/Dodge/Creature/HandPos.hs 76;" f +translatePointToRightHand src/Dodge/Creature/HandPos.hs 24;" f +translatePointToRightHand' src/Dodge/Creature/HandPos.hs 30;" f translateSH src/Shape.hs 243;" f translateSHxy src/Shape.hs 247;" f translateSHz src/Shape.hs 251;" f @@ -5957,17 +5955,17 @@ translateSP src/ShapePicture.hs 53;" f translateSPxy src/ShapePicture.hs 45;" f translateSPz src/ShapePicture.hs 49;" f translateScreenPos src/Dodge/ScreenPos.hs 12;" f -translateToBack src/Dodge/Creature/HandPos.hs 190;" f -translateToChest src/Dodge/Creature/HandPos.hs 183;" f -translateToHead src/Dodge/Creature/HandPos.hs 163;" f -translateToLeftHand src/Dodge/Creature/HandPos.hs 114;" f -translateToLeftLeg src/Dodge/Creature/HandPos.hs 141;" f -translateToLeftWrist src/Dodge/Creature/HandPos.hs 127;" f -translateToRightHand src/Dodge/Creature/HandPos.hs 68;" f -translateToRightHand' src/Dodge/Creature/HandPos.hs 71;" f -translateToRightLeg src/Dodge/Creature/HandPos.hs 152;" f -translateToRightWrist src/Dodge/Creature/HandPos.hs 84;" f -translateToRightWrist' src/Dodge/Creature/HandPos.hs 87;" f +translateToBack src/Dodge/Creature/HandPos.hs 165;" f +translateToChest src/Dodge/Creature/HandPos.hs 158;" f +translateToHead src/Dodge/Creature/HandPos.hs 138;" f +translateToLeftHand src/Dodge/Creature/HandPos.hs 89;" f +translateToLeftLeg src/Dodge/Creature/HandPos.hs 116;" f +translateToLeftWrist src/Dodge/Creature/HandPos.hs 102;" f +translateToRightHand src/Dodge/Creature/HandPos.hs 43;" f +translateToRightHand' src/Dodge/Creature/HandPos.hs 46;" f +translateToRightLeg src/Dodge/Creature/HandPos.hs 127;" f +translateToRightWrist src/Dodge/Creature/HandPos.hs 59;" f +translateToRightWrist' src/Dodge/Creature/HandPos.hs 62;" f translateWallID src/Dodge/Wall/Move.hs 37;" f translateXY src/Polyhedra.hs 26;" f trapezionBWHW src/Geometry/Polygon.hs 24;" f @@ -6006,13 +6004,13 @@ trySiphonFuel src/Dodge/Euse.hs 45;" f trySpinByCID src/Dodge/Projectile/Update.hs 95;" f turnTo src/Dodge/Movement/Turn.hs 4;" f turnToAmount src/Dodge/Movement/Turn.hs 15;" f -turretItemOffset src/Dodge/Item/HeldOffset.hs 17;" f +turretItemOffset src/Dodge/Item/HeldOffset.hs 16;" f tweenAngles src/Geometry/Vector.hs 184;" f twinSlowDoorChasers src/Dodge/Room/LongDoor.hs 79;" f twinSlowDoorRoom src/Dodge/Room/LongDoor.hs 28;" f twists src/Dodge/Creature/Test.hs 101;" f twoFlat src/Dodge/Creature/Test.hs 98;" f -twoFlatHRot src/Dodge/Item/HeldOffset.hs 79;" f +twoFlatHRot src/Dodge/Item/HeldOffset.hs 93;" f twoRoomPoss src/Dodge/PlacementSpot.hs 147;" f twoStep1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 400;" f twoStepS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 438;" f @@ -6173,14 +6171,14 @@ useC src/Dodge/Cuse.hs 8;" f useC' src/Dodge/Cuse.hs 13;" f useE src/Dodge/Euse.hs 23;" f useEquipment src/Dodge/Creature/State.hs 148;" f -useGasParams src/Dodge/HeldUse.hs 422;" f +useGasParams src/Dodge/HeldUse.hs 423;" f useHotKey src/Dodge/Creature/YourControl.hs 48;" f useItemHotkey src/Dodge/Creature/Impulse/UseItem.hs 143;" f useItemLeftClick src/Dodge/Creature/Impulse/UseItem.hs 117;" f useItemLeftClick' src/Dodge/Creature/Impulse/UseItem.hs 130;" f useL src/Dodge/Luse.hs 11;" f useLnkRoomPos src/Dodge/PlacementSpot.hs 244;" f -useLoadedAmmo src/Dodge/HeldUse.hs 214;" f +useLoadedAmmo src/Dodge/HeldUse.hs 215;" f useMagShield src/Dodge/Euse.hs 68;" f useNormalCamera src/Dodge/Camera.hs 6;" f usePayload src/Dodge/Payload.hs 7;" f @@ -6223,8 +6221,8 @@ visionCheck src/Dodge/Creature/Perception.hs 152;" f vocalizationTest src/Dodge/Creature/Vocalization.hs 8;" f volleyGun src/Dodge/Item/Held/Cane.hs 30;" f volleyGunShape src/Dodge/Item/Draw/SPic.hs 289;" f -waistSP src/Dodge/Creature/HandPos.hs 199;" f -walkNozzle src/Dodge/HeldUse.hs 240;" f +waistSP src/Dodge/Creature/HandPos.hs 174;" f +walkNozzle src/Dodge/HeldUse.hs 241;" f walkableNodeNear src/Dodge/Path.hs 48;" f wallBlips src/Dodge/RadarSweep.hs 80;" f wallBuffer src/Dodge/WallCreatureCollisions.hs 50;" f