From 1f855e13214aa1a3111cf3c25aceb9711de8ceae Mon Sep 17 00:00:00 2001 From: justin Date: Thu, 16 Apr 2026 09:38:55 +0100 Subject: [PATCH] Refactor slime update --- src/Dodge/Room/Tutorial.hs | 1 + src/Dodge/Update.hs | 31 +- tags | 585 +++++++++++++++++++------------------ 3 files changed, 319 insertions(+), 298 deletions(-) diff --git a/src/Dodge/Room/Tutorial.hs b/src/Dodge/Room/Tutorial.hs index c618329ea..dd1b91a68 100644 --- a/src/Dodge/Room/Tutorial.hs +++ b/src/Dodge/Room/Tutorial.hs @@ -61,6 +61,7 @@ tutAnoTree = do , tToBTree "" . return . cleatOnward <$> ((putSingleLight =<< roomRectAutoLights 300 300) <&> rmPmnts <>~ [sps0 (PutCrit slimeCrit) & plSpot . psPos .~ V2 150 100 , sps0 (PutCrit chaseCrit) & plSpot . psPos .~ V2 250 100 + , sps0 (PutCrit hoverCrit) & plSpot . psPos .~ V2 250 50 ] ) -- , tToBTree "" . return . cleatOnward <$> (cChasm diff --git a/src/Dodge/Update.hs b/src/Dodge/Update.hs index e71da15db..044a79206 100644 --- a/src/Dodge/Update.hs +++ b/src/Dodge/Update.hs @@ -1009,8 +1009,9 @@ crCrSpring c1 c2 , distance xy1 xy2 < r1 - (r2 + 5) = feedSlime c1 c2 | Just t <- c1 ^? crType . slimeSplitTimer - , t <= 0 = - cWorld . lWorld . creatures %~ (rolap . rolap') + , slimeFood c2 + , t <= 0 = slimeSuck c1 c2 +-- cWorld . lWorld . creatures %~ (rolap . rolap') | SlimeCrit{} <- c1 ^. crType = id | SlimeCrit{} <- c2 ^. crType = id | otherwise = cWorld . lWorld . creatures %~ ( olap c1 c2 . olap' c2 c1) @@ -1024,8 +1025,8 @@ crCrSpring c1 c2 olap a b = ix (a ^. crID) . crPos . _xy +~ overlap b olap' a b = ix (a ^. crID) . crPos . _xy -~ overlap b suckx = (min 1 $ 2 * (1 - distance xy1 xy2 / (r1 + r2))) ^ (2:: Int) - rolap = ix id1 . crPos . _xy +~ f (suckx * 1.5 * m2 / (m1+m2)) *^ normalize (xy2 - xy1) - rolap' = ix id2 . crPos . _xy +~ f (suckx * 1.5*m1 / (m1+m2)) *^ normalize (xy1 - xy2) +-- rolap = ix id1 . crPos . _xy +~ f (suckx * 1.5 * m2 / (m1+m2)) *^ normalize (xy2 - xy1) +-- rolap' = ix id2 . crPos . _xy +~ f (suckx * 1.5*m1 / (m1+m2)) *^ normalize (xy1 - xy2) f = min (distance xy1 xy2/2) id1 = _crID c1 id2 = _crID c2 @@ -1041,6 +1042,22 @@ crCrSpring c1 c2 m1 = crMass $ c1 ^. crType m2 = crMass $ c2 ^. crType +slimeSuck :: Creature -> Creature -> World -> World +slimeSuck c1 c2 = cWorld . lWorld . creatures %~ (rolap . rolap') + where + suckx = (min 1 $ 2 * (1 - distance xy1 xy2 / (r1 + r2))) ^ (2:: Int) + rolap = ix id1 . crPos . _xy +~ f (suckx * 1.5 * m2 / (m1+m2)) *^ normalize (xy2 - xy1) + rolap' = ix id2 . crPos . _xy +~ f (suckx * 1.5*m1 / (m1+m2)) *^ normalize (xy1 - xy2) + f = min (distance xy1 xy2/2) + id1 = _crID c1 + id2 = _crID c2 + xy1 = c1 ^. crPos . _xy + xy2 = c2 ^. crPos . _xy + r1 = crRad (c1 ^. crType) + r2 = crRad (c2 ^. crType) + m1 = crMass $ c1 ^. crType + m2 = crMass $ c2 ^. crType + slimeFood :: Creature -> Bool slimeFood cr = case cr ^. crType of Avatar{} -> True @@ -1053,7 +1070,7 @@ feedSlime s c w = fromMaybe w $ do ch <- crHeight c return $ if min 10 r1 + s ^?! crType . slimeFeedProgress < max 15 (ch + 2) then w & cWorld . lWorld . creatures . ix (s ^. crID) . crType . slimeFeedProgress %~ (min r1 . (+0.7)) - & cWorld . lWorld . creatures %~ (rolap . rolap') + & slimeSuck s c else w & cWorld . lWorld . creatures . ix (c ^. crID) . crHP .~ CrDestroyed Swallowed @@ -1068,8 +1085,8 @@ feedSlime s c w = fromMaybe w $ do r = sqrt (r1*r1 + 4*r2*r2) id1 = s ^. crID id2 = c ^. crID - rolap = ix id1 . crPos . _xy +~ f' (suckx * 1.5 * m2 / (m1+m2)) *^ normalize (xy2 - xy1) - rolap' = ix id2 . crPos . _xy +~ f' (suckx * 1.5*m1 / (m1+m2)) *^ normalize (xy1 - xy2) +-- rolap = ix id1 . crPos . _xy +~ f' (suckx * 1.5 * m2 / (m1+m2)) *^ normalize (xy2 - xy1) +-- rolap' = ix id2 . crPos . _xy +~ f' (suckx * 1.5*m1 / (m1+m2)) *^ normalize (xy1 - xy2) m1 = crMass $ s ^. crType m2 = crMass $ c ^. crType suckx = (min 1 $ 2 * (1 - distance xy1 xy2 / (r1 + r2))) ^ (2:: Int) diff --git a/tags b/tags index b50bf8e4d..5a264709d 100644 --- a/tags +++ b/tags @@ -74,11 +74,11 @@ AttachType src/Dodge/Data/Item/Combine.hs 92;" t Attention src/Dodge/Data/Creature/Perception.hs 58;" t AttentiveTo src/Dodge/Data/Creature/Perception.hs 59;" C Audition src/Dodge/Data/Creature/Perception.hs 45;" t -AutoCrit src/Dodge/Data/Creature/Misc.hs 81;" C +AutoCrit src/Dodge/Data/Creature/Misc.hs 83;" C AutoTrigger src/Dodge/Data/TriggerType.hs 8;" C -AvPosture src/Dodge/Data/Creature/Misc.hs 85;" C +AvPosture src/Dodge/Data/Creature/Misc.hs 87;" C Avatar src/Dodge/Data/Creature/Misc.hs 47;" C -AvatarPosture src/Dodge/Data/Creature/Misc.hs 85;" t +AvatarPosture src/Dodge/Data/Creature/Misc.hs 87;" t Awareness src/Dodge/Data/Creature/Perception.hs 63;" t BANGCONE src/Dodge/Data/Item/Combine.hs 150;" C BANGROD src/Dodge/Data/Item/Combine.hs 159;" C @@ -104,10 +104,10 @@ BURSTRIFLE src/Dodge/Data/Item/Combine.hs 158;" C BackdropCurs src/Dodge/Data/SelectionList.hs 23;" C BackgroundSound src/Dodge/Data/SoundOrigin.hs 13;" C Bark src/Dodge/Data/ActionPlan.hs 41;" C -BarrelCrit src/Dodge/Data/Creature/Misc.hs 82;" C +BarrelCrit src/Dodge/Data/Creature/Misc.hs 84;" C BarrelHiss src/Dodge/Data/SoundOrigin.hs 34;" C -BarrelType src/Dodge/Data/Creature/Misc.hs 97;" t -Barreloid src/Dodge/Data/Creature/Misc.hs 93;" C +BarrelType src/Dodge/Data/Creature/Misc.hs 99;" t +Barreloid src/Dodge/Data/Creature/Misc.hs 95;" C BasicBeamDraw src/Dodge/Data/Beam.hs 32;" C BasicBulletTrajectory src/Dodge/Data/Bullet.hs 41;" C BasicBulletTrajectoryType src/Dodge/Data/Bullet.hs 48;" C @@ -284,7 +284,7 @@ CreateFlame src/Dodge/Data/Item/Use/Consumption/Ammo.hs 17;" C CreatePoisonGas src/Dodge/Data/Item/Use/Consumption/Ammo.hs 17;" C Creature src/Dodge/Data/Creature.hs 35;" t CreaturePart src/Dodge/Data/Wall/Structure.hs 16;" C -CreatureShape src/Dodge/Data/Creature/Misc.hs 87;" t +CreatureShape src/Dodge/Data/Creature/Misc.hs 89;" t CreatureType src/Dodge/Data/Creature/Misc.hs 46;" t Crushing src/Dodge/Data/Damage.hs 19;" C CryoReleaseCloud src/Dodge/Data/Cloud.hs 23;" C @@ -403,7 +403,7 @@ Explosion src/Dodge/Data/SoundOrigin.hs 39;" C ExplosionPayload src/Dodge/Data/Payload.hs 9;" C Explosive src/Dodge/Data/Damage.hs 25;" C ExplosiveBall src/Dodge/Data/EnergyBall/Type.hs 14;" C -ExplosiveBarrel src/Dodge/Data/Creature/Misc.hs 99;" C +ExplosiveBarrel src/Dodge/Data/Creature/Misc.hs 101;" C ExplosivePutty src/Dodge/Data/AmmoType.hs 16;" C ExtraMenuOption src/Dodge/Data/Universe.hs 76;" t Eyes src/Dodge/Data/Creature/Perception.hs 39;" C @@ -557,7 +557,7 @@ HotkeyX src/Dodge/Data/Equipment/Misc.hs 36;" C HotkeyZ src/Dodge/Data/Equipment/Misc.hs 35;" C HoverCrit src/Dodge/Data/Creature/Misc.hs 68;" C Huge src/Shape/Data.hs 24;" C -Humanoid src/Dodge/Data/Creature/Misc.hs 88;" C +Humanoid src/Dodge/Data/Creature/Misc.hs 90;" C IMSI src/Dodge/Data/SelectionList.hs 41;" t IMSS src/Dodge/Data/SelectionList.hs 39;" t INTROSCAN src/Dodge/Data/Item/Combine.hs 32;" C @@ -645,7 +645,7 @@ LabLink src/Dodge/Data/Room.hs 50;" C LabSS src/Dodge/Data/Scenario.hs 97;" C LabelCluster src/Dodge/Data/RoomCluster.hs 13;" C Laboratory src/Dodge/Data/Scenario.hs 61;" C -LampCrit src/Dodge/Data/Creature/Misc.hs 83;" C +LampCrit src/Dodge/Data/Creature/Misc.hs 85;" C Large src/Shape/Data.hs 25;" C LasBeamCombine src/Dodge/Data/Beam.hs 38;" C LasGunFlare src/Dodge/Data/Muzzle.hs 34;" C @@ -853,7 +853,7 @@ NoWorldEffect src/Dodge/Data/WorldEffect.hs 26;" C Noclip src/Dodge/Data/Config.hs 83;" C NodeMTree src/Dodge/Data/MetaTree.hs 17;" C NodeTree src/Dodge/Data/MetaTree.hs 16;" C -NonDrawnCreature src/Dodge/Data/Creature/Misc.hs 94;" C +NonDrawnCreature src/Dodge/Data/Creature/Misc.hs 96;" C NonInf src/Dodge/Data/CardinalPoint.hs 44;" C NormalOptions src/Dodge/Data/Universe.hs 71;" C NormalSpark src/Dodge/Data/Spark.hs 19;" C @@ -997,7 +997,7 @@ Piezoelectric src/Dodge/Data/Material.hs 23;" C Pitted src/Dodge/Data/Creature.hs 68;" C Placement src/Dodge/Data/GenWorld.hs 113;" t PlacementSpot src/Dodge/Data/GenWorld.hs 97;" t -PlainBarrel src/Dodge/Data/Creature/Misc.hs 98;" C +PlainBarrel src/Dodge/Data/Creature/Misc.hs 100;" C PlainDeath src/Dodge/Data/Creature.hs 70;" C PlantNurserySS src/Dodge/Data/Scenario.hs 96;" C PlasmaBall src/Dodge/Data/PlasmaBall.hs 13;" t @@ -1229,7 +1229,7 @@ SixteenthRes src/Dodge/Data/Config.hs 113;" C Size src/Shape/Data.hs 24;" t SkiffBaySS src/Dodge/Data/Scenario.hs 108;" C SleepingQuatersSS src/Dodge/Data/Scenario.hs 90;" C -SlimeCrit src/Dodge/Data/Creature/Misc.hs 73;" C +SlimeCrit src/Dodge/Data/Creature/Misc.hs 74;" C SlimeIntelligence src/Dodge/Data/ActionPlan.hs 16;" C SlinkCrit src/Dodge/Data/Creature/Misc.hs 69;" C Small src/Shape/Data.hs 27;" C @@ -1284,7 +1284,7 @@ Suspicious src/Dodge/Data/Creature/Perception.hs 64;" C Swallowed src/Dodge/Data/Creature.hs 68;" C SwapEquipment src/Dodge/Data/RightButtonOptions.hs 24;" C Swarm src/Dodge/Data/Creature/State.hs 25;" C -SwarmCrit src/Dodge/Data/Creature/Misc.hs 80;" C +SwarmCrit src/Dodge/Data/Creature/Misc.hs 82;" C TAPE src/Dodge/Data/Item/Combine.hs 56;" C TARGETING src/Dodge/Data/Item/Combine.hs 21;" C TCBase src/Dodge/Data/Terminal.hs 49;" C @@ -1562,7 +1562,7 @@ _avStrength src/Dodge/Data/Creature/Misc.hs 50;" f _avatarMaterial src/Dodge/Data/Creature/Misc.hs 49;" f _avatarPulse src/Dodge/Data/Creature/Misc.hs 48;" f _barrelShader src/Data/Preload/Render.hs 27;" f -_barrelType src/Dodge/Data/Creature/Misc.hs 82;" f +_barrelType src/Dodge/Data/Creature/Misc.hs 84;" f _bdColor src/Dodge/Data/Prop.hs 23;" f _bdMaxX src/Dodge/Data/Bounds.hs 12;" f _bdMaxY src/Dodge/Data/Bounds.hs 14;" f @@ -1954,9 +1954,9 @@ _lInvLock src/Dodge/Data/LWorld.hs 148;" f _lTestInt src/Dodge/Data/LWorld.hs 144;" f _lTestString src/Dodge/Data/LWorld.hs 143;" f _lWorld src/Dodge/Data/CWorld.hs 24;" f -_lampColor src/Dodge/Data/Creature/Misc.hs 83;" f -_lampHeight src/Dodge/Data/Creature/Misc.hs 83;" f -_lampLSID src/Dodge/Data/Creature/Misc.hs 83;" f +_lampColor src/Dodge/Data/Creature/Misc.hs 85;" f +_lampHeight src/Dodge/Data/Creature/Misc.hs 85;" f +_lampLSID src/Dodge/Data/Creature/Misc.hs 85;" f _lasWepXSF src/Dodge/Data/ComposedItem.hs 42;" f _laserEmmiter src/Dodge/Data/Laser.hs 16;" f _laserTypeDamage src/Dodge/Data/Laser.hs 15;" f @@ -2117,7 +2117,7 @@ _phTargetingID src/Dodge/Data/Projectile.hs 42;" f _pickUpLevel src/Dodge/Layout/Generate.hs 15;" f _pickUps src/Dodge/Layout/Generate.hs 16;" f _pictureShaders src/Data/Preload/Render.hs 31;" f -_piercedPoints src/Dodge/Data/Creature/Misc.hs 99;" f +_piercedPoints src/Dodge/Data/Creature/Misc.hs 101;" f _pjBarrelSpin src/Dodge/Data/Projectile.hs 23;" f _pjDetonatorID src/Dodge/Data/Projectile.hs 25;" f _pjDir src/Dodge/Data/Projectile.hs 18;" f @@ -2328,17 +2328,19 @@ _skOldPos src/Dodge/Data/Spark.hs 14;" f _skPos src/Dodge/Data/Spark.hs 13;" f _skType src/Dodge/Data/Spark.hs 15;" f _skVel src/Dodge/Data/Spark.hs 12;" f -_skinHead src/Dodge/Data/Creature/Misc.hs 89;" f -_skinLower src/Dodge/Data/Creature/Misc.hs 91;" f -_skinUpper src/Dodge/Data/Creature/Misc.hs 90;" f +_skinHead src/Dodge/Data/Creature/Misc.hs 91;" f +_skinLower src/Dodge/Data/Creature/Misc.hs 93;" f +_skinUpper src/Dodge/Data/Creature/Misc.hs 92;" f _slInt src/Dodge/Data/HUD.hs 39;" f _slSec src/Dodge/Data/HUD.hs 39;" f _slSet src/Dodge/Data/HUD.hs 39;" f -_slimeCompression src/Dodge/Data/Creature/Misc.hs 77;" f -_slimeIsCompressing src/Dodge/Data/Creature/Misc.hs 78;" f -_slimeRad src/Dodge/Data/Creature/Misc.hs 74;" f -_slimeRadWobble src/Dodge/Data/Creature/Misc.hs 75;" f -_slimeSplitTimer src/Dodge/Data/Creature/Misc.hs 76;" f +_slimeCompression src/Dodge/Data/Creature/Misc.hs 78;" f +_slimeFeedProgress src/Dodge/Data/Creature/Misc.hs 80;" f +_slimeIsCompressing src/Dodge/Data/Creature/Misc.hs 79;" f +_slimeRad src/Dodge/Data/Creature/Misc.hs 75;" f +_slimeRadWobble src/Dodge/Data/Creature/Misc.hs 76;" f +_slimeSplitTimer src/Dodge/Data/Creature/Misc.hs 77;" f +_slinkHeadPos src/Dodge/Data/Creature/Misc.hs 72;" f _slinkSpine src/Dodge/Data/Creature/Misc.hs 71;" f _smoothScrollAmount src/Dodge/Data/Input.hs 41;" f _soundAngDist src/Sound/Data.hs 47;" f @@ -2669,7 +2671,7 @@ argV src/Geometry/Vector.hs 89;" f armourChaseCrit src/Dodge/Creature/ArmourChase.hs 34;" f armouredChasers src/Dodge/Room/Boss.hs 58;" f armouredCorridor src/Dodge/Room/RoadBlock.hs 20;" f -arms src/Dodge/Creature/Picture.hs 326;" f +arms src/Dodge/Creature/Picture.hs 331;" f arrow src/Picture/Composite.hs 19;" f arrowPath src/Picture/Composite.hs 8;" f assignHotkey src/Dodge/AssignHotkey.hs 9;" f @@ -2689,9 +2691,9 @@ attachTree src/Dodge/Tree/Compose.hs 39;" f attentionViewPoint src/Dodge/Creature/ReaderUpdate.hs 77;" f attribSize src/Shader/Compile.hs 139;" f autoAmr src/Dodge/Item/Held/Rod.hs 39;" f -autoBS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 791;" f +autoBS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 794;" f autoCrit src/Dodge/Creature/AutoCrit.hs 10;" f -autoGunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 591;" f +autoGunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 594;" f autoPistol src/Dodge/Item/Held/Stick.hs 21;" f autoRifle src/Dodge/Item/Held/Cane.hs 27;" f awakeLevelPerception src/Dodge/Creature/Perception.hs 171;" f @@ -2700,19 +2702,19 @@ azure src/Color.hs 49;" f bQuadToF src/Geometry/Bezier.hs 37;" f bQuadToLine src/Geometry/Bezier.hs 30;" f backPQ src/Dodge/Creature/HandPos.hs 183;" f -backgroundSpaceS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 781;" f +backgroundSpaceS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 784;" f backpackCombinations src/Dodge/Combine/Combinations.hs 27;" f backpackShape src/Dodge/Item/Draw/SPic.hs 189;" f backspaceInputted src/Dodge/Update/Input/Text.hs 25;" f bangCone src/Dodge/Item/Held/Cone.hs 11;" f bangConeShape src/Dodge/Item/Draw/SPic.hs 305;" f -bangEchoS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 693;" f +bangEchoS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 696;" f bangRod src/Dodge/Item/Held/Rod.hs 18;" f -bangS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 885;" f +bangS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 890;" f bangStick src/Dodge/Item/Held/Stick.hs 15;" f barPP src/Dodge/Room/Foreground.hs 231;" f barrel src/Dodge/Creature/Inanimate.hs 17;" f -barrelShape src/Dodge/Creature/Picture.hs 377;" f +barrelShape src/Dodge/Creature/Picture.hs 382;" f baseAMRShape src/Dodge/Item/Draw/SPic.hs 411;" f baseBlockPane src/Dodge/Placement/Instance/Wall.hs 76;" f baseCI src/Dodge/Item/Grammar.hs 167;" f @@ -2721,20 +2723,20 @@ baseItemTriggerType src/Dodge/BaseTriggerType.hs 21;" f baseRifleShape src/Dodge/Item/Draw/SPic.hs 325;" f baseRodShape src/Dodge/Item/Draw/SPic.hs 408;" f baseSMGShape src/Dodge/Item/Draw/SPic.hs 396;" f -baseShoulder src/Dodge/Creature/Picture.hs 364;" f +baseShoulder src/Dodge/Creature/Picture.hs 369;" f baseStickShape src/Dodge/Item/Draw/SPic.hs 302;" f baseStickShapeX src/Dodge/Item/Draw/SPic.hs 294;" f baseStickSpread src/Dodge/HeldUse.hs 346;" f basicAttentionUpdate src/Dodge/Creature/Perception.hs 137;" f basicAwarenessUpdate src/Dodge/Creature/Perception.hs 31;" f -basicCrPict src/Dodge/Creature/Picture.hs 73;" f -basicCrShape src/Dodge/Creature/Picture.hs 79;" f +basicCrPict src/Dodge/Creature/Picture.hs 74;" f +basicCrShape src/Dodge/Creature/Picture.hs 80;" f basicItemDisplay src/Dodge/Item/Display.hs 23;" f basicMachineApplyDamage src/Dodge/Machine/Damage.hs 6;" f basicMuzFlare src/Dodge/HeldUse.hs 731;" f battery src/Dodge/Item/Ammo.hs 60;" f batteryPack src/Dodge/Item/Equipment.hs 38;" f -beep3QuickS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 707;" f +beep3QuickS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 710;" f beltMag src/Dodge/Item/Ammo.hs 38;" f bfsThenReturn src/Dodge/Creature/ReaderUpdate.hs 327;" f bgateCalc src/Dodge/Inventory/SelectionList.hs 131;" f @@ -2755,22 +2757,22 @@ blockPillar src/Dodge/Room/Pillar.hs 23;" f blockedCorridor src/Dodge/Room/RoadBlock.hs 71;" f blockedCorridorCloseBlocks src/Dodge/Room/RoadBlock.hs 78;" f blockingLoad src/Dodge/Concurrent.hs 35;" f -blood1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 765;" f -blood2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 865;" f -blood3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 689;" f -blood4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 895;" f -blood5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 599;" f -blood6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 825;" f -blood7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 603;" f -blood8S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 589;" f -bloodShort1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 633;" f -bloodShort2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 831;" f -bloodShort3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 893;" f -bloodShort4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 899;" f -bloodShort5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 717;" f -bloodShort6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 807;" f -bloodShort7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 637;" f -bloodShort8S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 575;" f +blood1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 768;" f +blood2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 870;" f +blood3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 692;" f +blood4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 900;" f +blood5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 602;" f +blood6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 828;" f +blood7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 606;" f +blood8S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 592;" f +bloodShort1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 636;" f +bloodShort2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 834;" f +bloodShort3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 898;" f +bloodShort4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 904;" f +bloodShort5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 720;" f +bloodShort6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 810;" f +bloodShort7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 640;" f +bloodShort8S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 578;" f blowTorch src/Dodge/Item/Held/SprayGuns.hs 43;" f blue src/Color.hs 43;" f blunderbuss src/Dodge/Item/Held/Cone.hs 14;" f @@ -2808,10 +2810,10 @@ bulletSynthesizer src/Dodge/Item/Ammo.hs 89;" f bulletWeapons src/Dodge/Combine/Combinations.hs 247;" f burstRifle src/Dodge/Item/Held/Cane.hs 30;" f buttonFlip src/Dodge/Button/Event.hs 18;" f -buzz1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 887;" f -buzzS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 635;" f +buzz1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 892;" f +buzzS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 638;" f byNthLink src/Dodge/Room/Warning.hs 44;" f -cChasm src/Dodge/Room/Tutorial.hs 171;" f +cChasm src/Dodge/Room/Tutorial.hs 172;" f cFilledRect src/Dodge/CharacterEnums.hs 6;" f cWireRect src/Dodge/CharacterEnums.hs 10;" f calcSmoothScroll src/Dodge/SmoothScroll.hs 11;" f @@ -2844,20 +2846,20 @@ changeSwapWith src/Dodge/Inventory.hs 283;" f charToTuple src/Picture/Base.hs 312;" f charToTupleGrad src/Picture/Text.hs 18;" f chartreuse src/Color.hs 51;" f -chaseCorpse src/Dodge/Creature/Picture.hs 275;" f +chaseCorpse src/Dodge/Creature/Picture.hs 280;" f chaseCrit src/Dodge/Creature/ChaseCrit.hs 33;" f chaseCritInternal src/Dodge/Humanoid.hs 12;" f chaseCritMv src/Dodge/Creature/ReaderUpdate.hs 194;" f -chaseUpperBody src/Dodge/Creature/Picture.hs 153;" f +chaseUpperBody src/Dodge/Creature/Picture.hs 158;" f chasmRotate src/Dodge/Creature/State/WalkCycle.hs 124;" f -chasmSimpleMaze src/Dodge/Room/Tutorial.hs 408;" f -chasmSpitTerminal src/Dodge/Room/Tutorial.hs 341;" f +chasmSimpleMaze src/Dodge/Room/Tutorial.hs 409;" f +chasmSpitTerminal src/Dodge/Room/Tutorial.hs 342;" f chasmTestCliffPush src/Dodge/Creature/State/WalkCycle.hs 106;" f chasmWallToSurface src/Dodge/Base/Collide.hs 132;" f checkCombineSelectionExists src/Dodge/DisplayInventory.hs 100;" f checkConnection src/Dodge/Inventory/Swap.hs 66;" f -checkDeath src/Dodge/Creature/Update.hs 222;" f -checkDeath' src/Dodge/Creature/Update.hs 225;" f +checkDeath src/Dodge/Creature/Update.hs 224;" f +checkDeath' src/Dodge/Creature/Update.hs 227;" f checkEndGame src/Dodge/Update.hs 875;" f checkErrorGL src/Shader/Compile.hs 86;" f checkFBO src/Framebuffer/Check.hs 6;" f @@ -2891,16 +2893,16 @@ clAlt src/Dodge/Cloud.hs 5;" f clColor src/Shader/Poke/Cloud.hs 39;" f clZoneSize src/Dodge/Zoning/Cloud.hs 24;" f clampPath src/Dodge/Room/Procedural.hs 148;" f -clang1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 875;" f -clang2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 785;" f -clangS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 619;" f +clang1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 880;" f +clang2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 788;" f +clangS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 622;" f cleanUpPreload src/Preload.hs 10;" f cleanUpSoundPreload src/Preload.hs 15;" f cleanupHalted src/Sound.hs 119;" f cleatLabel src/Dodge/Cleat.hs 30;" f cleatOnward src/Dodge/Cleat.hs 24;" f cleatSide src/Dodge/Cleat.hs 27;" f -click1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 839;" f +click1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 844;" f clicker src/Dodge/Item/Scope.hs 88;" f clipV src/Geometry/Vector.hs 48;" f clipZoom src/Dodge/Update/Camera.hs 234;" f @@ -2947,7 +2949,7 @@ combineInventoryExtra src/Dodge/Render/HUD.hs 340;" f combineItemListYouX src/Dodge/Combine.hs 36;" f combineList src/Dodge/Combine.hs 21;" f combineRooms src/Dodge/Room/Procedural.hs 134;" f -combineS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 797;" f +combineS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 800;" f combineTree src/Dodge/Tree/Compose.hs 68;" f commandColor src/Dodge/Terminal.hs 127;" f commonPrefix src/Dodge/Debug/Terminal.hs 149;" f @@ -2962,10 +2964,10 @@ compileAndCheckShader src/Shader/Compile.hs 108;" f composeNode src/Dodge/Tree/Compose.hs 77;" f composeTree src/Dodge/Tree/Compose.hs 48;" f compressor src/Dodge/Item/Ammo.hs 74;" f -computerBeepingS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 713;" f +computerBeepingS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 716;" f conEffects src/Dodge/Concurrent.hs 12;" f concurrentIS src/Dodge/Inventory.hs 197;" f -connectItemS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 799;" f +connectItemS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 802;" f constructEdges src/Polyhedra.hs 31;" f constructEdgesList src/Polyhedra.hs 40;" f contToIDCont src/Dodge/LevelGen/PlacementHelper.hs 58;" f @@ -2981,7 +2983,7 @@ copierItemUpdate src/Dodge/Creature/State.hs 136;" f copyItemToFloor src/Dodge/FloorItem.hs 14;" f corDoor src/Dodge/Room/Room.hs 411;" f cornerList src/Preload/Render.hs 236;" f -corpseOrGib src/Dodge/Creature/Update.hs 271;" f +corpseOrGib src/Dodge/Creature/Update.hs 273;" f corridor src/Dodge/Room/Corridor.hs 17;" f corridorBoss src/Dodge/LockAndKey.hs 135;" f corridorN src/Dodge/Room/Corridor.hs 58;" f @@ -2989,7 +2991,7 @@ corridorWallN src/Dodge/Room/Corridor.hs 77;" f crAdd src/Dodge/Room/RezBox.hs 116;" f crAwayFromPost src/Dodge/Creature/Test.hs 83;" f crBlips src/Dodge/RadarSweep.hs 88;" f -crCamouflage src/Dodge/Creature/Picture.hs 76;" f +crCamouflage src/Dodge/Creature/Picture.hs 77;" f crCanSeeCr src/Dodge/Creature/Test.hs 50;" f crCrSpring src/Dodge/Update.hs 997;" f crCurrentEquipment src/Dodge/Creature/Statistics.hs 67;" f @@ -3030,7 +3032,7 @@ crShape src/Dodge/Creature/Shape.hs 8;" f crSpring src/Dodge/Update.hs 984;" f crStratConMatches src/Dodge/Creature/Test.hs 78;" f crStrength src/Dodge/Creature/Statistics.hs 30;" f -crUpdate src/Dodge/Creature/Update.hs 215;" f +crUpdate src/Dodge/Creature/Update.hs 217;" f crUpdateInvidLocations src/Dodge/Inventory/Location.hs 67;" f crUpdateItemLocations src/Dodge/Inventory/Location.hs 49;" f crVocalResetTime src/Dodge/Creature/Vocalization.hs 65;" f @@ -3041,15 +3043,15 @@ crWlPbHit src/Dodge/WorldEvent/ThingsHit.hs 71;" f crWlPbHitZ src/Dodge/WorldEvent/ThingsHit.hs 81;" f crZoneSize src/Dodge/Zoning/Creature.hs 43;" f crabActionUpdate src/Dodge/Creature/ReaderUpdate.hs 124;" f -crabCorpse src/Dodge/Creature/Picture.hs 294;" f +crabCorpse src/Dodge/Creature/Picture.hs 299;" f crabCrit src/Dodge/Creature/ChaseCrit.hs 40;" f crabCritInternal src/Dodge/Humanoid.hs 29;" f -crabFeet src/Dodge/Creature/Picture.hs 205;" f -crabRoom src/Dodge/Room/Tutorial.hs 462;" f -crabUpperBody src/Dodge/Creature/Picture.hs 129;" f +crabFeet src/Dodge/Creature/Picture.hs 210;" f +crabRoom src/Dodge/Room/Tutorial.hs 463;" f +crabUpperBody src/Dodge/Creature/Picture.hs 134;" f craftInfo src/Dodge/Item/Info.hs 168;" f craftItemSPic src/Dodge/Item/Draw/SPic.hs 41;" f -crankSlowS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 639;" f +crankSlowS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 642;" f createForceField src/Dodge/ForceField.hs 7;" f createGas src/Dodge/Gas.hs 10;" f createHeadLamp src/Dodge/Euse.hs 64;" f @@ -3146,11 +3148,11 @@ deZoneIX src/Dodge/Zoning/Base.hs 91;" f deZoneWall src/Dodge/Zoning/Wall.hs 69;" f deadEndPSType src/Dodge/Room/Room.hs 264;" f deadEndRoom src/Dodge/Room/Room.hs 267;" f -deadFeet src/Dodge/Creature/Picture.hs 322;" f -deadRot src/Dodge/Creature/Picture.hs 340;" f -deadScalp src/Dodge/Creature/Picture.hs 335;" f -deadUpperBody src/Dodge/Creature/Picture.hs 361;" f -debrisS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 775;" f +deadFeet src/Dodge/Creature/Picture.hs 327;" f +deadRot src/Dodge/Creature/Picture.hs 345;" f +deadScalp src/Dodge/Creature/Picture.hs 340;" f +deadUpperBody src/Dodge/Creature/Picture.hs 366;" f +debrisS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 778;" f debrisSPic src/Dodge/Prop/Draw.hs 17;" f debrisSize src/Dodge/Block/Debris.hs 131;" f debugEvent src/Dodge/Debug.hs 43;" f @@ -3175,10 +3177,10 @@ decoratedBlock src/Dodge/Placement/Instance/Block.hs 14;" f decorationToShape src/Dodge/Placement/TopDecoration.hs 16;" f decreaseAwareness src/Dodge/Creature/Perception.hs 128;" f decrementTimer src/Sound.hs 104;" f -dedaS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 597;" f -dededaS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 725;" f -dededumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 815;" f -dedumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 845;" f +dedaS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 600;" f +dededaS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 728;" f +dededumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 818;" f +dedumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 850;" f defCraftItem src/Dodge/Default/Item.hs 25;" f defDamageMaterial src/Dodge/Material/Damage.hs 34;" f defEquipment src/Dodge/Default.hs 24;" f @@ -3259,7 +3261,7 @@ digitalLine src/Geometry.hs 285;" f digitalRect src/Geometry.hs 302;" f dim src/Color.hs 139;" f dirtPoly src/Dodge/Room/RoadBlock.hs 74;" f -disconnectItemS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 843;" f +disconnectItemS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 848;" f displayConfig src/Dodge/Menu.hs 223;" f displayControls src/Dodge/Menu.hs 239;" f displayFrameTicks src/Dodge/Render/Picture.hs 50;" f @@ -3333,7 +3335,7 @@ doRoomShift src/Dodge/Room/Link.hs 34;" f doScopeZoom src/Dodge/Update/Scroll.hs 89;" f doSectionSize src/Dodge/DisplayInventory.hs 215;" f doSideEffects appDodge/Main.hs 118;" f -doSlimeRadChange src/Dodge/Creature/Update.hs 126;" f +doSlimeRadChange src/Dodge/Creature/Update.hs 127;" f doStrategyActions src/Dodge/Creature/ReaderUpdate.hs 272;" f doTabComplete src/Dodge/Terminal.hs 241;" f doTestDrawing src/Dodge/Render.hs 40;" f @@ -3373,7 +3375,7 @@ drawBoundingBox src/Dodge/Debug/Picture.hs 368;" f drawBullet src/Dodge/Render/ShapePicture.hs 156;" f drawButton src/Dodge/Button/Draw.hs 11;" f drawCPUShadows src/Dodge/Render/Shadow.hs 19;" f -drawChaseCrit src/Dodge/Creature/Picture.hs 120;" f +drawChaseCrit src/Dodge/Creature/Picture.hs 125;" f drawCircCollisionTest src/Dodge/Debug/Picture.hs 118;" f drawCliff src/Dodge/Render/ShapePicture.hs 87;" f drawCollisionTest src/Dodge/Debug/Picture.hs 103;" f @@ -3384,7 +3386,7 @@ drawCoord src/Dodge/Debug/Picture.hs 396;" f drawCountMod src/Render.hs 231;" f drawCrInfo src/Dodge/Debug.hs 215;" f drawCrInfo' src/Dodge/Debug.hs 210;" f -drawCrabCrit src/Dodge/Creature/Picture.hs 112;" f +drawCrabCrit src/Dodge/Creature/Picture.hs 117;" f drawCreature src/Dodge/Creature/Picture.hs 36;" f drawCreatureDisplayTexts src/Dodge/Debug/Picture.hs 199;" f drawCross src/Dodge/Render/Label.hs 25;" f @@ -3403,7 +3405,7 @@ drawDragSelecting src/Dodge/Render/HUD.hs 162;" f drawDumbSwitch src/Dodge/Button/Draw.hs 31;" f drawEmptySet src/Dodge/Render/Picture.hs 153;" f drawEnergyBall src/Dodge/EnergyBall/Draw.hs 7;" f -drawEquipment src/Dodge/Creature/Picture.hs 373;" f +drawEquipment src/Dodge/Creature/Picture.hs 378;" f drawExamineInventory src/Dodge/Render/HUD.hs 199;" f drawExplosiveBall src/Dodge/EnergyBall/Draw.hs 15;" f drawFarWallDetect src/Dodge/Debug/Picture.hs 271;" f @@ -3413,7 +3415,7 @@ drawForceField src/Dodge/Wall/Draw.hs 15;" f drawGapPlus src/Dodge/Render/Picture.hs 284;" f drawGib src/Dodge/Prop/Draw.hs 31;" f drawHUD src/Dodge/Render/HUD.hs 53;" f -drawHoverCrit src/Dodge/Creature/Picture.hs 102;" f +drawHoverCrit src/Dodge/Creature/Picture.hs 107;" f drawInputMenu src/Dodge/Render/MenuScreen.hs 33;" f drawInspectWall src/Dodge/Debug/Picture.hs 256;" f drawInspectWalls src/Dodge/Debug/Picture.hs 244;" f @@ -3467,7 +3469,7 @@ drawShadowsByImportance src/Dodge/Shadows.hs 8;" f drawShell src/Dodge/Projectile/Draw.hs 22;" f drawShockwave src/Dodge/Shockwave/Draw.hs 6;" f drawSlimeCrit src/Dodge/Creature/Picture.hs 56;" f -drawSlinkCrit src/Dodge/Creature/Picture.hs 94;" f +drawSlinkCrit src/Dodge/Creature/Picture.hs 95;" f drawSpark src/Dodge/Spark/Draw.hs 7;" f drawStaticBall src/Dodge/EnergyBall/Draw.hs 28;" f drawSubInventory src/Dodge/Render/HUD.hs 173;" f @@ -3495,7 +3497,7 @@ drawZone src/Dodge/Debug/Picture.hs 152;" f drawZoneCirc src/Dodge/Debug/Picture.hs 293;" f drawZoneCol src/Dodge/Debug/Picture.hs 149;" f drawZoneNearPointCursor src/Dodge/Debug/Picture.hs 286;" f -dropAll src/Dodge/Creature/Update.hs 309;" f +dropAll src/Dodge/Creature/Update.hs 311;" f dropInventoryPath src/Dodge/HeldUse.hs 1371;" f dropItem src/Dodge/Creature/Action.hs 169;" f dropper src/Dodge/Item/Scope.hs 82;" f @@ -3527,8 +3529,8 @@ edgeToPic src/Dodge/Debug/Picture.hs 426;" f effectOnEquip src/Dodge/Euse.hs 84;" f effectOnRemove src/Dodge/Euse.hs 74;" f eitType src/Dodge/Data/EquipType.hs 15;" f -ejectS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 897;" f -elecCrackleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 879;" f +ejectS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 902;" f +elecCrackleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 884;" f elephantGun src/Dodge/Item/Held/Rod.hs 27;" f emptyCorridor src/Dodge/Room/BlinkAcross.hs 23;" f emptyTrie src/SimpleTrie.hs 17;" f @@ -3539,7 +3541,7 @@ encircleP src/Dodge/Creature/Boid.hs 30;" f endArcPos src/Dodge/Tesla.hs 86;" f endCombineRegex src/Dodge/Update/Input/InGame.hs 310;" f endRegex src/Dodge/Update/Input/InGame.hs 304;" f -energyReleaseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 739;" f +energyReleaseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 742;" f enterCombineInv src/Dodge/DisplayInventory.hs 321;" f enumOption src/Dodge/Menu/OptionType.hs 17;" f epText src/Dodge/Inventory/SelectionList.hs 74;" f @@ -3573,7 +3575,7 @@ expandPolyCorners src/Dodge/LevelGen/StaticWalls.hs 103;" f expandToSquare src/Dodge/LevelGen/StaticWalls/Deprecated.hs 83;" f expireAndDamage src/Dodge/Bullet.hs 189;" f explodeShell src/Dodge/Projectile/Update.hs 274;" f -explosionS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 743;" f +explosionS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 746;" f explosiveBarrel src/Dodge/Creature/Inanimate.hs 25;" f extTrigLitPos src/Dodge/Placement/Instance/Button.hs 79;" f extendConeToScreenEdge src/Dodge/Debug/Picture.hs 82;" f @@ -3585,8 +3587,8 @@ faceEdges src/Polyhedra.hs 62;" f facesToVF src/Polyhedra/Geodesic.hs 70;" f farWallDistDirection src/Dodge/Update/Camera.hs 245;" f fdiv src/ShortShow.hs 41;" f -feedSlime src/Dodge/Update.hs 1051;" f -feet src/Dodge/Creature/Picture.hs 191;" f +feedSlime src/Dodge/Update.hs 1052;" f +feet src/Dodge/Creature/Picture.hs 196;" f filter3 src/FoldableHelp.hs 76;" f filterSectionsPair src/Dodge/DisplayInventory.hs 160;" f findBlips src/Dodge/RadarSweep.hs 63;" f @@ -3599,9 +3601,9 @@ findReverseEdgeList src/Polyhedra.hs 54;" f findWallFreeDropPoint src/Dodge/FloorItem.hs 27;" f findWallsInPolygon src/Dodge/LevelGen/StaticWalls/Deprecated.hs 78;" f findWithIx src/ListHelp.hs 124;" f -fireFadeS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 911;" f -fireLoudS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 709;" f -fireS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 759;" f +fireFadeS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 916;" f +fireLoudS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 712;" f +fireS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 762;" f firstBreather src/Dodge/Room/Breather.hs 9;" f firstTrie src/SimpleTrie.hs 51;" f firstWorldLoad appDodge/Main.hs 68;" f @@ -3632,17 +3634,17 @@ floorItemPickupInfo src/Dodge/Render/HUD.hs 233;" f floorItemSPic src/Dodge/Render/ShapePicture.hs 143;" f floorTo src/Geometry/Zone.hs 12;" f floorWire src/Dodge/Wire.hs 13;" f -foamSprayFadeOutS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 833;" f -foamSprayLoopS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 881;" f -foldMTRS src/Dodge/Room/Tutorial.hs 104;" f +foamSprayFadeOutS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 836;" f +foamSprayLoopS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 886;" f +foldMTRS src/Dodge/Room/Tutorial.hs 105;" f foldPairs src/ListHelp.hs 37;" f foldrWhileArb src/ListHelp.hs 111;" f followImpulse src/Dodge/Creature/Impulse.hs 24;" f -foot1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 877;" f -foot2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 755;" f -foot3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 891;" f -footPin1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 737;" f -footPin2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 803;" f +foot1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 882;" f +foot2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 758;" f +foot3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 896;" f +footPin1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 740;" f +footPin2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 806;" f forbidFlee src/Dodge/Creature/Boid.hs 45;" f forceElements src/StrictHelp.hs 10;" f forceField src/Dodge/Wall/ForceField.hs 6;" f @@ -3652,7 +3654,7 @@ fourEmbossDecoration src/Dodge/Placement/TopDecoration.hs 37;" f fpsText src/Dodge/Render/Picture.hs 57;" f fractionLoadedAmmo src/Dodge/Item/Draw/SPic.hs 148;" f frag src/Shader/Data.hs 110;" f -fridgeHumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 583;" f +fridgeHumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 586;" f fromJust' src/MaybeHelp.hs 22;" f fromListL src/DoubleStack.hs 7;" f fromTopLeft src/Dodge/ScreenPos.hs 9;" f @@ -3662,7 +3664,7 @@ fstV2 src/Geometry/Data.hs 70;" f fuelPack src/Dodge/Item/Equipment.hs 44;" f functionalUpdate src/Dodge/Update.hs 278;" f fusePoint src/Dodge/LevelGen/StaticWalls.hs 158;" f -fuseSlimes src/Dodge/Update.hs 1064;" f +fuseSlimes src/Dodge/Update.hs 1081;" f fuseWall src/Dodge/LevelGen/StaticWalls.hs 165;" f fuseWallsWith src/Dodge/LevelGen/StaticWalls.hs 172;" f g src/ShortShow.hs 48;" f @@ -3699,8 +3701,8 @@ getCloseObj src/Dodge/Update/Input/InGame.hs 543;" f getCommand src/Dodge/Terminal.hs 61;" f getCommands src/Dodge/Terminal.hs 58;" f getCrMoveSpeed src/Dodge/Creature/Statistics.hs 55;" f -getCrsFromRooms src/Dodge/Room/Tutorial.hs 619;" f -getCrsFromRooms' src/Dodge/Room/Tutorial.hs 606;" f +getCrsFromRooms src/Dodge/Room/Tutorial.hs 620;" f +getCrsFromRooms' src/Dodge/Room/Tutorial.hs 607;" f getDebugMouseOver src/Dodge/Update.hs 472;" f getDistortions src/Dodge/Render.hs 443;" f getEdgesCrossing src/Dodge/Path.hs 39;" f @@ -3717,7 +3719,7 @@ getPJStabiliser src/Dodge/HeldUse.hs 1271;" f getPretty src/AesonHelp.hs 8;" f getPromptTM src/Dodge/Terminal/Type.hs 3;" f getRoomFromID src/Dodge/Room/Modify.hs 31;" f -getRoomsFromInts src/Dodge/Room/Tutorial.hs 602;" f +getRoomsFromInts src/Dodge/Room/Tutorial.hs 603;" f getRootItemBounds src/Dodge/Render/HUD.hs 106;" f getRootItemInvID src/Dodge/Inventory/Location.hs 36;" f getSelectedCloseObj src/Dodge/SelectedClose.hs 14;" f @@ -3737,10 +3739,10 @@ girderZ src/Dodge/Room/Foreground.hs 108;" f glCreate src/GLHelp.hs 11;" f glassLesson src/Dodge/Room/GlassLesson.hs 23;" f glassLessonRunPast src/Dodge/Room/GlassLesson.hs 68;" f -glassShat1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 747;" f -glassShat2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 757;" f -glassShat3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 761;" f -glassShat4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 735;" f +glassShat1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 750;" f +glassShat2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 760;" f +glassShat3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 764;" f +glassShat4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 738;" f glassSwitchBack src/Dodge/Room/Room.hs 86;" f glassSwitchBackCrits src/Dodge/Room/Room.hs 120;" f glauncherPic src/Dodge/Item/Draw/SPic.hs 405;" f @@ -3761,13 +3763,13 @@ gridPointsOff src/Grid.hs 32;" f gridRoomPos src/Dodge/Room/Procedural.hs 91;" f groundCliffPush src/Dodge/Creature/State/WalkCycle.hs 72;" f groupSplitItemAmounts src/Dodge/Combine.hs 52;" f -gruntS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 557;" f -gut1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 909;" f -gut2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 629;" f -gut3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 731;" f -gut4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 745;" f -gut5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 721;" f -gut6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 771;" f +gruntS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 560;" f +gut1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 914;" f +gut2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 632;" f +gut3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 734;" f +gut4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 748;" f +gut5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 724;" f +gut6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 774;" f gyroscope src/Dodge/Item/Scope.hs 170;" f hackBoldText src/Picture/Base.hs 193;" f hackDropShadow src/Picture/Base.hs 196;" f @@ -3803,7 +3805,7 @@ headLamp src/Dodge/Item/Equipment.hs 68;" f headLampShape src/Dodge/Item/Draw/SPic.hs 426;" f headMap src/Dodge/DoubleTree.hs 118;" f headPQ src/Dodge/Creature/HandPos.hs 174;" f -healS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 671;" f +healS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 674;" f healthAnalyserByDoor src/Dodge/Room/LasTurret.hs 109;" f healthTest src/Dodge/Room/LasTurret.hs 129;" f heightWallPS src/Dodge/Placement/Instance/Wall.hs 24;" f @@ -3829,9 +3831,9 @@ hiToFloat src/Dodge/Room/Modify/Girder.hs 171;" f 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 657;" f +hit1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 660;" f hitEffFromBul src/Dodge/Bullet.hs 156;" f -hitS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 809;" f +hitS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 812;" f holdForm src/Dodge/Creature/Boid.hs 139;" f holsterWeapon src/Dodge/Creature/Volition.hs 14;" f homingModule src/Dodge/Item/Scope.hs 50;" f @@ -3839,8 +3841,8 @@ horPipe src/Dodge/Placement/Instance/Pipe.hs 9;" f hotkeyToChar src/Dodge/Inventory/SelectionList.hs 201;" f hotkeyToScancode src/Dodge/Creature/YourControl.hs 62;" f hotkeyToString src/Dodge/Inventory/SelectionList.hs 198;" f -hoverCrit src/Dodge/Creature/ChaseCrit.hs 77;" f -hoverCritHoverSound src/Dodge/Creature/Update.hs 192;" f +hoverCrit src/Dodge/Creature/ChaseCrit.hs 78;" f +hoverCritHoverSound src/Dodge/Creature/Update.hs 194;" f hoverCritInternal src/Dodge/Humanoid.hs 46;" f hoverCritMv src/Dodge/Creature/ReaderUpdate.hs 229;" f hoverDeathSounds src/Dodge/Creature/Vocalization.hs 58;" f @@ -3870,9 +3872,9 @@ insertAt src/Padding.hs 63;" f insertIMInZone src/Dodge/Base.hs 54;" f insertInTrie src/SimpleTrie.hs 24;" f insertNewKey src/IntMapHelp.hs 65;" f -insertOneS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 867;" f +insertOneS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 872;" f insertOver src/ListHelp.hs 47;" f -insertS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 763;" f +insertS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 766;" f insertStructureWalls src/Dodge/Placement/PlaceSpot/Block.hs 41;" f insertWall src/Dodge/Placement/PlaceSpot/Block.hs 134;" f insertWallInZones src/Dodge/Wall/Zone.hs 20;" f @@ -4036,21 +4038,21 @@ keyCardRoomRunPast src/Dodge/Room/LasTurret.hs 94;" f keyCardRunPastRand src/Dodge/LockAndKey.hs 37;" f keyPic src/Dodge/Item/Draw/SPic.hs 442;" f keyholeCorridor src/Dodge/Room/Corridor.hs 45;" f -knifeS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 795;" f -lChasm src/Dodge/Room/Tutorial.hs 183;" f +knifeS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 798;" f +lChasm src/Dodge/Room/Tutorial.hs 184;" f lConnect src/Dodge/Render/Connectors.hs 43;" f lConnectCol src/Dodge/Render/Connectors.hs 46;" f lConnectMulti src/Dodge/Render/Connectors.hs 51;" f lShape src/Dodge/Placement/Instance/LightSource.hs 61;" f lamp src/Dodge/Creature/Lamp.hs 18;" f -lampCrSPic src/Dodge/Creature/Picture.hs 382;" f +lampCrSPic src/Dodge/Creature/Picture.hs 387;" f lasCenRunClose' src/Dodge/Room/LasTurret.hs 308;" f lasCenRunClose1 src/Dodge/Room/LasTurret.hs 397;" f lasCenRunClose2 src/Dodge/Room/LasTurret.hs 470;" f lasCenRunCloseLongCor src/Dodge/Room/LasTurret.hs 362;" f lasCenSensEdge src/Dodge/Room/LasTurret.hs 164;" f lasGunPic src/Dodge/Item/Draw/SPic.hs 417;" f -lasPulseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 783;" f +lasPulseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 786;" f lasRunRand src/Dodge/Room/LasTurret.hs 467;" f lasRunYinYang src/Dodge/Room/LasTurret.hs 185;" f lasRunYinYangCenter src/Dodge/Room/LasTurret.hs 248;" f @@ -4105,7 +4107,7 @@ listSelectionColorPicture src/Dodge/DisplayInventory.hs 299;" f litCorridor90 src/Dodge/Room/RoadBlock.hs 26;" f lmt src/MatrixHelper.hs 53;" f lnkMidPosInvSelsCol src/Dodge/Render/HUD.hs 415;" f -loadAmmoTut src/Dodge/Room/Tutorial.hs 466;" f +loadAmmoTut src/Dodge/Room/Tutorial.hs 467;" f loadDodgeConfig src/Dodge/Config.hs 30;" f loadMusic src/Dodge/SoundLogic/LoadSound.hs 30;" f loadMuzzle src/Dodge/HeldUse.hs 654;" f @@ -4142,7 +4144,7 @@ loopPairs src/ListHelp.hs 30;" f lootRoom src/Dodge/Room/Treasure.hs 59;" f lorem src/Lorem.hs 3;" f lowBlock src/Dodge/Placement/Instance/Block.hs 28;" f -lowWhirS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 577;" f +lowWhirS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 580;" f lsColPos src/Dodge/LightSource.hs 24;" f lsColPosID src/Dodge/LightSource.hs 21;" f lsColPosRad src/Dodge/LightSource.hs 30;" f @@ -4170,7 +4172,7 @@ makeButton src/Dodge/LevelGen/Switch.hs 16;" f makeCloudAt src/Dodge/WorldEvent/Cloud.hs 7;" f makeColorTermLine src/Dodge/Terminal.hs 124;" f makeColorTermPara src/Dodge/Terminal.hs 121;" f -makeCorpse src/Dodge/Creature/Picture.hs 257;" f +makeCorpse src/Dodge/Creature/Picture.hs 262;" f makeCrGibs src/Dodge/Prop/Gib.hs 19;" f makeDebris src/Dodge/Block/Debris.hs 75;" f makeDebrisDirected src/Dodge/Block/Debris.hs 101;" f @@ -4216,10 +4218,10 @@ makeTileFromPoly src/Tile.hs 34;" f makeTypeCraft src/Dodge/Item/Craftable.hs 15;" f makeTypeCraftNum src/Dodge/Item/Craftable.hs 12;" f mapper src/Dodge/Item/Scope.hs 76;" f -marimbaB6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 659;" f -marimbaC5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 627;" f -marimbaE5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 667;" f -marimbaG5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 655;" f +marimbaB6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 662;" f +marimbaC5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 630;" f +marimbaE5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 670;" f +marimbaG5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 658;" f materialColor src/Dodge/Material/Color.hs 8;" f materialGib src/Dodge/Prop/Gib.hs 95;" f materialPenetrable src/Dodge/Bullet.hs 212;" f @@ -4272,21 +4274,21 @@ merge src/ListHelp.hs 84;" f mergeBy src/ListHelp.hs 87;" f mergeOn src/ListHelp.hs 94;" f mergeSound src/Sound.hs 60;" f -metal1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 901;" f -metal2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 787;" f -metal3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 615;" f -metal4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 559;" f -metal5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 701;" f -metal6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 835;" f -metal7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 733;" f +metal1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 906;" f +metal2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 790;" f +metal3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 618;" f +metal4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 562;" f +metal5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 704;" f +metal6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 840;" f +metal7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 736;" f metalPlate src/Dodge/Item/Craftable.hs 32;" f mglCreate src/GLHelp.hs 8;" f mglDelete src/GLHelp.hs 14;" f midBarDecoration src/Dodge/Placement/TopDecoration.hs 23;" f midBounds src/Dodge/Room/Foreground.hs 150;" f -midChasm src/Dodge/Room/Tutorial.hs 212;" f -midChasmPlatform src/Dodge/Room/Tutorial.hs 234;" f -midChasmSpit src/Dodge/Room/Tutorial.hs 302;" f +midChasm src/Dodge/Room/Tutorial.hs 213;" f +midChasmPlatform src/Dodge/Room/Tutorial.hs 235;" f +midChasmSpit src/Dodge/Room/Tutorial.hs 303;" f midPad src/Padding.hs 27;" f midPadL src/Padding.hs 33;" f midPoint src/Geometry.hs 83;" f @@ -4294,18 +4296,18 @@ midWall src/Dodge/Placement/Instance/Wall.hs 38;" f minAndMax src/FoldableHelp.hs 109;" f minCrIXOn src/Dodge/Zoning/Creature.hs 49;" f minOn src/FoldableHelp.hs 35;" f -mini1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 625;" f +mini1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 628;" f miniGunCrit src/Dodge/Creature.hs 56;" f miniGunX src/Dodge/Item/Held/Cane.hs 33;" f miniGunXPict src/Dodge/Item/Draw/SPic.hs 376;" f miniGunXPictItem src/Dodge/Item/Draw/SPic.hs 368;" f -miniS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 699;" f +miniS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 702;" f miniTree2 src/Dodge/Room/Room.hs 127;" f minimumOn src/FoldlHelp.hs 14;" f mirrorXAxis src/Geometry/Polygon.hs 76;" f mirrorxz src/Picture/Base.hs 330;" f mirroryz src/Picture/Base.hs 335;" f -missileLaunchS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 663;" f +missileLaunchS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 666;" f mixColors src/Color.hs 113;" f mixColorsFrac src/Color.hs 109;" f mixColorsLinear src/Color.hs 122;" f @@ -4389,7 +4391,7 @@ noShape src/ShapePicture.hs 29;" f noclipCheck src/Dodge/WallCreatureCollisions.hs 22;" f nodeNear src/Dodge/Path.hs 94;" f nodesNear src/Dodge/Path.hs 100;" f -nonConvexChasm src/Dodge/Room/Tutorial.hs 299;" f +nonConvexChasm src/Dodge/Room/Tutorial.hs 300;" f nonCornerLinks src/Dodge/Room/SensorDoor.hs 53;" f normalGait src/Dodge/Creature/State/WalkCycle.hs 148;" f normalTo8 src/Shader/Poke.hs 475;" f @@ -4412,11 +4414,11 @@ numSubElements src/Shader/Parameters.hs 39;" f numTraversable src/TreeHelp.hs 186;" f obstacleColor src/Dodge/Debug/Picture.hs 264;" f obstructPathsCrossing src/Dodge/Path.hs 153;" f -oldMachineBootS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 681;" f +oldMachineBootS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 684;" f onEquipWristShield src/Dodge/Euse.hs 89;" f onRemoveWristShield src/Dodge/Euse.hs 79;" f oneH src/Dodge/Creature/Test.hs 95;" f -oneSmooth src/Dodge/Creature/Picture.hs 188;" f +oneSmooth src/Dodge/Creature/Picture.hs 193;" f openConsole src/Dodge/Update.hs 140;" f optionMenu src/Dodge/Menu.hs 110;" f optionScreenDefaultEffect src/Dodge/Update/Input/ScreenLayer.hs 62;" f @@ -4466,7 +4468,7 @@ pairsToSCC src/Dodge/Graph.hs 32;" f paletteToColor src/Color.hs 85;" f parseItem src/Dodge/Debug/Terminal.hs 62;" f parseNum src/Dodge/Debug/Terminal.hs 77;" f -passthroughLockKeyLists src/Dodge/Room/Tutorial.hs 684;" f +passthroughLockKeyLists src/Dodge/Room/Tutorial.hs 685;" f pathConnected src/Dodge/Room/CheckConsistency.hs 13;" f pathEdgeObstructed src/Dodge/Path.hs 87;" f pauseAndFloatCam src/Dodge/Camera.hs 10;" f @@ -4490,7 +4492,7 @@ performTurnToA src/Dodge/Creature/Action.hs 142;" f perspectiveMatrixb src/MatrixHelper.hs 11;" f pickUpItem src/Dodge/Inventory/Add.hs 70;" f pickUpItemAt src/Dodge/Inventory/Add.hs 75;" f -pickUpS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 827;" f +pickUpS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 830;" f pincerP src/Dodge/Creature/Boid.hs 63;" f pincerP' src/Dodge/Creature/Boid.hs 96;" f pincerP'' src/Dodge/Creature/Boid.hs 106;" f @@ -4537,7 +4539,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 305;" f +poisonSPic src/Dodge/Creature/Update.hs 307;" f poisonSprayer src/Dodge/Item/Held/SprayGuns.hs 17;" f poke34 src/Shader/Poke.hs 518;" f pokeArrayOff src/Shader/Poke.hs 530;" f @@ -4572,8 +4574,8 @@ pokeWall src/Shader/Poke.hs 80;" f pokeWallsWindows src/Shader/Poke.hs 52;" f poly3 src/Picture/Base.hs 76;" f poly3Col src/Picture/Base.hs 80;" f -polyChasm src/Dodge/Room/Tutorial.hs 386;" f -polyChasmC src/Dodge/Room/Tutorial.hs 398;" f +polyChasm src/Dodge/Room/Tutorial.hs 387;" f +polyChasmC src/Dodge/Room/Tutorial.hs 399;" f polyCirc src/Shape.hs 48;" f polyCircx src/Shape.hs 53;" f polyCornerDist src/Geometry/Polygon.hs 69;" f @@ -4592,9 +4594,10 @@ polygon src/Picture/Base.hs 64;" f polygonCol src/Picture/Base.hs 70;" f polygonWire src/Picture/Base.hs 59;" f polysToPic src/Polyhedra.hs 122;" f -pop1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 581;" f -pop2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 869;" f -popS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 587;" f +pop1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 584;" f +pop2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 874;" f +pop3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 838;" f +popS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 590;" f popScreen src/Dodge/Menu/PushPop.hs 6;" f posRms src/Dodge/Tree/Shift.hs 46;" f posSelSecYint src/Dodge/SelectionSections.hs 161;" f @@ -4615,7 +4618,7 @@ premapMaybe src/FoldlHelp.hs 26;" f prependTwo src/Geometry.hs 177;" f prettyDT src/Dodge/DoubleTree.hs 127;" f prettyShort src/AesonHelp.hs 11;" f -primeS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 691;" f +primeS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 694;" f printColumnTitles src/Dodge/Tree/Shift.hs 155;" f printColumns src/Dodge/Tree/Shift.hs 145;" f printInfo src/Dodge/Tree/Shift.hs 158;" f @@ -4668,7 +4671,7 @@ putLitButOnPosExtTrig src/Dodge/Placement/Instance/Button.hs 97;" f putLitButOnPosExtTrig' src/Dodge/Placement/Instance/Button.hs 100;" f putMessageTerminal src/Dodge/Placement/Instance/Terminal.hs 58;" f putShape src/Dodge/Room/Foreground.hs 134;" f -putSingleLight src/Dodge/Room/Tutorial.hs 500;" f +putSingleLight src/Dodge/Room/Tutorial.hs 501;" f putSlideDr src/Dodge/Door/PutSlideDoor.hs 12;" f putStrLnAppend src/Dodge/LevelGen.hs 84;" f putTerminal src/Dodge/Placement/Instance/Terminal.hs 52;" f @@ -4759,10 +4762,10 @@ refract src/Dodge/Item/Weapon/LaserPath.hs 39;" f refreshOptionsSelectionList src/Dodge/Menu/Option.hs 35;" f regexCombs src/Dodge/DisplayInventory.hs 71;" f regexList src/Dodge/DisplayInventory.hs 312;" f -reload1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 751;" f -reloadFailS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 855;" f +reload1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 754;" f +reloadFailS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 860;" f reloadLevelStart src/Dodge/Save.hs 71;" f -reloadS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 567;" f +reloadS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 570;" f rememberSounds src/Dodge/Creature/Perception.hs 186;" f remoteDetonator src/Dodge/Item/Scope.hs 152;" f remoteScreen src/Dodge/Item/Scope.hs 146;" f @@ -4799,7 +4802,7 @@ restrictRMInLinksPD src/Dodge/Room/Link.hs 26;" f resumeSound src/Dodge/SoundLogic.hs 48;" f retreatPointForFrom src/Dodge/Creature/Impulse/Flee.hs 9;" f revCard src/Dodge/Data/CardinalPoint.hs 13;" f -reverseCymbal1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 863;" f +reverseCymbal1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 868;" f reversePair src/Dodge/LevelGen.hs 87;" f rewinder src/Dodge/Item/Held/Utility.hs 36;" f rezBox src/Dodge/Room/RezBox.hs 31;" f @@ -4899,18 +4902,18 @@ saveQuit src/Dodge/Menu.hs 77;" f saveQuitConc src/Dodge/Menu.hs 80;" f saveSlotPath src/Dodge/Save.hs 63;" f saveWorldInSlot src/Dodge/Save.hs 68;" f -sawtoothFailS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 847;" f +sawtoothFailS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 852;" f scToTS src/Dodge/Event/Input.hs 34;" f scale src/Picture/Base.hs 141;" f scale3 src/Picture/Base.hs 137;" f -scaleAlong src/Dodge/Creature/Picture.hs 69;" f +scaleAlong src/Dodge/Creature/Picture.hs 70;" f scaleMat src/MatrixHelper.hs 71;" f scaleMatrix src/MatrixHelper.hs 68;" f scaleSH src/Shape.hs 271;" f -scalp src/Dodge/Creature/Picture.hs 349;" f +scalp src/Dodge/Creature/Picture.hs 354;" f scancodeToHotkey src/Dodge/Creature/YourControl.hs 82;" f scodeToChar src/Dodge/ScodeToChar.hs 6;" f -scorchSPic src/Dodge/Creature/Update.hs 302;" f +scorchSPic src/Dodge/Creature/Update.hs 304;" f screenBox src/Dodge/Base/Window.hs 54;" f screenPolygon src/Dodge/Base/Window.hs 18;" f screenPolygonBord src/Dodge/Base/Window.hs 28;" f @@ -4922,15 +4925,15 @@ scrollRBOption src/Dodge/Update/Scroll.hs 139;" f scrollSelectionSections src/Dodge/SelectionSections.hs 28;" f scrollTimeBack src/Dodge/Update.hs 245;" f scrollTimeForward src/Dodge/Update.hs 262;" f -seagullBarkS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 621;" f -seagullBarkTransformedS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 569;" f -seagullChatter1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 641;" f -seagullChatterS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 889;" f -seagullCry1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 677;" f -seagullCry2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 719;" f -seagullCryS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 729;" f -seagullWhistle1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 805;" f -seagullWhistleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 665;" f +seagullBarkS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 624;" f +seagullBarkTransformedS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 572;" f +seagullChatter1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 644;" f +seagullChatterS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 894;" f +seagullCry1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 680;" f +seagullCry2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 722;" f +seagullCryS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 732;" f +seagullWhistle1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 808;" f +seagullWhistleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 668;" f searchIfDamaged src/Dodge/Creature/ReaderUpdate.hs 314;" f secondColumnLDP src/Dodge/ListDisplayParams.hs 45;" f sectionsDesiredLines src/Dodge/DisplayInventory.hs 202;" f @@ -4938,7 +4941,7 @@ sectionsSizes src/Dodge/DisplayInventory.hs 205;" f seedStartMenu src/Dodge/Menu.hs 85;" f seedStartOptions src/Dodge/Menu.hs 88;" f segOnCirc src/Geometry.hs 113;" f -segmentArea src/Dodge/Creature/Update.hs 173;" f +segmentArea src/Dodge/Creature/Update.hs 175;" f selNumPos src/Dodge/Render/HUD.hs 475;" f selNumPosCardinal src/Dodge/Render/HUD.hs 492;" f selSecDrawCursor src/Dodge/Render/List.hs 101;" f @@ -4947,7 +4950,7 @@ selSecSelSize src/Dodge/SelectionSections.hs 157;" f selSecYint src/Dodge/SelectionSections.hs 166;" f selectedItemScroll src/Dodge/Update/Scroll.hs 49;" f selectionSet src/Dodge/Update/Input/InGame.hs 171;" f -semitoneLoop1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 841;" f +semitoneLoop1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 846;" f sensAboveDoor src/Dodge/Room/SensorDoor.hs 68;" f sensInsideDoor src/Dodge/Room/SensorDoor.hs 77;" f senseDamage src/Dodge/Machine/Update.hs 262;" f @@ -4956,7 +4959,7 @@ sensorReqToString src/Dodge/Machine/Update.hs 240;" f sensorRoom src/Dodge/Room/SensorDoor.hs 27;" f sensorRoomRunPast src/Dodge/Room/SensorDoor.hs 59;" f sensorSPic src/Dodge/Machine/Draw.hs 89;" f -sensorTut src/Dodge/Room/Tutorial.hs 628;" f +sensorTut src/Dodge/Room/Tutorial.hs 629;" f sensorTypeDamages src/Dodge/Machine/Update.hs 286;" f sensorTypeDamages src/Dodge/Wall/Damage.hs 92;" f setChannelPos src/Sound.hs 152;" f @@ -4984,11 +4987,11 @@ setSelWhileDragging src/Dodge/Update/Input/InGame.hs 360;" f setSelectionListRestriction src/Dodge/Update/Input/ScreenLayer.hs 93;" f setShaderSource src/Shader/Compile.hs 121;" f setShadowLimits src/Dodge/Shadows.hs 11;" f -setSlimeDir src/Dodge/Creature/Update.hs 105;" f +setSlimeDir src/Dodge/Creature/Update.hs 106;" f setSoundVolume src/Sound.hs 159;" f setTile src/Dodge/Layout.hs 78;" f setTiles src/Dodge/Layout.hs 68;" f -setTreeInts src/Dodge/Room/Tutorial.hs 111;" f +setTreeInts src/Dodge/Room/Tutorial.hs 112;" f setViewDistance src/Dodge/Update/Camera.hs 240;" f setViewPos src/Dodge/Creature/ReaderUpdate.hs 71;" f setViewport src/Dodge/Render.hs 448;" f @@ -5059,7 +5062,7 @@ shootersRoom1 src/Dodge/Room/Room.hs 335;" f shootingRange src/Dodge/Room/Room.hs 362;" f shortPoint2 src/Dodge/ShortShow.hs 4;" f shortShow src/ShortShow.hs 7;" f -shotgunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 563;" f +shotgunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 566;" f shoulderHeight src/Dodge/Item/HeldOffset.hs 77;" f showAttachItem src/Dodge/Item/Display.hs 93;" f showEquipItem src/Dodge/Item/Display.hs 109;" f @@ -5080,54 +5083,54 @@ shuffleTail src/RandomHelp.hs 78;" f sigmoid src/Dodge/Base.hs 151;" f simpleCrSprings src/Dodge/Update.hs 978;" f simpleTermMessage src/Dodge/Terminal.hs 275;" f -sineRaisePitchOneSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 813;" f -sineRaisePitchTwoSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 849;" f +sineRaisePitchOneSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 816;" f +sineRaisePitchTwoSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 854;" f singleAmmo src/Dodge/Item/AmmoSlots.hs 63;" f singleDT src/Dodge/DoubleTree.hs 8;" f singleton src/DoubleStack.hs 11;" f singletonTrie src/SimpleTrie.hs 20;" f sizeFBOs src/Framebuffer/Update.hs 19;" f skColor src/Dodge/Spark/Draw.hs 14;" f -skwareFadeTwoSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 853;" f -slap1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 871;" f -slap2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 829;" f -slap3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 749;" f -slap4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 851;" f -slap5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 859;" f -slap6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 613;" f -slap7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 611;" f -slapClean2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 669;" f -slapClean3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 753;" f -slapClean4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 595;" f -slapClean5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 903;" f -slapClean6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 623;" f -slapClean7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 801;" f -slapS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 715;" f -slideDoorS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 673;" f +skwareFadeTwoSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 858;" f +slap1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 876;" f +slap2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 832;" f +slap3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 752;" f +slap4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 856;" f +slap5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 864;" f +slap6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 616;" f +slap7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 614;" f +slapClean2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 672;" f +slapClean3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 756;" f +slapClean4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 598;" f +slapClean5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 908;" f +slapClean6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 626;" f +slapClean7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 804;" f +slapS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 718;" f +slideDoorS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 676;" f slideWindow src/ListHelp.hs 81;" f -slimeCrit src/Dodge/Creature/ChaseCrit.hs 65;" f +slimeCrit src/Dodge/Creature/ChaseCrit.hs 66;" f slimeCritUpdate src/Dodge/Creature/Update.hs 71;" f -slimeEatSound src/Dodge/Update.hs 1083;" f -slimeFood src/Dodge/Update.hs 1044;" f +slimeEatSound src/Dodge/Update.hs 1100;" f +slimeFood src/Dodge/Update.hs 1045;" f slinkCrit src/Dodge/Creature/ChaseCrit.hs 54;" f -slinkCritUpdate src/Dodge/Creature/Update.hs 176;" f +slinkCritUpdate src/Dodge/Creature/Update.hs 178;" f slowCrush90 src/Dodge/Room/LongDoor.hs 263;" f slowCrushRoom src/Dodge/Room/LongDoor.hs 148;" f slowDoorRoom src/Dodge/Room/LongDoor.hs 309;" f slowDoorRoomRunPast src/Dodge/Room/LongDoor.hs 326;" f -slurp1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 779;" f -slurp2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 607;" f -slurp3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 793;" f -slurp4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 675;" f -slurp5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 653;" f +slurp1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 782;" f +slurp2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 610;" f +slurp3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 796;" f +slurp4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 678;" f +slurp5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 656;" f smallBattery src/Dodge/Item/Ammo.hs 57;" f smallBranch src/Dodge/Tree/GenerateStructure.hs 32;" f smallChaseCrit src/Dodge/Creature/ChaseCrit.hs 20;" f smallDrawTree src/Dodge/LevelGen.hs 93;" f -smallGlass1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 883;" f -smallGlass2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 571;" f -smallGlass3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 861;" f -smallGlass4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 649;" f +smallGlass1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 888;" f +smallGlass2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 574;" f +smallGlass3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 866;" f +smallGlass4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 652;" f smallPillar src/Dodge/Room/Pillar.hs 38;" f smallRoom src/Dodge/Room/RunPast.hs 31;" f smallSnailInt2 src/Dodge/Path.hs 106;" f @@ -5147,10 +5150,10 @@ soundMenuOptions src/Dodge/Menu.hs 161;" f 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 370;" f +soundPathList src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 372;" f soundPic src/Dodge/Debug/Picture.hs 373;" f soundStart src/Dodge/SoundLogic.hs 118;" f -soundToOnomato src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 187;" f +soundToOnomato src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 188;" f soundToVol src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 4;" f soundWithStatus src/Dodge/SoundLogic.hs 104;" f soundWithStatusVolume src/Dodge/SoundLogic.hs 54;" f @@ -5170,15 +5173,15 @@ spawnAt src/Dodge/SpawnAt.hs 14;" f spawnerCrit src/Dodge/Creature.hs 49;" f spawnerRoom src/Dodge/Room/Room.hs 390;" f speedLegs src/Dodge/Item/Equipment.hs 74;" f -spiderJoint src/Dodge/Creature/Picture.hs 239;" f +spiderJoint src/Dodge/Creature/Picture.hs 244;" f splashMenu src/Dodge/Menu.hs 31;" f splashMenuOptions src/Dodge/Menu.hs 36;" f splashScreen src/Dodge/Initialisation.hs 10;" f splitBezierquad src/Geometry/Bezier.hs 15;" f splitExtra src/Justify.hs 21;" f splitLookupTrie src/SimpleTrie.hs 39;" f -splitSlimeCrit src/Dodge/Creature/Update.hs 143;" f -splitSlimeCrit' src/Dodge/Creature/Update.hs 133;" f +splitSlimeCrit src/Dodge/Creature/Update.hs 144;" f +splitSlimeCrit' src/Dodge/Creature/Update.hs 134;" f splitTrunk src/TreeHelp.hs 181;" f splitTrunkAt src/TreeHelp.hs 169;" f spreadAroundCenter src/Dodge/Base.hs 173;" f @@ -5188,8 +5191,8 @@ spreadGunCrit src/Dodge/Creature/SpreadGunCrit.hs 11;" f spreadOut src/Dodge/Creature/Boid.hs 160;" f sps src/Dodge/LevelGen/PlacementHelper.hs 30;" f sps0 src/Dodge/LevelGen/PlacementHelper.hs 42;" f -sqPlatformChasm src/Dodge/Room/Tutorial.hs 263;" f -sqSpitChasm src/Dodge/Room/Tutorial.hs 278;" f +sqPlatformChasm src/Dodge/Room/Tutorial.hs 264;" f +sqSpitChasm src/Dodge/Room/Tutorial.hs 279;" f square src/Geometry/Polygon.hs 56;" f squareDecoration src/Dodge/Placement/TopDecoration.hs 48;" f squashIntersectCirclePoint src/Dodge/WallCreatureCollisions.hs 129;" f @@ -5216,7 +5219,7 @@ stackText src/Picture/Base.hs 180;" f stackedInventory src/Dodge/Creature.hs 321;" f startCr src/Dodge/Creature.hs 85;" f startCrafts src/Dodge/Room/Start.hs 94;" f -startDeathTimer src/Dodge/Creature/Update.hs 256;" f +startDeathTimer src/Dodge/Creature/Update.hs 258;" f startDrag src/Dodge/Update/Input/InGame.hs 319;" f startInvList src/Dodge/Creature.hs 100;" f startInventory src/Dodge/Creature.hs 103;" f @@ -5228,11 +5231,11 @@ startSeedGameConc src/Dodge/StartNewGame.hs 46;" f statsModifier src/Dodge/Creature/Info.hs 16;" f stickHitSound src/Dodge/Projectile/Update.hs 77;" f stickyMod src/Dodge/Item/Scope.hs 56;" f -stone1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 631;" f -stone2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 823;" f -stone3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 573;" f -stone4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 579;" f -stone5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 703;" f +stone1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 634;" f +stone2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 826;" f +stone3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 576;" f +stone4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 582;" f +stone5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 706;" f stopAllSounds src/Sound.hs 127;" f stopBulletAt src/Dodge/Bullet.hs 201;" f stopPushing src/Dodge/Wall/Damage.hs 172;" f @@ -5279,11 +5282,11 @@ tankShape src/Dodge/Placement/Instance/Tank.hs 23;" f tankSquareDec src/Dodge/Placement/Instance/Tank.hs 15;" f tanksPipesRoom src/Dodge/Room/Tanks.hs 69;" f tanksRoom src/Dodge/Room/Tanks.hs 77;" f -tap1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 837;" f -tap2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 553;" f -tap3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 777;" f -tap4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 873;" f -tapQuietS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 683;" f +tap1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 842;" f +tap2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 556;" f +tap3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 780;" f +tap4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 878;" f +tapQuietS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 686;" f targCorner src/Dodge/Targeting/Draw.hs 35;" f targetCursorPic src/Dodge/Targeting/Draw.hs 41;" f targetYouCognizant src/Dodge/Creature/ChooseTarget.hs 14;" f @@ -5292,7 +5295,7 @@ targetYouWhenCognizant src/Dodge/Creature/ReaderUpdate.hs 303;" f targetYouWhenCognizant src/Dodge/Creature/SetTarget.hs 9;" f targetingScope src/Dodge/Item/Scope.hs 38;" f tbComplete src/Dodge/Terminal.hs 217;" f -teleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 617;" f +teleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 620;" f termScreenColor src/Dodge/Terminal/Color.hs 8;" f termSoundLine src/Dodge/Terminal.hs 49;" f termTextColor src/Dodge/Terminal.hs 52;" f @@ -5339,8 +5342,8 @@ thingsHitExceptCr src/Dodge/WorldEvent/ThingsHit.hs 173;" f thingsHitZ src/Dodge/WorldEvent/ThingsHit.hs 56;" f thingsHitZ' src/Dodge/WorldEvent/ThingsHit.hs 64;" f threeLineDecoration src/Dodge/Placement/TopDecoration.hs 67;" f -throb1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 857;" f -throbC4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 817;" f +throb1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 862;" f +throbC4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 820;" f throwItem src/Dodge/Creature/Action.hs 205;" f tileTexCoords src/Tile.hs 11;" f tilesFromRooms src/Dodge/Layout.hs 221;" f @@ -5349,13 +5352,13 @@ timeFlowUpdate src/Dodge/Update.hs 205;" f timeScroller src/Dodge/Item/Held/Utility.hs 42;" f timeStopper src/Dodge/Item/Held/Utility.hs 39;" f tinMag src/Dodge/Item/Ammo.hs 24;" f -ting1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 651;" f -ting2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 723;" f -ting3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 767;" f -ting4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 645;" f -ting5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 821;" f -tingS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 789;" f -tinitusS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 907;" f +ting1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 654;" f +ting2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 726;" f +ting3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 770;" f +ting4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 648;" f +ting5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 824;" f +tingS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 792;" f +tinitusS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 912;" f titleOptionsMenu src/Dodge/Menu.hs 104;" f titleOptionsNoWrite src/Dodge/Menu.hs 107;" f tlDoEffect src/Dodge/Terminal.hs 115;" f @@ -5368,7 +5371,7 @@ toBinary src/Dodge/Inventory/SelectionList.hs 154;" f toBothLnk src/Dodge/RoomLink.hs 136;" f toClosestMultiple src/HelpNum.hs 3;" f toColor8 src/Color.hs 158;" f -toDeathCarriage src/Dodge/Creature/Update.hs 264;" f +toDeathCarriage src/Dodge/Creature/Update.hs 266;" f toFloatVAs src/Shader/Compile.hs 66;" f toLabel src/Dodge/Cleat.hs 16;" f toMultiset src/Multiset.hs 64;" f @@ -5384,11 +5387,11 @@ toggleEquipmentAt src/Dodge/Creature/Impulse/UseItem.hs 68;" f toggleExamineInv src/Dodge/Creature/Impulse/UseItem.hs 106;" f toggleJust src/MaybeHelp.hs 39;" f toggleMapperInv src/Dodge/Creature/Impulse/UseItem.hs 111;" f -tone440S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 741;" f -tone440_30sS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 679;" f -tone440raiseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 643;" f -tone440sawtoothS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 705;" f -tone440sawtoothquietS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 711;" f +tone440S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 744;" f +tone440_30sS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 682;" f +tone440raiseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 646;" f +tone440sawtoothS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 708;" f +tone440sawtoothquietS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 714;" f topInvW src/Dodge/ListDisplayParams.hs 56;" f topPrismEdgeIndices src/Shader/Poke.hs 344;" f topPrismIndices src/Shader/Poke.hs 419;" f @@ -5396,7 +5399,7 @@ topTestPart src/Dodge/TestString.hs 104;" f torchShape src/Dodge/Item/Draw/SPic.hs 278;" f torqueAmount src/Dodge/HeldUse.hs 606;" f torqueCr src/Dodge/WorldEffect.hs 85;" f -torso src/Dodge/Creature/Picture.hs 354;" f +torso src/Dodge/Creature/Picture.hs 359;" f tractCr src/Dodge/TractorBeam/Update.hs 28;" f tractFlIt src/Dodge/TractorBeam/Update.hs 23;" f tractorBeamAt src/Dodge/HeldUse.hs 850;" f @@ -5465,12 +5468,12 @@ tryUseParent src/Dodge/Creature/State.hs 150;" f turnTo src/Dodge/Movement/Turn.hs 8;" f turretItemOffset src/Dodge/Item/HeldOffset.hs 23;" f tutAnoTree src/Dodge/Room/Tutorial.hs 55;" f -tutDrop src/Dodge/Room/Tutorial.hs 116;" f -tutHub src/Dodge/Room/Tutorial.hs 526;" f -tutLight src/Dodge/Room/Tutorial.hs 430;" f -tutRezBox src/Dodge/Room/Tutorial.hs 639;" f +tutDrop src/Dodge/Room/Tutorial.hs 117;" f +tutHub src/Dodge/Room/Tutorial.hs 527;" f +tutLight src/Dodge/Room/Tutorial.hs 431;" f +tutRezBox src/Dodge/Room/Tutorial.hs 640;" f tutRoomTree src/Dodge/Floor.hs 20;" f -tutorialMessage1 src/Dodge/Room/Tutorial.hs 664;" f +tutorialMessage1 src/Dodge/Room/Tutorial.hs 665;" f tweenAngles src/Geometry/Vector.hs 198;" f twinSlowDoorChasers src/Dodge/Room/LongDoor.hs 83;" f twinSlowDoorRoom src/Dodge/Room/LongDoor.hs 39;" f @@ -5480,9 +5483,9 @@ twoFlatHRot src/Dodge/Item/HeldOffset.hs 89;" f twoHandOffY src/Dodge/Creature/HandPos.hs 130;" f twoHandTwistAmount src/Dodge/Creature/YourControl.hs 137;" f twoRoomPoss src/Dodge/PlacementSpot.hs 148;" f -twoStep1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 555;" f -twoStepS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 609;" f -twoStepSlowS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 695;" f +twoStep1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 558;" f +twoStepS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 612;" f +twoStepSlowS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 698;" f ubyteSize src/Shader/Parameters.hs 13;" f ugateCalc src/Dodge/Inventory/SelectionList.hs 125;" f uncurryV src/Geometry/Data.hs 66;" f @@ -5529,7 +5532,7 @@ updateCreatureStrides src/Dodge/Update.hs 373;" f updateDebris src/Dodge/Update.hs 676;" f updateDebrisChunk src/Dodge/Prop/Moving.hs 16;" f updateDebugMessageOffset src/Dodge/Update.hs 104;" f -updateDelayedEvents src/Dodge/Update.hs 1090;" f +updateDelayedEvents src/Dodge/Update.hs 1107;" f updateDisplaySections src/Dodge/DisplayInventory.hs 116;" f updateDistortion src/Dodge/Distortion.hs 8;" f updateDistortions src/Dodge/Update.hs 655;" f @@ -5587,7 +5590,7 @@ updatePlasmaBall src/Dodge/Update.hs 527;" f updatePlasmaBalls src/Dodge/Update.hs 669;" f updatePreload src/Preload/Update.hs 21;" f updateProjectile src/Dodge/Projectile/Update.hs 26;" f -updatePulse src/Dodge/Creature/Update.hs 317;" f +updatePulse src/Dodge/Creature/Update.hs 319;" f updatePulseBall src/Dodge/Update.hs 547;" f updatePulseLaser src/Dodge/Update.hs 716;" f updatePulseLasers src/Dodge/Update.hs 522;" f @@ -5629,7 +5632,7 @@ updateWheelEvent src/Dodge/Update/Scroll.hs 21;" f updateWheelEvents src/Dodge/Update.hs 492;" f updateWorldEventFlag src/Dodge/Update.hs 129;" f updateWorldEventFlags src/Dodge/Update.hs 117;" f -upperBody src/Dodge/Creature/Picture.hs 369;" f +upperBody src/Dodge/Creature/Picture.hs 374;" f upperBox src/Shape.hs 149;" f upperBoxHalf src/Shape.hs 224;" f upperBoxMT src/Shape.hs 140;" f @@ -5709,7 +5712,7 @@ wallsFromRooms src/Dodge/Layout.hs 158;" f wallsToDraw src/Dodge/Render/Walls.hs 18;" f warmupSound src/Dodge/HeldUse.hs 1396;" f warningRooms src/Dodge/Room/Warning.hs 34;" f -warp1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 905;" f +warp1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 910;" f wasdAim src/Dodge/Creature/YourControl.hs 116;" f wasdDir src/Dodge/WASD.hs 17;" f wasdM src/Dodge/WASD.hs 9;" f @@ -5725,22 +5728,22 @@ weaponRoom src/Dodge/Room/Room.hs 281;" f weaponUnderCrits src/Dodge/Room/Room.hs 179;" f wedgeGeom src/Dodge/Base.hs 42;" f wedgeOfThickness src/Dodge/Picture.hs 9;" f -whirS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 685;" f -whirTapS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 819;" f -whirdown1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 697;" f -whirdown2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 661;" f -whirdown3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 605;" f -whirdownS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 769;" f -whirdownShort1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 601;" f -whirdownShort2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 585;" f -whirdownShort3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 773;" f -whirdownShort4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 811;" f -whirdownSmall1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 565;" f -whirdownSmall2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 727;" f -whirupS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 687;" f +whirS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 688;" f +whirTapS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 822;" f +whirdown1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 700;" f +whirdown2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 664;" f +whirdown3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 608;" f +whirdownS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 772;" f +whirdownShort1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 604;" f +whirdownShort2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 588;" f +whirdownShort3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 776;" f +whirdownShort4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 814;" f +whirdownSmall1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 568;" f +whirdownSmall2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 730;" f +whirupS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 690;" f white src/Color.hs 53;" f -whiteNoiseFadeInS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 647;" f -whiteNoiseFadeOutS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 593;" f +whiteNoiseFadeInS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 650;" f +whiteNoiseFadeOutS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 596;" f wiToFloat src/Dodge/Room/Modify/Girder.hs 168;" f winConfig appDodge/Main.hs 47;" f windowLine src/Dodge/Placement/Instance/Wall.hs 51;" f @@ -5774,12 +5777,12 @@ worldPosToScreen src/Dodge/Base/Coordinate.hs 24;" f worldSPic src/Dodge/Render/ShapePicture.hs 22;" f worldToGenWorld src/Dodge/LevelGen/LevelStructure.hs 14;" f wpAdd src/Dodge/Room/RezBox.hs 148;" f -wrench1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 561;" f +wrench1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 564;" f wristArmour src/Dodge/Item/Equipment.hs 35;" f wristInvisibility src/Dodge/Item/Equipment.hs 80;" f writeConfig src/Dodge/Menu.hs 180;" f writeSaveSlot src/Dodge/Save.hs 36;" f -xChasm src/Dodge/Room/Tutorial.hs 150;" f +xChasm src/Dodge/Room/Tutorial.hs 151;" f xCylinder src/Shape.hs 129;" f xCylinderST src/Shape.hs 126;" f xIntercepts src/Dodge/Zoning/Base.hs 66;" f @@ -5801,7 +5804,7 @@ yourRootItem src/Dodge/Base/You.hs 26;" f yourRootItemDT src/Dodge/Base/You.hs 32;" f yourSelectedItem src/Dodge/Base/You.hs 20;" f yourStatsInfo src/Dodge/Creature/Info.hs 27;" f -zChasm src/Dodge/Room/Tutorial.hs 196;" f +zChasm src/Dodge/Room/Tutorial.hs 197;" f zConnect src/Dodge/Render/Connectors.hs 18;" f zConnectCol src/Dodge/Render/Connectors.hs 29;" f zConnectColMidX src/Dodge/Render/Connectors.hs 32;" f