Cleanup combining code, flatten modules

This commit is contained in:
2024-10-01 10:01:21 +01:00
parent f69d150e00
commit 87cbaf911f
17 changed files with 143 additions and 173 deletions
+72 -75
View File
@@ -107,7 +107,7 @@ ArcShad src/Picture/Data.hs 37;" C
ArcStep src/Dodge/Data/ArcStep.hs 14;" t
ArcStep src/Dodge/ArcStep.hs 1;" m
ArcStep src/Dodge/Data/ArcStep.hs 6;" m
Arcing src/Dodge/Data/Item/Params.hs 40;" C
Arcing src/Dodge/Data/Item/Params.hs 21;" C
Arithmetic src/Dodge/Base/Arithmetic.hs 1;" m
ArmourChase src/Dodge/Creature/ArmourChase.hs 1;" m
ArmourySS src/Dodge/Data/Scenario.hs 112;" C
@@ -263,7 +263,7 @@ BlockedLink src/Dodge/Data/Room.hs 48;" C
BloomLayer src/Picture/Data.hs 25;" C
BloomNoZWrite src/Picture/Data.hs 26;" C
Boid src/Dodge/Creature/Boid.hs 1;" m
BoostPropIX src/Dodge/Data/Item/Params.hs 48;" C
BoostPropIX src/Dodge/Data/Item/Params.hs 29;" C
Booster src/Dodge/Item/Equipment/Booster.hs 1;" m
Booster src/Dodge/Item/Weapon/Booster.hs 1;" m
Boosting src/Dodge/Creature/Stance/Data.hs 28;" C
@@ -955,7 +955,7 @@ FlareType src/Dodge/Data/Item/Use.hs 129;" t
Flash src/Dodge/WorldEvent/Flash.hs 11;" m
FlashBall src/Dodge/Data/Bullet.hs 33;" C
FlatFaces src/Shape/Data.hs 17;" C
FlatShieldParams src/Dodge/Data/Item/Params.hs 21;" C
FlatShieldParams src/Dodge/Data/Item/Params.hs 19;" C
FlechetteTrajectory src/Dodge/Data/Bullet.hs 53;" C
FlechetteTrajectoryType src/Dodge/Data/Bullet.hs 60;" C
Flee src/Dodge/Data/ActionPlan.hs 191;" C
@@ -1004,7 +1004,7 @@ FromEdge src/Dodge/Data/Room.hs 47;" C
FullRes src/Dodge/Config/Data.hs 54;" C
FullRes src/Dodge/Data/Config.hs 95;" C
FullShadowFidelity src/Shape/Data.hs 24;" C
FullSize src/Dodge/Data/Item/Params.hs 50;" C
FullSize src/Dodge/Data/Item/Params.hs 31;" C
FullyVisible src/Dodge/Data/CamouflageStatus.hs 12;" C
Furniture src/Dodge/Room/Furniture.hs 1;" m
GASINJECTOR src/Dodge/Data/Item/Combine.hs 69;" C
@@ -1290,7 +1290,7 @@ ItemFamily src/Dodge/Item/Family.hs 3;" t
ItemLink src/Dodge/Data/ComposedItem.hs 45;" t
ItemLocation src/Dodge/Data/Item/Location.hs 27;" t
ItemModuleType src/Dodge/Combine/Data.hs 197;" t
ItemParams src/Dodge/Data/Item/Params.hs 15;" t
ItemParams src/Dodge/Data/Item/Params.hs 13;" t
ItemParams src/Dodge/Tesla/ItemParams.hs 1;" m
ItemScrollTimeFlow src/Dodge/Data/World.hs 62;" C
ItemSpace src/Dodge/Inventory/ItemSpace.hs 1;" m
@@ -1521,7 +1521,7 @@ MachineAltSound src/Dodge/Data/SoundOrigin.hs 20;" C
MachinePart src/Dodge/Data/Wall.hs 51;" C
MachineSound src/Dodge/Data/SoundOrigin.hs 19;" C
MachineType src/Dodge/Data/Machine.hs 49;" t
MagShieldParams src/Dodge/Data/Item/Params.hs 17;" C
MagShieldParams src/Dodge/Data/Item/Params.hs 15;" C
Magazine src/Dodge/Item/AmmoPosition.hs 9;" C
Magnet src/Dodge/Data/Magnet.hs 21;" t
Magnet src/Dodge/Data/Magnet.hs 6;" m
@@ -1705,8 +1705,8 @@ NoLighting src/Dodge/Data/Config.hs 102;" C
NoMvType src/Dodge/Data/Creature/Misc.hs 38;" C
NoNeedWeapon src/Dodge/Room/NoNeedWeapon.hs 2;" m
NoObjShads src/Dodge/Data/Config.hs 100;" C
NoParams src/Dodge/Data/Item/Params.hs 16;" C
NoPreviousArcEffect src/Dodge/Data/Item/Params.hs 53;" C
NoParams src/Dodge/Data/Item/Params.hs 14;" C
NoPreviousArcEffect src/Dodge/Data/Item/Params.hs 34;" C
NoResurrection src/Dodge/Data/Corpse.hs 14;" C
NoRightButtonOptions src/Dodge/Data/RightButtonOptions.hs 14;" C
NoRoomClipBoundaries src/Dodge/Config/Data.hs 59;" C
@@ -1878,7 +1878,7 @@ PackAnimal src/Dodge/Data/Creature/Capability.hs 20;" C
Padding src/Padding.hs 2;" m
Pair src/FoldlHelp.hs 10;" t
PaletteColor src/Color/Data.hs 14;" t
ParamMID src/Dodge/Data/Item/Params.hs 47;" C
ParamMID src/Dodge/Data/Item/Params.hs 28;" C
Parameters src/Shader/Parameters.hs 1;" m
Parameters src/Shape/Parameters.hs 1;" m
Params src/Dodge/Data/Item/Params.hs 6;" m
@@ -1907,7 +1907,7 @@ Perception src/Dodge/Creature/Perception/Data.hs 29;" t
Perception src/Dodge/Data/Creature/Perception.hs 32;" t
Perception src/Dodge/Creature/Perception.hs 2;" m
Perception src/Dodge/Data/Creature/Perception.hs 6;" m
PerturbTillBreakPreviousArc src/Dodge/Data/Item/Params.hs 53;" C
PerturbTillBreakPreviousArc src/Dodge/Data/Item/Params.hs 34;" C
Pic2d src/PolyPic.hs 17;" t
PickOnePlacement src/Dodge/Data/GenWorld.hs 87;" C
PickUp src/Dodge/Inventory/PickUp.hs 1;" m
@@ -1974,7 +1974,7 @@ PressPlateEvent src/Dodge/Data/PressPlate.hs 14;" t
PressPlateId src/Dodge/Data/PressPlate.hs 15;" C
PressPlateLayer src/Dodge/Picture/Layer/Data.hs 14;" C
PressType src/Dodge/Data/Input.hs 13;" t
PreviousArcEffect src/Dodge/Data/Item/Params.hs 53;" t
PreviousArcEffect src/Dodge/Data/Item/Params.hs 34;" t
PrimitiveMode src/Shader/Data.hs 99;" t
Prison src/Dodge/Data/Scenario.hs 65;" C
Procedural src/Dodge/Room/Procedural.hs 2;" m
@@ -2107,7 +2107,6 @@ RecRoomSS src/Dodge/Data/Scenario.hs 103;" C
RectRoomType src/Dodge/Data/Room.hs 32;" C
ReduceSpinPU src/Dodge/Data/Item/Use/Consumption/Ammo.hs 33;" C
Reflect src/Dodge/Wall/Reflect.hs 1;" m
Refracting src/Dodge/Data/Item/Params.hs 23;" C
Regex src/Regex.hs 1;" m
ReigonalGovernment src/Dodge/Data/Scenario.hs 50;" C
Religion src/Dodge/Data/Scenario.hs 47;" C
@@ -2304,7 +2303,7 @@ Shape src/Dodge/Item/Equipment/Shape.hs 1;" m
Shape src/Dodge/Render/Shape.hs 1;" m
Shape src/Shape.hs 3;" m
ShapePicture src/Dodge/Render/ShapePicture.hs 1;" m
ShapePicture src/ShapePicture.hs 2;" m
ShapePicture src/ShapePicture.hs 1;" m
ShapeProp src/Dodge/Data/Prop.hs 33;" C
ShapeType src/Shape/Data.hs 16;" t
Shatter src/Dodge/Item/Weapon/Shatter.hs 1;" m
@@ -2349,9 +2348,9 @@ Show_wall_search_rays src/Dodge/Data/Config.hs 82;" C
Show_walls_near_point_cursor src/Dodge/Data/Config.hs 86;" C
Show_walls_near_point_you src/Dodge/Data/Config.hs 87;" C
Show_zone_near_point_cursor src/Dodge/Data/Config.hs 88;" C
ShrinkGunParams src/Dodge/Data/Item/Params.hs 19;" C
ShrinkGunStatus src/Dodge/Data/Item/Params.hs 50;" t
Shrunk src/Dodge/Data/Item/Params.hs 50;" C
ShrinkGunParams src/Dodge/Data/Item/Params.hs 17;" C
ShrinkGunStatus src/Dodge/Data/Item/Params.hs 31;" t
Shrunk src/Dodge/Data/Item/Params.hs 31;" C
SideCluster src/Dodge/Data/RoomCluster.hs 14;" C
SideCluster src/Dodge/RoomCluster/Data.hs 12;" C
SideEffect src/Dodge/Data/Universe.hs 60;" t
@@ -2955,8 +2954,8 @@ _arProgress src/Dodge/Data/Item/Use/Consumption.hs 31;" f
_arTime src/Dodge/Data/Item/Consumption.hs 26;" f
_arTime src/Dodge/Data/Item/Use/Consumption.hs 30;" f
_arbitraryAction src/Dodge/Data/ActionPlan.hs 167;" f
_arcNumber src/Dodge/Data/Item/Params.hs 43;" f
_arcSize src/Dodge/Data/Item/Params.hs 42;" f
_arcNumber src/Dodge/Data/Item/Params.hs 24;" f
_arcSize src/Dodge/Data/Item/Params.hs 23;" f
_argList src/Dodge/Data/Terminal.hs 96;" f
_argType src/Dodge/Data/Terminal.hs 95;" f
_asDir src/Dodge/Data/ArcStep.hs 16;" f
@@ -3019,7 +3018,7 @@ _bmTrajectory src/Dodge/Data/Item/BulletMod.hs 11;" f
_bmType src/Dodge/Data/Beam.hs 29;" f
_boffEff src/Dodge/Data/Button.hs 42;" f
_bonEff src/Dodge/Data/Button.hs 41;" f
_boostPropIX src/Dodge/Data/Item/Params.hs 48;" f
_boostPropIX src/Dodge/Data/Item/Params.hs 29;" f
_bpEff src/Dodge/Data/Button.hs 28;" f
_bpEvent src/Dodge/Data/Button.hs 26;" f
_bpSound src/Dodge/Data/Button.hs 27;" f
@@ -3186,7 +3185,7 @@ _ctActive src/Dodge/Data/Creature.hs 89;" f
_ctID src/Dodge/Data/Creature.hs 88;" f
_ctPos src/Dodge/Data/Creature.hs 86;" f
_ctType src/Dodge/Data/Creature.hs 87;" f
_currentArc src/Dodge/Data/Item/Params.hs 41;" f
_currentArc src/Dodge/Data/Item/Params.hs 22;" f
_currentFoot src/Dodge/Creature/Stance/Data.hs 23;" f
_currentFoot src/Dodge/Data/Creature/Stance.hs 23;" f
_cwGen src/Dodge/Data/CWorld.hs 27;" f
@@ -3351,7 +3350,7 @@ _flareTime src/Dodge/Data/Flare.hs 25;" f
_flareTran3 src/Dodge/Data/Flare.hs 18;" f
_flareTran3 src/Dodge/Data/Flare.hs 24;" f
_flares src/Dodge/Data/LWorld.hs 114;" f
_flatShieldWlMIX src/Dodge/Data/Item/Params.hs 22;" f
_flatShieldWlMIX src/Dodge/Data/Item/Params.hs 20;" f
_floorItems src/Dodge/Data/LWorld.hs 132;" f
_floorShader src/Data/Preload/Render.hs 44;" f
_floorVBO src/Data/Preload/Render.hs 43;" f
@@ -3513,10 +3512,6 @@ _laProgress src/Dodge/Data/Item/Consumption.hs 21;" f
_lampColor src/Dodge/Data/Creature/Misc.hs 72;" f
_lampHeight src/Dodge/Data/Creature/Misc.hs 72;" f
_lampLSID src/Dodge/Data/Creature/Misc.hs 72;" f
_lasColor src/Dodge/Data/Item/Params.hs 25;" f
_lasColor2 src/Dodge/Data/Item/Params.hs 26;" f
_lasCycle src/Dodge/Data/Item/Params.hs 27;" f
_lasDamage src/Dodge/Data/Item/Params.hs 28;" f
_laserEmmiter src/Dodge/Data/Laser.hs 18;" f
_laserTypeDamage src/Dodge/Data/Laser.hs 17;" f
_lasers src/Dodge/Data/LWorld.hs 119;" f
@@ -3569,7 +3564,7 @@ _lzColor src/Dodge/Data/Laser.hs 31;" f
_lzPoints src/Dodge/Data/Laser.hs 32;" f
_lzType src/Dodge/Data/Laser.hs 33;" f
_machines src/Dodge/Data/LWorld.hs 126;" f
_magShieldMgMIX src/Dodge/Data/Item/Params.hs 18;" f
_magShieldMgMIX src/Dodge/Data/Item/Params.hs 16;" f
_magnets src/Dodge/Data/LWorld.hs 128;" f
_mainAction src/Dodge/Data/ActionPlan.hs 171;" f
_manObject src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 16;" f
@@ -3631,7 +3626,7 @@ _mzFlareType src/Dodge/Data/Item/Use.hs 160;" f
_mzInaccuracy src/Dodge/Data/Item/Use.hs 158;" f
_mzPos src/Dodge/Data/Item/Use.hs 156;" f
_mzRot src/Dodge/Data/Item/Use.hs 157;" f
_newArcStep src/Dodge/Data/Item/Params.hs 44;" f
_newArcStep src/Dodge/Data/Item/Params.hs 25;" f
_noClip src/Dodge/Debug/Flag/Data.hs 7;" f
_nodeMetaTree src/Dodge/Tree/Compose/Data.hs 9;" f
_nodeTree src/Dodge/Tree/Compose/Data.hs 9;" f
@@ -3654,7 +3649,7 @@ _opTexture src/Dodge/Data/Wall.hs 42;" f
_opticDefaultZoom src/Dodge/Data/Item/Scope.hs 21;" f
_opticPos src/Dodge/Data/Item/Scope.hs 17;" f
_opticZoom src/Dodge/Data/Item/Scope.hs 20;" f
_paramMID src/Dodge/Data/Item/Params.hs 47;" f
_paramMID src/Dodge/Data/Item/Params.hs 28;" f
_partialAction src/Dodge/Data/ActionPlan.hs 145;" f
_pastWorlds src/Dodge/Data/World.hs 39;" f
_pathGraph src/Dodge/Data/CWorld.hs 31;" f
@@ -3669,7 +3664,6 @@ _penPathEdge src/Dodge/Data/PathGraph.hs 36;" f
_penStart src/Dodge/Data/PathGraph.hs 34;" f
_phRemoteID src/Dodge/Data/Item/Use/Consumption/Ammo.hs 25;" f
_phTargetingID src/Dodge/Data/Item/Use/Consumption/Ammo.hs 26;" f
_phaseV src/Dodge/Data/Item/Params.hs 24;" f
_pickUpLevel src/Dodge/Layout/Generate.hs 14;" f
_pickUps src/Dodge/Layout/Generate.hs 15;" f
_pictureShaders src/Data/Preload/Render.hs 28;" f
@@ -3739,7 +3733,7 @@ _prVelZ src/Dodge/Data/Prop.hs 27;" f
_preloadData src/Dodge/Data/Universe.hs 32;" f
_pressPlates src/Dodge/Data/LWorld.hs 136;" f
_pressedKeys src/Dodge/Data/Input.hs 22;" f
_previousArcEffect src/Dodge/Data/Item/Params.hs 45;" f
_previousArcEffect src/Dodge/Data/Item/Params.hs 26;" f
_prjAcc src/Dodge/Data/Projectile.hs 19;" f
_prjDir src/Dodge/Data/Projectile.hs 20;" f
_prjDraw src/Dodge/Data/Projectile.hs 22;" f
@@ -3950,7 +3944,7 @@ _shapeEBO src/Data/Preload/Render.hs 26;" f
_shapeHalfSize src/Shape/Data.hs 18;" f
_shapeShader src/Data/Preload/Render.hs 25;" f
_shockwaves src/Dodge/Data/LWorld.hs 118;" f
_shrinkGunStatus src/Dodge/Data/Item/Params.hs 20;" f
_shrinkGunStatus src/Dodge/Data/Item/Params.hs 18;" f
_siColor src/Dodge/Data/SelectionList.hs 80;" f
_siColor src/Dodge/Data/SelectionList.hs 88;" f
_siHeight src/Dodge/Data/SelectionList.hs 78;" f
@@ -4498,7 +4492,7 @@ basicDrawBeam src/Dodge/Beam/Draw.hs 11;" f
basicItemDisplay src/Dodge/Item/Display.hs 48;" f
basicMachineApplyDamage src/Dodge/Machine/Damage.hs 6;" f
basicMachineUpdate src/Dodge/Machine.hs 13;" f
basicMuzFlare src/Dodge/HeldUse.hs 157;" f
basicMuzFlare src/Dodge/HeldUse.hs 167;" f
basicPerceptionUpdateR src/Dodge/Creature/AlertLevel.hs 17;" f
basicTerminal src/Dodge/Terminal.hs 32;" f
battery src/Dodge/Item/Ammo.hs 72;" f
@@ -4812,7 +4806,7 @@ createItemYou src/Dodge/Inventory/Add.hs 77;" f
createLightMap src/Render.hs 26;" f
createNewArc src/Dodge/Tesla/Arc.hs 76;" f
createPathGrid src/Dodge/Room/Path.hs 21;" f
createProjectile src/Dodge/HeldUse.hs 462;" f
createProjectile src/Dodge/HeldUse.hs 473;" f
createShell src/Dodge/Projectile/Create.hs 19;" f
createShieldWall src/Dodge/Euse.hs 134;" f
createTorchLightOffset src/Dodge/LightSource/Torch.hs 9;" f
@@ -5060,11 +5054,11 @@ destroyMount src/Dodge/Block.hs 98;" f
destroyMounts src/Dodge/Block.hs 95;" f
destroyProjectile src/Dodge/Projectile/Update.hs 62;" f
detV src/Geometry/Vector.hs 93;" f
detectorColor src/Dodge/Item/Draw/SPic.hs 404;" f
detectorColor src/Dodge/Item/Draw/SPic.hs 405;" f
detectorEffect src/Dodge/Item/Weapon/Radar.hs 19;" f
detectorInfo src/Dodge/Item/Info.hs 195;" f
determineInvSelCursorWidth src/Dodge/ListDisplayParams.hs 54;" f
determineProjectileTracking src/Dodge/HeldUse.hs 452;" f
determineProjectileTracking src/Dodge/HeldUse.hs 463;" f
diagonalLinesRect src/Dodge/Room/Foreground.hs 52;" f
diffAngles src/Geometry.hs 196;" f
difference src/Geometry.hs 130;" f
@@ -5121,7 +5115,7 @@ doDrawing src/Dodge/Render.hs 35;" f
doDrawing' src/Dodge/Render.hs 46;" f
doFloatFloat src/Dodge/FloatFunction.hs 5;" f
doFloorEffect src/Dodge/ItEffect.hs 21;" f
doGenFloat src/Dodge/HeldUse.hs 390;" f
doGenFloat src/Dodge/HeldUse.hs 401;" f
doInPlacements src/Dodge/Layout.hs 92;" f
doIndividualPlacements src/Dodge/Layout.hs 117;" f
doInputScreenInput src/Dodge/Update/Input/ScreenLayer.hs 25;" f
@@ -5428,7 +5422,7 @@ flareCircleAt src/Dodge/WorldEvent/Flash.hs 46;" f
flatItemCombinations src/Dodge/Combine/Combinations.hs 49;" f
flatLookupItems src/Dodge/Combine.hs 29;" f
flatShield src/Dodge/Item/Held/Utility.hs 9;" f
flatShieldEquipSPic src/Dodge/Item/Draw/SPic.hs 391;" f
flatShieldEquipSPic src/Dodge/Item/Draw/SPic.hs 392;" f
flattenIMIMIM src/Dodge/Base/Zone.hs 246;" f
fleeFrom src/Dodge/CreatureEffect.hs 120;" f
fleeFromTarget src/Dodge/CreatureEffect.hs 66;" f
@@ -5502,7 +5496,7 @@ gameRoomViewpoints src/Dodge/Viewpoints.hs 35;" f
gameRoomsFromRooms src/Dodge/Layout.hs 158;" f
gameplayMenu src/Dodge/Menu.hs 131;" f
gameplayMenuOptions src/Dodge/Menu.hs 134;" f
gasCreate src/Dodge/HeldUse.hs 387;" f
gasCreate src/Dodge/HeldUse.hs 398;" f
generateGenParams src/Dodge/LevelGen/LevelStructure.hs 22;" f
generateGraphs src/Dodge/LevelGen.hs 39;" f
generateLayout src/Dodge/Layout/Generate.hs 10;" f
@@ -5516,8 +5510,8 @@ geqConstr src/SameConstr.hs 21;" f
getArguments src/Dodge/Update/Scroll.hs 151;" f
getArguments' src/Dodge/Update/Scroll.hs 139;" f
getAvailableListLines src/Dodge/SelectionList.hs 11;" f
getBulletTrajectory src/Dodge/HeldUse.hs 301;" f
getBulletType src/Dodge/HeldUse.hs 276;" f
getBulletTrajectory src/Dodge/HeldUse.hs 312;" f
getBulletType src/Dodge/HeldUse.hs 287;" f
getCommands src/Dodge/Terminal.hs 115;" f
getCommandsHelp src/Dodge/Terminal.hs 73;" f
getCrDexterity src/Dodge/Creature/Statistics.hs 13;" f
@@ -5530,6 +5524,9 @@ getItem src/Dodge/Item/Location.hs 15;" f
getIthPos src/SelectionIntMap.hs 55;" f
getIthYOffset src/SelectionIntMap.hs 58;" f
getLDPWidth src/Dodge/Render/List.hs 70;" f
getLaserColor src/Dodge/HeldUse.hs 164;" f
getLaserDamage src/Dodge/HeldUse.hs 161;" f
getLaserPhaseV src/Dodge/HeldUse.hs 158;" f
getLinksOfType src/Dodge/RoomLink.hs 39;" f
getNodePos src/Dodge/Path.hs 31;" f
getPretty src/AesonHelp.hs 7;" f
@@ -5617,7 +5614,7 @@ hasLOSIndirect src/Dodge/Base/Collide.hs 214;" f
hat src/Dodge/Item/Equipment.hs 104;" f
head src/DoubleStack.hs 14;" f
headLamp src/Dodge/Item/Equipment.hs 117;" f
headLampShape src/Dodge/Item/Draw/SPic.hs 394;" f
headLampShape src/Dodge/Item/Draw/SPic.hs 395;" f
headMap src/Dodge/DoubleTree.hs 117;" f
heal src/Dodge/Item/Consumable.hs 17;" f
heal25 src/Dodge/Item/Consumable.hs 14;" f
@@ -5762,7 +5759,7 @@ invertIntMap src/Multiset.hs 61;" f
invertInventoryToMap src/Dodge/Combine.hs 18;" f
invisibleChaseCrit src/Dodge/Creature/ChaseCrit.hs 25;" f
invisibleWall src/Dodge/Placement/Instance/Wall.hs 16;" f
isAmmoIntLink src/Dodge/HeldUse.hs 178;" f
isAmmoIntLink src/Dodge/HeldUse.hs 188;" f
isAnimate src/Dodge/Creature/Test.hs 138;" f
isCognizant src/Dodge/Creature/Perception.hs 105;" f
isElectrical src/Dodge/Data/Damage.hs 42;" f
@@ -5800,7 +5797,7 @@ itemBlips src/Dodge/Item/Weapon/UseEffect.hs 38;" f
itemBlips src/Dodge/RadarSweep.hs 75;" f
itemCombinations src/Dodge/Combine/Combinations.hs 54;" f
itemCombinationsEdges src/Dodge/Combine/Graph.hs 54;" f
itemDetectorEffect src/Dodge/HeldUse.hs 203;" f
itemDetectorEffect src/Dodge/HeldUse.hs 213;" f
itemDisplay src/Dodge/Item/Display.hs 31;" f
itemDisplayPad src/Dodge/Item/Display.hs 43;" f
itemEffect src/Dodge/Creature/Action/UseItem.hs 28;" f
@@ -5815,7 +5812,7 @@ itemFromLeftType src/Dodge/Item.hs 77;" f
itemInfo src/Dodge/Item/Info.hs 12;" f
itemInvColor src/Dodge/Item/InventoryColor.hs 9;" f
itemInvSideEffect src/Dodge/Creature/State.hs 245;" f
itemNumberDisplay src/Dodge/Item/Display.hs 110;" f
itemNumberDisplay src/Dodge/Item/Display.hs 111;" f
itemRooms src/Dodge/LockAndKey.hs 39;" f
itemRotTreeSPic src/Dodge/Item/Draw/SPic.hs 27;" f
itemSPic src/Dodge/Item/Draw/SPic.hs 34;" f
@@ -5856,7 +5853,7 @@ keyCard src/Dodge/Item/PassKey.hs 8;" f
keyCardAnalyserByDoor src/Dodge/Room/LasTurret.hs 69;" f
keyCardRoomRunPast src/Dodge/Room/LasTurret.hs 57;" f
keyCardRunPastRand src/Dodge/LockAndKey.hs 36;" f
keyPic src/Dodge/Item/Draw/SPic.hs 410;" f
keyPic src/Dodge/Item/Draw/SPic.hs 411;" f
keyholeCorridor src/Dodge/Room/Corridor.hs 39;" f
killBulletUpdate src/Dodge/WorldEvent/HitEffect.hs 30;" f
killParticleUpdate src/Dodge/Particle/Update.hs 9;" f
@@ -5874,9 +5871,9 @@ lampCoverWhen src/Dodge/Placement/Instance/LightSource/Cover.hs 19;" f
lampCrSPic src/Dodge/Render/ShapePicture.hs 104;" f
lasCenSensEdge src/Dodge/Room/LasTurret.hs 112;" f
lasDronesPic src/Dodge/Item/Weapon/Drone.hs 22;" f
lasGun src/Dodge/Item/Held/BatteryGuns.hs 46;" f
lasGun src/Dodge/Item/Held/BatteryGuns.hs 40;" f
lasGunPic src/Dodge/Item/Draw/SPic.hs 361;" f
lasRayAt src/Dodge/HeldUse.hs 261;" f
lasRayAt src/Dodge/HeldUse.hs 272;" 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
@@ -5902,7 +5899,7 @@ leftIsParentCombine src/Dodge/Item/Grammar.hs 85;" f
leftItemSPic src/Dodge/Item/Draw/SPic.hs 99;" f
leftPad src/Padding.hs 14;" f
leftRightCombine src/Dodge/Item/Grammar.hs 97;" f
legsSPic src/Dodge/Item/Draw/SPic.hs 428;" f
legsSPic src/Dodge/Item/Draw/SPic.hs 429;" f
liShape src/Dodge/Placement/Instance/LightSource.hs 99;" f
liShape src/Dodge/Placements/LightSource.hs 55;" f
light src/Color.hs 100;" f
@@ -6004,7 +6001,7 @@ makeArc src/Picture/Base.hs 157;" f
makeBlip src/Dodge/RadarSweep.hs 51;" f
makeBlockDebris src/Dodge/Block/Debris.hs 28;" f
makeBoolOption src/Dodge/Menu/OptionType.hs 8;" f
makeBullet src/Dodge/HeldUse.hs 330;" f
makeBullet src/Dodge/HeldUse.hs 341;" f
makeButton src/Dodge/LevelGen/Switch.hs 16;" f
makeByteStringShaderUsingVAO src/Shader/Compile.hs 137;" f
makeCloudAt src/Dodge/WorldEvent/Cloud.hs 18;" f
@@ -6085,7 +6082,7 @@ maybeOpenTerminal src/Dodge/Update.hs 115;" f
maybeReadFile src/Dodge/LoadSeed.hs 10;" f
maybeTakeOne src/Dodge/RandomHelp.hs 96;" f
maybeTakeOne src/RandomHelp.hs 107;" f
maybeWarmupStatus src/Dodge/Item/Display.hs 136;" f
maybeWarmupStatus src/Dodge/Item/Display.hs 137;" f
mcApplyDamage src/Dodge/Machine/Update.hs 90;" f
mcKillBut src/Dodge/Machine/Destroy.hs 34;" f
mcKillTerm src/Dodge/Machine/Destroy.hs 26;" f
@@ -6095,10 +6092,10 @@ mcProximitySensorUpdate src/Dodge/Machine/Update.hs 104;" f
mcSPic src/Dodge/Render/ShapePicture.hs 180;" f
mcSensorTriggerUpdate src/Dodge/Machine/Update.hs 69;" f
mcSensorUpdate src/Dodge/Machine/Update.hs 99;" f
mcShootLaser src/Dodge/HeldUse.hs 414;" f
mcShootLaser src/Dodge/HeldUse.hs 425;" f
mcTriggerVal src/Dodge/Machine/Update.hs 75;" f
mcTypeUpdate src/Dodge/Machine/Update.hs 24;" f
mcUseHeld src/Dodge/HeldUse.hs 355;" f
mcUseHeld src/Dodge/HeldUse.hs 366;" f
mcUseItem src/Dodge/Machine/Update.hs 61;" f
medkit src/Dodge/Item/Consumable.hs 8;" f
megaBattery src/Dodge/Item/Ammo.hs 67;" f
@@ -6272,8 +6269,8 @@ newKey src/IntMapHelp.hs 59;" f
newMapKey src/Dodge/Config/KeyConfig.hs 33;" f
newSounds src/Dodge/Creature/Perception.hs 170;" f
newTextureFramebuffer src/Framebuffer/Setup.hs 16;" f
noPic src/ShapePicture.hs 26;" f
noShape src/ShapePicture.hs 30;" f
noPic src/ShapePicture.hs 25;" f
noShape src/ShapePicture.hs 29;" f
noclipCheck src/Dodge/WallCreatureCollisions.hs 20;" f
nodeFormatting src/Dodge/Combine/Graph.hs 133;" f
normalGait src/Dodge/Creature/State/WalkCycle.hs 19;" f
@@ -6336,7 +6333,7 @@ overLnkType src/Dodge/RoomLink.hs 87;" f
overPos src/Picture/Base.hs 303;" f
overPosObj src/Shape.hs 273;" f
overPosSH src/Shape.hs 257;" f
overPosSP src/ShapePicture.hs 42;" f
overPosSP src/ShapePicture.hs 41;" f
overlapCircWalls src/Dodge/Base/Collide.hs 137;" f
overlapCircWallsClosest src/Dodge/Base/Collide.hs 168;" f
overlapSegCrs src/Dodge/Base/Collide.hs 58;" f
@@ -6731,7 +6728,7 @@ rememberSounds src/Dodge/Creature/Perception.hs 177;" f
remoteBombUnarmedPic src/Dodge/Item/Weapon/Grenade.hs 268;" f
remoteScreen src/Dodge/Item/Scope.hs 52;" f
remoteShellShape src/Dodge/Projectile/Draw.hs 42;" f
removeAmmoFromMag src/Dodge/HeldUse.hs 271;" f
removeAmmoFromMag src/Dodge/HeldUse.hs 282;" f
removeDot src/ShortShow.hs 30;" f
removeEither src/Dodge/Layout/Tree/Either.hs 41;" f
removeHotkey src/Dodge/Hotkey.hs 41;" f
@@ -6840,7 +6837,7 @@ rotateProp src/Dodge/Prop/Update.hs 49;" f
rotateSH src/Shape.hs 253;" f
rotateSHq src/Shape.hs 162;" f
rotateSHx src/Shape.hs 261;" f
rotateSP src/ShapePicture.hs 58;" f
rotateSP src/ShapePicture.hs 57;" f
rotateTo src/Polyhedra/Geodesic.hs 63;" f
rotateToOverlappingWall src/Dodge/Update/Camera.hs 179;" f
rotateToZ src/Quaternion.hs 31;" f
@@ -7043,7 +7040,7 @@ shootBangCone src/Dodge/HeldUse/BulletWeapon.hs 98;" f
shootBangRod src/Dodge/HeldUse/BulletWeapon.hs 185;" f
shootBangstick src/Dodge/HeldUse/BulletWeapon.hs 9;" f
shootBezier src/Dodge/Item/Weapon/Bezier.hs 51;" f
shootBullet src/Dodge/HeldUse.hs 315;" f
shootBullet src/Dodge/HeldUse.hs 326;" f
shootBurstRifle src/Dodge/HeldUse/BulletWeapon.hs 164;" f
shootBurstRifleRepeat src/Dodge/HeldUse/BulletWeapon.hs 176;" f
shootElephantGun src/Dodge/HeldUse/BulletWeapon.hs 196;" f
@@ -7052,7 +7049,7 @@ 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 298;" f
shootLaser src/Dodge/HeldUse.hs 244;" f
shootLaser src/Dodge/HeldUse.hs 254;" f
shootMachineGun src/Dodge/HeldUse/BulletWeapon.hs 218;" f
shootMachinePistol src/Dodge/HeldUse/BulletWeapon.hs 62;" f
shootMiniGun src/Dodge/HeldUse/BulletWeapon.hs 113;" f
@@ -7063,9 +7060,9 @@ 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 423;" f
shootTeslaArc src/Dodge/HeldUse.hs 434;" f
shootTillEmpty src/Dodge/Creature/Volition.hs 18;" f
shootTractorBeam src/Dodge/HeldUse.hs 223;" f
shootTractorBeam src/Dodge/HeldUse.hs 233;" f
shootVolleyGun src/Dodge/HeldUse/BulletWeapon.hs 128;" f
shootersRoom src/Dodge/Room/Room.hs 317;" f
shootersRoom' src/Dodge/Room/Room.hs 282;" f
@@ -7079,9 +7076,9 @@ shoulderHeight src/Dodge/Item/HeldOffset.hs 57;" f
shoulderSH src/Dodge/Creature/Picture.hs 171;" f
shoulderSP src/Dodge/Creature/HandPos.hs 196;" f
showAttachItem src/Dodge/Item/Display.hs 76;" f
showAutoRechargeProgress src/Dodge/Item/Display.hs 89;" f
showAutoRechargeProgress src/Dodge/Item/Display.hs 90;" f
showEquipItem src/Dodge/Item/Display.hs 85;" f
showEquipmentNumber src/Dodge/Item/Display.hs 127;" f
showEquipmentNumber src/Dodge/Item/Display.hs 128;" f
showInt src/Dodge/Item/Info.hs 31;" f
showIntsString src/Dodge/Tree/Compose.hs 129;" f
showManObj src/Dodge/TestString.hs 40;" f
@@ -7173,7 +7170,7 @@ spanLSLightI src/Dodge/Placement/Instance/LightSource.hs 164;" f
spanLightI src/Dodge/Placement/Instance/LightSource.hs 193;" f
spanLightI src/Dodge/Placements/LightSource.hs 110;" f
sparkDam src/Dodge/Spark.hs 32;" f
sparkGun src/Dodge/Item/Held/BatteryGuns.hs 21;" f
sparkGun src/Dodge/Item/Held/BatteryGuns.hs 15;" f
spawnCrNextTo src/Dodge/Item/Weapon/Spawn.hs 20;" f
spawnElectricalSparks src/Dodge/PosEvent.hs 20;" f
spawnGun src/Dodge/Item/Weapon/Spawn.hs 12;" f
@@ -7319,7 +7316,7 @@ terminalReturnEffect src/Dodge/Terminal/ReturnEffect.hs 10;" f
terminalSPic src/Dodge/Machine/Draw.hs 26;" f
terminalShape src/Dodge/Machine/Draw.hs 29;" f
terminalWheelEvent src/Dodge/Update/Scroll.hs 76;" f
teslaGun src/Dodge/Item/Held/BatteryGuns.hs 27;" f
teslaGun src/Dodge/Item/Held/BatteryGuns.hs 21;" f
teslaGunPic src/Dodge/Item/Draw/SPic.hs 351;" f
teslaParams src/Dodge/Tesla/ItemParams.hs 6;" f
testCrossWalls src/Dodge/Room/Path.hs 47;" f
@@ -7400,9 +7397,9 @@ torqueCr src/Dodge/WorldEffect.hs 70;" f
torso src/Dodge/Creature/Picture.hs 133;" f
tractCr src/Dodge/TractorBeam/Update.hs 28;" f
tractFlIt src/Dodge/TractorBeam/Update.hs 23;" f
tractorBeamAt src/Dodge/HeldUse.hs 233;" f
tractorGun src/Dodge/Item/Held/BatteryGuns.hs 73;" f
tractorGunPic src/Dodge/Item/Draw/SPic.hs 388;" f
tractorBeamAt src/Dodge/HeldUse.hs 243;" f
tractorGun src/Dodge/Item/Held/BatteryGuns.hs 67;" f
tractorGunPic src/Dodge/Item/Draw/SPic.hs 389;" f
tractorPullPos src/Dodge/TractorBeam/Update.hs 33;" f
tractorSPic src/Dodge/TractorBeam/Draw.hs 10;" f
tranRot src/Picture/Base.hs 124;" f
@@ -7421,9 +7418,9 @@ translatePointToRightHand' src/Dodge/Creature/HandPos.hs 55;" f
translateSH src/Shape.hs 241;" f
translateSHxy src/Shape.hs 245;" f
translateSHz src/Shape.hs 249;" f
translateSP src/ShapePicture.hs 54;" f
translateSPxy src/ShapePicture.hs 46;" f
translateSPz src/ShapePicture.hs 50;" f
translateSP src/ShapePicture.hs 53;" f
translateSPxy src/ShapePicture.hs 45;" f
translateSPz src/ShapePicture.hs 49;" f
translateScreenPos src/Dodge/ScreenPos.hs 12;" f
translateToBack src/Dodge/Creature/HandPos.hs 190;" f
translateToChest src/Dodge/Creature/HandPos.hs 183;" f
@@ -7672,8 +7669,8 @@ useC src/Dodge/Cuse.hs 8;" f
useC' src/Dodge/Cuse.hs 13;" f
useE src/Dodge/Euse.hs 24;" f
useEquipment src/Dodge/Creature/State.hs 222;" f
useForceFieldGun src/Dodge/HeldUse.hs 437;" f
useGasParams src/Dodge/HeldUse.hs 366;" f
useForceFieldGun src/Dodge/HeldUse.hs 448;" f
useGasParams src/Dodge/HeldUse.hs 377;" 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 126;" f
@@ -7682,7 +7679,7 @@ useItemLeftClick' src/Dodge/Creature/Impulse/UseItem.hs 113;" f
useL src/Dodge/Luse.hs 13;" f
useLeftItem src/Dodge/Creature/Action/UseItem.hs 38;" f
useLnkRoomPos src/Dodge/PlacementSpot.hs 244;" f
useLoadedAmmo src/Dodge/HeldUse.hs 182;" f
useLoadedAmmo src/Dodge/HeldUse.hs 192;" f
useMagShield src/Dodge/Euse.hs 69;" f
useNormalCamera src/Dodge/Camera.hs 6;" f
usePayload src/Dodge/Payload.hs 7;" f
@@ -7730,7 +7727,7 @@ volleyGun src/Dodge/Item/Held/Cane.hs 32;" f
volleyGun src/Dodge/Item/Weapon/BulletGun/Cane.hs 43;" f
volleyGunShape src/Dodge/Item/Draw/SPic.hs 292;" f
waistSP src/Dodge/Creature/HandPos.hs 199;" f
walkNozzle src/Dodge/HeldUse.hs 208;" f
walkNozzle src/Dodge/HeldUse.hs 218;" f
walkableNodeNear src/Dodge/Path.hs 48;" f
wallBlips src/Dodge/Item/Weapon/UseEffect.hs 43;" f
wallBlips src/Dodge/RadarSweep.hs 80;" f