Pass ammo magazine items to held item use chain

This commit is contained in:
2024-06-25 15:50:22 +01:00
parent c723d1b1e1
commit 009a6cd30f
7 changed files with 289 additions and 238 deletions
+87 -87
View File
@@ -4394,7 +4394,7 @@ airlockZ src/Dodge/Room/Airlock.hs 91;" f
allHotkeys src/Dodge/Creature/YourControl.hs 52;" f
allVisibleWalls src/Dodge/Base/Collide.hs 131;" f
alongSegBy src/Geometry.hs 43;" f
ammoCheckI src/Dodge/Item/Weapon/TriggerType.hs 143;" f
ammoCheckI src/Dodge/Item/Weapon/TriggerType.hs 144;" f
ammoTweakStrings src/Dodge/Render/HUD.hs 268;" f
amr src/Dodge/Item/Held/Rod.hs 50;" f
amr src/Dodge/Item/Weapon/BulletGun/Rod.hs 56;" f
@@ -4484,7 +4484,7 @@ autoGun src/Dodge/Item/Weapon/AutoGun.hs 24;" f
autoGunPic src/Dodge/Item/Weapon/AutoGun.hs 66;" f
autoGunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 496;" f
autoGunSound src/Dodge/SoundLogic/Synonyms.hs 4;" f
autoPistol src/Dodge/Item/Held/Stick.hs 55;" f
autoPistol src/Dodge/Item/Held/Stick.hs 53;" f
autoPistol src/Dodge/Item/Weapon/BulletGun/Stick.hs 79;" f
autoRadarEffect src/Dodge/Item/Weapon/ExtraEffect.hs 39;" f
autoRifle src/Dodge/Item/Held/Cane.hs 78;" f
@@ -4509,7 +4509,7 @@ bangRod src/Dodge/Item/Weapon/BulletGun/Rod.hs 18;" f
bangS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 478;" f
bangStick src/Dodge/Item/Held/Stick.hs 16;" f
bangStick src/Dodge/Item/Weapon/BulletGun/Stick.hs 17;" f
bangStickSoundChoice src/Dodge/HeldUse.hs 514;" f
bangStickSoundChoice src/Dodge/HeldUse.hs 515;" f
bangStickSoundChoice src/Dodge/HeldUse/BulletWeapon.hs 226;" f
barPP src/Dodge/Room/Foreground.hs 236;" f
barrel src/Dodge/Creature/Inanimate.hs 17;" f
@@ -4548,7 +4548,7 @@ basicPerceptionUpdateR src/Dodge/Creature/AlertLevel.hs 17;" f
basicTerminal src/Dodge/Terminal.hs 32;" f
battery src/Dodge/Item/Ammo.hs 69;" f
batteryGuns src/Dodge/Combine/Combinations.hs 220;" f
batteryModules src/Dodge/Item/Held/BatteryGuns.hs 116;" f
batteryModules src/Dodge/Item/Held/BatteryGuns.hs 111;" f
batteryPack src/Dodge/Item/Equipment.hs 58;" f
belowNumX src/Dodge/Combine/Graph.hs 77;" f
beltMag src/Dodge/Item/Ammo.hs 42;" f
@@ -4556,7 +4556,7 @@ bezierGun src/Dodge/Item/Weapon/Bezier.hs 24;" f
bfsNodePoints src/Dodge/Path.hs 58;" f
bfsThenReturn src/Dodge/Creature/ReaderUpdate.hs 233;" f
bindFBO src/Render.hs 244;" f
blCheck src/Dodge/Item/Weapon/TriggerType.hs 380;" f
blCheck src/Dodge/Item/Weapon/TriggerType.hs 378;" f
black src/Color.hs 27;" f
blank src/Picture/Base.hs 59;" f
blinkAcrossChallenge src/Dodge/Room/BlinkAcross.hs 14;" f
@@ -4583,7 +4583,7 @@ blood6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 500;" f
blood7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 342;" f
blood8S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 330;" f
bloodPuddleAt src/Dodge/Creature/State.hs 133;" f
blowTorch src/Dodge/Item/Held/SprayGuns.hs 46;" f
blowTorch src/Dodge/Item/Held/SprayGuns.hs 44;" f
blowTorch src/Dodge/Item/Weapon/SprayGuns.hs 49;" f
blue src/Color.hs 16;" f
blunderbuss src/Dodge/Item/Held/Cone.hs 28;" f
@@ -4607,7 +4607,7 @@ boxSurfaces src/Shader/Poke.hs 269;" f
boxSurfacesIndices src/Shader/Poke.hs 282;" f
boxXYZ src/Polyhedra.hs 93;" f
boxXYZnobase src/Polyhedra.hs 79;" f
brainHat src/Dodge/Item/Equipment.hs 97;" f
brainHat src/Dodge/Item/Equipment.hs 99;" f
branchRectWith src/Dodge/Room/Branch.hs 15;" f
branchWith src/Dodge/Room/Room.hs 69;" f
bres src/Dodge/Base/Zone.hs 80;" f
@@ -4622,7 +4622,7 @@ bufferShaderLayers src/Shader/Bind.hs 35;" f
bulDamageCr src/Dodge/Particle/Bullet/DestroyDamage.hs 21;" f
bulDamageWall src/Dodge/Particle/Bullet/DestroyDamage.hs 30;" f
bulSelTweak src/Dodge/TweakBullet.hs 15;" f
bulletBeltBracer src/Dodge/Item/Equipment.hs 82;" f
bulletBeltBracer src/Dodge/Item/Equipment.hs 83;" f
bulletBeltPack src/Dodge/Item/Equipment.hs 74;" f
bulletBodyCraft src/Dodge/Item/Craftable.hs 24;" f
bulletCombinations src/Dodge/Combine/Graph.hs 35;" f
@@ -4640,7 +4640,7 @@ canAttachTargeting src/Dodge/Item/Display.hs 33;" f
canHeldScrollAttach src/Dodge/HeldScroll.hs 75;" f
canSee src/Dodge/Base/Collide.hs 228;" f
canSeeIndirect src/Dodge/Base/Collide.hs 235;" f
caneStickSoundChoice src/Dodge/HeldUse.hs 509;" f
caneStickSoundChoice src/Dodge/HeldUse.hs 510;" f
cardList src/Dodge/Base/CardinalPoint.hs 6;" f
cardVec src/Dodge/Base/CardinalPoint.hs 9;" f
cardinalVectors src/Dodge/FloorItem.hs 38;" f
@@ -4794,8 +4794,8 @@ composeTree src/Dodge/Tree/Compose.hs 46;" f
computerBeepingS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 458;" f
conEffects src/Dodge/Concurrent.hs 17;" f
concBall src/Dodge/WorldEvent/SpawnParticle.hs 27;" f
coneRandItemParams src/Dodge/HeldUse.hs 523;" f
coneRandItemUpdate src/Dodge/HeldUse.hs 517;" f
coneRandItemParams src/Dodge/HeldUse.hs 524;" f
coneRandItemUpdate src/Dodge/HeldUse.hs 518;" f
connectRoom src/Dodge/Layout/Tree/Either.hs 48;" f
connectTrunk src/Dodge/Layout/Tree/Either.hs 54;" f
connectionBlurb src/Dodge/Terminal.hs 100;" f
@@ -5012,11 +5012,11 @@ defaultAimingCrit src/Dodge/Default/Creature.hs 131;" f
defaultApplyDamage src/Dodge/Creature/Damage.hs 20;" f
defaultArcStep src/Dodge/Tesla/Arc/Default.hs 15;" f
defaultAudition src/Dodge/Default/Creature.hs 99;" f
defaultAutoBatteryGun src/Dodge/Item/Held/BatteryGuns.hs 123;" f
defaultAutoBatteryGun src/Dodge/Item/Held/BatteryGuns.hs 118;" f
defaultAutoWall src/Dodge/Default/Door.hs 15;" f
defaultBangCane src/Dodge/Item/Held/Cane.hs 18;" f
defaultBangCane src/Dodge/Item/Weapon/BulletGun/Cane.hs 16;" f
defaultBatteryGun src/Dodge/Item/Held/BatteryGuns.hs 111;" f
defaultBatteryGun src/Dodge/Item/Held/BatteryGuns.hs 106;" f
defaultBlock src/Dodge/Default/Block.hs 5;" f
defaultBounds src/Dodge/Bounds.hs 13;" f
defaultBounds src/Dodge/Data/Bounds.hs 20;" f
@@ -5373,16 +5373,16 @@ dropExcept src/Dodge/Creature/Action.hs 178;" f
dropItem src/Dodge/Creature/Action.hs 183;" f
dropItemKey src/Dodge/Config/KeyConfig.hs 24;" f
drumMag src/Dodge/Item/Ammo.hs 36;" f
dualBeam src/Dodge/Item/Held/BatteryGuns.hs 141;" f
dualBeam src/Dodge/Item/Held/BatteryGuns.hs 136;" f
dualBeamPic src/Dodge/Item/Draw/SPic.hs 463;" f
dualRayAt src/Dodge/Item/Weapon/BatteryGuns.hs 194;" f
dummyMenuOption src/Dodge/Menu/Option.hs 81;" f
duplicateItem src/Dodge/Item/Weapon/TriggerType.hs 711;" f
duplicateLoaded src/Dodge/Item/Weapon/TriggerType.hs 662;" f
duplicateLoadedBarrels src/Dodge/Item/Weapon/TriggerType.hs 684;" f
duplicateNumBarrels src/Dodge/Item/Weapon/TriggerType.hs 670;" f
duplicateOffsetsFocus src/Dodge/Item/Weapon/TriggerType.hs 692;" f
duplicateOffsetsV2 src/Dodge/Item/Weapon/TriggerType.hs 716;" f
duplicateItem src/Dodge/Item/Weapon/TriggerType.hs 709;" f
duplicateLoaded src/Dodge/Item/Weapon/TriggerType.hs 660;" f
duplicateLoadedBarrels src/Dodge/Item/Weapon/TriggerType.hs 682;" f
duplicateNumBarrels src/Dodge/Item/Weapon/TriggerType.hs 668;" f
duplicateOffsetsFocus src/Dodge/Item/Weapon/TriggerType.hs 690;" f
duplicateOffsetsV2 src/Dodge/Item/Weapon/TriggerType.hs 714;" f
ebFlicker src/Dodge/EnergyBall.hs 94;" f
edgeFormatting src/Dodge/Combine/Graph.hs 119;" f
edgeToPic src/Dodge/Debug/Picture.hs 392;" f
@@ -5468,7 +5468,7 @@ findReverseEdgeList src/Polyhedra.hs 56;" f
findWallFreeDropPoint src/Dodge/FloorItem.hs 46;" f
findWallsInPolygon src/Dodge/LevelGen/StaticWalls/Deprecated.hs 78;" f
fireLoudS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 504;" f
fireRemoteShell src/Dodge/HeldUse.hs 484;" f
fireRemoteShell src/Dodge/HeldUse.hs 485;" f
fireS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 332;" f
fireShell src/Dodge/Projectile/Create.hs 16;" f
fireSound src/Dodge/SoundLogic/Synonyms.hs 4;" f
@@ -5481,13 +5481,13 @@ flDamageInArea src/Dodge/Flame.hs 110;" f
flFlicker src/Dodge/Flame.hs 124;" f
flameBeamCombine src/Dodge/Beam.hs 24;" f
flameShield src/Dodge/Item/Equipment.hs 37;" f
flameSpitter src/Dodge/Item/Held/SprayGuns.hs 26;" f
flameSpitter src/Dodge/Item/Held/SprayGuns.hs 24;" f
flameSpitter src/Dodge/Item/Weapon/SprayGuns.hs 27;" f
flameThrower src/Dodge/Item/Held/SprayGuns.hs 67;" f
flameThrower src/Dodge/Item/Held/SprayGuns.hs 65;" f
flameThrower src/Dodge/Item/Weapon/SprayGuns.hs 70;" f
flameTorrent src/Dodge/Item/Held/SprayGuns.hs 35;" f
flameTorrent src/Dodge/Item/Held/SprayGuns.hs 33;" f
flameTorrent src/Dodge/Item/Weapon/SprayGuns.hs 38;" f
flameWall src/Dodge/Item/Held/SprayGuns.hs 51;" f
flameWall src/Dodge/Item/Held/SprayGuns.hs 49;" f
flameWall src/Dodge/Item/Weapon/SprayGuns.hs 54;" f
flamerPic src/Dodge/Item/Draw/SPic.hs 407;" f
flareCircleAt src/Dodge/WorldEvent/Flash.hs 46;" f
@@ -5579,6 +5579,7 @@ geometryTests test/Spec.hs 17;" f
geometryUnitTests test/Spec.hs 22;" f
geqConstr src/SameConstr.hs 21;" f
getAmmoMagazine src/Dodge/HeldUse.hs 462;" f
getAmmoMags src/Dodge/Creature/Impulse/UseItem.hs 35;" f
getArguments src/Dodge/Update/Scroll.hs 147;" f
getArguments' src/Dodge/Update/Scroll.hs 135;" f
getAvailableListLines src/Dodge/SelectionList.hs 11;" f
@@ -5656,7 +5657,7 @@ hackOutline src/Dodge/Render/Outline.hs 5;" f
halfHeight src/Dodge/Base/Window.hs 48;" f
halfWidth src/Dodge/Base/Window.hs 48;" f
haltSound src/Dodge/SoundLogic.hs 37;" f
hammerCheckL src/Dodge/Item/Weapon/TriggerType.hs 388;" f
hammerCheckL src/Dodge/Item/Weapon/TriggerType.hs 386;" f
handleEvent src/Dodge/Event.hs 27;" f
handleHotkeys src/Dodge/Creature/YourControl.hs 42;" f
handleKeyboardEvent src/Dodge/Event/Input.hs 22;" f
@@ -5676,10 +5677,10 @@ hasFrontArmour src/Dodge/Creature/Property.hs 19;" f
hasFrontArmour src/Dodge/Creature/Test.hs 112;" f
hasLOS src/Dodge/Base/Collide.hs 200;" f
hasLOSIndirect src/Dodge/Base/Collide.hs 214;" f
hat src/Dodge/Item/Equipment.hs 103;" f
hat src/Dodge/Item/Equipment.hs 105;" f
hatCombinations src/Dodge/Combine/Combinations.hs 31;" f
head src/DoubleStack.hs 14;" f
headLamp src/Dodge/Item/Equipment.hs 116;" f
headLamp src/Dodge/Item/Equipment.hs 118;" f
headLampShape src/Dodge/Item/Draw/SPic.hs 486;" f
heal src/Dodge/Item/Consumable.hs 17;" f
heal25 src/Dodge/Item/Consumable.hs 14;" f
@@ -5859,7 +5860,7 @@ itemDisplay src/Dodge/Item/Display.hs 47;" f
itemDisplayOffset src/Dodge/Item/Display.hs 21;" f
itemDisplayPad src/Dodge/Item/Display.hs 59;" f
itemEffect src/Dodge/Creature/Action/UseItem.hs 28;" f
itemEffect src/Dodge/Creature/Impulse/UseItem.hs 35;" f
itemEffect src/Dodge/Creature/Impulse/UseItem.hs 40;" f
itemEquipPict src/Dodge/Item/Draw.hs 17;" f
itemFromAmmoMag src/Dodge/Item.hs 29;" f
itemFromAttachType src/Dodge/Item.hs 38;" f
@@ -5888,7 +5889,7 @@ ixZone src/Dodge/Base/Zone.hs 197;" f
jShape src/Dodge/Placement/Instance/LightSource.hs 86;" f
jShape src/Dodge/Placements/LightSource.hs 43;" f
jaggedShape src/Dodge/Block/Debris.hs 191;" f
jetPack src/Dodge/Item/Equipment.hs 90;" f
jetPack src/Dodge/Item/Equipment.hs 92;" f
jps0' src/Dodge/LevelGen/Data.hs 60;" f
jps0' src/Dodge/LevelGen/PlacementHelper.hs 60;" f
jps0PushPS src/Dodge/LevelGen/Data.hs 63;" f
@@ -5901,7 +5902,7 @@ jsps0J src/Dodge/LevelGen/Data.hs 48;" f
jsps0J src/Dodge/LevelGen/PlacementHelper.hs 48;" f
jspsJ src/Dodge/LevelGen/Data.hs 45;" f
jspsJ src/Dodge/LevelGen/PlacementHelper.hs 45;" f
jumpLegs src/Dodge/Item/Equipment.hs 132;" f
jumpLegs src/Dodge/Item/Equipment.hs 134;" f
justify src/Justify.hs 9;" f
keyCard src/Dodge/Item/Held/Utility.hs 20;" f
keyCard src/Dodge/Item/PassKey.hs 8;" f
@@ -5925,18 +5926,18 @@ lampCoverWhen src/Dodge/Placement/Instance/LightSource/Cover.hs 19;" f
lampCrSPic src/Dodge/Render/ShapePicture.hs 93;" f
lasBeamCombine src/Dodge/Beam.hs 31;" f
lasCenSensEdge src/Dodge/Room/LasTurret.hs 112;" f
lasCircle src/Dodge/Item/Held/BatteryGuns.hs 128;" f
lasCircle src/Dodge/Item/Held/BatteryGuns.hs 123;" f
lasDronesPic src/Dodge/Item/Weapon/Drone.hs 22;" f
lasGun src/Dodge/Item/Held/BatteryGuns.hs 36;" f
lasGunPic src/Dodge/Item/Draw/SPic.hs 449;" f
lasGunTweak src/Dodge/Item/Held/BatteryGuns.hs 67;" f
lasGunTweak src/Dodge/Item/Held/BatteryGuns.hs 65;" f
lasRayAt src/Dodge/Beam.hs 62;" f
lasSensorTurretTest src/Dodge/Room/LasTurret.hs 105;" f
lasTunnel src/Dodge/Room/LasTurret.hs 124;" f
lasTunnelRunPast src/Dodge/Room/LasTurret.hs 165;" f
lasTurret src/Dodge/Placement/Instance/Turret.hs 23;" f
lasTurret src/Dodge/Placements/Turret.hs 29;" f
lasWide src/Dodge/Item/Held/BatteryGuns.hs 102;" f
lasWide src/Dodge/Item/Held/BatteryGuns.hs 97;" f
lasWideRate src/Dodge/HeldUse.hs 377;" f
latchkey src/Dodge/Item/Held/Utility.hs 23;" f
latchkey src/Dodge/Item/PassKey.hs 14;" f
@@ -6006,7 +6007,7 @@ loadingScreen src/Dodge/Menu/Loading.hs 7;" f
loadme src/Dodge/Debug/Terminal.hs 135;" f
lockAndKeyRoomList src/Dodge/Room/LockAndKeyList.hs 11;" f
lockInv src/Dodge/Inventory/Lock.hs 6;" f
lockInvFor src/Dodge/Item/Weapon/TriggerType.hs 89;" f
lockInvFor src/Dodge/Item/Weapon/TriggerType.hs 90;" f
lockRoomKeyItems src/Dodge/LockAndKey.hs 25;" f
lockRoomMultiItems src/Dodge/LockAndKey.hs 14;" f
lockedStart src/Dodge/Room/RunPast.hs 34;" f
@@ -6035,7 +6036,7 @@ ltAutoCrit src/Dodge/Creature/LtAutoCrit.hs 13;" f
machineAddSound src/Dodge/Machine.hs 49;" f
machineGun src/Dodge/Item/Held/Rod.hs 68;" f
machineGun src/Dodge/Item/Weapon/BulletGun/Rod.hs 79;" f
machinePistol src/Dodge/Item/Held/Stick.hs 62;" f
machinePistol src/Dodge/Item/Held/Stick.hs 60;" f
machinePistol src/Dodge/Item/Weapon/BulletGun/Stick.hs 86;" f
machineUpdateDeathEff src/Dodge/Machine.hs 34;" f
machineUpdateLiveDieEff src/Dodge/Machine.hs 16;" f
@@ -6145,7 +6146,7 @@ mcProximitySensorUpdate src/Dodge/Machine/Update.hs 104;" f
mcSPic src/Dodge/Render/ShapePicture.hs 169;" f
mcSensorTriggerUpdate src/Dodge/Machine/Update.hs 69;" f
mcSensorUpdate src/Dodge/Machine/Update.hs 99;" f
mcShootLaser src/Dodge/HeldUse.hs 531;" f
mcShootLaser src/Dodge/HeldUse.hs 532;" f
mcTriggerVal src/Dodge/Machine/Update.hs 75;" f
mcTypeUpdate src/Dodge/Machine/Update.hs 24;" f
mcUseHeld src/Dodge/HeldUse.hs 380;" f
@@ -6221,7 +6222,7 @@ mntLight src/Dodge/Placement/Instance/LightSource.hs 154;" f
mntLight src/Dodge/Placements/LightSource.hs 89;" f
mntLightLnkCond src/Dodge/Placement/Instance/LightSource.hs 159;" f
mntLightLnkCond src/Dodge/Placements/LightSource.hs 94;" f
modClock src/Dodge/Item/Weapon/TriggerType.hs 447;" f
modClock src/Dodge/Item/Weapon/TriggerType.hs 445;" f
modTo src/Geometry/Zone.hs 10;" f
modifierKey src/Dodge/Config/KeyConfig.hs 34;" f
moduleAttachPosition src/Dodge/Item/Module.hs 6;" f
@@ -6384,9 +6385,9 @@ overColObj src/Shape.hs 269;" f
overColSH src/Shape.hs 237;" f
overLnkPosDir src/Dodge/RoomLink.hs 100;" f
overLnkType src/Dodge/RoomLink.hs 87;" f
overNozzle src/Dodge/HeldUse.hs 444;" f
overNozzles src/Dodge/HeldUse.hs 424;" f
overNozzles' src/Dodge/HeldUse.hs 432;" f
overNozzle src/Dodge/HeldUse.hs 443;" f
overNozzles src/Dodge/HeldUse.hs 421;" f
overNozzles' src/Dodge/HeldUse.hs 430;" f
overPos src/Picture/Base.hs 302;" f
overPosObj src/Shape.hs 273;" f
overPosSH src/Shape.hs 257;" f
@@ -6588,7 +6589,7 @@ postUniverseLoadSideEffect src/Dodge/WorldLoad.hs 11;" f
postWorldLoad src/Dodge/WorldLoad.hs 14;" f
powerFakeout src/Dodge/Room/Start.hs 37;" f
powerFakeout' src/Dodge/Room/Start.hs 34;" f
powerLegs src/Dodge/Item/Equipment.hs 123;" f
powerLegs src/Dodge/Item/Equipment.hs 125;" f
powlist src/Multiset.hs 55;" f
powlistUpToN src/Multiset.hs 20;" f
powlistUpToN' src/Multiset.hs 9;" f
@@ -6804,8 +6805,8 @@ renderLayer src/Render.hs 233;" f
renderLightingNoShadows src/Render.hs 48;" f
renderListAt src/Dodge/Render/List.hs 160;" f
renderShadows src/Render.hs 117;" f
repeatOnFrames src/Dodge/Item/Weapon/TriggerType.hs 650;" f
repeatTransformed src/Dodge/Item/Weapon/TriggerType.hs 94;" f
repeatOnFrames src/Dodge/Item/Weapon/TriggerType.hs 648;" f
repeatTransformed src/Dodge/Item/Weapon/TriggerType.hs 95;" f
repeater src/Dodge/Item/Held/Cane.hs 72;" f
repeater src/Dodge/Item/Weapon/BulletGun/Cane.hs 89;" f
replaceNullWith src/Dodge/Creature/ReaderUpdate.hs 161;" f
@@ -7110,7 +7111,7 @@ shootFirstMiss src/Dodge/Creature/Volition.hs 33;" f
shootFlameSpitter src/Dodge/HeldUse/SprayWeapon.hs 9;" f
shootFlameSpitterRepeat src/Dodge/HeldUse/SprayWeapon.hs 19;" f
shootFlameThrower src/Dodge/HeldUse/SprayWeapon.hs 26;" f
shootL src/Dodge/Item/Weapon/TriggerType.hs 402;" f
shootL src/Dodge/Item/Weapon/TriggerType.hs 400;" f
shootLaser src/Dodge/Item/Weapon/BatteryGuns.hs 127;" f
shootMachineGun src/Dodge/HeldUse/BulletWeapon.hs 218;" f
shootMachinePistol src/Dodge/HeldUse/BulletWeapon.hs 62;" f
@@ -7122,7 +7123,7 @@ shootRevolverXRepeat src/Dodge/HeldUse/BulletWeapon.hs 49;" f
shootRifle src/Dodge/HeldUse/BulletWeapon.hs 140;" f
shootShatter src/Dodge/Item/Weapon/Shatter.hs 12;" f
shootSmgMod src/Dodge/HeldUse/BulletWeapon.hs 86;" f
shootTeslaArc src/Dodge/HeldUse.hs 540;" f
shootTeslaArc src/Dodge/HeldUse.hs 541;" f
shootTillEmpty src/Dodge/Creature/Volition.hs 18;" f
shootVolleyGun src/Dodge/HeldUse/BulletWeapon.hs 128;" f
shootersRoom src/Dodge/Room/Room.hs 317;" f
@@ -7160,7 +7161,7 @@ shuffleLinks src/Dodge/Room/Link.hs 30;" f
shuffleRoomPos src/Dodge/Layout.hs 78;" f
shuffleTail src/Dodge/RandomHelp.hs 50;" f
shuffleTail src/RandomHelp.hs 55;" f
sideEffectOnFrame src/Dodge/Item/Weapon/TriggerType.hs 630;" f
sideEffectOnFrame src/Dodge/Item/Weapon/TriggerType.hs 628;" f
sideEffectUpdatePreload src/Dodge/PreloadData.hs 7;" f
sigmoid src/Dodge/Base.hs 129;" f
simpleCrSprings src/Dodge/Update.hs 639;" f
@@ -7197,7 +7198,7 @@ smallGlass3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 372;" f
smallGlass4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 334;" f
smallPillar src/Dodge/Room/Pillar.hs 32;" f
smallRoom src/Dodge/Room/RunPast.hs 31;" f
smg src/Dodge/Item/Held/Stick.hs 71;" f
smg src/Dodge/Item/Held/Stick.hs 69;" f
smg src/Dodge/Item/Weapon/BulletGun/Stick.hs 95;" f
smokeCloudAt src/Dodge/WorldEvent/Cloud.hs 41;" f
smokeTrailSound src/Dodge/SoundLogic/Synonyms.hs 4;" f
@@ -7239,7 +7240,7 @@ spawnGun src/Dodge/Item/Weapon/Spawn.hs 12;" f
spawnSmokeAtCursor src/Dodge/WorldEvent/Cloud.hs 73;" f
spawnerCrit src/Dodge/Creature.hs 55;" f
spawnerRoom src/Dodge/Room/Room.hs 362;" f
speedLegs src/Dodge/Item/Equipment.hs 129;" f
speedLegs src/Dodge/Item/Equipment.hs 131;" f
spinDrag src/Dodge/Item/Held/Launcher.hs 62;" f
spinStart src/Dodge/Item/Held/Launcher.hs 70;" f
splashMenu src/Dodge/Menu.hs 27;" f
@@ -7377,7 +7378,7 @@ targetYouCognizant src/Dodge/Creature/ChooseTarget.hs 13;" f
targetYouLOS src/Dodge/Creature/ChooseTarget.hs 7;" f
targetYouWhenCognizant src/Dodge/Creature/ReaderUpdate.hs 211;" f
targetYouWhenCognizant src/Dodge/Creature/SetTarget.hs 9;" f
targetingHat src/Dodge/Item/Equipment.hs 109;" f
targetingHat src/Dodge/Item/Equipment.hs 111;" f
targetingInfo src/Dodge/Item/Info.hs 142;" f
targetingScope src/Dodge/Item/Scope.hs 16;" f
telRoomLev src/Dodge/Room/Teleport.hs 14;" f
@@ -7460,7 +7461,7 @@ toV3 src/Geometry/Data.hs 38;" f
toV4 src/Geometry/Data.hs 40;" f
toggleCombineInv src/Dodge/DisplayInventory.hs 30;" f
toggleCommand src/Dodge/Terminal.hs 194;" f
toggleEquipmentAt src/Dodge/Creature/Impulse/UseItem.hs 55;" f
toggleEquipmentAt src/Dodge/Creature/Impulse/UseItem.hs 60;" f
toggleJust src/MaybeHelp.hs 41;" f
toggleMap src/Dodge/Update/Input/InGame.hs 237;" f
toggleMapKey src/Dodge/Config/KeyConfig.hs 25;" f
@@ -7474,17 +7475,17 @@ topPrismEdgeIndices src/Shader/Poke.hs 327;" f
topPrismIndices src/Shader/Poke.hs 402;" f
torch src/Dodge/Item/Held/Utility.hs 26;" f
torchShape src/Dodge/Item/Draw/SPic.hs 195;" f
torqueBefore src/Dodge/Item/Weapon/TriggerType.hs 560;" f
torqueBeforeAtLeast src/Dodge/Item/Weapon/TriggerType.hs 583;" f
torqueBefore src/Dodge/Item/Weapon/TriggerType.hs 558;" f
torqueBeforeAtLeast src/Dodge/Item/Weapon/TriggerType.hs 581;" f
torqueCr src/Dodge/WorldEffect.hs 64;" f
torqueSideEffect src/Dodge/Item/Weapon/TriggerType.hs 638;" f
torqueSideEffect src/Dodge/Item/Weapon/TriggerType.hs 636;" f
torso src/Dodge/Creature/Picture.hs 132;" f
tractCr src/Dodge/TractorBeam/Update.hs 27;" f
tractFlIt src/Dodge/TractorBeam/Update.hs 22;" f
tractorBeamAt src/Dodge/Item/Weapon/BatteryGuns.hs 210;" f
tractorGun src/Dodge/Item/Held/BatteryGuns.hs 75;" f
tractorGun src/Dodge/Item/Held/BatteryGuns.hs 73;" f
tractorGunPic src/Dodge/Item/Draw/SPic.hs 477;" f
tractorGunTweak src/Dodge/Item/Held/BatteryGuns.hs 94;" f
tractorGunTweak src/Dodge/Item/Held/BatteryGuns.hs 89;" f
tractorPullPos src/Dodge/TractorBeam/Update.hs 32;" f
tractorSPic src/Dodge/TractorBeam/Draw.hs 10;" f
tranRot src/Picture/Base.hs 124;" f
@@ -7541,7 +7542,7 @@ treePost src/TreeHelp.hs 45;" f
triLootRoom src/Dodge/Room/Treasure.hs 22;" f
triangulate src/Shader/Poke/Triangulate.hs 5;" f
triangulateIndices src/Shader/Poke/Triangulate.hs 9;" f
trigDoAlso src/Dodge/Item/Weapon/TriggerType.hs 101;" f
trigDoAlso src/Dodge/Item/Weapon/TriggerType.hs 102;" f
triggerDoorRoom src/Dodge/Room/Door.hs 30;" f
triggerSwitch src/Dodge/Placement/Instance/Button.hs 47;" f
triggerSwitch src/Dodge/Placements/Button.hs 35;" f
@@ -7748,20 +7749,19 @@ upperPrismPolyTS src/Shape.hs 118;" f
upperRounded src/Shape.hs 181;" f
upsProjectile src/Dodge/Projectile/Update.hs 53;" f
useAllAmmo src/Dodge/Item/Weapon/TriggerType.hs 339;" f
useAmmoAmount src/Dodge/Item/Weapon/TriggerType.hs 354;" f
useAmmoAmount' src/Dodge/Item/Weapon/TriggerType.hs 361;" f
useAmmoAmount src/Dodge/Item/Weapon/TriggerType.hs 356;" f
useAmmoParams src/Dodge/Item/Weapon/AmmoParams.hs 17;" f
useAmmoUpTo src/Dodge/Item/Weapon/TriggerType.hs 346;" f
useAmmoUpTo src/Dodge/Item/Weapon/TriggerType.hs 347;" f
useC src/Dodge/Cuse.hs 6;" f
useE src/Dodge/Euse.hs 24;" f
useEquipment src/Dodge/Creature/State.hs 219;" f
useForceFieldGun src/Dodge/HeldUse.hs 553;" f
useForceFieldGun src/Dodge/HeldUse.hs 554;" f
useGasParams src/Dodge/HeldUse.hs 471;" f
useHeld src/Dodge/HeldUse.hs 385;" f
useHotKey src/Dodge/Creature/YourControl.hs 49;" f
useItem src/Dodge/Creature/Action/UseItem.hs 14;" f
useItemHotkey src/Dodge/Creature/Impulse/UseItem.hs 115;" f
useItemLeftClick src/Dodge/Creature/Impulse/UseItem.hs 98;" f
useItemHotkey src/Dodge/Creature/Impulse/UseItem.hs 120;" f
useItemLeftClick src/Dodge/Creature/Impulse/UseItem.hs 103;" f
useItemRightClick src/Dodge/Creature/Impulse/UseItem.hs 23;" f
useL src/Dodge/Luse.hs 13;" f
useLeftItem src/Dodge/Creature/Action/UseItem.hs 38;" f
@@ -7771,14 +7771,14 @@ useMod src/Dodge/HeldUse.hs 28;" f
useNormalCamera src/Dodge/Camera.hs 6;" f
usePayload src/Dodge/Payload.hs 7;" f
usePjCreation src/Dodge/HeldUse.hs 404;" f
usePjCreationX src/Dodge/HeldUse.hs 412;" f
usePjCreationX src/Dodge/HeldUse.hs 409;" f
useRewindGun src/Dodge/Luse.hs 41;" f
useRoomPosCond src/Dodge/PlacementSpot.hs 178;" f
useRoomPosRoomCond src/Dodge/PlacementSpot.hs 181;" f
useShrinkGun src/Dodge/Luse.hs 59;" f
useStopWatch src/Dodge/Luse.hs 24;" f
useTargetPos src/Dodge/Item/Weapon/Targeting.hs 9;" f
useTimeCheck src/Dodge/Item/Weapon/TriggerType.hs 369;" f
useTimeCheck src/Dodge/Item/Weapon/TriggerType.hs 367;" f
useTimeScrollGun src/Dodge/Luse.hs 32;" f
useUnusedLnk src/Dodge/PlacementSpot.hs 169;" f
useUpdate src/Dodge/Creature/State.hs 211;" f
@@ -7875,35 +7875,35 @@ windowxsize src/LoadConfig.hs 12;" f
windowysize src/LoadConfig.hs 13;" f
withAlpha src/Color.hs 10;" f
withByteString src/Shader/Compile.hs 370;" f
withCrPos src/Dodge/Item/Weapon/TriggerType.hs 485;" f
withCrPosShift src/Dodge/Item/Weapon/TriggerType.hs 488;" f
withFlare src/Dodge/Item/Weapon/TriggerType.hs 452;" f
withItem src/Dodge/Item/Weapon/TriggerType.hs 425;" f
withItemUpdate src/Dodge/Item/Weapon/TriggerType.hs 434;" f
withItemUpdateFirst src/Dodge/Item/Weapon/TriggerType.hs 429;" f
withMuzFlare src/Dodge/Item/Weapon/TriggerType.hs 464;" f
withOldDir src/Dodge/Item/Weapon/TriggerType.hs 502;" f
withPosDirWallCheck src/Dodge/Item/Weapon/TriggerType.hs 542;" f
withPositionOffset src/Dodge/Item/Weapon/TriggerType.hs 526;" f
withPositionWallCheck src/Dodge/Item/Weapon/TriggerType.hs 533;" f
withRandomDirI src/Dodge/Item/Weapon/TriggerType.hs 494;" f
withRandomItem src/Dodge/Item/Weapon/TriggerType.hs 521;" f
withRandomItemParams src/Dodge/Item/Weapon/TriggerType.hs 516;" f
withRandomItemUpdate src/Dodge/Item/Weapon/TriggerType.hs 509;" f
withRandomOffset src/Dodge/Item/Weapon/TriggerType.hs 552;" f
withCrPos src/Dodge/Item/Weapon/TriggerType.hs 483;" f
withCrPosShift src/Dodge/Item/Weapon/TriggerType.hs 486;" f
withFlare src/Dodge/Item/Weapon/TriggerType.hs 450;" f
withItem src/Dodge/Item/Weapon/TriggerType.hs 423;" f
withItemUpdate src/Dodge/Item/Weapon/TriggerType.hs 432;" f
withItemUpdateFirst src/Dodge/Item/Weapon/TriggerType.hs 427;" f
withMuzFlare src/Dodge/Item/Weapon/TriggerType.hs 462;" f
withOldDir src/Dodge/Item/Weapon/TriggerType.hs 500;" f
withPosDirWallCheck src/Dodge/Item/Weapon/TriggerType.hs 540;" f
withPositionOffset src/Dodge/Item/Weapon/TriggerType.hs 524;" f
withPositionWallCheck src/Dodge/Item/Weapon/TriggerType.hs 531;" f
withRandomDirI src/Dodge/Item/Weapon/TriggerType.hs 492;" f
withRandomItem src/Dodge/Item/Weapon/TriggerType.hs 519;" f
withRandomItemParams src/Dodge/Item/Weapon/TriggerType.hs 514;" f
withRandomItemUpdate src/Dodge/Item/Weapon/TriggerType.hs 507;" f
withRandomOffset src/Dodge/Item/Weapon/TriggerType.hs 550;" f
withRecoil src/Dodge/Item/Weapon/TriggerType.hs 297;" f
withSidePushAfterI src/Dodge/Item/Weapon/TriggerType.hs 326;" f
withSidePushI src/Dodge/Item/Weapon/TriggerType.hs 307;" f
withSmoke src/Dodge/Item/Weapon/TriggerType.hs 114;" f
withSmoke src/Dodge/Item/Weapon/TriggerType.hs 115;" f
withSoundContinue src/Dodge/Item/Weapon/TriggerType.hs 250;" f
withSoundForI src/Dodge/Item/Weapon/TriggerType.hs 263;" f
withSoundForVol src/Dodge/Item/Weapon/TriggerType.hs 276;" f
withSoundItemChoiceStart src/Dodge/Item/Weapon/TriggerType.hs 221;" f
withSoundStart src/Dodge/Item/Weapon/TriggerType.hs 237;" f
withTempLight src/Dodge/Item/Weapon/TriggerType.hs 439;" f
withThickSmokeI src/Dodge/Item/Weapon/TriggerType.hs 132;" f
withThinSmokeI src/Dodge/Item/Weapon/TriggerType.hs 123;" f
withTorqueAfter src/Dodge/Item/Weapon/TriggerType.hs 609;" f
withTempLight src/Dodge/Item/Weapon/TriggerType.hs 437;" f
withThickSmokeI src/Dodge/Item/Weapon/TriggerType.hs 133;" f
withThinSmokeI src/Dodge/Item/Weapon/TriggerType.hs 124;" f
withTorqueAfter src/Dodge/Item/Weapon/TriggerType.hs 607;" f
withWarmUp src/Dodge/Item/Weapon/TriggerType.hs 201;" f
wlDustAt src/Dodge/Wall/Dust.hs 10;" f
wlIXsNearCirc src/Dodge/Zoning/Wall.hs 32;" f
@@ -7931,7 +7931,7 @@ worldShape src/Dodge/Render/Shape.hs 14;" f
worldToGenWorld src/Dodge/LevelGen/LevelStructure.hs 14;" f
wpAdd src/Dodge/Room/RezBox.hs 134;" f
wristArmour src/Dodge/Item/Equipment.hs 49;" f
wristInvisibility src/Dodge/Item/Equipment.hs 135;" f
wristInvisibility src/Dodge/Item/Equipment.hs 137;" f
writeConfig src/Dodge/Menu.hs 159;" f
writeSaveSlot src/Dodge/Save.hs 34;" f
xCylinder src/Shape.hs 134;" f