diff --git a/saveSlot/seed b/saveSlot/seed index 2f0d3ff35..335495db1 100644 --- a/saveSlot/seed +++ b/saveSlot/seed @@ -1 +1 @@ -7114951007332849727 \ No newline at end of file +5641590692396144028 \ No newline at end of file diff --git a/src/Dodge/Bullet.hs b/src/Dodge/Bullet.hs index 4567734c7..e8b10e3c2 100644 --- a/src/Dodge/Bullet.hs +++ b/src/Dodge/Bullet.hs @@ -21,10 +21,10 @@ import Linear updateBullet :: World -> Bullet -> (World, Maybe Bullet) updateBullet w bu - | magV (_buVel bu) < 10 + | norm (_buVel bu) < 10 , BulBall _ <- _buPayload bu = (useBulletPayload bu (_buPos bu) w, Nothing) - | magV (_buVel bu) < 1 = (useBulletPayload bu (_buPos bu) w, Nothing) + | norm (_buVel bu) < 1 = (useBulletPayload bu (_buPos bu) w, Nothing) -- have to be slightly carefull not to accelerate bullets using magnets | otherwise = second (Just . updateBulVel) . hitEffFromBul w $ applyMagnetsToBul bu w @@ -52,7 +52,7 @@ doMagnetBuBu bu mg mgalignpos | dotV bvel (bpos - mpos) > 0 = bpos - mpos | otherwise = mpos - bpos - d = dist (bu ^. buPos) (mg ^. mgPos) + d = distance (bu ^. buPos) (mg ^. mgPos) updateBulVel :: Bullet -> Bullet updateBulVel bt = bt & buVel .*.*~ _buDrag bt @@ -145,7 +145,7 @@ makeFragBullets p w = w & cWorld . lWorld . bullets .++~ bus makeFlak :: Bullet -> Point2 -> World -> World makeFlak bu _ w = w & cWorld . lWorld . bullets .++~ [f x | x <- xs] where - s = min 10 (0.5 * magV (_buVel bu)) + s = min 10 (0.5 * norm (_buVel bu)) xs = take 5 $ randomRs (- s, s) $ _randGen w f x = bu & buVel %~ g x diff --git a/tags b/tags index 31e5a68b7..850d9fd1c 100644 --- a/tags +++ b/tags @@ -384,7 +384,7 @@ Dungeon src/Dodge/Data/Scenario.hs 66;" C Dust src/Dodge/Data/Cloud.hs 29;" t EBO src/Shader/Data.hs 88;" t EBSound src/Dodge/Data/SoundOrigin.hs 40;" C -ECW src/Dodge/Material/Damage.hs 11;" t +ECW src/Dodge/Material/Damage.hs 12;" t ELEPHANTGUN src/Dodge/Data/Item/Combine.hs 158;" C EQUIP src/Dodge/Data/Item/Combine.hs 18;" C EXPLOSIVES src/Dodge/Data/Item/Combine.hs 117;" C @@ -727,7 +727,7 @@ MODStringOption src/Dodge/Data/Universe.hs 97;" C MOTOR src/Dodge/Data/Item/Combine.hs 64;" C MP2Ac src/Dodge/Data/CreatureEffect.hs 56;" t MP2NoAction src/Dodge/Data/CreatureEffect.hs 56;" C -MPO src/Dodge/Base/Collide.hs 87;" t +MPO src/Dodge/Base/Collide.hs 89;" t MTRS src/Dodge/Data/MTRS.hs 6;" t MTree src/Dodge/Data/MetaTree.hs 11;" C Machine src/Dodge/Data/Machine.hs 30;" t @@ -952,7 +952,7 @@ Opaque src/Dodge/Data/Wall.hs 44;" C OpticScope src/Dodge/Data/Item/Scope.hs 14;" C OptionScreen src/Dodge/Data/Universe.hs 82;" C OptionScreenFlag src/Dodge/Data/Universe.hs 72;" t -OutAction src/Dodge/Creature/Action.hs 46;" t +OutAction src/Dodge/Creature/Action.hs 47;" t OutLink src/Dodge/Data/Room.hs 44;" C OutsideTerminal src/Dodge/Data/Input.hs 29;" C OutwardShockwave src/Dodge/Data/Shockwave.hs 14;" C @@ -974,7 +974,7 @@ P2NoAction src/Dodge/Data/CreatureEffect.hs 53;" C PBSound src/Dodge/Data/SoundOrigin.hs 42;" C PIPE src/Dodge/Data/Item/Combine.hs 51;" C PISTOL src/Dodge/Data/Item/Combine.hs 144;" C -PJStabiliser src/Dodge/Projectile/Create.hs 16;" t +PJStabiliser src/Dodge/Projectile/Create.hs 17;" t PLANK src/Dodge/Data/Item/Combine.hs 60;" C PLATE src/Dodge/Data/Item/Combine.hs 70;" C PLUS src/Dodge/Data/GenParams.hs 20;" C @@ -1286,8 +1286,8 @@ SpawnedBy src/Dodge/Data/Creature/State.hs 19;" C SplashOptions src/Dodge/Data/Universe.hs 72;" C SplitBeamCombine src/Dodge/Data/Beam.hs 42;" C SpreadGunAI src/Dodge/Data/Creature/Misc.hs 42;" C -StabOrthReduce src/Dodge/Projectile/Create.hs 17;" C -StabSpinIncrease src/Dodge/Projectile/Create.hs 18;" C +StabOrthReduce src/Dodge/Projectile/Create.hs 18;" C +StabSpinIncrease src/Dodge/Projectile/Create.hs 19;" C Stance src/Dodge/Data/Creature/Stance.hs 17;" t StandaloneWall src/Dodge/Data/Wall/Structure.hs 13;" C Standing src/Dodge/Data/Creature/Stance.hs 29;" C @@ -1730,7 +1730,6 @@ _crPos src/Dodge/Data/Creature.hs 40;" f _crStance src/Dodge/Data/Creature.hs 55;" f _crType src/Dodge/Data/Creature.hs 47;" f _crVocalization src/Dodge/Data/Creature.hs 59;" f -_crZ src/Dodge/Data/Creature.hs 42;" f _crZVel src/Dodge/Data/Creature.hs 43;" f _crZoning src/Dodge/Data/World.hs 48;" f _creatureGroups src/Dodge/Data/LWorld.hs 99;" f @@ -2552,9 +2551,9 @@ _wsMachine src/Dodge/Data/Wall/Structure.hs 15;" f _xNum src/Dodge/Data/Item/Combine.hs 140;" f _xNum src/Dodge/Data/Item/Combine.hs 150;" f _xNum src/Dodge/Data/Item/Combine.hs 171;" f -aFlame src/Dodge/Gas.hs 18;" f -aGasCloud src/Dodge/Gas.hs 13;" f -aRadarPulse src/Dodge/RadarSweep.hs 19;" f +aFlame src/Dodge/Gas.hs 20;" f +aGasCloud src/Dodge/Gas.hs 15;" f +aRadarPulse src/Dodge/RadarSweep.hs 20;" f aShape src/Dodge/Placement/Instance/LightSource.hs 121;" f aSound src/Dodge/SoundLogic.hs 74;" f aTreeStrut src/Dodge/Tree/GenerateStructure.hs 42;" f @@ -2564,16 +2563,16 @@ activeTargetCursorPic src/Dodge/Targeting/Draw.hs 31;" f addArmour src/Dodge/Creature.hs 84;" f addBranchAt src/Dodge/Tree/GenerateStructure.hs 18;" f addButtonSlowDoor src/Dodge/Room/LongDoor.hs 98;" f -addCrGibs src/Dodge/Prop/Gib.hs 16;" f +addCrGibs src/Dodge/Prop/Gib.hs 17;" f addDepth src/Picture/Base.hs 133;" f addDoorAtNthLinkToggleTerminal src/Dodge/Room/Warning.hs 40;" f addDoorToggleTerminal src/Dodge/Room/Warning.hs 37;" f addDoorWall src/Dodge/Placement/PlaceSpot/TriggerDoor.hs 53;" f addEdges src/Dodge/Path.hs 122;" f -addGib4 src/Dodge/Prop/Gib.hs 51;" f -addGibAt src/Dodge/Prop/Gib.hs 62;" f -addGibAtDir src/Dodge/Prop/Gib.hs 67;" f -addGibsAtDir src/Dodge/Prop/Gib.hs 39;" f +addGib4 src/Dodge/Prop/Gib.hs 52;" f +addGibAt src/Dodge/Prop/Gib.hs 63;" f +addGibAtDir src/Dodge/Prop/Gib.hs 69;" f +addGibsAtDir src/Dodge/Prop/Gib.hs 40;" f addGirder src/Dodge/Room/Modify/Girder.hs 90;" f addGirder' src/Dodge/Room/Modify/Girder.hs 111;" f addGirderEW src/Dodge/Room/Modify/Girder.hs 72;" f @@ -2585,7 +2584,7 @@ addHighGirder src/Dodge/Room/Modify/Girder.hs 132;" f addHighGirder' src/Dodge/Room/Modify/Girder.hs 142;" f addIndefiniteArticle src/StringHelp.hs 17;" f addNodes src/Dodge/Path.hs 115;" f -addPane src/Dodge/Placement/PlaceSpot.hs 172;" f +addPane src/Dodge/Placement/PlaceSpot.hs 173;" f addPlmnt src/Dodge/LevelGen/PlacementHelper.hs 87;" f addPointPolygon src/Geometry/Polygon.hs 133;" f addPolyWall src/Dodge/LevelGen/StaticWalls.hs 141;" f @@ -2601,10 +2600,10 @@ addZ src/Geometry/Vector3D.hs 89;" f adjustIMZone src/Dodge/Base.hs 81;" f advanceScrollAmount src/Dodge/Update.hs 403;" f advanceSmoothScroll src/Dodge/SmoothScroll.hs 33;" f -advanceStepCounter src/Dodge/Creature/Impulse/Movement.hs 45;" f -aimDelaySweep src/Dodge/Render/Picture.hs 272;" f +advanceStepCounter src/Dodge/Creature/Impulse/Movement.hs 46;" f +aimDelaySweep src/Dodge/Render/Picture.hs 273;" f aimStanceInfo src/Dodge/Item/Info.hs 243;" f -aimTurn src/Dodge/Creature/YourControl.hs 180;" f +aimTurn src/Dodge/Creature/YourControl.hs 181;" f airlock src/Dodge/Room/Airlock.hs 23;" f airlock0 src/Dodge/Room/Airlock.hs 67;" f airlock90 src/Dodge/Room/Airlock.hs 165;" f @@ -2613,7 +2612,7 @@ airlockDoor src/Dodge/Room/Airlock.hs 93;" f airlockDoubleDoor src/Dodge/Room/Airlock.hs 96;" f airlockSimple src/Dodge/Room/Airlock.hs 108;" f airlockZ src/Dodge/Room/Airlock.hs 133;" f -allVisibleWalls src/Dodge/Base/Collide.hs 215;" f +allVisibleWalls src/Dodge/Base/Collide.hs 214;" f alongSegBy src/Geometry.hs 40;" f alteRifle src/Dodge/Item/Held/Cane.hs 22;" f ammoMagInfo src/Dodge/Item/Info.hs 49;" f @@ -2631,22 +2630,22 @@ angleBetween src/Geometry.hs 158;" f angleVV src/Geometry/Vector.hs 58;" f angleVV3 src/Geometry/Vector3D.hs 122;" f anyUnusedSpot src/Dodge/PlacementSpot.hs 66;" f -anythingHitCirc src/Dodge/Base/Collide.hs 338;" f -applyCME src/Dodge/HeldUse.hs 361;" f -applyCreatureDamage src/Dodge/Creature/Damage.hs 13;" f +anythingHitCirc src/Dodge/Base/Collide.hs 337;" f +applyCME src/Dodge/HeldUse.hs 362;" f +applyCreatureDamage src/Dodge/Creature/Damage.hs 14;" f applyEventIO src/Loop.hs 89;" f applyGravityPU src/Dodge/Projectile/Update.hs 41;" f -applyIndividualDamage src/Dodge/Creature/Damage.hs 16;" f -applyInvLock src/Dodge/HeldUse.hs 420;" f -applyMagnetsToBul src/Dodge/Bullet.hs 31;" f -applyPastDamages src/Dodge/Creature/State.hs 48;" f -applyPiercingDamage src/Dodge/Creature/Damage.hs 22;" f +applyIndividualDamage src/Dodge/Creature/Damage.hs 17;" f +applyInvLock src/Dodge/HeldUse.hs 421;" f +applyMagnetsToBul src/Dodge/Bullet.hs 32;" f +applyPastDamages src/Dodge/Creature/State.hs 49;" f +applyPiercingDamage src/Dodge/Creature/Damage.hs 23;" f applyPosition src/Sound.hs 111;" f -applyRecoil src/Dodge/HeldUse.hs 451;" f +applyRecoil src/Dodge/HeldUse.hs 452;" f applyResFactor src/Dodge/Data/Config.hs 110;" f applySetTerminalString src/Dodge/Debug/Terminal.hs 83;" f -applySidePush src/Dodge/HeldUse.hs 551;" f -applySoundCME src/Dodge/HeldUse.hs 441;" f +applySidePush src/Dodge/HeldUse.hs 552;" f +applySoundCME src/Dodge/HeldUse.hs 442;" f applyTerminalCommand src/Dodge/Debug/Terminal.hs 28;" f applyTerminalCommandArguments src/Dodge/Debug/Terminal.hs 44;" f applyTerminalString src/Dodge/Debug/Terminal.hs 22;" f @@ -2654,7 +2653,7 @@ applyToNode src/TreeHelp.hs 65;" f applyToRandomNode src/TreeHelp.hs 151;" f applyToSubforest src/TreeHelp.hs 78;" f applyToSubtree src/TreeHelp.hs 71;" f -applyTorqueCME src/Dodge/HeldUse.hs 562;" f +applyTorqueCME src/Dodge/HeldUse.hs 563;" f applyWorldConfig src/Dodge/Config.hs 55;" f aquamarine src/Color.hs 23;" f arHUD src/Dodge/Item/Scope.hs 134;" f @@ -2687,7 +2686,7 @@ attachList src/Dodge/Tree/Compose.hs 80;" f attachOnward src/Dodge/Tree/Compose.hs 95;" f attachOnward' src/Dodge/Tree/Compose.hs 98;" f attachTree src/Dodge/Tree/Compose.hs 38;" f -attentionViewPoint src/Dodge/Creature/ReaderUpdate.hs 68;" f +attentionViewPoint src/Dodge/Creature/ReaderUpdate.hs 69;" f attribSize src/Shader/Compile.hs 306;" f autoAmr src/Dodge/Item/Held/Rod.hs 39;" f autoBS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 488;" f @@ -2696,7 +2695,7 @@ autoGunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 694;" f autoPistol src/Dodge/Item/Held/Stick.hs 49;" f autoRifle src/Dodge/Item/Held/Cane.hs 27;" f awakeLevelPerception src/Dodge/Creature/Perception.hs 163;" f -axisInt src/Geometry/Intersect.hs 275;" f +axisInt src/Geometry/Intersect.hs 248;" f azure src/Color.hs 22;" f bQuadToF src/Geometry/Bezier.hs 37;" f bQuadToLine src/Geometry/Bezier.hs 30;" f @@ -2725,7 +2724,7 @@ baseSMGShape src/Dodge/Item/Draw/SPic.hs 391;" f baseShoulder src/Dodge/Creature/Picture.hs 116;" f baseStickShape src/Dodge/Item/Draw/SPic.hs 300;" f baseStickShapeX src/Dodge/Item/Draw/SPic.hs 292;" f -baseStickSpread src/Dodge/HeldUse.hs 311;" f +baseStickSpread src/Dodge/HeldUse.hs 312;" f basicAttentionUpdate src/Dodge/Creature/Perception.hs 128;" f basicAwarenessUpdate src/Dodge/Creature/Perception.hs 38;" f basicCrPict src/Dodge/Creature/Picture.hs 30;" f @@ -2733,27 +2732,27 @@ basicCrShape src/Dodge/Creature/Picture.hs 36;" f basicDrawBeam src/Dodge/Beam/Draw.hs 11;" f basicItemDisplay src/Dodge/Item/Display.hs 23;" f basicMachineApplyDamage src/Dodge/Machine/Damage.hs 6;" f -basicMachineUpdate src/Dodge/Machine.hs 13;" f -basicMuzFlare src/Dodge/HeldUse.hs 706;" f +basicMachineUpdate src/Dodge/Machine.hs 14;" f +basicMuzFlare src/Dodge/HeldUse.hs 707;" f battery src/Dodge/Item/Ammo.hs 63;" f batteryPack src/Dodge/Item/Equipment.hs 46;" f belowNumX src/Dodge/Combine/Graph.hs 86;" f beltMag src/Dodge/Item/Ammo.hs 39;" f bfsNodePoints src/Dodge/Path.hs 58;" f -bfsThenReturn src/Dodge/Creature/ReaderUpdate.hs 218;" f +bfsThenReturn src/Dodge/Creature/ReaderUpdate.hs 219;" f bgateCalc src/Dodge/Inventory/SelectionList.hs 118;" f -bgunSound src/Dodge/HeldUse.hs 506;" f +bgunSound src/Dodge/HeldUse.hs 507;" f bindFBO src/Render.hs 245;" f bingate src/Dodge/Item/Scope.hs 109;" f black src/Color.hs 27;" f blank src/Picture/Base.hs 59;" f blinkAcrossChallenge src/Dodge/Room/BlinkAcross.hs 14;" f -blinkActionFail src/Dodge/Creature/Action/Blink.hs 88;" f -blinkActionMousePos src/Dodge/Creature/Action/Blink.hs 23;" f -blinkDistortions src/Dodge/Creature/Action/Blink.hs 44;" f -blinkShockwave src/Dodge/Creature/Action/Blink.hs 79;" f +blinkActionFail src/Dodge/Creature/Action/Blink.hs 89;" f +blinkActionMousePos src/Dodge/Creature/Action/Blink.hs 24;" f +blinkDistortions src/Dodge/Creature/Action/Blink.hs 45;" f +blinkShockwave src/Dodge/Creature/Action/Blink.hs 80;" f blinker src/Dodge/Item/Held/Utility.hs 30;" f -blipAt src/Dodge/RadarSweep.hs 77;" f +blipAt src/Dodge/RadarSweep.hs 78;" f blockLine src/Dodge/Placement/Instance/Wall.hs 41;" f blockPillar src/Dodge/Room/Pillar.hs 22;" f blockedCorridor src/Dodge/Room/RoadBlock.hs 71;" f @@ -2780,8 +2779,8 @@ blue src/Color.hs 16;" f blunderbuss src/Dodge/Item/Held/Cone.hs 14;" f bossKeyItems src/Dodge/LockAndKey.hs 12;" f bossRoom src/Dodge/Room/Boss.hs 61;" f -bounceDir src/Dodge/Bullet.hs 109;" f -bouncePoint src/Dodge/Base/Collide.hs 83;" f +bounceDir src/Dodge/Bullet.hs 110;" f +bouncePoint src/Dodge/Base/Collide.hs 85;" f boundPoints src/Bound.hs 10;" f boundedGrid src/Grid.hs 19;" f boxABC src/Polyhedra.hs 108;" f @@ -2814,9 +2813,9 @@ cFilledRect src/Dodge/CharacterEnums.hs 6;" f cWireRect src/Dodge/CharacterEnums.hs 10;" f calcSmoothScroll src/Dodge/SmoothScroll.hs 11;" f calcTexCoord src/Tile.hs 19;" f -canSee src/Dodge/Base/Collide.hs 324;" f -canSeeIndirect src/Dodge/Base/Collide.hs 331;" f -cancelExamineInventory src/Dodge/Item/BackgroundEffect.hs 22;" f +canSee src/Dodge/Base/Collide.hs 323;" f +canSeeIndirect src/Dodge/Base/Collide.hs 330;" f +cancelExamineInventory src/Dodge/Item/BackgroundEffect.hs 23;" f capacitor src/Dodge/Item/Ammo.hs 69;" f cardEightVec src/Dodge/Base/CardinalPoint.hs 17;" f cardList src/Dodge/Base/CardinalPoint.hs 7;" f @@ -2832,24 +2831,24 @@ centroid src/Geometry/Polygon.hs 167;" f centroidNum src/Geometry/Polygon.hs 170;" f chainCreatureUpdates src/Dodge/Creature/ChainUpdates.hs 6;" f chainPairs src/Geometry.hs 360;" f -changeSwapOther src/Dodge/Inventory.hs 140;" f -changeSwapSel src/Dodge/Inventory.hs 133;" f -changeSwapWith src/Dodge/Inventory.hs 174;" f +changeSwapOther src/Dodge/Inventory.hs 141;" f +changeSwapSel src/Dodge/Inventory.hs 134;" f +changeSwapWith src/Dodge/Inventory.hs 175;" f charToTuple src/Picture/Base.hs 317;" f charToTupleGrad src/Picture/Text.hs 18;" f chartreuse src/Color.hs 24;" f chaseCrit src/Dodge/Creature/ChaseCrit.hs 27;" f chaseCritAwarenessUpdate src/Dodge/Creature/Perception.hs 70;" f -chaseCritMv src/Dodge/Creature/ReaderUpdate.hs 114;" f +chaseCritMv src/Dodge/Creature/ReaderUpdate.hs 115;" f chaseCritPerceptionUpdate src/Dodge/Creature/Perception.hs 31;" f chaseCritVocalization src/Dodge/Creature/ChaseCrit.hs 37;" f chasmSimpleMaze src/Dodge/Room/Tutorial.hs 175;" f -chasmTest src/Dodge/Creature/Update.hs 131;" f -chasmWallToSurface src/Dodge/Base/Collide.hs 109;" f +chasmTest src/Dodge/Creature/Update.hs 132;" f +chasmWallToSurface src/Dodge/Base/Collide.hs 111;" f checkCombineSelectionExists src/Dodge/DisplayInventory.hs 100;" f -checkConnection src/Dodge/Inventory/Swap.hs 65;" f -checkDeath src/Dodge/Creature/Update.hs 69;" f -checkDeath' src/Dodge/Creature/Update.hs 72;" f +checkConnection src/Dodge/Inventory/Swap.hs 66;" f +checkDeath src/Dodge/Creature/Update.hs 70;" f +checkDeath' src/Dodge/Creature/Update.hs 73;" f checkEndGame src/Dodge/Update.hs 754;" f checkErrorGL src/Shader/Compile.hs 255;" f checkFBO src/Framebuffer/Check.hs 6;" f @@ -2864,18 +2863,18 @@ chemFuelPouch src/Dodge/Item/Ammo.hs 75;" f chestPQ src/Dodge/Creature/HandPos.hs 124;" f chooseCursorBorders src/Dodge/Render/List.hs 155;" f chooseEquipPosition src/Dodge/Inventory/RBList.hs 41;" f -chooseFootSound src/Dodge/Creature/State/WalkCycle.hs 34;" f +chooseFootSound src/Dodge/Creature/State/WalkCycle.hs 35;" f chooseFreeSite src/Dodge/Inventory/RBList.hs 47;" f -chooseMovementLtAuto src/Dodge/CreatureEffect.hs 105;" f -chooseMovementPistol src/Dodge/Humanoid.hs 203;" f -chooseMovementPistol' src/Dodge/Humanoid.hs 208;" f -chooseMovementSpreadGun src/Dodge/CreatureEffect.hs 88;" f -circHitWall src/Dodge/Base/Collide.hs 232;" f +chooseMovementLtAuto src/Dodge/CreatureEffect.hs 107;" f +chooseMovementPistol src/Dodge/Humanoid.hs 204;" f +chooseMovementPistol' src/Dodge/Humanoid.hs 209;" f +chooseMovementSpreadGun src/Dodge/CreatureEffect.hs 90;" f +circHitWall src/Dodge/Base/Collide.hs 231;" f circInPolygon src/Geometry/Polygon.hs 101;" f -circOnAnyCr src/Dodge/Base/Collide.hs 287;" f +circOnAnyCr src/Dodge/Base/Collide.hs 286;" f circOnSeg src/Geometry.hs 101;" f circOnSegNoEndpoints src/Geometry.hs 91;" f -circOnSomeWall src/Dodge/Base/Collide.hs 281;" f +circOnSomeWall src/Dodge/Base/Collide.hs 280;" f circle src/Picture/Base.hs 180;" f circleDecoration src/Dodge/Placement/TopDecoration.hs 56;" f circleSolid src/Picture/Base.hs 164;" f @@ -2907,11 +2906,11 @@ closeItemToSelectionItem src/Dodge/Inventory/SelectionList.hs 208;" f closeItemToTextPictures src/Dodge/Inventory/SelectionList.hs 243;" f closeObjectInfo src/Dodge/Render/HUD.hs 226;" f closestCreatureID src/Dodge/Debug.hs 118;" f -closestPointOnLine src/Geometry/Intersect.hs 299;" f -closestPointOnLineParam src/Geometry/Intersect.hs 315;" f -closestPointOnSeg src/Geometry/Intersect.hs 330;" f +closestPointOnLine src/Geometry/Intersect.hs 272;" f +closestPointOnLineParam src/Geometry/Intersect.hs 288;" f +closestPointOnSeg src/Geometry/Intersect.hs 303;" f cloudEffect src/Dodge/Update.hs 779;" f -cloudPoisonDamage src/Dodge/Update/Cloud.hs 10;" f +cloudPoisonDamage src/Dodge/Update/Cloud.hs 11;" f clsNearCirc src/Dodge/Zoning/Cloud.hs 18;" f clsNearPoint src/Dodge/Zoning/Cloud.hs 9;" f clsNearRect src/Dodge/Zoning/Cloud.hs 15;" f @@ -2919,22 +2918,22 @@ clsNearSeg src/Dodge/Zoning/Cloud.hs 12;" f clusterFormatting src/Dodge/Combine/Graph.hs 125;" f clusterFunc src/Dodge/Combine/Graph.hs 119;" f cogRaised src/Dodge/Creature/Perception.hs 102;" f -colCrWall src/Dodge/WallCreatureCollisions.hs 28;" f -colCrsWalls src/Dodge/WallCreatureCollisions.hs 18;" f +colCrWall src/Dodge/WallCreatureCollisions.hs 29;" f +colCrsWalls src/Dodge/WallCreatureCollisions.hs 19;" f collectDamageTypes src/Dodge/Damage.hs 53;" f collectInvItems src/Dodge/Update/Input/InGame.hs 295;" f -collide3 src/Dodge/Base/Collide.hs 118;" f -collide3Chasm src/Dodge/Base/Collide.hs 102;" f -collide3Chasms src/Dodge/Base/Collide.hs 95;" f -collide3Creature src/Dodge/Base/Collide.hs 152;" f -collide3Floors src/Dodge/Base/Collide.hs 133;" f -collide3Wall src/Dodge/Base/Collide.hs 147;" f -collide3Walls src/Dodge/Base/Collide.hs 127;" f -collide3WallsFloor src/Dodge/Base/Collide.hs 89;" f -collideCircWalls src/Dodge/Base/Collide.hs 244;" f -collidePoint src/Dodge/Base/Collide.hs 53;" f -collidePointTestFilter src/Dodge/Base/Collide.hs 180;" f -collidePointWallsFilter src/Dodge/Base/Collide.hs 194;" f +collide3 src/Dodge/Base/Collide.hs 120;" f +collide3Chasm src/Dodge/Base/Collide.hs 104;" f +collide3Chasms src/Dodge/Base/Collide.hs 97;" f +collide3Creature src/Dodge/Base/Collide.hs 153;" f +collide3Floors src/Dodge/Base/Collide.hs 134;" f +collide3Wall src/Dodge/Base/Collide.hs 148;" f +collide3Walls src/Dodge/Base/Collide.hs 129;" f +collide3WallsFloor src/Dodge/Base/Collide.hs 91;" f +collideCircWalls src/Dodge/Base/Collide.hs 243;" f +collidePoint src/Dodge/Base/Collide.hs 54;" f +collidePointTestFilter src/Dodge/Base/Collide.hs 179;" f +collidePointWallsFilter src/Dodge/Base/Collide.hs 193;" f color src/Picture/Base.hs 108;" f colorLamp src/Dodge/Creature/Lamp.hs 10;" f colorSH src/Shape.hs 237;" f @@ -2972,99 +2971,98 @@ continueTerminal src/Dodge/Update/Input/InGame.hs 402;" f convexHull src/Geometry/Polygon.hs 141;" f convexHullSafe src/Geometry/Polygon.hs 148;" f convexPolysOverlap src/Geometry/ConvexPoly.hs 48;" f -coolMachinePistol src/Dodge/Creature/State.hs 101;" f -coolMinigun src/Dodge/Creature/State.hs 94;" 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 -copierItemUpdate src/Dodge/Creature/State.hs 130;" f +copierItemUpdate src/Dodge/Creature/State.hs 131;" f copyItemToFloor src/Dodge/FloorItem.hs 14;" f corDoor src/Dodge/Room/Room.hs 385;" f cornerList src/Preload/Render.hs 198;" f -corpseOrGib src/Dodge/Creature/Update.hs 110;" f +corpseOrGib src/Dodge/Creature/Update.hs 111;" f corridor src/Dodge/Room/Corridor.hs 17;" f corridorBoss src/Dodge/LockAndKey.hs 133;" f corridorN src/Dodge/Room/Corridor.hs 52;" f corridorWallN src/Dodge/Room/Corridor.hs 71;" f crAdd src/Dodge/Room/RezBox.hs 116;" f -crAwayFromPost src/Dodge/Creature/Test.hs 82;" f -crBlips src/Dodge/RadarSweep.hs 87;" f +crAwayFromPost src/Dodge/Creature/Test.hs 83;" f +crBlips src/Dodge/RadarSweep.hs 88;" f crCamouflage src/Dodge/Creature/Picture.hs 33;" f -crCanSeeCr src/Dodge/Creature/Test.hs 51;" f +crCanSeeCr src/Dodge/Creature/Test.hs 52;" f crCrSpring src/Dodge/Update.hs 855;" f crCurrentEquipment src/Dodge/Creature/Statistics.hs 62;" f crDexterity src/Dodge/Creature/Statistics.hs 19;" f -crDisplayAwareness src/Dodge/Creature/Picture/Awareness.hs 38;" f -crDisplayVigilance src/Dodge/Creature/Picture/Awareness.hs 52;" f -crHasTarget src/Dodge/Creature/Test.hs 64;" f -crHasTargetLOS src/Dodge/Creature/Test.hs 67;" f -crHeight src/Dodge/Base/Collide.hs 165;" f -crHit src/Dodge/WorldEvent/ThingsHit.hs 112;" f -crIXsNearCirc src/Dodge/Zoning/Creature.hs 32;" f -crIXsNearPoint src/Dodge/Zoning/Creature.hs 14;" f -crInAimStance src/Dodge/Creature/Test.hs 90;" f +crDisplayAwareness src/Dodge/Creature/Picture/Awareness.hs 39;" f +crDisplayVigilance src/Dodge/Creature/Picture/Awareness.hs 53;" f +crHasTarget src/Dodge/Creature/Test.hs 65;" f +crHasTargetLOS src/Dodge/Creature/Test.hs 68;" f +crHeight src/Dodge/Base/Collide.hs 164;" f +crHit src/Dodge/WorldEvent/ThingsHit.hs 113;" f +crIXsNearCirc src/Dodge/Zoning/Creature.hs 33;" f +crIXsNearPoint src/Dodge/Zoning/Creature.hs 15;" f +crInAimStance src/Dodge/Creature/Test.hs 91;" f crIntelligence src/Dodge/Creature/Statistics.hs 39;" f -crIsAiming src/Dodge/Creature/Test.hs 59;" f -crIsArmouredFrom src/Dodge/Creature/Test.hs 105;" f +crIsAiming src/Dodge/Creature/Test.hs 60;" f +crIsArmouredFrom src/Dodge/Creature/Test.hs 106;" f crMass src/Dodge/Creature/Mass.hs 5;" f crMaterial src/Dodge/Creature/Material.hs 8;" f crMaxHP src/Dodge/Creature/MaxHP.hs 6;" f -crMvAbsolute src/Dodge/Creature/Impulse/Movement.hs 28;" f -crMvBy src/Dodge/Creature/Impulse/Movement.hs 20;" f -crMvForward src/Dodge/Creature/Impulse/Movement.hs 42;" f +crMvAbsolute src/Dodge/Creature/Impulse/Movement.hs 29;" f +crMvBy src/Dodge/Creature/Impulse/Movement.hs 21;" f +crMvForward src/Dodge/Creature/Impulse/Movement.hs 43;" f crMvType src/Dodge/Creature/MoveType.hs 6;" f -crNearPoint src/Dodge/Creature/Test.hs 127;" f +crNearPoint src/Dodge/Creature/Test.hs 129;" f crNumFreeSlots src/Dodge/Inventory/CheckSlots.hs 25;" f -crOnWall src/Dodge/WallCreatureCollisions.hs 86;" f +crOnWall src/Dodge/WallCreatureCollisions.hs 88;" f crRad src/Dodge/Creature/Radius.hs 7;" f -crSafeDistFromTarg src/Dodge/Creature/Test.hs 72;" f +crSafeDistFromTarg src/Dodge/Creature/Test.hs 73;" f crSetRoots src/Dodge/Inventory/Location.hs 55;" f crShape src/Dodge/Creature/Shape.hs 8;" f crSpring src/Dodge/Update.hs 852;" f -crStratConMatches src/Dodge/Creature/Test.hs 77;" f +crStratConMatches src/Dodge/Creature/Test.hs 78;" f crStrength src/Dodge/Creature/Statistics.hs 29;" f -crUpdate' src/Dodge/Creature/Update.hs 58;" f +crUpdate' src/Dodge/Creature/Update.hs 59;" f crUpdateInvidLocations src/Dodge/Inventory/Location.hs 66;" f crUpdateItemLocations src/Dodge/Inventory/Location.hs 48;" f crVocalizationSound src/Dodge/Creature/Vocalization.hs 13;" f crWarningSounds src/Dodge/Creature/Vocalization.hs 23;" f -crWlPbHit src/Dodge/WorldEvent/ThingsHit.hs 50;" f -crZoneSize src/Dodge/Zoning/Creature.hs 41;" f +crWlPbHit src/Dodge/WorldEvent/ThingsHit.hs 51;" f +crZoneSize src/Dodge/Zoning/Creature.hs 42;" f craftInfo src/Dodge/Item/Info.hs 169;" f craftItemSPic src/Dodge/Item/Draw/SPic.hs 40;" f crankSlowS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 590;" f createForceField src/Dodge/ForceField.hs 7;" f -createGas src/Dodge/Gas.hs 8;" f -createHeadLamp src/Dodge/Euse.hs 55;" f -createItemYou src/Dodge/Inventory/Add.hs 60;" f +createGas src/Dodge/Gas.hs 10;" f +createHeadLamp src/Dodge/Euse.hs 58;" f +createItemYou src/Dodge/Inventory/Add.hs 61;" f createLightMap src/Render.hs 26;" f createPathGrid src/Dodge/Room/Path.hs 20;" f -createProjectile src/Dodge/HeldUse.hs 1308;" f -createProjectileR src/Dodge/HeldUse.hs 1257;" f -createShell src/Dodge/Projectile/Create.hs 21;" f -createShieldWall src/Dodge/Item/BackgroundEffect.hs 39;" f +createProjectile src/Dodge/HeldUse.hs 1309;" f +createProjectileR src/Dodge/HeldUse.hs 1258;" f +createShell src/Dodge/Projectile/Create.hs 22;" f +createShieldWall src/Dodge/Item/BackgroundEffect.hs 40;" f createUnusedLinkPos src/Dodge/Tree/Shift.hs 124;" f createWall src/Dodge/Wall/Create.hs 8;" f -creatureDisplayText src/Dodge/Creature/Picture/Awareness.hs 11;" f -creatureShootLaser src/Dodge/HeldUse.hs 815;" f -creatureShootPulseBall src/Dodge/HeldUse.hs 892;" f -creatureShootPulseLaser src/Dodge/HeldUse.hs 859;" f -creatureTurnTo src/Dodge/Creature/Impulse/Movement.hs 53;" f -creatureTurnToward src/Dodge/Creature/Impulse/Movement.hs 74;" f -creatureTurnTowardDir src/Dodge/Creature/Impulse/Movement.hs 63;" f +creatureDisplayText src/Dodge/Creature/Picture/Awareness.hs 12;" f +creatureShootLaser src/Dodge/HeldUse.hs 816;" f +creatureShootPulseBall src/Dodge/HeldUse.hs 893;" f +creatureShootPulseLaser src/Dodge/HeldUse.hs 860;" f +creatureTurnTo src/Dodge/Creature/Impulse/Movement.hs 54;" f +creatureTurnToward src/Dodge/Creature/Impulse/Movement.hs 75;" f +creatureTurnTowardDir src/Dodge/Creature/Impulse/Movement.hs 64;" f critInDeadEnd src/Dodge/Room/Room.hs 243;" f critsPillarRoom src/Dodge/Room/Room.hs 390;" f critsRoom src/Dodge/Room/Room.hs 398;" f -crixsNearSeg src/Dodge/Zoning/Creature.hs 29;" f +crixsNearSeg src/Dodge/Zoning/Creature.hs 30;" f crossPic src/Dodge/Render/Label.hs 27;" f crossProd src/Geometry/Vector3D.hs 41;" f -crossV src/Geometry/Vector.hs 179;" f -crsHit src/Dodge/WorldEvent/ThingsHit.hs 60;" f -crsHitRadial src/Dodge/WorldEvent/ThingsHit.hs 147;" f -crsHitZ src/Dodge/WorldEvent/ThingsHit.hs 71;" f +crsHit src/Dodge/WorldEvent/ThingsHit.hs 61;" f +crsHitRadial src/Dodge/WorldEvent/ThingsHit.hs 148;" f +crsHitZ src/Dodge/WorldEvent/ThingsHit.hs 72;" f crsItmsUnused src/Dodge/Room/Containing.hs 45;" f -crsNearCirc src/Dodge/Zoning/Creature.hs 35;" f -crsNearPoint src/Dodge/Zoning/Creature.hs 17;" f -crsNearRect src/Dodge/Zoning/Creature.hs 38;" f -crsNearSeg src/Dodge/Zoning/Creature.hs 23;" f +crsNearCirc src/Dodge/Zoning/Creature.hs 36;" f +crsNearPoint src/Dodge/Zoning/Creature.hs 18;" f +crsNearRect src/Dodge/Zoning/Creature.hs 39;" f +crsNearSeg src/Dodge/Zoning/Creature.hs 24;" f crystalLine src/Dodge/Placement/Instance/Wall.hs 55;" f cubeShape src/Dodge/Block/Debris.hs 103;" f cullPoint src/Dodge/Render/ShapePicture.hs 92;" f @@ -3089,29 +3087,29 @@ cylinderOnSeg src/Geometry.hs 122;" f cylinderPoly src/Shape.hs 87;" f cylinderRoundIndices src/Shader/Poke.hs 389;" f dShadCol src/Dodge/Render/List.hs 214;" f -damMatSideEffect src/Dodge/Material/Damage.hs 13;" f +damMatSideEffect src/Dodge/Material/Damage.hs 14;" f damThingHitWith src/Dodge/Damage.hs 72;" f -damToExpBarrel src/Dodge/Barreloid.hs 52;" f +damToExpBarrel src/Dodge/Barreloid.hs 53;" f damageCodeCommand src/Dodge/Terminal.hs 59;" f damageCrWl src/Dodge/Damage.hs 29;" f damageCrWlID src/Dodge/Damage.hs 23;" f damageDirection src/Dodge/Damage.hs 35;" f -damageDirt src/Dodge/Material/Damage.hs 119;" f -damageFlesh src/Dodge/Material/Damage.hs 86;" f -damageHP src/Dodge/Creature/Damage.hs 34;" f +damageDirt src/Dodge/Material/Damage.hs 120;" f +damageFlesh src/Dodge/Material/Damage.hs 87;" f +damageHP src/Dodge/Creature/Damage.hs 35;" f damageInCircle src/Dodge/Damage.hs 61;" f -damageMetal src/Dodge/Material/Damage.hs 55;" f +damageMetal src/Dodge/Material/Damage.hs 56;" f damageSensor src/Dodge/Placement/Instance/Sensor.hs 14;" f -damageStone src/Dodge/Material/Damage.hs 25;" f -damageThingHit src/Dodge/Bullet.hs 177;" f +damageStone src/Dodge/Material/Damage.hs 26;" f +damageThingHit src/Dodge/Bullet.hs 179;" f damageTypeThreshold src/Dodge/Placement/Instance/Sensor.hs 35;" f damageWall src/Dodge/Wall/Damage.hs 15;" f -damsToExpBarrel src/Dodge/Barreloid.hs 49;" f +damsToExpBarrel src/Dodge/Barreloid.hs 50;" f dark src/Color.hs 108;" f darkenBackground src/Dodge/Render/MenuScreen.hs 32;" f dbArg src/Dodge/Base.hs 165;" f dbArgChain src/Dodge/Base.hs 170;" f -dbwMuzzles src/Dodge/HeldUse.hs 314;" f +dbwMuzzles src/Dodge/HeldUse.hs 315;" f deZoneIX src/Dodge/Zoning/Base.hs 89;" f deZoneWall src/Dodge/Zoning/Wall.hs 70;" f deadEndRoom src/Dodge/Room/Room.hs 246;" f @@ -3143,7 +3141,7 @@ dedaS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 672;" f dededaS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 454;" f dededumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 628;" f dedumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 444;" f -defDamageMaterial src/Dodge/Material/Damage.hs 22;" f +defDamageMaterial src/Dodge/Material/Damage.hs 23;" f defLSPic src/Dodge/LightSource/Draw.hs 10;" f defSPic src/Dodge/Item/Draw/SPic.hs 309;" f defaultAimMvType src/Dodge/Creature/MoveType.hs 16;" f @@ -3201,11 +3199,11 @@ deleteWallFromZones src/Dodge/Wall/Zone.hs 23;" f deleteWallID src/Dodge/Wall/Delete.hs 13;" f deleteWallIDs src/Dodge/Wall/Delete.hs 28;" f denormalEdges src/Polyhedra.hs 136;" f -destroyAllInvItems src/Dodge/Inventory.hs 52;" f +destroyAllInvItems src/Dodge/Inventory.hs 53;" f destroyBlock src/Dodge/Block.hs 52;" f destroyDoor src/Dodge/Block.hs 80;" f -destroyInvItem src/Dodge/Inventory.hs 39;" f -destroyItem src/Dodge/Inventory.hs 61;" f +destroyInvItem src/Dodge/Inventory.hs 40;" f +destroyItem src/Dodge/Inventory.hs 62;" f destroyLS src/Dodge/LightSource.hs 32;" f destroyLSFlashAt src/Dodge/LightSource.hs 42;" f destroyMachine src/Dodge/Machine/Destroy.hs 13;" f @@ -3218,7 +3216,7 @@ detV src/Geometry/Vector.hs 94;" f detector src/Dodge/Item/Held/Utility.hs 27;" f detectorColor src/Dodge/Item/Draw/SPic.hs 453;" f detectorInfo src/Dodge/Item/Info.hs 224;" f -determineProjectileTracking src/Dodge/HeldUse.hs 1228;" f +determineProjectileTracking src/Dodge/HeldUse.hs 1229;" f diagonalLinesRect src/Dodge/Room/Foreground.hs 52;" f did src/Dodge/Item/InvSize.hs 54;" f diffAngles src/Geometry.hs 205;" f @@ -3231,12 +3229,12 @@ dirtPoly src/Dodge/Room/RoadBlock.hs 74;" f disconnectItemS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 650;" f displayConfig src/Dodge/Menu.hs 231;" f displayControls src/Dodge/Menu.hs 242;" f -displayFrameTicks src/Dodge/Render/Picture.hs 45;" f +displayFrameTicks src/Dodge/Render/Picture.hs 46;" f displayFreeSlots src/Dodge/DisplayInventory.hs 192;" f displayIndents src/Dodge/DisplayInventory.hs 110;" f displayPulse src/Dodge/Inventory/SelectionList.hs 179;" f displayTerminalLineString src/Dodge/Update.hs 467;" f -dist src/Geometry/Vector.hs 191;" f +dist src/Geometry/Vector.hs 185;" f dist3 src/Geometry/Vector3D.hs 101;" f divTo src/Geometry/Zone.hs 6;" f divideCircle src/Geometry.hs 321;" f @@ -3245,24 +3243,24 @@ divideLine src/Geometry.hs 248;" f divideLineExact src/Geometry.hs 276;" f divideLineOddNumPoints src/Geometry.hs 261;" f dmType src/Dodge/Damage.hs 38;" f -doAimTwist src/Dodge/Creature/YourControl.hs 153;" f -doAnyEquipmentEffect src/Dodge/Creature/State.hs 140;" f +doAimTwist src/Dodge/Creature/YourControl.hs 154;" f +doAnyEquipmentEffect src/Dodge/Creature/State.hs 141;" f doBackspace src/Dodge/Update/Input/Text.hs 31;" f doBarrelSpin src/Dodge/Projectile/Update.hs 211;" f doBlBl src/Dodge/BlBl.hs 5;" f doBlSh src/Dodge/Block/Draw.hs 14;" f -doBounce src/Dodge/Base/Collide.hs 65;" f +doBounce src/Dodge/Base/Collide.hs 67;" f doButtonEvent src/Dodge/Button/Event.hs 9;" f doConLoop src/Loop.hs 137;" f doConLoop' src/Loop.hs 226;" f -doCrAc src/Dodge/CreatureEffect.hs 61;" f -doCrBl src/Dodge/CreatureEffect.hs 49;" f +doCrAc src/Dodge/CreatureEffect.hs 62;" f +doCrBl src/Dodge/CreatureEffect.hs 50;" f doCrGroupUpdate src/Dodge/CrGroupUpdate.hs 5;" f -doCrImp src/Dodge/CreatureEffect.hs 28;" f -doCrWdAc src/Dodge/CreatureEffect.hs 77;" f -doCrWdImp src/Dodge/CreatureEffect.hs 16;" f -doCrWdWd src/Dodge/CreatureEffect.hs 20;" f -doDamage src/Dodge/Creature/State.hs 42;" f +doCrImp src/Dodge/CreatureEffect.hs 29;" f +doCrWdAc src/Dodge/CreatureEffect.hs 79;" f +doCrWdImp src/Dodge/CreatureEffect.hs 17;" f +doCrWdWd src/Dodge/CreatureEffect.hs 21;" f +doDamage src/Dodge/Creature/State.hs 43;" f doDeathToggle src/Dodge/WorldEffect.hs 86;" f doDeathTriggers src/Dodge/WorldEffect.hs 79;" f doDebugTest src/Dodge/Update/Input/DebugTest.hs 23;" f @@ -3278,24 +3276,24 @@ doDrag src/Dodge/Update/Input/InGame.hs 127;" f doDrawing src/Dodge/Render.hs 34;" f doDrawing' src/Dodge/Render.hs 45;" f doFloatFloat src/Dodge/FloatFunction.hs 5;" f -doGenFloat src/Dodge/HeldUse.hs 1184;" f +doGenFloat src/Dodge/HeldUse.hs 1185;" f doGravityPU src/Dodge/Projectile/Update.hs 35;" f -doHeldUseEffect src/Dodge/HeldUse.hs 343;" f +doHeldUseEffect src/Dodge/HeldUse.hs 344;" f doInPlacements src/Dodge/Layout.hs 82;" f doIndividualPlacements src/Dodge/Layout.hs 96;" f doInputScreenInput src/Dodge/Update/Input/ScreenLayer.hs 28;" f -doIntImp src/Dodge/CreatureEffect.hs 24;" f +doIntImp src/Dodge/CreatureEffect.hs 25;" f doItemTimeScroll src/Dodge/Update.hs 191;" f doLoop src/Loop.hs 60;" f -doMCrAc src/Dodge/CreatureEffect.hs 57;" f -doMP2Ac src/Dodge/CreatureEffect.hs 73;" f -doMagnetBuBu src/Dodge/Bullet.hs 34;" f +doMCrAc src/Dodge/CreatureEffect.hs 58;" f +doMP2Ac src/Dodge/CreatureEffect.hs 75;" f +doMagnetBuBu src/Dodge/Bullet.hs 35;" f doModificationEffect src/Dodge/ModificationEffect.hs 7;" f -doP2Ac src/Dodge/CreatureEffect.hs 69;" f -doP2Imp src/Dodge/CreatureEffect.hs 33;" f +doP2Ac src/Dodge/CreatureEffect.hs 71;" f +doP2Imp src/Dodge/CreatureEffect.hs 34;" f doPrWdLsLs src/Dodge/PrWdLsLs.hs 8;" f doPreload appDodge/Main.hs 136;" f -doPressPlateEvent src/Dodge/PressPlate.hs 8;" f +doPressPlateEvent src/Dodge/PressPlate.hs 10;" f doPropUpdates src/Dodge/Prop/Update.hs 34;" f doQuickload src/Dodge/Save.hs 82;" f doQuicksave src/Dodge/Save.hs 77;" f @@ -3306,7 +3304,7 @@ doRoomShift src/Dodge/Room/Link.hs 33;" f doScopeZoom src/Dodge/Update/Scroll.hs 91;" f doSectionSize src/Dodge/DisplayInventory.hs 211;" f doSideEffects appDodge/Main.hs 121;" f -doStrategyActions src/Dodge/Creature/ReaderUpdate.hs 166;" f +doStrategyActions src/Dodge/Creature/ReaderUpdate.hs 167;" f doTestDrawing src/Dodge/Render.hs 41;" f doTextInputOver src/Dodge/Update/Input/Text.hs 15;" f doTextInputOverUniverse src/Dodge/Update/Input/Text.hs 12;" f @@ -3315,12 +3313,12 @@ doTimeScroll src/Dodge/Update.hs 196;" f doTmWdWd src/Dodge/WorldEffect.hs 89;" f doWallRotate src/Dodge/Update/Camera.hs 220;" f doWdBl src/Dodge/WorldBool.hs 10;" f -doWdCrBl src/Dodge/CreatureEffect.hs 37;" f -doWdCrCr src/Dodge/CreatureEffect.hs 12;" f +doWdCrBl src/Dodge/CreatureEffect.hs 38;" f +doWdCrCr src/Dodge/CreatureEffect.hs 13;" f doWdP2f src/Dodge/WdP2f.hs 12;" f doWdWd src/Dodge/WorldEffect.hs 28;" f doWorldEvents src/Dodge/Update.hs 412;" f -doWorldPos src/Dodge/WorldPos.hs 7;" f +doWorldPos src/Dodge/WorldPos.hs 10;" f door src/Dodge/Room/Door.hs 14;" f doorBetween src/Dodge/Placement/Instance/Door.hs 39;" f doorMechanism src/Dodge/DrWdWd.hs 24;" f @@ -3337,62 +3335,62 @@ doublePair src/Geometry.hs 162;" f doublePairSet src/Geometry.hs 166;" f doubleTreeToIndentList src/Dodge/DoubleTree.hs 129;" f doubleV2 src/Geometry.hs 169;" f -drawARHUD src/Dodge/Creature/State.hs 192;" f -drawAimSweep src/Dodge/Render/Picture.hs 279;" f +drawARHUD src/Dodge/Creature/State.hs 193;" f +drawAimSweep src/Dodge/Render/Picture.hs 280;" f drawAllShadows src/Dodge/Shadows.hs 5;" f -drawArrowDown src/Dodge/Render/Picture.hs 206;" f +drawArrowDown src/Dodge/Render/Picture.hs 207;" f drawBaseMachine src/Dodge/Machine/Draw.hs 68;" f drawBeam src/Dodge/Beam/Draw.hs 6;" f drawBlip src/Dodge/RadarBlip.hs 16;" f drawBlock src/Dodge/Block/Draw.hs 7;" f -drawBoundingBox src/Dodge/Debug/Picture.hs 347;" f +drawBoundingBox src/Dodge/Debug/Picture.hs 348;" f drawBullet src/Dodge/Render/ShapePicture.hs 140;" f drawButton src/Dodge/Button/Draw.hs 10;" f drawCPUShadows src/Dodge/Render/Shadow.hs 19;" f drawChasm src/Dodge/Render/ShapePicture.hs 48;" f -drawCircCollisionTest src/Dodge/Debug/Picture.hs 117;" f +drawCircCollisionTest src/Dodge/Debug/Picture.hs 118;" f drawCliff src/Dodge/Render/ShapePicture.hs 51;" f -drawCollisionTest src/Dodge/Debug/Picture.hs 102;" f -drawCombFilter src/Dodge/Render/Picture.hs 254;" f +drawCollisionTest src/Dodge/Debug/Picture.hs 103;" f +drawCombFilter src/Dodge/Render/Picture.hs 255;" f drawCombineInventory src/Dodge/Render/HUD.hs 182;" f -drawConcurrentMessage src/Dodge/Render/Picture.hs 68;" f -drawCoord src/Dodge/Debug/Picture.hs 375;" f -drawCrInfo src/Dodge/Debug/Picture.hs 396;" f +drawConcurrentMessage src/Dodge/Render/Picture.hs 69;" f +drawCoord src/Dodge/Debug/Picture.hs 376;" f +drawCrInfo src/Dodge/Debug/Picture.hs 397;" f drawCreature src/Dodge/Render/ShapePicture.hs 67;" f -drawCreatureDisplayTexts src/Dodge/Debug/Picture.hs 197;" f +drawCreatureDisplayTexts src/Dodge/Debug/Picture.hs 198;" f drawCross src/Dodge/Render/Label.hs 24;" f drawCrossCol src/Dodge/Render/Label.hs 21;" f drawCursorAt src/Dodge/Render/List.hs 71;" f -drawCursorByTerminalStatus src/Dodge/Render/Picture.hs 124;" f -drawDDATest src/Dodge/Debug/Picture.hs 302;" f +drawCursorByTerminalStatus src/Dodge/Render/Picture.hs 125;" f +drawDDATest src/Dodge/Debug/Picture.hs 303;" f drawDamSensor src/Dodge/Machine/Draw.hs 27;" f -drawDoorPaths src/Dodge/Debug/Picture.hs 252;" f +drawDoorPaths src/Dodge/Debug/Picture.hs 253;" f drawDoubleLampCover src/Dodge/Prop/Draw.hs 95;" f -drawDrag src/Dodge/Render/Picture.hs 185;" f -drawDragDrop src/Dodge/Render/Picture.hs 214;" f -drawDragPickup src/Dodge/Render/Picture.hs 223;" f -drawDragSelect src/Dodge/Render/Picture.hs 182;" f +drawDrag src/Dodge/Render/Picture.hs 186;" f +drawDragDrop src/Dodge/Render/Picture.hs 215;" f +drawDragPickup src/Dodge/Render/Picture.hs 224;" f +drawDragSelect src/Dodge/Render/Picture.hs 183;" f drawDragSelected src/Dodge/Render/HUD.hs 136;" f drawDragSelecting src/Dodge/Render/HUD.hs 153;" f -drawEmptySet src/Dodge/Render/Picture.hs 138;" f +drawEmptySet src/Dodge/Render/Picture.hs 139;" f drawEnergyBall src/Dodge/EnergyBall/Draw.hs 7;" f drawEquipment src/Dodge/Creature/Picture.hs 127;" f drawExamineInventory src/Dodge/Render/HUD.hs 198;" f drawExplosiveBall src/Dodge/EnergyBall/Draw.hs 15;" f -drawFarWallDetect src/Dodge/Debug/Picture.hs 269;" f +drawFarWallDetect src/Dodge/Debug/Picture.hs 270;" f drawFlame src/Dodge/Flame/Draw.hs 8;" f drawFlamelet src/Dodge/EnergyBall/Draw.hs 37;" f drawForceField src/Dodge/Wall/Draw.hs 11;" f -drawGapPlus src/Dodge/Render/Picture.hs 265;" f +drawGapPlus src/Dodge/Render/Picture.hs 266;" f drawGib src/Dodge/Prop/Draw.hs 39;" f drawHUD src/Dodge/Render/HUD.hs 51;" f drawInputMenu src/Dodge/Render/MenuScreen.hs 19;" f -drawInspectWall src/Dodge/Debug/Picture.hs 244;" f -drawInspectWalls src/Dodge/Debug/Picture.hs 232;" f +drawInspectWall src/Dodge/Debug/Picture.hs 245;" f +drawInspectWalls src/Dodge/Debug/Picture.hs 233;" f drawInventory src/Dodge/Render/HUD.hs 58;" f drawItemChildrenConnect src/Dodge/Render/HUD.hs 329;" f drawItemConnections src/Dodge/Render/HUD.hs 319;" f -drawJumpDown src/Dodge/Render/Picture.hs 177;" f +drawJumpDown src/Dodge/Render/Picture.hs 178;" f drawLabCrossCol src/Dodge/Render/Label.hs 8;" f drawLampCover src/Dodge/Prop/Draw.hs 55;" f drawLaser src/Dodge/Laser/Update.hs 29;" f @@ -3405,34 +3403,34 @@ drawListYoff src/Dodge/Render/List.hs 92;" f drawMachine src/Dodge/Machine/Draw.hs 16;" f drawMapperAR src/Dodge/Targeting/Draw.hs 12;" f drawMapperInventory src/Dodge/Render/HUD.hs 173;" f -drawMenuClick src/Dodge/Render/Picture.hs 153;" f -drawMenuCursor src/Dodge/Render/Picture.hs 165;" f -drawMenuOrHUD src/Dodge/Render/Picture.hs 63;" f +drawMenuClick src/Dodge/Render/Picture.hs 154;" f +drawMenuCursor src/Dodge/Render/Picture.hs 166;" f +drawMenuOrHUD src/Dodge/Render/Picture.hs 64;" f drawMenuScreen src/Dodge/Render/MenuScreen.hs 14;" f -drawMouseCursor src/Dodge/Render/Picture.hs 79;" f +drawMouseCursor src/Dodge/Render/Picture.hs 80;" f drawMouseOver src/Dodge/Render/HUD.hs 109;" f -drawMousePosition src/Dodge/Debug/Picture.hs 365;" f +drawMousePosition src/Dodge/Debug/Picture.hs 366;" f drawMovingShape src/Dodge/Prop/Draw.hs 81;" f drawMovingShapeCol src/Dodge/Prop/Draw.hs 87;" f drawOptions src/Dodge/Render/MenuScreen.hs 22;" f -drawPathBetween src/Dodge/Debug/Picture.hs 200;" f -drawPathEdge src/Dodge/Debug/Picture.hs 257;" f -drawPathing src/Dodge/Debug/Picture.hs 438;" f -drawPlus src/Dodge/Render/Picture.hs 150;" f +drawPathBetween src/Dodge/Debug/Picture.hs 201;" f +drawPathEdge src/Dodge/Debug/Picture.hs 258;" f +drawPathing src/Dodge/Debug/Picture.hs 439;" f +drawPlus src/Dodge/Render/Picture.hs 151;" f drawPointLabel src/Dodge/Render/Label.hs 13;" f drawProjectile src/Dodge/Projectile/Draw.hs 13;" f drawProp src/Dodge/Prop/Draw.hs 26;" f drawProxSensor src/Dodge/Machine/Draw.hs 37;" f drawPulseBall src/Dodge/Render/ShapePicture.hs 59;" f -drawQuitTerminal src/Dodge/Render/Picture.hs 132;" f +drawQuitTerminal src/Dodge/Render/Picture.hs 133;" f drawRBOptions src/Dodge/Render/HUD.hs 251;" f drawRadarSweep src/Dodge/RadarSweep/Draw.hs 14;" f drawRemoteShell src/Dodge/Projectile/Draw.hs 38;" f -drawReturn src/Dodge/Render/Picture.hs 141;" f +drawReturn src/Dodge/Render/Picture.hs 142;" f drawRootCursor src/Dodge/Render/HUD.hs 76;" f drawSSCursor src/Dodge/SelectionSections/Draw.hs 35;" f drawSSMultiCursor src/Dodge/SelectionSections/Draw.hs 46;" f -drawSelect src/Dodge/Render/Picture.hs 242;" f +drawSelect src/Dodge/Render/Picture.hs 243;" f drawSelectionList src/Dodge/Render/List.hs 35;" f drawSelectionListBackground src/Dodge/Render/List.hs 51;" f drawSelectionSections src/Dodge/SelectionSections/Draw.hs 16;" f @@ -3454,23 +3452,23 @@ drawTitle src/Dodge/Render/MenuScreen.hs 35;" f drawTitleBackground src/Dodge/Render/List.hs 44;" f drawTractorBeam src/Dodge/TractorBeam/Draw.hs 7;" f drawTurret src/Dodge/Machine/Draw.hs 76;" f -drawVerticalDoubleArrow src/Dodge/Render/Picture.hs 197;" f +drawVerticalDoubleArrow src/Dodge/Render/Picture.hs 198;" f drawVerticalLampCover src/Dodge/Prop/Draw.hs 71;" f drawWall src/Dodge/Wall/Draw.hs 7;" f -drawWallFace src/Dodge/Debug/Picture.hs 72;" f -drawWallSearchRays src/Dodge/Debug/Picture.hs 311;" f -drawWallsNearCursor src/Dodge/Debug/Picture.hs 221;" f -drawWallsNearSegment src/Dodge/Debug/Picture.hs 129;" f -drawWallsNearYou src/Dodge/Debug/Picture.hs 212;" f +drawWallFace src/Dodge/Debug/Picture.hs 73;" f +drawWallSearchRays src/Dodge/Debug/Picture.hs 312;" f +drawWallsNearCursor src/Dodge/Debug/Picture.hs 222;" f +drawWallsNearSegment src/Dodge/Debug/Picture.hs 130;" f +drawWallsNearYou src/Dodge/Debug/Picture.hs 213;" f drawWeapon src/Dodge/Creature/Volition.hs 15;" f -drawWlIDs src/Dodge/Debug/Picture.hs 383;" f -drawZoneCirc src/Dodge/Debug/Picture.hs 291;" f -drawZoneCol src/Dodge/Debug/Picture.hs 148;" f -drawZoneNearPointCursor src/Dodge/Debug/Picture.hs 284;" f -dropAll src/Dodge/Creature/Update.hs 128;" f -dropExcept src/Dodge/Creature/Action.hs 167;" f -dropInventoryPath src/Dodge/HeldUse.hs 1396;" f -dropItem src/Dodge/Creature/Action.hs 174;" f +drawWlIDs src/Dodge/Debug/Picture.hs 384;" f +drawZoneCirc src/Dodge/Debug/Picture.hs 292;" f +drawZoneCol src/Dodge/Debug/Picture.hs 149;" f +drawZoneNearPointCursor src/Dodge/Debug/Picture.hs 285;" f +dropAll src/Dodge/Creature/Update.hs 129;" f +dropExcept src/Dodge/Creature/Action.hs 168;" f +dropInventoryPath src/Dodge/HeldUse.hs 1397;" f +dropItem src/Dodge/Creature/Action.hs 175;" f dropper src/Dodge/Item/Scope.hs 76;" f drumMag src/Dodge/Item/Ammo.hs 34;" f dsZoneSize src/Dodge/Zoning/Cloud.hs 42;" f @@ -3498,19 +3496,19 @@ ebEffect src/Dodge/EnergyBall.hs 45;" f ebFlicker src/Dodge/EnergyBall.hs 70;" f ebtToDamage src/Dodge/EnergyBall.hs 93;" f edgeFormatting src/Dodge/Combine/Graph.hs 131;" f -edgeToPic src/Dodge/Debug/Picture.hs 447;" f -effectOnEquip src/Dodge/Equipment.hs 31;" f -effectOnRemove src/Dodge/Equipment.hs 18;" f +edgeToPic src/Dodge/Debug/Picture.hs 448;" f +effectOnEquip src/Dodge/Equipment.hs 32;" f +effectOnRemove src/Dodge/Equipment.hs 19;" f eitType src/Dodge/Data/EquipType.hs 15;" f ejectS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 656;" f elecCrackleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 508;" f elephantGun src/Dodge/Item/Held/Rod.hs 27;" f emptyCorridor src/Dodge/Room/BlinkAcross.hs 22;" f emptyTrie src/SimpleTrie.hs 17;" f -encircle src/Dodge/Creature/Boid.hs 116;" f -encircleCloseP src/Dodge/Creature/Boid.hs 36;" f -encircleDistP src/Dodge/Creature/Boid.hs 22;" f -encircleP src/Dodge/Creature/Boid.hs 28;" f +encircle src/Dodge/Creature/Boid.hs 117;" f +encircleCloseP src/Dodge/Creature/Boid.hs 37;" f +encircleDistP src/Dodge/Creature/Boid.hs 23;" f +encircleP src/Dodge/Creature/Boid.hs 29;" f endArcPos src/Dodge/Tesla.hs 87;" f endCombineRegex src/Dodge/Update/Input/InGame.hs 271;" f endRegex src/Dodge/Update/Input/InGame.hs 265;" f @@ -3522,7 +3520,7 @@ eqPosText src/Dodge/Equipment/Text.hs 5;" f eqTypeToSites src/Dodge/Inventory/RBList.hs 77;" f equipAllocString src/Dodge/Render/HUD.hs 310;" f equipAttachPos src/Dodge/Item/Draw.hs 30;" f -equipBackgroundEffect src/Dodge/Euse.hs 15;" f +equipBackgroundEffect src/Dodge/Euse.hs 14;" f equipInfo src/Dodge/Item/Info.hs 141;" f equipItemSPic src/Dodge/Item/Draw/SPic.hs 157;" f equipPosition src/Dodge/Item/Draw.hs 38;" f @@ -3545,12 +3543,12 @@ expandPolyBy src/Dodge/LevelGen/StaticWalls.hs 91;" f expandPolyByFixed src/Dodge/LevelGen/StaticWalls.hs 97;" f expandPolyCorners src/Dodge/LevelGen/StaticWalls.hs 103;" f expandToSquare src/Dodge/LevelGen/StaticWalls/Deprecated.hs 83;" f -expireAndDamage src/Dodge/Bullet.hs 185;" f +expireAndDamage src/Dodge/Bullet.hs 187;" f explodeShell src/Dodge/Projectile/Update.hs 281;" f explosionS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 556;" f explosiveBarrel src/Dodge/Creature/Inanimate.hs 25;" f extTrigLitPos src/Dodge/Placement/Instance/Button.hs 84;" f -extendConeToScreenEdge src/Dodge/Debug/Picture.hs 81;" f +extendConeToScreenEdge src/Dodge/Debug/Picture.hs 82;" f extraPics src/Dodge/Render/ShapePicture.hs 97;" f extraWeaponLinks src/Dodge/Item/Grammar.hs 90;" f extraWeaponLinksBelow src/Dodge/Item/Grammar.hs 99;" f @@ -3563,7 +3561,7 @@ feet src/Dodge/Creature/Picture.hs 51;" f ffoldM src/Framebuffer/Update.hs 79;" f filter3 src/FoldableHelp.hs 76;" f filterSectionsPair src/Dodge/DisplayInventory.hs 157;" f -findBlips src/Dodge/RadarSweep.hs 62;" f +findBlips src/Dodge/RadarSweep.hs 63;" f findBoundDists src/Dodge/Update/Camera.hs 248;" f findClosePoint src/Dodge/LevelGen/StaticWalls.hs 155;" f findClosePoint src/Dodge/LevelGen/StaticWalls/Deprecated.hs 74;" f @@ -3579,10 +3577,10 @@ fireS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 464;" f firstBreather src/Dodge/Room/Breather.hs 9;" f firstTrie src/SimpleTrie.hs 51;" f firstWorldLoad appDodge/Main.hs 77;" f -fixedCoordPictures src/Dodge/Render/Picture.hs 17;" f +fixedCoordPictures src/Dodge/Render/Picture.hs 18;" f fixedSizePicClampArrow src/Dodge/Picture/SizeInvariant.hs 57;" f flFlicker src/Dodge/Flame.hs 38;" f -flameMuzzles src/Dodge/HeldUse.hs 317;" f +flameMuzzles src/Dodge/HeldUse.hs 318;" f flameShield src/Dodge/Item/Equipment.hs 33;" f flameSize src/Dodge/Flame/Size.hs 5;" f flameSpitter src/Dodge/Item/Held/SprayGuns.hs 23;" f @@ -3590,25 +3588,25 @@ 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 394;" f -flareCircleAt src/Dodge/HeldUse.hs 687;" f +flareCircleAt src/Dodge/HeldUse.hs 688;" f flatItemCombinations src/Dodge/Combine/Combinations.hs 51;" f flatLookupItems src/Dodge/Combine.hs 38;" f flatShield src/Dodge/Item/Held/Utility.hs 17;" f flatShieldEquipSPic src/Dodge/Item/Draw/SPic.hs 440;" f -fleeFrom src/Dodge/CreatureEffect.hs 120;" f -fleeFromTarget src/Dodge/CreatureEffect.hs 66;" f +fleeFrom src/Dodge/CreatureEffect.hs 122;" f +fleeFromTarget src/Dodge/CreatureEffect.hs 68;" f flickerMod src/Dodge/Placement/Instance/LightSource/Flicker.hs 10;" f flickerUpdate src/Dodge/Placement/Instance/LightSource/Flicker.hs 24;" f floatSize src/Shader/Parameters.hs 17;" f -flockACC src/Dodge/Creature/ReaderUpdate.hs 89;" f +flockACC src/Dodge/Creature/ReaderUpdate.hs 90;" f flockArmourChaseCrit src/Dodge/Creature/ArmourChase.hs 14;" f -flockCenterFunc src/Dodge/Creature/Boid.hs 254;" f -flockChaseTarget src/Dodge/Creature/Boid.hs 185;" f -flockFunc src/Dodge/Creature/Boid.hs 241;" f -flockPointTarget src/Dodge/Creature/Boid.hs 200;" f -flockPointTargetR src/Dodge/Creature/Boid.hs 267;" f -flockToPointUsing src/Dodge/Creature/Boid.hs 215;" f -flockToPointUsing' src/Dodge/Creature/Boid.hs 228;" f +flockCenterFunc src/Dodge/Creature/Boid.hs 258;" f +flockChaseTarget src/Dodge/Creature/Boid.hs 189;" f +flockFunc src/Dodge/Creature/Boid.hs 245;" f +flockPointTarget src/Dodge/Creature/Boid.hs 204;" f +flockPointTargetR src/Dodge/Creature/Boid.hs 271;" f +flockToPointUsing src/Dodge/Creature/Boid.hs 219;" f +flockToPointUsing' src/Dodge/Creature/Boid.hs 232;" f floorItemPickupInfo src/Dodge/Render/HUD.hs 231;" f floorItemSPic src/Dodge/Render/ShapePicture.hs 123;" f floorWire src/Dodge/Wire.hs 13;" f @@ -3617,18 +3615,18 @@ foamSprayLoopS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 554;" f foldMTRS src/Dodge/Room/Tutorial.hs 53;" f foldPairs src/ListHelp.hs 37;" f foldrWhileArb src/ListHelp.hs 110;" f -followImpulse src/Dodge/Creature/Impulse.hs 39;" f -followImpulses src/Dodge/Creature/Impulse.hs 33;" f +followImpulse src/Dodge/Creature/Impulse.hs 38;" f +followImpulses src/Dodge/Creature/Impulse.hs 32;" f foot1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 486;" f foot2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 510;" f foot3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 622;" f -forbidFlee src/Dodge/Creature/Boid.hs 43;" f +forbidFlee src/Dodge/Creature/Boid.hs 44;" f forceElements src/StrictHelp.hs 10;" f forceField src/Dodge/Wall/ForceField.hs 7;" f forceFoldable src/StrictHelp.hs 7;" f forceSpine src/StrictHelp.hs 4;" f fourEmbossDecoration src/Dodge/Placement/TopDecoration.hs 29;" f -fpsText src/Dodge/Render/Picture.hs 53;" f +fpsText src/Dodge/Render/Picture.hs 54;" f fractionLoadedAmmo src/Dodge/Item/Draw/SPic.hs 145;" f frag src/Shader/Data.hs 102;" f freeShaderPointers' src/Shader.hs 37;" f @@ -3650,14 +3648,14 @@ fuseWallsWith src/Dodge/LevelGen/StaticWalls.hs 172;" f g src/ShortShow.hs 44;" f gLauncher src/Dodge/Item/Held/Launcher.hs 24;" f gRandify src/Dodge/Randify.hs 11;" f -gadgetEffect src/Dodge/HeldUse.hs 46;" f +gadgetEffect src/Dodge/HeldUse.hs 47;" f gameOverMenu src/Dodge/Menu.hs 208;" f gameRoomFromRoom src/Dodge/Layout.hs 147;" f gameRoomViewpoints src/Dodge/Viewpoints.hs 35;" f gameRoomsFromRooms src/Dodge/Layout.hs 144;" f gameplayMenu src/Dodge/Menu.hs 155;" f gameplayMenuOptions src/Dodge/Menu.hs 158;" f -gasType src/Dodge/HeldUse.hs 1141;" f +gasType src/Dodge/HeldUse.hs 1142;" f generateGenParams src/Dodge/LevelGen/LevelStructure.hs 23;" f generateGraphs src/Dodge/Menu.hs 149;" f generateLayout src/Dodge/Layout/Generate.hs 10;" f @@ -3670,11 +3668,11 @@ geometryUnitTests test/Spec.hs 22;" f geqConstr src/SameConstr.hs 21;" f getAimZoom src/Dodge/Update/Camera.hs 143;" f getAmmoLinks src/Dodge/Item/Grammar.hs 104;" f -getAttachedSFLink src/Dodge/HeldUse.hs 761;" f +getAttachedSFLink src/Dodge/HeldUse.hs 762;" f getAutoSpringLinks src/Dodge/Item/Grammar.hs 85;" f getAvailableListLines src/Dodge/SelectionList.hs 10;" f -getBulHitDams src/Dodge/Bullet.hs 170;" f -getBulletType src/Dodge/HeldUse.hs 924;" f +getBulHitDams src/Dodge/Bullet.hs 172;" f +getBulletType src/Dodge/HeldUse.hs 925;" f getCloseObj src/Dodge/Update/Input/InGame.hs 533;" f getCommand src/Dodge/Terminal.hs 52;" f getCommands src/Dodge/Terminal.hs 49;" f @@ -3682,17 +3680,17 @@ getCrMoveSpeed src/Dodge/Creature/Statistics.hs 50;" f getCrsFromRooms src/Dodge/Room/Tutorial.hs 323;" f getCrsFromRooms' src/Dodge/Room/Tutorial.hs 310;" f getDistortions src/Dodge/Render.hs 435;" f -getGrenadeHitEffect src/Dodge/HeldUse.hs 1296;" f +getGrenadeHitEffect src/Dodge/HeldUse.hs 1297;" f getInventoryPath src/Dodge/Inventory/Path.hs 9;" f getItemValue src/Dodge/Inventory/SelectionList.hs 147;" 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 41;" f getMaxLinesTM src/Dodge/Terminal/Type.hs 6;" f getMenuMouseContext src/Dodge/Update.hs 372;" f getNodePos src/Dodge/Path.hs 31;" f -getPJStabiliser src/Dodge/HeldUse.hs 1283;" f +getPJStabiliser src/Dodge/HeldUse.hs 1284;" f getPretty src/AesonHelp.hs 8;" f getPromptTM src/Dodge/Terminal/Type.hs 3;" f getRoomsFromInts src/Dodge/Room/Tutorial.hs 306;" f @@ -3703,7 +3701,7 @@ getSmoothScrollValue src/Dodge/SmoothScroll.hs 21;" f getSplitString src/Dodge/Debug/Terminal.hs 129;" f getTiles src/Dodge/Layout.hs 194;" f getViewpoints src/Dodge/Viewpoints.hs 29;" f -getVolleyBurst src/Dodge/HeldUse.hs 125;" f +getVolleyBurst src/Dodge/HeldUse.hs 126;" f getWallSPic src/Dodge/Render/Walls.hs 51;" f getWindowSize src/Dodge/WindowSize.hs 5;" f gimbal src/Dodge/Item/Scope.hs 153;" f @@ -3723,7 +3721,7 @@ glassSwitchBackCrits src/Dodge/Room/Room.hs 106;" f glauncherPic src/Dodge/Item/Draw/SPic.hs 400;" f glushortSize src/Shader/Parameters.hs 25;" f goToPostStrat src/Dodge/Creature/Strategy.hs 10;" f -goToTarget src/Dodge/Creature/ReaderUpdate.hs 138;" f +goToTarget src/Dodge/Creature/ReaderUpdate.hs 139;" f grahamEliminate src/Geometry/Polygon.hs 162;" f grahamScan src/Geometry/Polygon.hs 153;" f grapeCannon src/Dodge/Item/Held/Cone.hs 17;" f @@ -3751,11 +3749,11 @@ 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 62;" f +hammerCheck src/Dodge/HeldUse.hs 63;" f handHandleOrient src/Dodge/Item/HeldOffset.hs 62;" f handOrient src/Dodge/Item/HeldOffset.hs 38;" f handleEvent src/Dodge/Event.hs 27;" f -handleHotkeys src/Dodge/Creature/YourControl.hs 45;" f +handleHotkeys src/Dodge/Creature/YourControl.hs 46;" f handleKeyboardEvent src/Dodge/Event/Input.hs 23;" f handleMouseButtonEvent src/Dodge/Event/Input.hs 61;" f handleMouseMotionEvent src/Dodge/Event/Input.hs 47;" f @@ -3766,10 +3764,10 @@ handleResizeEvent src/Dodge/Event.hs 53;" f handleTextInput src/Dodge/Event/Input.hs 19;" f handleWindowMoveEvent src/Dodge/Event.hs 44;" f hardQuit src/Dodge/Concurrent.hs 32;" f -hasButtonLOS src/Dodge/Base/Collide.hs 301;" f +hasButtonLOS src/Dodge/Base/Collide.hs 300;" f hasCaneGunDim src/Dodge/Item/InvSize.hs 48;" f -hasLOS src/Dodge/Base/Collide.hs 294;" f -hasLOSIndirect src/Dodge/Base/Collide.hs 310;" f +hasLOS src/Dodge/Base/Collide.hs 293;" f +hasLOSIndirect src/Dodge/Base/Collide.hs 309;" f hat src/Dodge/Item/Equipment.hs 76;" f head src/DoubleStack.hs 14;" f headLamp src/Dodge/Item/Equipment.hs 79;" f @@ -3782,20 +3780,20 @@ healthTest src/Dodge/Room/LasTurret.hs 122;" f heightWallPS src/Dodge/Placement/Instance/Wall.hs 13;" f heldAimStance src/Dodge/Item/AimStance.hs 24;" f heldAimZoom src/Dodge/Update/Camera.hs 149;" f -heldEffect src/Dodge/HeldUse.hs 59;" f -heldEffectMuzzles src/Dodge/HeldUse.hs 130;" f +heldEffect src/Dodge/HeldUse.hs 60;" f +heldEffectMuzzles src/Dodge/HeldUse.hs 131;" f heldHandlePos src/Dodge/Item/HeldOffset.hs 90;" f heldInfo src/Dodge/Item/Info.hs 92;" f heldItemAmmoSlots src/Dodge/Item/AmmoSlots.hs 19;" f -heldItemBulkiness src/Dodge/Creature/YourControl.hs 193;" f -heldItemInvLock src/Dodge/HeldUse.hs 434;" f -heldItemMuzVel src/Dodge/HeldUse.hs 1021;" f -heldItemMuzzles src/Dodge/HeldUse.hs 175;" f -heldItemRifling src/Dodge/HeldUse.hs 1064;" f +heldItemBulkiness src/Dodge/Creature/YourControl.hs 194;" f +heldItemInvLock src/Dodge/HeldUse.hs 435;" f +heldItemMuzVel src/Dodge/HeldUse.hs 1022;" f +heldItemMuzzles src/Dodge/HeldUse.hs 176;" f +heldItemRifling src/Dodge/HeldUse.hs 1065;" f heldItemSPic src/Dodge/Item/Draw/SPic.hs 233;" f heldItemWeight src/Dodge/Creature/Statistics.hs 80;" f heldPositionInfo src/Dodge/Item/Info.hs 240;" f -heldTorqueAmount src/Dodge/HeldUse.hs 578;" f +heldTorqueAmount src/Dodge/HeldUse.hs 579;" f heldTriggerType src/Dodge/BaseTriggerType.hs 27;" f helpPara src/Dodge/Terminal.hs 90;" f helpPoly3D src/Polyhedra.hs 125;" f @@ -3805,23 +3803,23 @@ highBar src/Dodge/Room/Foreground.hs 89;" f highDiagonalMesh src/Dodge/Room/Foreground.hs 35;" f highMesh src/Dodge/Room/Foreground.hs 25;" f hit1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 580;" f -hitEffFromBul src/Dodge/Bullet.hs 153;" f +hitEffFromBul src/Dodge/Bullet.hs 155;" f hitS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 534;" f -holdForm src/Dodge/Creature/Boid.hs 137;" f +holdForm src/Dodge/Creature/Boid.hs 138;" f holsterWeapon src/Dodge/Creature/Volition.hs 15;" f homingModule src/Dodge/Item/Scope.hs 48;" f horPipe src/Dodge/Placement/Instance/Pipe.hs 9;" f hotkeyToChar src/Dodge/Inventory/SelectionList.hs 188;" f -hotkeyToScancode src/Dodge/Creature/YourControl.hs 81;" f +hotkeyToScancode src/Dodge/Creature/YourControl.hs 82;" f hotkeyToString src/Dodge/Inventory/SelectionList.hs 185;" f -humanoidAIList src/Dodge/Humanoid.hs 182;" f +humanoidAIList src/Dodge/Humanoid.hs 183;" f iShape src/Dodge/Placement/Instance/LightSource.hs 87;" f icosahedronPoints src/Polyhedra/Geodesic.hs 12;" f icosohedronFaces src/Polyhedra/Geodesic.hs 19;" f ildtPropagate src/Dodge/DoubleTree.hs 111;" f -impulsiveAIBefore src/Dodge/Creature/Impulse.hs 24;" f +impulsiveAIBefore src/Dodge/Creature/Impulse.hs 23;" f inLink src/Dodge/RoomLink.hs 128;" f -inSegArea src/Geometry/Intersect.hs 346;" f +inSegArea src/Geometry/Intersect.hs 319;" f inSimplePoly src/Geometry/Polygon.hs 89;" f inTextInputFocus src/Dodge/InputFocus.hs 8;" f incidenceToFunction src/Dodge/Graph.hs 26;" f @@ -3852,29 +3850,28 @@ insertWalls src/Dodge/Placement/PlaceSpot/Block.hs 117;" f insertWithNewKeys src/IntMapHelp.hs 70;" f intAnno src/Dodge/Floor.hs 111;" f interactWithCloseObj src/Dodge/SelectedClose.hs 9;" f -interpWith src/Dodge/Creature/Boid.hs 11;" f -intersectCircLine src/Geometry/Intersect.hs 373;" f -intersectCircLineAlong src/Geometry/Intersect.hs 364;" f -intersectCircSeg src/Geometry/Intersect.hs 353;" f -intersectCircSegFirst src/Geometry/Intersect.hs 417;" f -intersectCircSegTest src/Geometry/Intersect.hs 409;" f -intersectCylSeg src/Geometry/Intersect.hs 382;" f -intersectLineLine src/Geometry/Intersect.hs 19;" f -intersectLinePlaneAlong src/Geometry/Intersect.hs 34;" f -intersectLinefromScreen src/Dodge/Debug/Picture.hs 95;" f -intersectSegBezquad src/Geometry/Intersect.hs 284;" f -intersectSegLine src/Geometry/Intersect.hs 135;" f -intersectSegLineext src/Geometry/Intersect.hs 117;" f -intersectSegPlane src/Geometry/Intersect.hs 41;" f -intersectSegPolyFirst src/Geometry/Intersect.hs 291;" f -intersectSegRay src/Geometry/Intersect.hs 102;" f -intersectSegSeg src/Geometry/Intersect.hs 81;" f -intersectSegSegErrorTest src/Geometry/Intersect.hs 66;" f -intersectSegSegFullTest src/Geometry/Intersect.hs 151;" f -intersectSegSegPreTest src/Geometry/Intersect.hs 184;" f -intersectSegSegTest src/Geometry/Intersect.hs 170;" f -intersectSegSurface src/Geometry/Intersect.hs 50;" f -intersectSegsSeg src/Geometry/Intersect.hs 280;" f +interpWith src/Dodge/Creature/Boid.hs 12;" f +intersectCircLine src/Geometry/Intersect.hs 354;" f +intersectCircLineAlong src/Geometry/Intersect.hs 345;" f +intersectCircSeg src/Geometry/Intersect.hs 324;" f +intersectCircSegFirst src/Geometry/Intersect.hs 398;" f +intersectCircSegTest src/Geometry/Intersect.hs 390;" f +intersectCylSeg src/Geometry/Intersect.hs 363;" f +intersectLineLine src/Geometry/Intersect.hs 18;" f +intersectLinePlaneAlong src/Geometry/Intersect.hs 27;" f +intersectLinefromScreen src/Dodge/Debug/Picture.hs 96;" f +intersectSegBezquad src/Geometry/Intersect.hs 257;" f +intersectSegLine src/Geometry/Intersect.hs 110;" f +intersectSegPlane src/Geometry/Intersect.hs 34;" f +intersectSegPolyFirst src/Geometry/Intersect.hs 264;" f +intersectSegRay src/Geometry/Intersect.hs 92;" f +intersectSegSeg src/Geometry/Intersect.hs 71;" f +intersectSegSegErrorTest src/Geometry/Intersect.hs 56;" f +intersectSegSegFullTest src/Geometry/Intersect.hs 124;" f +intersectSegSegPreTest src/Geometry/Intersect.hs 157;" f +intersectSegSegTest src/Geometry/Intersect.hs 143;" f +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 @@ -3889,12 +3886,12 @@ invDimColor src/Dodge/DisplayInventory.hs 186;" f invHead src/Dodge/Render/HUD.hs 398;" f invIMDT src/Dodge/Item/Grammar.hs 245;" f invIndents src/Dodge/Item/Grammar.hs 252;" f -invItemEffs src/Dodge/Creature/State.hs 62;" f -invItemLocUpdate src/Dodge/Creature/State.hs 70;" f +invItemEffs src/Dodge/Creature/State.hs 63;" f +invItemLocUpdate src/Dodge/Creature/State.hs 71;" f invRootMap src/Dodge/Item/Grammar.hs 226;" f invSelectionItem src/Dodge/Inventory/SelectionList.hs 32;" f -invSetSelection src/Dodge/Inventory.hs 179;" f -invSetSelectionPos src/Dodge/Inventory.hs 187;" f +invSetSelection src/Dodge/Inventory.hs 180;" f +invSetSelectionPos src/Dodge/Inventory.hs 188;" f invShiftPointBy src/Dodge/ShiftPoint.hs 8;" f invSize src/Dodge/Inventory/CheckSlots.hs 33;" f inventoryX src/Dodge/Creature.hs 113;" f @@ -3902,18 +3899,18 @@ inverseSelNumPos src/Dodge/SelectionSections.hs 193;" f inverseSelSecYint src/Dodge/SelectionSections.hs 164;" f inverseSelSecYintXPosCheck src/Dodge/SelectionSections.hs 177;" f inverseShockwaveAt src/Dodge/WorldEvent/Shockwave.hs 43;" f -invertEncircleDistP src/Dodge/Creature/Boid.hs 14;" f +invertEncircleDistP src/Dodge/Creature/Boid.hs 15;" f invertIntMap src/IntMapHelp.hs 99;" f invertIntMap src/Multiset.hs 67;" f invertInventoryToMap src/Dodge/Combine.hs 56;" f invisibleChaseCrit src/Dodge/Creature/ChaseCrit.hs 21;" f invisibleWall src/Dodge/Placement/Instance/Wall.hs 16;" f -isAmmoIntLink src/Dodge/HeldUse.hs 713;" f -isAnimate src/Dodge/Creature/Test.hs 130;" f +isAmmoIntLink src/Dodge/HeldUse.hs 714;" f +isAnimate src/Dodge/Creature/Test.hs 132;" f isCognizant src/Dodge/Creature/Perception.hs 106;" f -isConnected src/Dodge/Inventory/Swap.hs 76;" f +isConnected src/Dodge/Inventory/Swap.hs 77;" f isCornerLink src/Dodge/RoomLink.hs 65;" f -isElectrical src/Dodge/Machine/Update.hs 83;" f +isElectrical src/Dodge/Machine/Update.hs 84;" f isGroupSelectableSection src/Dodge/Update/Input/InGame.hs 197;" f isInLnk src/Dodge/PlacementSpot.hs 161;" f isJust' src/MaybeHelp.hs 29;" f @@ -3921,7 +3918,7 @@ isLHS src/Geometry/LHS.hs 11;" f isLeftOf src/Geometry.hs 199;" f isLeftOfA src/Geometry.hs 193;" f isMidEdgeLink src/Dodge/RoomLink.hs 56;" f -isNHS src/Geometry/Intersect.hs 63;" f +isNHS src/Geometry/Intersect.hs 53;" f isNothing' src/MaybeHelp.hs 33;" f isOnSeg src/Geometry.hs 237;" f isOutLnk src/Dodge/PlacementSpot.hs 166;" f @@ -3934,12 +3931,12 @@ isUnusedLnkType src/Dodge/PlacementSpot.hs 190;" f isUsedLnkUnplaced src/Dodge/PlacementSpot.hs 174;" f isValidCommand src/Dodge/Debug/Terminal.hs 134;" f isVowel src/StringHelp.hs 8;" f -isWalkable src/Dodge/Base/Collide.hs 317;" f +isWalkable src/Dodge/Base/Collide.hs 316;" f isoMatrix src/MatrixHelper.hs 30;" f isotriBWH src/Geometry/Polygon.hs 21;" f itDim src/Dodge/Item/InvSize.hs 21;" f -itEffectOnDrop src/Dodge/Item/BackgroundEffect.hs 67;" f -itEffectOnPickup src/Dodge/Item/BackgroundEffect.hs 64;" f +itEffectOnDrop src/Dodge/Item/BackgroundEffect.hs 68;" f +itEffectOnPickup src/Dodge/Item/BackgroundEffect.hs 65;" f itInvHeight src/Dodge/Item/InvSize.hs 11;" f itUseCondition src/Dodge/ItemUseCondition.hs 6;" f itemAboveAttachables src/Dodge/Item/Grammar.hs 37;" f @@ -3948,11 +3945,11 @@ itemAmmoSlots src/Dodge/Item/AmmoSlots.hs 12;" f itemBaseName src/Dodge/Item/Display.hs 60;" f itemBaseStance src/Dodge/Item/AimStance.hs 18;" f itemBelowAttachables src/Dodge/Item/Grammar.hs 50;" f -itemBlips src/Dodge/RadarSweep.hs 93;" f -itemBulkiness src/Dodge/Creature/YourControl.hs 187;" f +itemBlips src/Dodge/RadarSweep.hs 94;" f +itemBulkiness src/Dodge/Creature/YourControl.hs 188;" f itemCombinations src/Dodge/Combine/Combinations.hs 56;" f itemCombinationsEdges src/Dodge/Combine/Graph.hs 61;" f -itemDetectorEffect src/Dodge/HeldUse.hs 767;" f +itemDetectorEffect src/Dodge/HeldUse.hs 768;" f itemDisplay src/Dodge/Inventory/SelectionList.hs 50;" f itemEquipPict src/Dodge/Item/Draw.hs 18;" f itemExternalValue src/Dodge/Inventory/SelectionList.hs 85;" f @@ -3964,8 +3961,8 @@ itemFromHeldType src/Dodge/Item/Held.hs 25;" f itemInfo src/Dodge/Item/Info.hs 20;" f itemInternalValue src/Dodge/Item/Display.hs 34;" f itemInvColor src/Dodge/Item/InventoryColor.hs 9;" f -itemInvLock src/Dodge/HeldUse.hs 429;" f -itemMuzzles src/Dodge/HeldUse.hs 161;" f +itemInvLock src/Dodge/HeldUse.hs 430;" f +itemMuzzles src/Dodge/HeldUse.hs 162;" 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 @@ -3978,7 +3975,7 @@ itemShapeMaxX src/Dodge/Item/Orientation.hs 47;" f itemShapeMaxY src/Dodge/Item/Orientation.hs 50;" f itemShapeMaxZ src/Dodge/Item/Orientation.hs 53;" f itemShapeMin src/Dodge/Item/Orientation.hs 62;" f -itemSidePush src/Dodge/HeldUse.hs 377;" f +itemSidePush src/Dodge/HeldUse.hs 378;" f itemString src/Dodge/Item/Display.hs 56;" f itemToFunction src/Dodge/Item/Grammar.hs 107;" f itemTreeSPic src/Dodge/Item/Draw/SPicTree.hs 13;" f @@ -4059,22 +4056,22 @@ lightSensInsideDoor src/Dodge/Room/LasTurret.hs 39;" f lightSensor src/Dodge/Placement/Instance/Sensor.hs 42;" f lightsToRender src/Dodge/Render/Lights.hs 14;" f lightx4 src/Color.hs 145;" f -linGrad src/Geometry/Intersect.hs 268;" f +linGrad src/Geometry/Intersect.hs 241;" f line src/Picture/Base.hs 226;" f lineCol src/Picture/Base.hs 230;" f lineGeom src/Dodge/Base.hs 32;" f -lineOnScreenCone src/Dodge/Debug/Picture.hs 59;" f -lineOrth src/Dodge/Creature/Boid.hs 126;" f +lineOnScreenCone src/Dodge/Debug/Picture.hs 60;" f +lineOrth src/Dodge/Creature/Boid.hs 127;" f lineOutputTerminal src/Dodge/Room/Warning.hs 66;" f lineSplit src/Justify.hs 26;" f lineThick src/Picture/Base.hs 234;" f -lineUp src/Dodge/Creature/Boid.hs 148;" f +lineUp src/Dodge/Creature/Boid.hs 150;" f linksGridToPath src/Dodge/Room/Path.hs 36;" f linksOnPath src/Dodge/Room/CheckConsistency.hs 6;" f listConfig src/Dodge/Menu.hs 235;" f listControls src/Dodge/Menu.hs 247;" f listCursorChooseBorderScale src/Dodge/Render/List.hs 134;" f -listGuard src/Dodge/Creature/ReaderUpdate.hs 190;" f +listGuard src/Dodge/Creature/ReaderUpdate.hs 191;" f listSelectionColorPicture src/Dodge/DisplayInventory.hs 302;" f litCorridor90 src/Dodge/Room/RoadBlock.hs 26;" f lmt src/MatrixHelper.hs 43;" f @@ -4082,7 +4079,7 @@ lnkBothAnd src/Dodge/Room/Procedural.hs 124;" f lnkMidPosInvSelsCol src/Dodge/Render/HUD.hs 387;" f loadDodgeConfig src/Dodge/Config.hs 30;" f loadMusic src/Dodge/SoundLogic/LoadSound.hs 30;" f -loadMuzzle src/Dodge/HeldUse.hs 622;" f +loadMuzzle src/Dodge/HeldUse.hs 623;" f loadSaveSlot src/Dodge/Save.hs 74;" f loadSeed src/Dodge/LoadSeed.hs 7;" f loadSound src/Dodge/SoundLogic/LoadSound.hs 11;" f @@ -4099,7 +4096,7 @@ locGoLeft src/Dodge/DoubleTree.hs 319;" f locGoRight src/Dodge/DoubleTree.hs 324;" f locLDTToLocDT src/Dodge/DoubleTree.hs 19;" f locLeftmost src/Dodge/DoubleTree.hs 306;" f -locMuzzles src/Dodge/HeldUse.hs 144;" f +locMuzzles src/Dodge/HeldUse.hs 145;" f locOrient src/Dodge/Item/HeldOffset.hs 57;" f locRightmost src/Dodge/DoubleTree.hs 309;" f locToTop src/Dodge/DoubleTree.hs 301;" f @@ -4130,11 +4127,11 @@ lsPosRad src/Dodge/LightSource.hs 17;" f ltAutoCrit src/Dodge/Creature/LtAutoCrit.hs 12;" f m src/ShortShow.hs 44;" f mAT src/Dodge/Item/MagAmmoType.hs 19;" f -machineAddSound src/Dodge/Machine.hs 49;" f +machineAddSound src/Dodge/Machine.hs 50;" f machinePistol src/Dodge/Item/Held/Stick.hs 52;" f -machineUpdateDeathEff src/Dodge/Machine.hs 34;" f -machineUpdateLiveDieEff src/Dodge/Machine.hs 16;" f -magAmmoParams src/Dodge/HeldUse.hs 945;" f +machineUpdateDeathEff src/Dodge/Machine.hs 35;" f +machineUpdateLiveDieEff src/Dodge/Machine.hs 17;" f +magAmmoParams src/Dodge/HeldUse.hs 946;" f magAmmoType src/Dodge/Item/MagAmmoType.hs 11;" f magShield src/Dodge/Item/Equipment.hs 27;" f magV src/Geometry/Vector.hs 172;" f @@ -4146,10 +4143,10 @@ main bench/Bench.hs 15;" f main test/Spec.hs 12;" f makeArc src/Picture/Base.hs 157;" f makeAttach src/Dodge/Item/Attach.hs 10;" f -makeBlip src/Dodge/RadarSweep.hs 69;" f +makeBlip src/Dodge/RadarSweep.hs 70;" f makeBlockDebris src/Dodge/Block/Debris.hs 34;" f makeBoolOption src/Dodge/Menu/OptionType.hs 8;" f -makeBullet src/Dodge/HeldUse.hs 1002;" f +makeBullet src/Dodge/HeldUse.hs 1003;" f makeButton src/Dodge/LevelGen/Switch.hs 16;" f makeByteStringShaderUsingVAO src/Shader/Compile.hs 128;" f makeCloudAt src/Dodge/WorldEvent/Cloud.hs 7;" f @@ -4162,16 +4159,16 @@ makeDoorDebris src/Dodge/Block/Debris.hs 24;" f makeDustAt src/Dodge/WorldEvent/Cloud.hs 17;" f makeEnumOption src/Dodge/Menu/OptionType.hs 13;" f makeExplosionAt src/Dodge/WorldEvent/Explosion.hs 73;" f -makeFlak src/Dodge/Bullet.hs 143;" f +makeFlak src/Dodge/Bullet.hs 145;" f makeFlame src/Dodge/Flame.hs 45;" f makeFlameExplosionAt src/Dodge/WorldEvent/Explosion.hs 56;" f makeFlamelet src/Dodge/EnergyBall.hs 21;" f -makeFragBullets src/Dodge/Bullet.hs 129;" f +makeFragBullets src/Dodge/Bullet.hs 131;" f makeGasCloud src/Dodge/WorldEvent/SpawnParticle.hs 11;" f makeGrid src/Grid.hs 46;" f makeIntInterval src/Dodge/Zoning/Base.hs 35;" f makeMovingEB src/Dodge/EnergyBall.hs 60;" f -makeMuzzleFlare src/Dodge/HeldUse.hs 648;" f +makeMuzzleFlare src/Dodge/HeldUse.hs 649;" f makeParagraph src/Justify.hs 6;" f makePathBetween src/Dodge/Path.hs 35;" f makePathBetweenPs src/Dodge/Path.hs 54;" f @@ -4215,28 +4212,28 @@ maybeOpenConsole src/Dodge/Update.hs 124;" f maybeReadFile src/Dodge/LoadSeed.hs 10;" f maybeTakeOne src/RandomHelp.hs 116;" f maybeWarmupStatus src/Dodge/Item/Display.hs 45;" f -mcApplyDamage src/Dodge/Machine/Update.hs 128;" f -mcDamSensorTriggerUpdate src/Dodge/Machine/Update.hs 97;" f -mcDamSensorUpdate src/Dodge/Machine/Update.hs 135;" f +mcApplyDamage src/Dodge/Machine/Update.hs 129;" f +mcDamSensorTriggerUpdate src/Dodge/Machine/Update.hs 98;" f +mcDamSensorUpdate src/Dodge/Machine/Update.hs 136;" f mcKillBut src/Dodge/Machine/Destroy.hs 37;" f mcKillTerm src/Dodge/Machine/Destroy.hs 29;" f -mcNoItemsTest src/Dodge/Machine/Update.hs 143;" f -mcPlaySound src/Dodge/Machine/Update.hs 112;" f -mcProxSensorTriggerUpdate src/Dodge/Machine/Update.hs 103;" f -mcProxSensorUpdate src/Dodge/Machine/Update.hs 138;" f -mcProxTest src/Dodge/Machine/Update.hs 202;" f -mcProximitySensorUpdate src/Dodge/Machine/Update.hs 170;" f +mcNoItemsTest src/Dodge/Machine/Update.hs 144;" f +mcPlaySound src/Dodge/Machine/Update.hs 113;" f +mcProxSensorTriggerUpdate src/Dodge/Machine/Update.hs 104;" f +mcProxSensorUpdate src/Dodge/Machine/Update.hs 139;" f +mcProxTest src/Dodge/Machine/Update.hs 203;" f +mcProximitySensorUpdate src/Dodge/Machine/Update.hs 171;" f mcSPic src/Dodge/Render/ShapePicture.hs 135;" f -mcShootAuto src/Dodge/HeldUse.hs 1195;" f -mcShootLaser src/Dodge/HeldUse.hs 1188;" f -mcTriggerVal src/Dodge/Machine/Update.hs 109;" f -mcTypeUpdate src/Dodge/Machine/Update.hs 31;" f -mcUseHeld src/Dodge/HeldUse.hs 1107;" f -mcUseItem src/Dodge/Machine/Update.hs 88;" f +mcShootAuto src/Dodge/HeldUse.hs 1196;" f +mcShootLaser src/Dodge/HeldUse.hs 1189;" f +mcTriggerVal src/Dodge/Machine/Update.hs 110;" f +mcTypeUpdate src/Dodge/Machine/Update.hs 32;" f +mcUseHeld src/Dodge/HeldUse.hs 1108;" f +mcUseItem src/Dodge/Machine/Update.hs 89;" 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 -meleeHeadingMove src/Dodge/Creature/Boid.hs 282;" f +meleeHeadingMove src/Dodge/Creature/Boid.hs 286;" f memoBoxEdgeIndices src/Shader/Poke.hs 352;" f memoBoxSurfaces src/Shader/Poke.hs 286;" f memoCylinderIndices src/Shader/Poke.hs 323;" f @@ -4267,7 +4264,7 @@ midPadL src/Padding.hs 33;" f midPoint src/Geometry.hs 83;" f midWall src/Dodge/Placement/Instance/Wall.hs 27;" f minAndMax src/FoldableHelp.hs 109;" f -minCrIXOn src/Dodge/Zoning/Creature.hs 47;" f +minCrIXOn src/Dodge/Zoning/Creature.hs 48;" f minOn src/FoldableHelp.hs 35;" f mini1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 452;" f miniGunCrit src/Dodge/Creature.hs 63;" f @@ -4294,13 +4291,13 @@ mntLightLnkCond src/Dodge/Placement/Instance/LightSource.hs 177;" f mntLightLnkCond' src/Dodge/Placement/Instance/LightSource.hs 182;" f modTo src/Geometry/Zone.hs 10;" f mouseClickOptionsList src/Dodge/Update/Input/ScreenLayer.hs 60;" f -mouseCursorType src/Dodge/Render/Picture.hs 86;" f +mouseCursorType src/Dodge/Render/Picture.hs 87;" f mouseWorldPos src/Dodge/Base/Coordinate.hs 25;" f -moveBullet src/Dodge/Bullet.hs 194;" f +moveBullet src/Dodge/Bullet.hs 196;" f moveCombineSel src/Dodge/Update/Scroll.hs 121;" f moveInverseShockwave src/Dodge/Shockwave/Update.hs 44;" f moveLSThen src/Dodge/Placement/Instance/LightSource.hs 43;" f -movePenBullet src/Dodge/Bullet.hs 200;" f +movePenBullet src/Dodge/Bullet.hs 202;" f moveProjectile src/Dodge/Projectile/Update.hs 259;" f moveRoomBy src/Dodge/Room/Link.hs 53;" f moveShockwave src/Dodge/Shockwave/Update.hs 13;" f @@ -4320,22 +4317,22 @@ multiArrow src/Picture/Composite.hs 11;" f multiLookupTrie src/SimpleTrie.hs 57;" f multiLookupTrieI src/SimpleTrie.hs 66;" f muout src/Dodge/RoomLink.hs 144;" f -muzFlareAt src/Dodge/HeldUse.hs 674;" f -mvButton src/Dodge/Placement/PlaceSpot.hs 180;" f -mvCr src/Dodge/Placement/PlaceSpot.hs 186;" f -mvFS src/Dodge/Placement/PlaceSpot.hs 189;" f +muzFlareAt src/Dodge/HeldUse.hs 675;" f +mvButton src/Dodge/Placement/PlaceSpot.hs 181;" f +mvCr src/Dodge/Placement/PlaceSpot.hs 187;" f +mvFS src/Dodge/Placement/PlaceSpot.hs 193;" f mvGust src/Dodge/Update.hs 770;" f -mvLS src/Dodge/Placement/PlaceSpot.hs 254;" f +mvLS src/Dodge/Placement/PlaceSpot.hs 258;" f mvP src/Dodge/Wall/Move.hs 54;" f -mvPP src/Dodge/Placement/PlaceSpot.hs 183;" f +mvPP src/Dodge/Placement/PlaceSpot.hs 184;" f mvPointAlongAtSpeed src/Dodge/Base.hs 121;" f -mvPointMeleeTarg src/Dodge/Creature/Boid.hs 314;" f +mvPointMeleeTarg src/Dodge/Creature/Boid.hs 318;" f mvPointToward src/Dodge/Base.hs 136;" f mvPointTowardAtSpeed src/Dodge/Base.hs 105;" f -mvProp src/Dodge/Placement/PlaceSpot.hs 177;" f +mvProp src/Dodge/Placement/PlaceSpot.hs 178;" f mvPs src/Dodge/Wall/Move.hs 58;" f -myIntersectLineLine src/Geometry/Intersect.hs 225;" f -myIntersectSegSeg src/Geometry/Intersect.hs 203;" f +myIntersectLineLine src/Geometry/Intersect.hs 198;" f +myIntersectSegSeg src/Geometry/Intersect.hs 176;" f myParams src/Dodge/Combine/Graph.hs 103;" f nRays src/Geometry.hs 182;" f nRaysRad src/Geometry.hs 186;" f @@ -4355,9 +4352,9 @@ nextInSectionSS src/Dodge/SelectionSections.hs 34;" f nextLayoutInt src/Dodge/Data/MetaTree.hs 43;" f noPic src/ShapePicture.hs 25;" f noShape src/ShapePicture.hs 29;" f -noclipCheck src/Dodge/WallCreatureCollisions.hs 22;" f +noclipCheck src/Dodge/WallCreatureCollisions.hs 23;" f nodeFormatting src/Dodge/Combine/Graph.hs 147;" f -normalGait src/Dodge/Creature/State/WalkCycle.hs 29;" f +normalGait src/Dodge/Creature/State/WalkCycle.hs 30;" f normalizeAngle src/Geometry/Vector.hs 128;" f normalizeAnglePi src/Dodge/Base.hs 154;" f normalizeColor src/Color.hs 76;" f @@ -4376,13 +4373,13 @@ numSelfTree' src/Dodge/Tree/Compose.hs 110;" f numShads src/Picture/Data.hs 42;" f numSubElements src/Shader/Parameters.hs 39;" f numTraversable src/TreeHelp.hs 184;" f -obstacleColor src/Dodge/Debug/Picture.hs 262;" f +obstacleColor src/Dodge/Debug/Picture.hs 263;" f obstructPathsCrossing src/Dodge/Path.hs 138;" f oldMachineBootS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 698;" f -onEquipWristShield src/Dodge/Equipment.hs 36;" f -onRemoveWristShield src/Dodge/Equipment.hs 23;" f +onEquipWristShield src/Dodge/Equipment.hs 37;" f +onRemoveWristShield src/Dodge/Equipment.hs 24;" f onXY src/Geometry/Vector3D.hs 130;" f -oneH src/Dodge/Creature/Test.hs 93;" f +oneH src/Dodge/Creature/Test.hs 94;" f openConsole src/Dodge/Update.hs 129;" f optionMenu src/Dodge/Menu.hs 113;" f optionScreenDefaultEffect src/Dodge/Update/Input/ScreenLayer.hs 52;" f @@ -4400,9 +4397,9 @@ orderPolygonAround src/Geometry/Polygon.hs 107;" f orientAttachment src/Dodge/Item/Orientation.hs 68;" f orientByParentChSF src/Dodge/Item/Orientation.hs 34;" f orientChild src/Dodge/Item/Orientation.hs 18;" f -orthogonalPointOnSeg src/Geometry/Intersect.hs 339;" f +orthogonalPointOnSeg src/Geometry/Intersect.hs 312;" f outLink src/Dodge/RoomLink.hs 120;" f -outsideScreenPolygon src/Dodge/Debug/Picture.hs 43;" f +outsideScreenPolygon src/Dodge/Debug/Picture.hs 44;" f outwardIntegers src/Dodge/Base.hs 181;" f overCol src/Picture/Base.hs 308;" f overColObj src/Shape.hs 273;" f @@ -4413,12 +4410,12 @@ overPos src/Picture/Base.hs 303;" f overPosObj src/Shape.hs 277;" f overPosSH src/Shape.hs 261;" f overPosSP src/ShapePicture.hs 41;" f -overlapCircWalls src/Dodge/Base/Collide.hs 221;" f -overlapCircWallsClosest src/Dodge/Base/Collide.hs 267;" f -overlapSegCrs src/Dodge/Base/Collide.hs 59;" f -overlapSegWalls src/Dodge/Base/Collide.hs 203;" f -overrideInternal src/Dodge/Creature/ReaderUpdate.hs 174;" f -overrideMeleeCloseTarget src/Dodge/Creature/ReaderUpdate.hs 35;" f +overlapCircWalls src/Dodge/Base/Collide.hs 220;" f +overlapCircWallsClosest src/Dodge/Base/Collide.hs 266;" f +overlapSegCrs src/Dodge/Base/Collide.hs 61;" f +overlapSegWalls src/Dodge/Base/Collide.hs 202;" f +overrideInternal src/Dodge/Creature/ReaderUpdate.hs 175;" f +overrideMeleeCloseTarget src/Dodge/Creature/ReaderUpdate.hs 36;" f overwriteLabel src/Dodge/Tree/Compose.hs 31;" f p src/ShortShow.hs 44;" f pContID src/Dodge/LevelGen/PlacementHelper.hs 15;" f @@ -4440,17 +4437,17 @@ pauseMenuOptions src/Dodge/Menu.hs 66;" f pauseSound src/Dodge/SoundLogic.hs 42;" f pauseTime src/Dodge/Update.hs 180;" f pbFlicker src/Dodge/Update.hs 453;" f -pbsHit src/Dodge/WorldEvent/ThingsHit.hs 88;" f +pbsHit src/Dodge/WorldEvent/ThingsHit.hs 89;" f peZoneSize src/Dodge/Zoning/Pathing.hs 46;" f pedestalRoom src/Dodge/Room/Containing.hs 50;" f -penThing src/Dodge/Bullet.hs 208;" f +penThing src/Dodge/Bullet.hs 210;" f perMat src/MatrixHelper.hs 49;" f perceptionUpdate src/Dodge/Creature/Perception.hs 23;" f -performAction src/Dodge/Creature/Action.hs 92;" f -performActions src/Dodge/Creature/Action.hs 38;" f -performAimAt src/Dodge/Creature/Action.hs 48;" f -performPathTo src/Dodge/Creature/Action.hs 61;" f -performTurnToA src/Dodge/Creature/Action.hs 79;" f +performAction src/Dodge/Creature/Action.hs 93;" f +performActions src/Dodge/Creature/Action.hs 39;" f +performAimAt src/Dodge/Creature/Action.hs 49;" f +performPathTo src/Dodge/Creature/Action.hs 62;" f +performTurnToA src/Dodge/Creature/Action.hs 80;" f perspectiveMatrixb src/MatrixHelper.hs 11;" f pesNearCirc src/Dodge/Zoning/Pathing.hs 43;" f pesNearPoint src/Dodge/Zoning/Pathing.hs 33;" f @@ -4458,13 +4455,13 @@ pesNearRect src/Dodge/Zoning/Pathing.hs 40;" f pesNearSeg src/Dodge/Zoning/Pathing.hs 37;" f picFormat src/Polyhedra.hs 23;" f picMap src/Picture/Base.hs 67;" f -pickUpItem src/Dodge/Inventory/Add.hs 68;" f -pickUpItemAt src/Dodge/Inventory/Add.hs 73;" f +pickUpItem src/Dodge/Inventory/Add.hs 69;" f +pickUpItemAt src/Dodge/Inventory/Add.hs 74;" f pickUpS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 624;" f -pincerP src/Dodge/Creature/Boid.hs 61;" f -pincerP' src/Dodge/Creature/Boid.hs 94;" f -pincerP'' src/Dodge/Creature/Boid.hs 104;" f -pincerP''' src/Dodge/Creature/Boid.hs 75;" f +pincerP src/Dodge/Creature/Boid.hs 62;" f +pincerP' src/Dodge/Creature/Boid.hs 95;" f +pincerP'' src/Dodge/Creature/Boid.hs 105;" f +pincerP''' src/Dodge/Creature/Boid.hs 76;" f pingPongBetween src/Render.hs 221;" f pipe src/Dodge/Item/Craftable.hs 32;" f pistol src/Dodge/Item/Held/Stick.hs 40;" f @@ -4473,22 +4470,22 @@ pjRemoteSetDirection src/Dodge/Projectile/Update.hs 224;" f plBlock src/Dodge/Placement/PlaceSpot/Block.hs 18;" f plDoor src/Dodge/Placement/PlaceSpot/TriggerDoor.hs 22;" f plLineBlock src/Dodge/Placement/PlaceSpot/Block.hs 50;" f -plMachine src/Dodge/Placement/PlaceSpot.hs 192;" f -plMachine' src/Dodge/Placement/PlaceSpot.hs 229;" f +plMachine src/Dodge/Placement/PlaceSpot.hs 196;" f +plMachine' src/Dodge/Placement/PlaceSpot.hs 233;" f plNew src/Dodge/Base/NewID.hs 19;" f plNewID src/Dodge/Base/NewID.hs 7;" f plNewUpID src/Dodge/Base/NewID.hs 13;" f plNewUsing src/Dodge/Base/NewID.hs 27;" f plRRpt src/Dodge/LevelGen/PlacementHelper.hs 33;" f plSlideDoor src/Dodge/Placement/PlaceSpot/TriggerDoor.hs 78;" f -plTurret src/Dodge/Placement/PlaceSpot.hs 198;" f -placeMachineWalls src/Dodge/Placement/PlaceSpot.hs 243;" f -placePlainPSSpot src/Dodge/Placement/PlaceSpot.hs 42;" f -placeSpot src/Dodge/Placement/PlaceSpot.hs 32;" f -placeSpotID src/Dodge/Placement/PlaceSpot.hs 98;" f -placeSpotRoomRand src/Dodge/Placement/PlaceSpot.hs 86;" f -placeSpotUsingLink src/Dodge/Placement/PlaceSpot.hs 63;" f -placeWallPoly src/Dodge/Placement/PlaceSpot.hs 166;" f +plTurret src/Dodge/Placement/PlaceSpot.hs 202;" f +placeMachineWalls src/Dodge/Placement/PlaceSpot.hs 247;" f +placePlainPSSpot src/Dodge/Placement/PlaceSpot.hs 43;" f +placeSpot src/Dodge/Placement/PlaceSpot.hs 33;" f +placeSpotID src/Dodge/Placement/PlaceSpot.hs 99;" f +placeSpotRoomRand src/Dodge/Placement/PlaceSpot.hs 87;" f +placeSpotUsingLink src/Dodge/Placement/PlaceSpot.hs 64;" f +placeWallPoly src/Dodge/Placement/PlaceSpot.hs 167;" f plainRegex src/Dodge/DisplayInventory.hs 189;" f playIfFree src/Sound.hs 137;" f playPositionalSoundQueue src/Sound.hs 145;" f @@ -4523,7 +4520,7 @@ pointerToItemID src/Dodge/Item/Location.hs 42;" f pointerYourRootItem src/Dodge/Item/Location.hs 33;" f pointerYourSelectedItem src/Dodge/Item/Location.hs 26;" f pointsToPoly src/Geometry/ConvexPoly.hs 37;" f -poisonSPic src/Dodge/Creature/Update.hs 124;" f +poisonSPic src/Dodge/Creature/Update.hs 125;" f poisonSprayer src/Dodge/Item/Held/SprayGuns.hs 17;" f poke34 src/Shader/Poke.hs 506;" f pokeArrayOff src/Shader/Poke.hs 517;" f @@ -4596,7 +4593,7 @@ powlistUpToN' src/Multiset.hs 12;" f powlistUpToN'' src/Multiset.hs 31;" f ppDraw src/Dodge/Render/ShapePicture.hs 120;" f ppEvents src/Dodge/Update.hs 733;" f -ppLevelReset src/Dodge/PressPlate.hs 13;" f +ppLevelReset src/Dodge/PressPlate.hs 15;" f preCritStart src/Dodge/Room/Start.hs 83;" f prePos src/Quaternion.hs 68;" f preloadRender src/Preload/Render.hs 30;" f @@ -4611,11 +4608,11 @@ printColumns src/Dodge/Tree/Shift.hs 139;" f printInfo src/Dodge/Tree/Shift.hs 152;" f printInfoCheckNum src/Dodge/Tree/Shift.hs 161;" f printPartialColumns src/Dodge/Tree/Shift.hs 142;" f -printPoint src/Dodge/Debug/Picture.hs 34;" f -printRotPoint src/Dodge/Debug/Picture.hs 37;" f +printPoint src/Dodge/Debug/Picture.hs 35;" f +printRotPoint src/Dodge/Debug/Picture.hs 38;" f prismBox src/Shape.hs 73;" f prismPoly src/Shape.hs 59;" f -projV src/Geometry/Vector.hs 183;" f +projV src/Geometry/Vector.hs 177;" f projV3 src/Geometry/Vector3D.hs 127;" f propDrawToggle src/Dodge/Prop/Draw.hs 50;" f propLSThen src/Dodge/Placement/Instance/LightSource.hs 29;" f @@ -4639,12 +4636,12 @@ psposAddLabel src/Dodge/PlacementSpot.hs 69;" f pt0 src/Dodge/LevelGen/PlacementHelper.hs 54;" f ptCont src/Dodge/LevelGen/PlacementHelper.hs 21;" f pulseChecker src/Dodge/Item/Equipment.hs 103;" f -pushCreatureOutFromWalls src/Dodge/WallCreatureCollisions.hs 55;" f +pushCreatureOutFromWalls src/Dodge/WallCreatureCollisions.hs 56;" f pushL src/DoubleStack.hs 20;" f -pushOrCrush src/Dodge/WallCreatureCollisions.hs 74;" f -pushOutFromCorners src/Dodge/WallCreatureCollisions.hs 108;" f -pushOutFromWall src/Dodge/WallCreatureCollisions.hs 97;" f -pushOutFromWalls src/Dodge/WallCreatureCollisions.hs 61;" f +pushOrCrush src/Dodge/WallCreatureCollisions.hs 76;" f +pushOutFromCorners src/Dodge/WallCreatureCollisions.hs 110;" f +pushOutFromWall src/Dodge/WallCreatureCollisions.hs 99;" f +pushOutFromWalls src/Dodge/WallCreatureCollisions.hs 63;" f pushR src/DoubleStack.hs 24;" f pushScreen src/Dodge/Menu/PushPop.hs 9;" f putAutoDoor src/Dodge/Placement/Instance/Door.hs 78;" f @@ -4719,9 +4716,9 @@ randomTank src/Dodge/Room/Tanks.hs 19;" f randomTreeStructure src/Dodge/Layout/Generate.hs 18;" f randsOnCirc src/RandomHelp.hs 127;" f randsSpread src/RandomHelp.hs 120;" f -ratIntersectLineLine src/Geometry/Intersect.hs 243;" f +ratIntersectLineLine src/Geometry/Intersect.hs 216;" f readSaveSlot src/Dodge/Save.hs 45;" f -recoilAmount src/Dodge/HeldUse.hs 459;" f +recoilAmount src/Dodge/HeldUse.hs 460;" f rectNSWE src/Geometry/Polygon.hs 14;" f rectVV src/Geometry/Polygon.hs 39;" f rectWH src/Geometry/Polygon.hs 18;" f @@ -4736,7 +4733,7 @@ reflVelWall src/Dodge/Base/Wall.hs 24;" f reflVelWallDamp src/Dodge/Base/Wall.hs 20;" f reflectAngle src/Geometry.hs 142;" f reflectIn src/Geometry.hs 136;" f -reflectInNormal src/Geometry/Vector.hs 223;" f +reflectInNormal src/Geometry/Vector.hs 217;" f reflectInParam src/Geometry.hs 230;" f reflectLaserAlong src/Dodge/Item/Weapon/LaserPath.hs 16;" f reflectPulseLaserAlong src/Dodge/Item/Weapon/LaserPath.hs 69;" f @@ -4750,12 +4747,12 @@ reloadS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 600;" f rememberSounds src/Dodge/Creature/Perception.hs 178;" f remoteDetonator src/Dodge/Item/Scope.hs 144;" f remoteScreen src/Dodge/Item/Scope.hs 139;" f -removeAimPosture src/Dodge/Creature/YourControl.hs 158;" f -removeAmmoFromMag src/Dodge/HeldUse.hs 920;" f +removeAimPosture src/Dodge/Creature/YourControl.hs 159;" f +removeAmmoFromMag src/Dodge/HeldUse.hs 921;" f removeDot src/ShortShow.hs 40;" f removeInverseWalls src/Dodge/LevelGen/StaticWalls.hs 25;" f removeLights src/Dodge/Room/Tutorial.hs 224;" f -removeShieldWall src/Dodge/Item/BackgroundEffect.hs 57;" f +removeShieldWall src/Dodge/Item/BackgroundEffect.hs 58;" f removeWallsInPolygon src/Dodge/LevelGen/StaticWalls.hs 182;" f renderDataResizeUpdate src/Preload/Update.hs 26;" f renderFlatLighting src/Render.hs 104;" f @@ -4765,24 +4762,24 @@ renderLayer src/Render.hs 234;" f renderLightingNoShadows src/Render.hs 48;" f renderListAt src/Dodge/Render/List.hs 191;" f renderShadows src/Render.hs 117;" f -replaceNullWith src/Dodge/Creature/ReaderUpdate.hs 162;" f +replaceNullWith src/Dodge/Creature/ReaderUpdate.hs 163;" f replacePutID src/Dodge/Placement/Instance/Wall.hs 102;" f resetCrVocCoolDown src/Dodge/Creature/Vocalization.hs 47;" f resetPLUse src/Dodge/PlacementSpot.hs 92;" f -resetStride src/Dodge/Creature/State/WalkCycle.hs 24;" f +resetStride src/Dodge/Creature/State/WalkCycle.hs 25;" f resetTerminal src/Dodge/WorldEffect.hs 104;" f resizeFBOTO src/Framebuffer/Update.hs 203;" f resizeFBOTO3 src/Framebuffer/Update.hs 175;" f resizeRBO src/Framebuffer/Update.hs 87;" f -respawn src/Dodge/SpawnAt.hs 11;" f +respawn src/Dodge/SpawnAt.hs 12;" f restrictInLinks src/Dodge/RoomLink.hs 44;" f restrictLinkType src/Dodge/RoomLink.hs 34;" f restrictOutLinks src/Dodge/RoomLink.hs 47;" f restrictRMInLinksPD src/Dodge/Room/Link.hs 25;" f resumeSound src/Dodge/SoundLogic.hs 48;" f -retreatActionsPistol src/Dodge/Humanoid.hs 249;" f -retreatFireLauncher src/Dodge/Humanoid.hs 270;" f -retreatPointForFrom src/Dodge/Creature/Impulse/Flee.hs 7;" f +retreatActionsPistol src/Dodge/Humanoid.hs 250;" f +retreatFireLauncher src/Dodge/Humanoid.hs 271;" f +retreatPointForFrom src/Dodge/Creature/Impulse/Flee.hs 9;" f reversePair src/Dodge/LevelGen.hs 85;" f rewinder src/Dodge/Item/Held/Utility.hs 36;" f rezBox src/Dodge/Room/RezBox.hs 31;" f @@ -4807,7 +4804,7 @@ rightWristPQ src/Dodge/Creature/HandPos.hs 57;" f rlPosDir src/Dodge/RoomLink.hs 112;" f rlauncherPic src/Dodge/Item/Draw/SPic.hs 397;" f rmInLinks src/Dodge/RoomLink.hs 153;" f -rmInvItem src/Dodge/Inventory.hs 73;" f +rmInvItem src/Dodge/Inventory.hs 74;" f rmLinksOfType src/Dodge/RoomLink.hs 150;" f rmOutLinks src/Dodge/RoomLink.hs 153;" f roomC src/Dodge/Room/Room.hs 40;" f @@ -4829,7 +4826,7 @@ roomShuriken src/Dodge/Room/Boss.hs 123;" f roomTwistCross src/Dodge/Room/Boss.hs 154;" f roomsContaining src/Dodge/Room/Containing.hs 20;" f roomsContaining' src/Dodge/Room/Containing.hs 25;" f -rootNotrootEff src/Dodge/Item/BackgroundEffect.hs 28;" f +rootNotrootEff src/Dodge/Item/BackgroundEffect.hs 29;" f rose src/Color.hs 20;" f rotD src/Padding.hs 44;" f rotMatr src/MatrixHelper.hs 66;" f @@ -4852,7 +4849,7 @@ rotateToZ src/Quaternion.hs 39;" f rotateV src/Geometry/Vector.hs 106;" f rotateVAround src/Geometry/Vector.hs 113;" f rotateXY src/Polyhedra.hs 31;" f -roundPoint2 src/Geometry/Intersect.hs 264;" f +roundPoint2 src/Geometry/Intersect.hs 237;" f roundTank src/Dodge/Placement/Instance/Tank.hs 25;" f roundTankCross src/Dodge/Placement/Instance/Tank.hs 31;" f rpIsOffGrid src/Dodge/PlacementSpot.hs 81;" f @@ -4890,16 +4887,16 @@ scaleMat src/MatrixHelper.hs 59;" f scaleMatrix src/MatrixHelper.hs 56;" f scaleSH src/Shape.hs 269;" f scalp src/Dodge/Creature/Picture.hs 93;" f -scancodeToHotkey src/Dodge/Creature/YourControl.hs 101;" f +scancodeToHotkey src/Dodge/Creature/YourControl.hs 102;" f scodeToChar src/Dodge/ScodeToChar.hs 6;" f -scorchSPic src/Dodge/Creature/Update.hs 121;" f +scorchSPic src/Dodge/Creature/Update.hs 122;" f screenBox src/Dodge/Base/Window.hs 53;" f screenPolygon src/Dodge/Base/Window.hs 17;" f screenPolygonBord src/Dodge/Base/Window.hs 27;" f screenPosAbs src/Dodge/ScreenPos.hs 15;" f screenToWorldPos src/Dodge/Base/Coordinate.hs 28;" f -scrollAugInvSel src/Dodge/Inventory.hs 190;" f -scrollAugNextInSection src/Dodge/Inventory.hs 203;" f +scrollAugInvSel src/Dodge/Inventory.hs 191;" f +scrollAugNextInSection src/Dodge/Inventory.hs 204;" f scrollDebugInfoInt src/Dodge/Debug.hs 73;" f scrollRBOption src/Dodge/Update/Scroll.hs 202;" f scrollSelectionSections src/Dodge/SelectionSections.hs 28;" f @@ -4914,7 +4911,7 @@ seagullCry2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 576;" f seagullCryS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 588;" f seagullWhistle1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 502;" f seagullWhistleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 718;" f -searchIfDamaged src/Dodge/Creature/ReaderUpdate.hs 205;" f +searchIfDamaged src/Dodge/Creature/ReaderUpdate.hs 206;" f secondColumnLDP src/Dodge/ListDisplayParams.hs 43;" f sectionsDesiredLines src/Dodge/DisplayInventory.hs 198;" f sectionsSizes src/Dodge/DisplayInventory.hs 201;" f @@ -4932,17 +4929,17 @@ selectCreatureDebugItem src/Dodge/Debug.hs 65;" f selectedItemScroll src/Dodge/Update/Scroll.hs 51;" f sensAboveDoor src/Dodge/Room/SensorDoor.hs 53;" f sensInsideDoor src/Dodge/Room/SensorDoor.hs 59;" f -senseDamage src/Dodge/Machine/Update.hs 214;" f -sensorReqToString src/Dodge/Machine/Update.hs 196;" f +senseDamage src/Dodge/Machine/Update.hs 215;" f +sensorReqToString src/Dodge/Machine/Update.hs 197;" f sensorRoom src/Dodge/Room/SensorDoor.hs 26;" f sensorRoomRunPast src/Dodge/Room/SensorDoor.hs 46;" f sensorSPic src/Dodge/Machine/Draw.hs 81;" f sensorTut src/Dodge/Room/Tutorial.hs 332;" f -sensorTypeDamages src/Dodge/Machine/Update.hs 233;" f +sensorTypeDamages src/Dodge/Machine/Update.hs 234;" f sentinelAI src/Dodge/Creature/SentinelAI.hs 20;" f sentinelExtraWatchUpdate src/Dodge/Creature/SentinelAI.hs 83;" f sentinelFireType src/Dodge/Creature/SentinelAI.hs 50;" f -setAimPosture src/Dodge/Creature/YourControl.hs 144;" f +setAimPosture src/Dodge/Creature/YourControl.hs 145;" f setChannelPos src/Sound.hs 150;" f setClickWorldPos src/Dodge/Update.hs 99;" f setClusterID src/Dodge/Combine/Graph.hs 116;" f @@ -4957,29 +4954,29 @@ setLayer src/Picture/Base.hs 139;" f setLinkType src/Dodge/RoomLink.hs 78;" f setLinkTypePD src/Dodge/RoomLink.hs 85;" f setMusicVolume src/Sound.hs 162;" f -setMvPos src/Dodge/Creature/ReaderUpdate.hs 53;" f +setMvPos src/Dodge/Creature/ReaderUpdate.hs 54;" f setOldPos src/Dodge/Update.hs 486;" f setOutLinks src/Dodge/RoomLink.hs 50;" f setOutLinksByType src/Dodge/RoomLink.hs 75;" f setOutLinksPD src/Dodge/RoomLink.hs 95;" f -setRBCreatureTargeting src/Dodge/Creature/State.hs 289;" f +setRBCreatureTargeting src/Dodge/Creature/State.hs 290;" f setRoomInt src/Dodge/Room/Tutorial.hs 60;" f setSelWhileDragging src/Dodge/Update/Input/InGame.hs 337;" f setSelectionListRestriction src/Dodge/Update/Input/ScreenLayer.hs 87;" f setShaderSource src/Shader/Compile.hs 290;" f setShadowLimits src/Dodge/Shadows.hs 11;" f setSoundVolume src/Sound.hs 157;" f -setTargetMv src/Dodge/Creature/ReaderUpdate.hs 76;" f +setTargetMv src/Dodge/Creature/ReaderUpdate.hs 77;" f setTile src/Dodge/Layout.hs 67;" f setTiles src/Dodge/Layout.hs 64;" f setToggle src/Dodge/Prop/Update.hs 44;" f setTreeInts src/Dodge/Room/Tutorial.hs 67;" f setViewDistance src/Dodge/Update/Camera.hs 236;" f -setViewPos src/Dodge/Creature/ReaderUpdate.hs 63;" f +setViewPos src/Dodge/Creature/ReaderUpdate.hs 64;" f setViewport src/Dodge/Render.hs 440;" f setVol src/Dodge/Config.hs 47;" f -setWristShieldPos src/Dodge/Equipment.hs 48;" f -setWristShieldPos src/Dodge/Euse.hs 35;" f +setWristShieldPos src/Dodge/Equipment.hs 49;" f +setWristShieldPos src/Dodge/Euse.hs 38;" f setupConLoop src/Loop.hs 102;" f setupConLoop' src/Loop.hs 192;" f setupEBO src/Shader/Compile.hs 188;" f @@ -5005,7 +5002,7 @@ shapeVerxAttributes src/Shape/Parameters.hs 13;" f shapeVerxSize src/Shape/Parameters.hs 10;" f shatterGun src/Dodge/Item/Held/Weapons.hs 8;" f shatterGunSPic src/Dodge/Item/Draw/SPic.hs 312;" f -shatterWall src/Dodge/Item/Weapon/Shatter.hs 26;" f +shatterWall src/Dodge/Item/Weapon/Shatter.hs 27;" f shellExplosionCheck src/Dodge/Projectile/Update.hs 55;" f shellHitCreature src/Dodge/Projectile/Update.hs 83;" f shellHitFloor src/Dodge/Projectile/Update.hs 99;" f @@ -5013,7 +5010,7 @@ shellHitWall src/Dodge/Projectile/Update.hs 66;" f shellMag src/Dodge/Item/Ammo.hs 49;" f shellModule src/Dodge/Item/Scope.hs 123;" f shellShape src/Dodge/Projectile/Draw.hs 35;" f -shieldWall src/Dodge/Item/BackgroundEffect.hs 77;" f +shieldWall src/Dodge/Item/BackgroundEffect.hs 78;" f shiftByV2 src/Dodge/PlacementSpot.hs 250;" f shiftChildren src/Dodge/Tree/Compose.hs 44;" f shiftDraw src/Dodge/Render/ShapePicture.hs 86;" f @@ -5033,18 +5030,18 @@ shiftRoomBy src/Dodge/Room/Link.hs 37;" f shiftRoomShiftBy src/Dodge/Room/Link.hs 81;" f shiftRoomShiftToLink src/Dodge/Room/Link.hs 70;" f shiftedGrid src/Grid.hs 25;" f -shineTargetLaser src/Dodge/Creature/State.hs 200;" f -shineTorch src/Dodge/Creature/State.hs 237;" f -shootBullet src/Dodge/HeldUse.hs 987;" f -shootBullets src/Dodge/HeldUse.hs 977;" f +shineTargetLaser src/Dodge/Creature/State.hs 201;" f +shineTorch src/Dodge/Creature/State.hs 238;" f +shootBullet src/Dodge/HeldUse.hs 988;" f +shootBullets src/Dodge/HeldUse.hs 978;" f shootFirstMiss src/Dodge/Creature/Volition.hs 34;" f -shootLaser src/Dodge/HeldUse.hs 838;" f -shootPulseBall src/Dodge/HeldUse.hs 906;" f -shootPulseLaser src/Dodge/HeldUse.hs 879;" f -shootShatter src/Dodge/Item/Weapon/Shatter.hs 11;" f -shootTeslaArc src/Dodge/HeldUse.hs 1211;" f +shootLaser src/Dodge/HeldUse.hs 839;" f +shootPulseBall src/Dodge/HeldUse.hs 907;" f +shootPulseLaser src/Dodge/HeldUse.hs 880;" f +shootShatter src/Dodge/Item/Weapon/Shatter.hs 12;" f +shootTeslaArc src/Dodge/HeldUse.hs 1212;" f shootTillEmpty src/Dodge/Creature/Volition.hs 19;" f -shootTractorBeam src/Dodge/HeldUse.hs 794;" f +shootTractorBeam src/Dodge/HeldUse.hs 795;" f shootersRoom src/Dodge/Room/Room.hs 324;" f shootersRoom' src/Dodge/Room/Room.hs 291;" f shootersRoom1 src/Dodge/Room/Room.hs 314;" f @@ -5055,7 +5052,7 @@ shotgunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 708;" f shoulderHeight src/Dodge/Item/HeldOffset.hs 69;" f shoulderSH src/Dodge/Creature/Picture.hs 124;" f showAttachItem src/Dodge/Item/Display.hs 92;" f -showEnabledDebugs src/Dodge/Debug/Picture.hs 155;" f +showEnabledDebugs src/Dodge/Debug/Picture.hs 156;" f showEquipItem src/Dodge/Item/Display.hs 107;" f showInt src/Dodge/Item/Info.hs 75;" f showIntsString src/Dodge/Tree/Compose.hs 129;" f @@ -5114,7 +5111,7 @@ soundMultiFrom src/Dodge/SoundLogic.hs 187;" f soundOriginIDsAt src/Dodge/WorldEvent/Sound.hs 18;" f soundOriginsIDsAt src/Dodge/WorldEvent/Sound.hs 13;" f soundPathList src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 296;" f -soundPic src/Dodge/Debug/Picture.hs 352;" f +soundPic src/Dodge/Debug/Picture.hs 353;" f soundStart src/Dodge/SoundLogic.hs 118;" f soundToOnomato src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 150;" f soundToVol src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 4;" f @@ -5130,7 +5127,7 @@ sparkDam src/Dodge/Spark.hs 36;" f sparkGun src/Dodge/Item/Held/BatteryGuns.hs 13;" f sparkRandDir src/Dodge/Spark.hs 116;" f sparkToDamage src/Dodge/Spark.hs 39;" f -spawnAt src/Dodge/SpawnAt.hs 14;" f +spawnAt src/Dodge/SpawnAt.hs 15;" f spawnerCrit src/Dodge/Creature.hs 56;" f spawnerRoom src/Dodge/Room/Room.hs 369;" f speedLegs src/Dodge/Item/Equipment.hs 90;" f @@ -5147,12 +5144,12 @@ spreadAroundCenter src/Dodge/Base.hs 173;" f spreadCenter src/Dodge/Base.hs 187;" f spreadFromCenter src/Dodge/Base.hs 176;" f spreadGunCrit src/Dodge/Creature/SpreadGunCrit.hs 11;" f -spreadOut src/Dodge/Creature/Boid.hs 158;" f +spreadOut src/Dodge/Creature/Boid.hs 161;" f sps src/Dodge/LevelGen/PlacementHelper.hs 30;" f sps0 src/Dodge/LevelGen/PlacementHelper.hs 42;" f square src/Geometry/Polygon.hs 47;" f squareDecoration src/Dodge/Placement/TopDecoration.hs 41;" f -squashIntersectCirclePoint src/Dodge/WallCreatureCollisions.hs 112;" f +squashIntersectCirclePoint src/Dodge/WallCreatureCollisions.hs 114;" f squashNormalizeV src/Geometry/Vector.hs 158;" f ssLookupDown src/Dodge/SelectionSections.hs 82;" f ssLookupGE' src/Dodge/SelectionSections.hs 136;" f @@ -5191,12 +5188,12 @@ stone3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 572;" f stone4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 484;" f stone5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 626;" f stopAllSounds src/Sound.hs 125;" f -stopBulletAt src/Dodge/Bullet.hs 197;" f +stopBulletAt src/Dodge/Bullet.hs 199;" f stopPushing src/Dodge/Block.hs 105;" f stopSoundFrom src/Dodge/SoundLogic.hs 220;" f strFromEquipment src/Dodge/Creature/Statistics.hs 53;" f strFromHeldItem src/Dodge/Creature/Statistics.hs 67;" f -strengthFactor src/Dodge/Creature/Impulse/Movement.hs 36;" f +strengthFactor src/Dodge/Creature/Impulse/Movement.hs 37;" f strictify src/MaybeHelp.hs 37;" f strideRot src/Dodge/Item/HeldOffset.hs 72;" f stringToList src/Picture/Base.hs 313;" f @@ -5205,13 +5202,13 @@ stripZ src/Geometry/Vector3D.hs 97;" f subInvX src/Dodge/ListDisplayParams.hs 46;" f subMap src/TreeHelp.hs 119;" f subZipWith src/Dodge/Placement/Instance/Wall.hs 115;" f -swapAnyExtraSelection src/Dodge/Inventory/Swap.hs 56;" f +swapAnyExtraSelection src/Dodge/Inventory/Swap.hs 57;" f swapInOutLinks src/Dodge/RoomLink.hs 98;" f swapIndices src/ListHelp.hs 50;" f -swapInvItems src/Dodge/Inventory/Swap.hs 21;" f -swapItemWith src/Dodge/Inventory.hs 163;" f +swapInvItems src/Dodge/Inventory/Swap.hs 22;" f +swapItemWith src/Dodge/Inventory.hs 164;" f swarmCrit src/Dodge/Creature/SwarmCrit.hs 10;" f -swarmUsingCenter src/Dodge/Creature/Boid.hs 172;" f +swarmUsingCenter src/Dodge/Creature/Boid.hs 176;" f switchDoor src/Dodge/Placement/Instance/Door.hs 104;" f switchWallCol src/Dodge/Default/Door.hs 12;" f t src/ShortShow.hs 44;" f @@ -5239,9 +5236,9 @@ tap4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 706;" f tapQuietS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 460;" f targCorner src/Dodge/Targeting/Draw.hs 35;" f targetCursorPic src/Dodge/Targeting/Draw.hs 41;" f -targetYouCognizant src/Dodge/Creature/ChooseTarget.hs 13;" f -targetYouLOS src/Dodge/Creature/ChooseTarget.hs 7;" f -targetYouWhenCognizant src/Dodge/Creature/ReaderUpdate.hs 196;" f +targetYouCognizant src/Dodge/Creature/ChooseTarget.hs 14;" f +targetYouLOS src/Dodge/Creature/ChooseTarget.hs 8;" f +targetYouWhenCognizant src/Dodge/Creature/ReaderUpdate.hs 197;" f targetYouWhenCognizant src/Dodge/Creature/SetTarget.hs 9;" f targetingScope src/Dodge/Item/Scope.hs 38;" f telRoomLev src/Dodge/Room/Teleport.hs 14;" f @@ -5252,7 +5249,7 @@ termTextColor src/Dodge/Terminal.hs 46;" f terminalColor src/Dodge/Placement/Instance/Terminal.hs 74;" f terminalReturnEffect src/Dodge/Terminal.hs 168;" f terminalSPic src/Dodge/Machine/Draw.hs 40;" f -terminalScreenGlow src/Dodge/Machine/Update.hs 39;" f +terminalScreenGlow src/Dodge/Machine/Update.hs 40;" f terminalShape src/Dodge/Machine/Draw.hs 43;" f terminalWheelEvent src/Dodge/Update/Scroll.hs 131;" f teslaGun src/Dodge/Item/Held/BatteryGuns.hs 19;" f @@ -5283,13 +5280,13 @@ thickCircle src/Picture/Base.hs 272;" f thickLine src/Picture/Base.hs 244;" f thickLineCol src/Picture/Base.hs 255;" f thinHighBar src/Dodge/Room/Foreground.hs 77;" f -thingHit src/Dodge/WorldEvent/ThingsHit.hs 109;" f -thingHitFilt src/Dodge/WorldEvent/ThingsHit.hs 97;" f -thingsHit src/Dodge/WorldEvent/ThingsHit.hs 35;" f -thingsHitExceptCr src/Dodge/WorldEvent/ThingsHit.hs 118;" f -thingsHitZ src/Dodge/WorldEvent/ThingsHit.hs 43;" f +thingHit src/Dodge/WorldEvent/ThingsHit.hs 110;" f +thingHitFilt src/Dodge/WorldEvent/ThingsHit.hs 98;" f +thingsHit src/Dodge/WorldEvent/ThingsHit.hs 36;" f +thingsHitExceptCr src/Dodge/WorldEvent/ThingsHit.hs 119;" f +thingsHitZ src/Dodge/WorldEvent/ThingsHit.hs 44;" f threeLineDecoration src/Dodge/Placement/TopDecoration.hs 61;" f -throwItem src/Dodge/Creature/Action.hs 211;" f +throwItem src/Dodge/Creature/Action.hs 212;" f tileTexCoords src/Tile.hs 11;" f tilesFromRooms src/Dodge/Layout.hs 191;" f tilesToLine src/Shader/AuxAddition.hs 66;" f @@ -5336,15 +5333,15 @@ topPrismEdgeIndices src/Shader/Poke.hs 335;" f topPrismIndices src/Shader/Poke.hs 410;" f topTestPart src/Dodge/TestString.hs 41;" f torchShape src/Dodge/Item/Draw/SPic.hs 276;" f -torqueAmount src/Dodge/HeldUse.hs 573;" f +torqueAmount src/Dodge/HeldUse.hs 574;" f torqueCr src/Dodge/WorldEffect.hs 72;" f torso src/Dodge/Creature/Picture.hs 102;" f -tractCr src/Dodge/TractorBeam/Update.hs 27;" f -tractFlIt src/Dodge/TractorBeam/Update.hs 22;" f -tractorBeamAt src/Dodge/HeldUse.hs 806;" f +tractCr src/Dodge/TractorBeam/Update.hs 28;" f +tractFlIt src/Dodge/TractorBeam/Update.hs 23;" f +tractorBeamAt src/Dodge/HeldUse.hs 807;" f tractorGun src/Dodge/Item/Held/BatteryGuns.hs 53;" f tractorGunPic src/Dodge/Item/Draw/SPic.hs 437;" f -tractorPullPos src/Dodge/TractorBeam/Update.hs 32;" 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 @@ -5389,22 +5386,22 @@ truncFaces src/Polyhedra/Geodesic.hs 53;" f truncate src/Polyhedra/Geodesic.hs 38;" f trunkDepth src/TreeHelp.hs 162;" f tryAttachItems src/Dodge/Item/Grammar.hs 34;" f -tryClickUse src/Dodge/Creature/YourControl.hs 236;" f +tryClickUse src/Dodge/Creature/YourControl.hs 237;" f tryCombine src/Dodge/Update/Input/InGame.hs 545;" f -tryDrawToCapacitor src/Dodge/Creature/State.hs 150;" f +tryDrawToCapacitor src/Dodge/Creature/State.hs 151;" f tryDropSelected src/Dodge/Update/Input/InGame.hs 138;" f tryGetChannel src/Sound.hs 97;" f tryGetRootAttachedFromInvID src/Dodge/Inventory/Location.hs 22;" f -tryMeleeAttack src/Dodge/Creature/ReaderUpdate.hs 38;" f +tryMeleeAttack src/Dodge/Creature/ReaderUpdate.hs 39;" f tryPickupSelected src/Dodge/Update/Input/InGame.hs 145;" f tryPlay src/Sound.hs 84;" f -tryPutItemInInv src/Dodge/Inventory/Add.hs 23;" f -tryPutItemInInvAt src/Dodge/Inventory/Add.hs 52;" f +tryPutItemInInv src/Dodge/Inventory/Add.hs 24;" f +tryPutItemInInvAt src/Dodge/Inventory/Add.hs 53;" f trySeedFromClipboard src/Dodge/Menu.hs 96;" f trySpin src/Dodge/Projectile/Update.hs 169;" f -trySynthBullet src/Dodge/Creature/State.hs 166;" f +trySynthBullet src/Dodge/Creature/State.hs 167;" f tryThrust src/Dodge/Projectile/Update.hs 175;" f -tryUseParent src/Dodge/Creature/State.hs 144;" f +tryUseParent src/Dodge/Creature/State.hs 145;" f turnTo src/Dodge/Movement/Turn.hs 8;" f turret src/Dodge/Placement/Instance/Turret.hs 37;" f turretItemOffset src/Dodge/Item/HeldOffset.hs 21;" f @@ -5415,13 +5412,13 @@ tutLight src/Dodge/Room/Tutorial.hs 196;" f tutRezBox src/Dodge/Room/Tutorial.hs 343;" f tutRoomTree src/Dodge/Floor.hs 21;" f tutorialMessage1 src/Dodge/Room/Tutorial.hs 367;" f -tweenAngles src/Geometry/Vector.hs 196;" f +tweenAngles src/Geometry/Vector.hs 190;" f twinSlowDoorChasers src/Dodge/Room/LongDoor.hs 81;" f twinSlowDoorRoom src/Dodge/Room/LongDoor.hs 29;" f -twists src/Dodge/Creature/Test.hs 99;" f -twoFlat src/Dodge/Creature/Test.hs 96;" f +twists src/Dodge/Creature/Test.hs 100;" f +twoFlat src/Dodge/Creature/Test.hs 97;" f twoFlatHRot src/Dodge/Item/HeldOffset.hs 81;" f -twoHandTwistAmount src/Dodge/Creature/YourControl.hs 165;" f +twoHandTwistAmount src/Dodge/Creature/YourControl.hs 166;" f twoRoomPoss src/Dodge/PlacementSpot.hs 146;" f twoStep1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 544;" f twoStepS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 596;" f @@ -5435,7 +5432,7 @@ unigate src/Dodge/Item/Scope.hs 102;" f unitVectorAtAngle src/Geometry/Vector.hs 101;" f unlockInv src/Dodge/Inventory/Lock.hs 12;" f unpause src/Dodge/Menu.hs 213;" f -unsafeBlinkAction src/Dodge/Creature/Action/Blink.hs 56;" f +unsafeBlinkAction src/Dodge/Creature/Action/Blink.hs 57;" f unsafeBlinker src/Dodge/Item/Held/Utility.hs 33;" f unsafeSwapKeys src/IntMapHelp.hs 74;" f unshadowBlock src/Dodge/Block.hs 39;" f @@ -5449,21 +5446,21 @@ updateAimPos src/Dodge/Update.hs 302;" f updateAllNodes src/TreeHelp.hs 86;" f updateArc src/Dodge/Tesla.hs 44;" f updateBackspaceRegex src/Dodge/Update/Input/InGame.hs 478;" f -updateBarrel src/Dodge/Barreloid.hs 43;" f -updateBarreloid src/Dodge/Barreloid.hs 15;" f +updateBarrel src/Dodge/Barreloid.hs 44;" f +updateBarreloid src/Dodge/Barreloid.hs 16;" f updateBaseWheelEvent src/Dodge/Update/Scroll.hs 34;" f updateBounds src/Dodge/Update/Camera.hs 258;" f -updateBulVel src/Dodge/Bullet.hs 56;" f -updateBullet src/Dodge/Bullet.hs 21;" f +updateBulVel src/Dodge/Bullet.hs 57;" f +updateBullet src/Dodge/Bullet.hs 22;" f updateBullets src/Dodge/Update.hs 549;" f updateCamera src/Dodge/Update/Camera.hs 30;" f -updateCloseObjects src/Dodge/Inventory.hs 114;" f +updateCloseObjects src/Dodge/Inventory.hs 115;" f updateCloud src/Dodge/Update.hs 784;" f updateClouds src/Dodge/Update.hs 652;" f updateCombinePositioning src/Dodge/DisplayInventory.hs 40;" f updateCombineSections src/Dodge/DisplayInventory.hs 47;" f -updateCreature src/Dodge/Creature/Update.hs 31;" f -updateCreature' src/Dodge/Creature/Update.hs 40;" f +updateCreature src/Dodge/Creature/Update.hs 32;" f +updateCreature' src/Dodge/Creature/Update.hs 41;" f updateCreatureGroups src/Dodge/Update.hs 521;" f updateCreatureSoundPositions src/Dodge/Update.hs 501;" f updateDebris src/Dodge/Update.hs 556;" f @@ -5479,7 +5476,7 @@ updateDusts src/Dodge/Update.hs 655;" f updateEnergyBall src/Dodge/EnergyBall.hs 31;" f updateEnergyBalls src/Dodge/Update.hs 643;" f updateEnterRegex src/Dodge/Update/Input/InGame.hs 505;" f -updateExpBarrel src/Dodge/Barreloid.hs 20;" f +updateExpBarrel src/Dodge/Barreloid.hs 21;" f updateFBOTO src/Framebuffer/Update.hs 97;" f updateFBOTO3 src/Framebuffer/Update.hs 131;" f updateFlame src/Dodge/Flame.hs 19;" f @@ -5488,26 +5485,26 @@ updateFloatingCamera src/Dodge/Update/Camera.hs 35;" f updateFunctionKey src/Dodge/Update/Input/InGame.hs 363;" f updateFunctionKeys src/Dodge/Update/Input/InGame.hs 359;" f updateGusts src/Dodge/Update.hs 767;" f -updateHumanoid src/Dodge/Humanoid.hs 13;" f +updateHumanoid src/Dodge/Humanoid.hs 14;" f updateIMl src/Dodge/Update.hs 515;" f updateIMl' src/Dodge/Update.hs 518;" f updateInGameCamera src/Dodge/Update/Camera.hs 79;" f updateInitialPressInGame src/Dodge/Update/Input/InGame.hs 428;" f updateInt2Map src/Dodge/Zoning/Base.hs 92;" f updateInventoryPositioning src/Dodge/DisplayInventory.hs 86;" f -updateItemTargeting src/Dodge/Creature/State.hs 259;" f +updateItemTargeting src/Dodge/Creature/State.hs 260;" f updateKeyContinueTerminal src/Dodge/Update/Input/InGame.hs 396;" f updateKeyInGame src/Dodge/Update/Input/InGame.hs 422;" f updateKeysInGame src/Dodge/Update/Input/InGame.hs 83;" f updateKeysInTerminal src/Dodge/Update/Input/InGame.hs 382;" f updateKeysTextInputTerminal src/Dodge/Update/Input/InGame.hs 405;" f -updateLampoid src/Dodge/Lampoid.hs 12;" f +updateLampoid src/Dodge/Lampoid.hs 13;" f updateLaser src/Dodge/Laser/Update.hs 11;" f updateLasers src/Dodge/Update.hs 419;" f updateLeftParentSF src/Dodge/Item/Grammar.hs 170;" f updateLinearShockwave src/Dodge/LinearShockwave/Update.hs 8;" f updateLongPressInGame src/Dodge/Update/Input/InGame.hs 441;" f -updateMachine src/Dodge/Machine/Update.hs 23;" f +updateMachine src/Dodge/Machine/Update.hs 24;" f updateMagnets src/Dodge/Update.hs 310;" f updateMouseClickInGame src/Dodge/Update/Input/InGame.hs 203;" f updateMouseContext src/Dodge/Update.hs 323;" f @@ -5521,14 +5518,14 @@ updatePastWorlds src/Dodge/Update.hs 408;" f updatePreload src/Preload/Update.hs 20;" f updateProjectile src/Dodge/Projectile/Update.hs 26;" f updateProp src/Dodge/Prop/Update.hs 11;" f -updatePulse src/Dodge/Creature/Update.hs 145;" f +updatePulse src/Dodge/Creature/Update.hs 146;" f updatePulseBall src/Dodge/Update.hs 433;" f updatePulseLaser src/Dodge/Update.hs 596;" f updatePulseLasers src/Dodge/Update.hs 428;" f updateRBList src/Dodge/Inventory/RBList.hs 22;" f updateRadarBlip src/Dodge/RadarBlip.hs 11;" f updateRadarBlips src/Dodge/Update.hs 545;" f -updateRadarSweep src/Dodge/RadarSweep.hs 39;" f +updateRadarSweep src/Dodge/RadarSweep.hs 40;" f updateRadarSweeps src/Dodge/Update.hs 646;" f updateRandNode src/TreeHelp.hs 109;" f updateRenderSplit appDodge/Main.hs 109;" f @@ -5547,16 +5544,16 @@ updateSpark src/Dodge/Spark.hs 19;" f updateSparks src/Dodge/Update.hs 649;" f updateTeslaArc src/Dodge/Update.hs 566;" f updateTeslaArcs src/Dodge/Update.hs 563;" f -updateTractorBeam src/Dodge/TractorBeam/Update.hs 8;" f +updateTractorBeam src/Dodge/TractorBeam/Update.hs 9;" f updateTractorBeams src/Dodge/Update.hs 634;" f -updateTurret src/Dodge/Machine/Update.hs 48;" f +updateTurret src/Dodge/Machine/Update.hs 49;" f updateUniverse src/Dodge/Update.hs 72;" f updateUniverseFirst src/Dodge/Update.hs 83;" f updateUniverseLast src/Dodge/Update.hs 134;" f updateUniverseMid src/Dodge/Update.hs 154;" f updateUseInputInGame src/Dodge/Update/Input/InGame.hs 45;" f updateUseInputOnScreen src/Dodge/Update/Input/ScreenLayer.hs 23;" f -updateWalkCycle src/Dodge/Creature/State/WalkCycle.hs 10;" f +updateWalkCycle src/Dodge/Creature/State/WalkCycle.hs 11;" f updateWallDamages src/Dodge/Update/WallDamage.hs 10;" f updateWheelEvent src/Dodge/Update/Scroll.hs 25;" f updateWheelEvents src/Dodge/Update.hs 398;" f @@ -5580,22 +5577,22 @@ upperPrismPolyST src/Shape.hs 108;" f upperPrismPolySU src/Shape.hs 114;" f upperPrismPolyTS src/Shape.hs 120;" f upperRounded src/Shape.hs 185;" f -useBulletPayload src/Dodge/Bullet.hs 114;" f -useGasParams src/Dodge/HeldUse.hs 1112;" f -useHotkey src/Dodge/Creature/YourControl.hs 76;" f -useInventoryPath src/Dodge/HeldUse.hs 1427;" f +useBulletPayload src/Dodge/Bullet.hs 116;" f +useGasParams src/Dodge/HeldUse.hs 1113;" f +useHotkey src/Dodge/Creature/YourControl.hs 77;" f +useInventoryPath src/Dodge/HeldUse.hs 1428;" f useItem src/Dodge/Creature/Impulse/UseItem.hs 19;" f useItemLoc src/Dodge/Creature/Impulse/UseItem.hs 26;" f useLnkRoomPos src/Dodge/PlacementSpot.hs 255;" f -useLoadedAmmo src/Dodge/HeldUse.hs 716;" f -useMagShield src/Dodge/Euse.hs 27;" f +useLoadedAmmo src/Dodge/HeldUse.hs 717;" f +useMagShield src/Dodge/Euse.hs 30;" f useNormalCamera src/Dodge/Camera.hs 6;" f usePayload src/Dodge/Payload.hs 18;" f -useRewindGun src/Dodge/HeldUse.hs 1387;" f +useRewindGun src/Dodge/HeldUse.hs 1388;" f useRoomPosCond src/Dodge/PlacementSpot.hs 180;" f useRoomPosRoomCond src/Dodge/PlacementSpot.hs 183;" f -useStopWatch src/Dodge/HeldUse.hs 1368;" f -useTimeScrollGun src/Dodge/HeldUse.hs 1376;" f +useStopWatch src/Dodge/HeldUse.hs 1369;" f +useTimeScrollGun src/Dodge/HeldUse.hs 1377;" f useUnusedLnk src/Dodge/PlacementSpot.hs 171;" f usedRoomInLinkPoss src/Dodge/PlacementSpot.hs 202;" f usedRoomLinkPoss src/Dodge/PlacementSpot.hs 209;" f @@ -5618,35 +5615,35 @@ 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 333;" f -viewBoundaries src/Dodge/Debug/Picture.hs 320;" f -viewClipBounds src/Dodge/Debug/Picture.hs 329;" f +vgunMuzzles src/Dodge/HeldUse.hs 334;" f +viewBoundaries src/Dodge/Debug/Picture.hs 321;" f +viewClipBounds src/Dodge/Debug/Picture.hs 330;" f viewDistanceFromItems src/Dodge/Update/Camera.hs 194;" f -viewTarget src/Dodge/Creature/ReaderUpdate.hs 146;" f +viewTarget src/Dodge/Creature/ReaderUpdate.hs 147;" f violet src/Color.hs 21;" f -visibleWalls src/Dodge/Base/Collide.hs 207;" f +visibleWalls src/Dodge/Base/Collide.hs 206;" f visionCheck src/Dodge/Creature/Perception.hs 153;" f vocalizationTest src/Dodge/Creature/Vocalization.hs 42;" f volleyGun src/Dodge/Item/Held/Cane.hs 15;" f volleyGunShape src/Dodge/Item/Draw/SPic.hs 357;" f -walkNozzle src/Dodge/HeldUse.hs 782;" f +walkNozzle src/Dodge/HeldUse.hs 783;" f walkableNodeNear src/Dodge/Path.hs 48;" f -wallBlips src/Dodge/RadarSweep.hs 98;" f -wallBuffer src/Dodge/WallCreatureCollisions.hs 52;" f +wallBlips src/Dodge/RadarSweep.hs 99;" f +wallBuffer src/Dodge/WallCreatureCollisions.hs 53;" f wallIsZeroLength src/Dodge/LevelGen/StaticWalls.hs 179;" f wallLine src/Dodge/Placement/Instance/Wall.hs 71;" f -wallToSurface src/Dodge/Base/Collide.hs 172;" f +wallToSurface src/Dodge/Base/Collide.hs 171;" f wallsFromRooms src/Dodge/Layout.hs 132;" f wallsToDraw src/Dodge/Render/Walls.hs 17;" f -warmupSound src/Dodge/HeldUse.hs 1421;" f +warmupSound src/Dodge/HeldUse.hs 1422;" f warningRooms src/Dodge/Room/Warning.hs 30;" f -wasdAim src/Dodge/Creature/YourControl.hs 132;" f +wasdAim src/Dodge/Creature/YourControl.hs 133;" f wasdDir src/Dodge/WASD.hs 17;" f wasdM src/Dodge/WASD.hs 9;" f -wasdMovement src/Dodge/Creature/YourControl.hs 168;" f -wasdWithAiming src/Dodge/Creature/YourControl.hs 125;" f +wasdMovement src/Dodge/Creature/YourControl.hs 169;" f +wasdWithAiming src/Dodge/Creature/YourControl.hs 126;" f watchCombinations src/Dodge/Combine/Combinations.hs 16;" f -watchUpdateStrat src/Dodge/Creature/ReaderUpdate.hs 179;" f +watchUpdateStrat src/Dodge/Creature/ReaderUpdate.hs 180;" f weakenMatS src/Dodge/Material/Sound.hs 18;" f weaponBehindPillar src/Dodge/Room/Room.hs 186;" f weaponBetweenPillars src/Dodge/Room/Room.hs 202;" f @@ -5690,8 +5687,8 @@ wlOpaqueDraw src/Dodge/Render/Walls.hs 45;" f wlSeeThroughDraw src/Dodge/Render/Walls.hs 48;" f wlZoneSize src/Dodge/Zoning/Wall.hs 52;" f wlsFromIXs src/Dodge/Zoning/Wall.hs 35;" f -wlsHit src/Dodge/WorldEvent/ThingsHit.hs 132;" f -wlsHitRadial src/Dodge/WorldEvent/ThingsHit.hs 140;" f +wlsHit src/Dodge/WorldEvent/ThingsHit.hs 133;" f +wlsHitRadial src/Dodge/WorldEvent/ThingsHit.hs 141;" f wlsNearCirc src/Dodge/Zoning/Wall.hs 49;" f wlsNearPoint src/Dodge/Zoning/Wall.hs 39;" f wlsNearRect src/Dodge/Zoning/Wall.hs 46;" f @@ -5709,16 +5706,16 @@ writeSaveSlot src/Dodge/Save.hs 34;" f xCylinder src/Shape.hs 137;" f xCylinderST src/Shape.hs 134;" f xIntercepts src/Dodge/Zoning/Base.hs 60;" f -xV2 src/Geometry/Vector.hs 207;" f -xyV3 src/Geometry/Vector.hs 219;" f -xyzV4 src/Geometry/Vector.hs 215;" f +xV2 src/Geometry/Vector.hs 201;" f +xyV3 src/Geometry/Vector.hs 213;" f +xyzV4 src/Geometry/Vector.hs 209;" f yIntercepts' src/Dodge/Zoning/Base.hs 76;" f -yV2 src/Geometry/Vector.hs 211;" f +yV2 src/Geometry/Vector.hs 205;" f yellow src/Color.hs 17;" f you src/Dodge/Base/You.hs 13;" f -youDropItem src/Dodge/Creature/Action.hs 196;" f +youDropItem src/Dodge/Creature/Action.hs 197;" f yourAugmentedItem src/Dodge/Render/HUD.hs 238;" f -yourControl src/Dodge/Creature/YourControl.hs 27;" f +yourControl src/Dodge/Creature/YourControl.hs 28;" f yourDefaultStrideLength src/Dodge/Default/Creature.hs 110;" f yourInfo src/Dodge/Creature/Info.hs 10;" f yourInv src/Dodge/Base/You.hs 28;" f @@ -5735,7 +5732,7 @@ zipCount src/Dodge/Tree/Shift.hs 136;" f zipCountDown src/Dodge/Room/Procedural.hs 121;" f zoneCloud src/Dodge/Zoning/Cloud.hs 27;" f zoneClouds src/Dodge/Update.hs 460;" f -zoneCreature src/Dodge/Zoning/Creature.hs 54;" f +zoneCreature src/Dodge/Zoning/Creature.hs 55;" f zoneCreatures src/Dodge/Update.hs 496;" f zoneDust src/Dodge/Zoning/Cloud.hs 48;" f zoneDusts src/Dodge/Update.hs 464;" f @@ -5743,7 +5740,7 @@ zoneExtract src/Dodge/Zoning/Base.hs 52;" f zoneMonoid src/Dodge/Zoning/Base.hs 83;" f zoneOfCirc src/Dodge/Zoning/Base.hs 24;" f zoneOfCl src/Dodge/Zoning/Cloud.hs 24;" f -zoneOfCr src/Dodge/Zoning/Creature.hs 44;" f +zoneOfCr src/Dodge/Zoning/Creature.hs 45;" f zoneOfDs src/Dodge/Zoning/Cloud.hs 45;" f zoneOfPe src/Dodge/Zoning/Pathing.hs 49;" f zoneOfPn src/Dodge/Zoning/Pathing.hs 27;" f