Move further towards removing _crInvEquipped

This commit is contained in:
2024-12-19 12:29:17 +00:00
parent 7e0184a54d
commit 80b03e6544
11 changed files with 82 additions and 97 deletions
+1 -1
View File
File diff suppressed because one or more lines are too long
-1
View File
@@ -48,4 +48,3 @@ armourChaseCrit =
, _crMvType = defaultChaseMvType{_mvTurnRad = FloatConst 0.05}
}
& crEquipment . at OnChest ?~ 0
-- & crInvEquipped . at 0 ?~ OnChest
-1
View File
@@ -28,7 +28,6 @@ invisibleChaseCrit =
-- & crCamouflage .~ Invisible
& crInv . at 0 ?~ wristInvisibility
& crEquipment . at OnLeftWrist ?~ 0
-- & crInvEquipped . at 0 ?~ OnLeftWrist
chaseCrit :: Creature
chaseCrit =
-6
View File
@@ -25,12 +25,6 @@ equipmentStrValue itm = case _itType itm of
crCurrentEquipment :: Creature -> IM.IntMap Item
crCurrentEquipment = IM.filter (isJust . (^? itLocation . ilEquipPosition . _Just)) . _crInv
-- merge
-- dropMissing
-- dropMissing
-- (zipWithMatched (\_ _ itm -> itm))
-- (_crInvEquipped cr)
-- (_crInv cr)
strFromHeldItem :: Creature -> Int
strFromHeldItem cr
-2
View File
@@ -75,8 +75,6 @@ data Creature = Creature
, _crHammerPosition :: HammerPosition
, _crName :: String
, _crStatistics :: CreatureStatistics
-- , _crCamouflage :: CamouflageStatus
-- , _crTargeting :: CreatureTargeting
}
--deriving (Eq, Show, Read) --Generic, Flat)
+1 -3
View File
@@ -34,8 +34,6 @@ useE loc cr = case eo of
Just EMagShield -> useMagShield itm cr
Just EWristShield -> setWristShieldPos itm cr
Just EHeadLamp -> createHeadLamp itm cr
-- Just EBatterySource{} -> tryChargeBattery itm cr
-- Just EAmmoSource{} -> tryAttachBulletBelt itm cr
where
itm = loc ^. locLDT . ldtValue . _1
eo = itm ^? itUse . uequipEffect . eeUse
@@ -106,7 +104,7 @@ setWristShieldPos itm cr w = w & moveWallIDUnsafe i wlline
i = _eparamID $ _eeParams $ _uequipEffect $ _itUse itm
wlline = (f (V3 (-10) 7 0), f (V3 10 7 0))
invid = _ilInvID (_itLocation itm)
handtrans = case cr ^? crInvEquipped . ix invid of
handtrans = case cr ^? crInv . ix invid . itLocation . ilEquipPosition . _Just of
Just OnLeftWrist -> \cr' -> translatePointToLeftHand cr' . g
_ -> translatePointToRightHand
g
+2 -1
View File
@@ -25,7 +25,8 @@ newHotkey cr = fromMaybe maxBound $ find (not . (`M.member` usedhks)) [minBound
-- requires there actually is equipment in the slot, too
assignHotkey :: Int -> Hotkey -> Creature -> Creature
assignHotkey invid hk cr = fromMaybe cr $ do
guard (invid `IM.member` (cr ^. crInvEquipped))
--guard (invid `IM.member` (cr ^. crInvEquipped))
guard $ isJust $ cr ^? crInv . ix invid . itLocation . ilEquipPosition . _Just
_ <- cr ^? crInv . ix invid . itUse . leftUse
return $ (setHotkey invid hk . moveOldHotkey invid hk) cr
-2
View File
@@ -36,7 +36,6 @@ updateRBList w
chooseEquipmentPosition :: Creature -> [EquipPosition] -> Int
chooseEquipmentPosition cr eps = fromMaybe (chooseFreeSite cr eps) $ do
i <- cr ^? crManipulation . manObject . imSelectedItem
--ep <- cr ^? crInvEquipped . ix i
ep <- cr ^? crInv . ix i . itLocation . ilEquipPosition . _Just
elemIndex ep eps
@@ -52,7 +51,6 @@ getEquipmentAllocation w = fromMaybe DoNotMoveEquipment $ do
i <- w ^? rbOptions . opSel
<|> Just (chooseEquipmentPosition (you w) (equipSiteToPositions esite))
es <- equipSiteToPositions esite ^? ix i
--return $ case you w ^? crInvEquipped . ix curpos of
return $ case you w ^? crInv . ix curpos . itLocation . ilEquipPosition . _Just of
Just epos
| es == epos -> RemoveEquipment{_allocOldPos = epos}
-1
View File
@@ -34,7 +34,6 @@ invSelectionItem indent cr i ci =
anyhotkey = maybe [] ((' ' :) . hotkeyToString) (cr ^? crInvHotkeys . ix i)
anyequippos = maybe [] (rightPad 8 ' ' . (' ' :) . eqPosText)
(ci ^? _1 . itLocation . ilEquipPosition . _Just)
-- (cr ^? crInvEquipped . ix i)
col = itemInvColor ci
pics = itemDisplay cr ci
+1 -1
View File
@@ -22,7 +22,7 @@ itemEquipPict cr itmtree = case itm ^. itUse of
ituse -> fold $ do
attachpos <- ituse ^? uequipEffect . eeAttachPos
i <- itm ^? itLocation . ilInvID
epos <- cr ^? crInvEquipped . ix i
epos <- cr ^? crInv . ix i . itLocation . ilEquipPosition . _Just
return $ equipPosition epos cr attachpos (itemSPic itm)
where
itm = itmtree ^. ldtValue . _1
+77 -78
View File
@@ -16,7 +16,7 @@
<$> src/Dodge/Data/ActionPlan.hs 203;" o
<$> src/Dodge/Data/CWorld.hs 49;" o
<$> src/Dodge/Data/Camera.hs 39;" o
<$> src/Dodge/Data/Creature.hs 108;" o
<$> src/Dodge/Data/Creature.hs 106;" o
<$> src/Dodge/Data/LWorld.hs 155;" o
<$> src/Dodge/Data/Terminal.hs 131;" o
AIUNIT src/Dodge/Data/Item/Combine.hs 52;" C
@@ -422,14 +422,14 @@ Creature src/Dodge/Data/Creature.hs 7;" m
Creature src/Dodge/Default/Creature.hs 1;" m
Creature src/Dodge/Placement/Instance/Creature.hs 1;" m
Creature src/Dodge/Zoning/Creature.hs 1;" m
CreatureCorpse src/Dodge/Data/Creature.hs 91;" t
CreatureCorpse src/Dodge/Data/Creature.hs 89;" t
CreatureDropType src/Dodge/Data/Creature/State.hs 23;" t
CreatureEffect src/Dodge/CreatureEffect.hs 1;" m
CreatureEffect src/Dodge/Data/CreatureEffect.hs 6;" m
CreaturePart src/Dodge/Data/Wall.hs 53;" C
CreatureState src/Dodge/Data/Creature/State.hs 16;" t
CreatureStatistics src/Dodge/Data/Creature/Misc.hs 20;" t
CreatureTargeting src/Dodge/Data/Creature.hs 84;" t
CreatureTargeting src/Dodge/Data/Creature.hs 82;" t
CreatureType src/Dodge/Data/Creature/Misc.hs 69;" t
CryostatisSS src/Dodge/Data/Scenario.hs 91;" C
Crystal src/Dodge/Data/Material.hs 11;" C
@@ -597,7 +597,6 @@ DudPayload src/Dodge/Data/Payload.hs 11;" C
Dungeon src/Dodge/Data/Scenario.hs 66;" C
Dust src/Dodge/Wall/Dust.hs 1;" m
EBO src/Shader/Data.hs 88;" t
ECamouflage src/Dodge/Data/Item/Use/Equipment.hs 31;" C
EDoNothing src/Dodge/Data/Item/HeldUse.hs 19;" C
EHeadLamp src/Dodge/Data/Item/HeldUse.hs 22;" C
ELECTRICAL src/Dodge/Data/Damage/Type.hs 20;" C
@@ -631,14 +630,14 @@ EnergyBall src/Dodge/EnergyBall.hs 1;" m
EnergyBallType src/Dodge/Data/Bullet.hs 31;" t
EnergyGeneratorSS src/Dodge/Data/Scenario.hs 109;" C
EngineSS src/Dodge/Data/Scenario.hs 88;" C
EoffWristShield src/Dodge/Data/Item/Use/Equipment.hs 33;" C
EonWristShield src/Dodge/Data/Item/Use/Equipment.hs 32;" C
EquipCounter src/Dodge/Data/Item/Use/Equipment.hs 39;" C
EquipEffect src/Dodge/Data/Item/Use/Equipment.hs 18;" t
EquipID src/Dodge/Data/Item/Use/Equipment.hs 38;" C
EoffWristShield src/Dodge/Data/Item/Use/Equipment.hs 32;" C
EonWristShield src/Dodge/Data/Item/Use/Equipment.hs 31;" C
EquipCounter src/Dodge/Data/Item/Use/Equipment.hs 38;" C
EquipEffect src/Dodge/Data/Item/Use/Equipment.hs 17;" t
EquipID src/Dodge/Data/Item/Use/Equipment.hs 37;" C
EquipItemType src/Dodge/Data/Item/Combine.hs 100;" t
EquipOptions src/Dodge/Data/RightButtonOptions.hs 15;" C
EquipParams src/Dodge/Data/Item/Use/Equipment.hs 36;" t
EquipParams src/Dodge/Data/Item/Use/Equipment.hs 35;" t
EquipPosition src/Dodge/Data/Equipment/Misc.hs 20;" t
EquipSite src/Dodge/Data/Equipment/Misc.hs 11;" t
Equipment src/Dodge/Data/Item/Use/Equipment.hs 5;" m
@@ -908,7 +907,7 @@ IntAnno src/Dodge/Annotation/Data.hs 17;" C
IntID src/Dodge/Data/Universe.hs 110;" t
IntImp src/Dodge/Data/CreatureEffect.hs 20;" t
IntMapHelp src/IntMapHelp.hs 8;" m
Intention src/Dodge/Data/Creature.hs 95;" t
Intention src/Dodge/Data/Creature.hs 93;" t
Intention src/Dodge/Creature/Intention.hs 1;" m
Intersect src/Geometry/Intersect.hs 5;" m
IntersectingRoomClipBoundaries src/Dodge/Data/Config.hs 105;" C
@@ -949,8 +948,8 @@ ItemStructuralFunction src/Dodge/Data/ComposedItem.hs 29;" t
ItemTargeting src/Dodge/Data/Item.hs 53;" t
ItemType src/Dodge/Data/Item/Combine.hs 15;" t
ItemUse src/Dodge/Data/Item/Use.hs 35;" t
ItmCrWdWd src/Dodge/Data/Item/Use/Equipment.hs 29;" t
ItmCrWdWdDoNothing src/Dodge/Data/Item/Use/Equipment.hs 30;" C
ItmCrWdWd src/Dodge/Data/Item/Use/Equipment.hs 28;" t
ItmCrWdWdDoNothing src/Dodge/Data/Item/Use/Equipment.hs 29;" C
ItmInt src/Dodge/Data/Item/Location.hs 25;" t
JGK src/Control/Foldl/JGK.hs 1;" m
JUMPLEGS src/Dodge/Data/Item/Combine.hs 111;" C
@@ -1124,7 +1123,7 @@ MagnetUpdate src/Dodge/Data/Magnet.hs 13;" t
MagnetUpdateTimer src/Dodge/Data/Magnet.hs 13;" C
Main appDodge/Main.hs 1;" m
Make src/Dodge/Corpse/Make.hs 1;" m
MakeDefaultCorpse src/Dodge/Data/Creature.hs 91;" C
MakeDefaultCorpse src/Dodge/Data/Creature.hs 89;" C
MakeSound src/Dodge/Data/ActionPlan.hs 43;" C
MakeStartCloudAt src/Dodge/Data/WorldEffect.hs 30;" C
MakeTempLight src/Dodge/Data/WorldEffect.hs 34;" C
@@ -1248,7 +1247,7 @@ NoDamageEffect src/Dodge/Data/Damage.hs 29;" C
NoDebugInfo src/Dodge/Data/Universe.hs 54;" C
NoDelay src/Dodge/Data/Item/HeldDelay.hs 14;" C
NoDropEffect src/Dodge/Data/Item/Effect.hs 31;" C
NoEquipParams src/Dodge/Data/Item/Use/Equipment.hs 37;" C
NoEquipParams src/Dodge/Data/Item/Use/Equipment.hs 36;" C
NoEscapeMenuOption src/Dodge/Data/Universe.hs 75;" C
NoFaction src/Dodge/Data/Creature/State.hs 40;" C
NoHammer src/Dodge/Data/Hammer.hs 13;" C
@@ -2386,10 +2385,10 @@ _csDropsOnDeath src/Dodge/Data/Creature/State.hs 19;" f
_csLinks src/Dodge/Data/RoomCluster.hs 11;" f
_csName src/Dodge/Data/RoomCluster.hs 10;" f
_csSpState src/Dodge/Data/Creature/State.hs 18;" f
_ctActive src/Dodge/Data/Creature.hs 88;" f
_ctID src/Dodge/Data/Creature.hs 87;" f
_ctPos src/Dodge/Data/Creature.hs 85;" f
_ctType src/Dodge/Data/Creature.hs 86;" f
_ctActive src/Dodge/Data/Creature.hs 86;" f
_ctID src/Dodge/Data/Creature.hs 85;" f
_ctPos src/Dodge/Data/Creature.hs 83;" f
_ctType src/Dodge/Data/Creature.hs 84;" f
_currentArc src/Dodge/Data/Item/Params.hs 22;" f
_currentFoot src/Dodge/Data/Creature/Stance.hs 23;" f
_cursSides src/Dodge/Data/SelectionList.hs 20;" f
@@ -2483,18 +2482,17 @@ _ebWidth src/Dodge/Data/EnergyBall.hs 19;" f
_ebZ src/Dodge/Data/EnergyBall.hs 22;" f
_eboName src/Shader/Data.hs 89;" f
_eboPtr src/Shader/Data.hs 90;" f
_eeAttachPos src/Dodge/Data/Item/Use/Equipment.hs 25;" f
_eeOnEquip src/Dodge/Data/Item/Use/Equipment.hs 20;" f
_eeOnRemove src/Dodge/Data/Item/Use/Equipment.hs 21;" f
_eeParams src/Dodge/Data/Item/Use/Equipment.hs 23;" f
_eeSite src/Dodge/Data/Item/Use/Equipment.hs 22;" f
_eeUse src/Dodge/Data/Item/Use/Equipment.hs 19;" f
_eeViewDist src/Dodge/Data/Item/Use/Equipment.hs 24;" f
_eeAttachPos src/Dodge/Data/Item/Use/Equipment.hs 24;" f
_eeOnEquip src/Dodge/Data/Item/Use/Equipment.hs 19;" f
_eeOnRemove src/Dodge/Data/Item/Use/Equipment.hs 20;" f
_eeParams src/Dodge/Data/Item/Use/Equipment.hs 22;" f
_eeSite src/Dodge/Data/Item/Use/Equipment.hs 21;" f
_eeUse src/Dodge/Data/Item/Use/Equipment.hs 18;" f
_eeViewDist src/Dodge/Data/Item/Use/Equipment.hs 23;" f
_emoMenuOption src/Dodge/Data/Universe.hs 73;" f
_energyBalls src/Dodge/Data/LWorld.hs 107;" f
_eparamID src/Dodge/Data/Item/Use/Equipment.hs 38;" f
_eparamInt src/Dodge/Data/Item/Use/Equipment.hs 39;" f
_euseCamouflageStatus src/Dodge/Data/Item/Use/Equipment.hs 31;" f
_eparamID src/Dodge/Data/Item/Use/Equipment.hs 37;" f
_eparamInt src/Dodge/Data/Item/Use/Equipment.hs 38;" f
_fbo2 src/Data/Preload/Render.hs 29;" f
_fbo3 src/Data/Preload/Render.hs 30;" f
_fboBase src/Data/Preload/Render.hs 33;" f
@@ -2766,7 +2764,7 @@ _musicData src/Data/Preload.hs 13;" f
_muzVel src/Dodge/Data/Item/Use.hs 90;" f
_mvAimSpeed src/Dodge/Data/Creature/Misc.hs 44;" f
_mvSpeed src/Dodge/Data/Creature/Misc.hs 39;" f
_mvToPoint src/Dodge/Data/Creature.hs 97;" f
_mvToPoint src/Dodge/Data/Creature.hs 95;" f
_mvTurnJit src/Dodge/Data/Creature/Misc.hs 43;" f
_mvTurnRad src/Dodge/Data/Creature/Misc.hs 42;" f
_mzAmmoPerShot src/Dodge/Data/Item/Use.hs 159;" f
@@ -3092,7 +3090,7 @@ _taArcSteps src/Dodge/Data/TeslaArc.hs 18;" f
_taColor src/Dodge/Data/TeslaArc.hs 19;" f
_taPoints src/Dodge/Data/TeslaArc.hs 16;" f
_taTimer src/Dodge/Data/TeslaArc.hs 17;" f
_targetCr src/Dodge/Data/Creature.hs 96;" f
_targetCr src/Dodge/Data/Creature.hs 94;" f
_targetID src/Dodge/Data/ActionPlan.hs 85;" f
_targetSeenAt src/Dodge/Data/ActionPlan.hs 86;" f
_tbPos src/Dodge/Data/TractorBeam.hs 14;" f
@@ -3218,7 +3216,7 @@ _vcWarnings src/Dodge/Data/Creature/Misc.hs 31;" f
_vertices src/Polyhedra/Data.hs 22;" f
_viDist src/Dodge/Data/Creature/Perception.hs 43;" f
_viFOV src/Dodge/Data/Creature/Perception.hs 42;" f
_viewPoint src/Dodge/Data/Creature.hs 98;" f
_viewPoint src/Dodge/Data/Creature.hs 96;" f
_volume_master src/Dodge/Data/Config.hs 39;" f
_volume_music src/Dodge/Data/Config.hs 41;" f
_volume_sound src/Dodge/Data/Config.hs 40;" f
@@ -3395,7 +3393,7 @@ argumentHelp src/Dodge/Terminal.hs 151;" f
armourChaseCrit src/Dodge/Creature/ArmourChase.hs 38;" f
armouredChasers src/Dodge/Room/Boss.hs 63;" f
armouredCorridor src/Dodge/Room/RoadBlock.hs 20;" f
arms src/Dodge/Creature/Picture.hs 72;" f
arms src/Dodge/Creature/Picture.hs 75;" f
arrow src/Picture/Composite.hs 19;" f
arrowPath src/Picture/Composite.hs 8;" f
assignHotkey src/Dodge/Hotkey.hs 26;" f
@@ -3448,7 +3446,7 @@ basePCI src/Dodge/Item/Grammar.hs 107;" f
baseRifleShape src/Dodge/Item/Draw/SPic.hs 259;" f
baseRodShape src/Dodge/Item/Draw/SPic.hs 343;" f
baseSMGShape src/Dodge/Item/Draw/SPic.hs 326;" f
baseShoulder src/Dodge/Creature/Picture.hs 128;" f
baseShoulder src/Dodge/Creature/Picture.hs 131;" f
baseStickShape src/Dodge/Item/Draw/SPic.hs 233;" f
baseStickShapeX src/Dodge/Item/Draw/SPic.hs 228;" f
baseStickSpread src/Dodge/Item/Held/Stick.hs 28;" f
@@ -3456,7 +3454,7 @@ basicAttentionUpdate src/Dodge/Creature/Perception.hs 127;" f
basicAwarenessUpdate src/Dodge/Creature/Perception.hs 37;" f
basicBulDams src/Dodge/Item/Weapon/Bullet.hs 25;" f
basicCrPict src/Dodge/Creature/Picture.hs 26;" f
basicCrShape src/Dodge/Creature/Picture.hs 31;" f
basicCrShape src/Dodge/Creature/Picture.hs 34;" f
basicDrawBeam src/Dodge/Beam/Draw.hs 11;" f
basicItemDisplay src/Dodge/Item/Display.hs 34;" f
basicMachineApplyDamage src/Dodge/Machine/Damage.hs 6;" f
@@ -3464,7 +3462,7 @@ basicMachineUpdate src/Dodge/Machine.hs 13;" f
basicMuzFlare src/Dodge/HeldUse.hs 219;" f
basicTerminal src/Dodge/Terminal.hs 35;" f
battery src/Dodge/Item/Ammo.hs 97;" f
batteryPack src/Dodge/Item/Equipment.hs 58;" f
batteryPack src/Dodge/Item/Equipment.hs 57;" f
belowNumX src/Dodge/Combine/Graph.hs 85;" f
beltMag src/Dodge/Item/Ammo.hs 54;" f
bfsNodePoints src/Dodge/Path.hs 58;" f
@@ -3510,7 +3508,7 @@ boxSurfaces src/Shader/Poke.hs 269;" f
boxSurfacesIndices src/Shader/Poke.hs 282;" f
boxXYZ src/Polyhedra.hs 94;" f
boxXYZnobase src/Polyhedra.hs 80;" f
brainHat src/Dodge/Item/Equipment.hs 130;" f
brainHat src/Dodge/Item/Equipment.hs 129;" f
branchRectWith src/Dodge/Room/Branch.hs 15;" f
branchWith src/Dodge/Room/Room.hs 67;" f
bright src/Color.hs 120;" f
@@ -3519,8 +3517,8 @@ btSPic src/Dodge/Render/ShapePicture.hs 127;" f
bufferEBO src/Shader/Bind.hs 28;" f
bufferPokedVBO src/Shader/Bind.hs 19;" f
bufferShaderLayers src/Shader/Bind.hs 36;" f
bulletBeltBracer src/Dodge/Item/Equipment.hs 112;" f
bulletBeltPack src/Dodge/Item/Equipment.hs 94;" f
bulletBeltBracer src/Dodge/Item/Equipment.hs 111;" f
bulletBeltPack src/Dodge/Item/Equipment.hs 93;" f
bulletModule src/Dodge/Item/Scope.hs 35;" f
bulletPayloadModule src/Dodge/Item/Scope.hs 44;" f
bulletSynthesizer src/Dodge/Item/Ammo.hs 127;" f
@@ -3609,9 +3607,9 @@ clickGetCreature src/Dodge/Debug.hs 83;" f
clipV src/Geometry/Vector.hs 47;" f
clipZoom src/Dodge/Update/Camera.hs 221;" f
clockCycle src/Dodge/Clock.hs 9;" f
closeButtonToSelectionItem src/Dodge/Inventory/SelectionList.hs 71;" f
closeItemToSelectionItem src/Dodge/Inventory/SelectionList.hs 56;" f
closeItemToTextPictures src/Dodge/Inventory/SelectionList.hs 85;" f
closeButtonToSelectionItem src/Dodge/Inventory/SelectionList.hs 70;" f
closeItemToSelectionItem src/Dodge/Inventory/SelectionList.hs 55;" f
closeItemToTextPictures src/Dodge/Inventory/SelectionList.hs 84;" f
closeObjectInfo src/Dodge/Render/HUD.hs 211;" f
closestCreatureID src/Dodge/Debug.hs 92;" f
closestPointOnLine src/Geometry/Intersect.hs 251;" f
@@ -3688,6 +3686,7 @@ corridorWallN src/Dodge/Room/Corridor.hs 71;" f
crAdd src/Dodge/Room/RezBox.hs 104;" f
crAwayFromPost src/Dodge/Creature/Test.hs 77;" f
crBlips src/Dodge/RadarSweep.hs 69;" f
crCamouflage src/Dodge/Creature/Picture.hs 31;" f
crCanSeeCr src/Dodge/Creature/Test.hs 48;" f
crCrSpring src/Dodge/Update.hs 764;" f
crCurrentEquipment src/Dodge/Creature/Statistics.hs 26;" f
@@ -3723,14 +3722,14 @@ createBarrelSpark src/Dodge/Spark.hs 44;" f
createFlIt src/Dodge/Placement/PlaceSpot.hs 180;" f
createForceField src/Dodge/ForceField.hs 7;" f
createGas src/Dodge/Gas.hs 8;" f
createHeadLamp src/Dodge/Euse.hs 162;" f
createHeadLamp src/Dodge/Euse.hs 160;" f
createItemYou src/Dodge/Inventory/Add.hs 95;" 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 526;" f
createShell src/Dodge/Projectile/Create.hs 19;" f
createShieldWall src/Dodge/Euse.hs 137;" f
createShieldWall src/Dodge/Euse.hs 135;" f
createUnusedLinkPos src/Dodge/Tree/Shift.hs 117;" f
createWall src/Dodge/Wall/Create.hs 8;" f
creatureDisplayText src/Dodge/Creature/Picture/Awareness.hs 10;" f
@@ -3806,10 +3805,10 @@ dbArgChain src/Dodge/Base.hs 148;" f
deZoneIX src/Dodge/Zoning/Base.hs 86;" f
deZoneWall src/Dodge/Zoning/Wall.hs 70;" f
deadEndRoom src/Dodge/Room/Room.hs 235;" f
deadFeet src/Dodge/Creature/Picture.hs 68;" f
deadRot src/Dodge/Creature/Picture.hs 84;" f
deadScalp src/Dodge/Creature/Picture.hs 81;" f
deadUpperBody src/Dodge/Creature/Picture.hs 125;" f
deadFeet src/Dodge/Creature/Picture.hs 71;" f
deadRot src/Dodge/Creature/Picture.hs 87;" f
deadScalp src/Dodge/Creature/Picture.hs 84;" f
deadUpperBody src/Dodge/Creature/Picture.hs 128;" f
debrisSize src/Dodge/Block/Debris.hs 111;" f
debugDraw src/Dodge/Debug/Picture.hs 124;" f
debugDraw' src/Dodge/Debug/Picture.hs 135;" f
@@ -4085,7 +4084,7 @@ drawDragSelected src/Dodge/Render/HUD.hs 131;" f
drawDragSelecting src/Dodge/Render/HUD.hs 148;" f
drawEmptySet src/Dodge/Render/Picture.hs 117;" f
drawEnergyBall src/Dodge/EnergyBall/Draw.hs 8;" f
drawEquipment src/Dodge/Creature/Picture.hs 139;" f
drawEquipment src/Dodge/Creature/Picture.hs 142;" f
drawExamineInventory src/Dodge/Render/HUD.hs 183;" f
drawFarWallDetect src/Dodge/Debug/Picture.hs 234;" f
drawFlame src/Dodge/Flame/Draw.hs 7;" f
@@ -4246,7 +4245,7 @@ fallSmallBounce' src/Dodge/Prop/Moving.hs 33;" f
fallSmallBounceDamage src/Dodge/Prop/Moving.hs 11;" f
farWallDistDirection src/Dodge/Update/Camera.hs 232;" f
fdiv src/ShortShow.hs 27;" f
feet src/Dodge/Creature/Picture.hs 50;" f
feet src/Dodge/Creature/Picture.hs 53;" f
ffoldM src/Framebuffer/Update.hs 79;" f
filter3 src/FoldableHelp.hs 76;" f
filterSectionsPair src/Dodge/DisplayInventory.hs 192;" f
@@ -4268,7 +4267,7 @@ fixedCoordPictures src/Dodge/Render/Picture.hs 18;" f
fixedSizePicClampArrow src/Dodge/Picture/SizeInvariant.hs 57;" f
flDamageInArea src/Dodge/Flame.hs 109;" f
flFlicker src/Dodge/Flame.hs 123;" f
flameShield src/Dodge/Item/Equipment.hs 37;" f
flameShield src/Dodge/Item/Equipment.hs 36;" f
flameSpitter src/Dodge/Item/Held/SprayGuns.hs 29;" f
flameThrower src/Dodge/Item/Held/SprayGuns.hs 72;" f
flameTorrent src/Dodge/Item/Held/SprayGuns.hs 40;" f
@@ -4324,9 +4323,9 @@ fromJust' src/MaybeHelp.hs 24;" f
fromListL src/DoubleStack.hs 7;" f
fromTopLeft src/Dodge/ScreenPos.hs 9;" f
fromV3 src/Geometry/Data.hs 43;" f
frontArmour src/Dodge/Item/Equipment.hs 43;" f
frontArmour src/Dodge/Item/Equipment.hs 42;" f
fstV2 src/Geometry/Data.hs 50;" f
fuelPack src/Dodge/Item/Equipment.hs 76;" f
fuelPack src/Dodge/Item/Equipment.hs 75;" f
functionalUpdate src/Dodge/Update.hs 250;" f
fuseFunc src/Dodge/Path.hs 150;" f
fusePairs src/Dodge/Path.hs 153;" f
@@ -4448,9 +4447,9 @@ hasCaneGunDim src/Dodge/Item/InvSize.hs 47;" f
hasFrontArmour src/Dodge/Creature/Test.hs 110;" f
hasLOS src/Dodge/Base/Collide.hs 200;" f
hasLOSIndirect src/Dodge/Base/Collide.hs 215;" f
hat src/Dodge/Item/Equipment.hs 136;" f
hat src/Dodge/Item/Equipment.hs 135;" f
head src/DoubleStack.hs 14;" f
headLamp src/Dodge/Item/Equipment.hs 142;" f
headLamp src/Dodge/Item/Equipment.hs 141;" f
headLampShape src/Dodge/Item/Draw/SPic.hs 382;" f
headMap src/Dodge/DoubleTree.hs 170;" f
heal src/Dodge/Item/Consumable.hs 17;" f
@@ -4485,7 +4484,7 @@ homingDrawType src/Dodge/Projectile/Create.hs 12;" f
homingModule src/Dodge/Item/Scope.hs 32;" f
horPipe src/Dodge/Placement/Instance/Pipe.hs 9;" f
hotkeyToScancode src/Dodge/Creature/YourControl.hs 53;" f
hotkeyToString src/Dodge/Inventory/SelectionList.hs 41;" f
hotkeyToString src/Dodge/Inventory/SelectionList.hs 40;" f
humanoidAIList src/Dodge/Humanoid.hs 181;" f
hvBulletAmmo src/Dodge/Item/Weapon/Bullet.hs 30;" f
iShape src/Dodge/Placement/Instance/LightSource.hs 73;" f
@@ -4586,7 +4585,7 @@ isCognizant src/Dodge/Creature/Perception.hs 105;" f
isConnected src/Dodge/Inventory/Swap.hs 90;" f
isElectrical src/Dodge/Data/Damage.hs 42;" f
isFrictionless src/Dodge/Creature/State.hs 447;" f
isGas src/Dodge/Euse.hs 67;" f
isGas src/Dodge/Euse.hs 65;" f
isGroupSelectableSection src/Dodge/Update/Input/InGame.hs 169;" f
isInLnk src/Dodge/PlacementSpot.hs 160;" f
isJust' src/MaybeHelp.hs 29;" f
@@ -4652,7 +4651,7 @@ jsps src/Dodge/LevelGen/PlacementHelper.hs 36;" f
jsps0 src/Dodge/LevelGen/PlacementHelper.hs 39;" f
jsps0J src/Dodge/LevelGen/PlacementHelper.hs 48;" f
jspsJ src/Dodge/LevelGen/PlacementHelper.hs 45;" f
jumpLegs src/Dodge/Item/Equipment.hs 158;" f
jumpLegs src/Dodge/Item/Equipment.hs 157;" f
justify src/Justify.hs 9;" f
k src/ShortShow.hs 34;" f
keyCard src/Dodge/Item/Held/Utility.hs 19;" f
@@ -4778,7 +4777,7 @@ machineAddSound src/Dodge/Machine.hs 49;" f
machinePistol src/Dodge/Item/Held/Stick.hs 54;" f
machineUpdateDeathEff src/Dodge/Machine.hs 34;" f
machineUpdateLiveDieEff src/Dodge/Machine.hs 16;" f
magShield src/Dodge/Item/Equipment.hs 29;" f
magShield src/Dodge/Item/Equipment.hs 28;" f
magV src/Geometry/Vector.hs 160;" f
magV3 src/Geometry/Vector3D.hs 78;" f
magazineCombinations src/Dodge/Combine/Combinations.hs 41;" f
@@ -5024,8 +5023,8 @@ numTraversable src/TreeHelp.hs 183;" f
obstacleColor src/Dodge/Debug/Picture.hs 227;" f
obstructPathsCrossing src/Dodge/Path.hs 138;" f
oldMachineBootS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 516;" f
onEquipWristShield src/Dodge/Euse.hs 86;" f
onRemoveWristShield src/Dodge/Euse.hs 95;" f
onEquipWristShield src/Dodge/Euse.hs 84;" f
onRemoveWristShield src/Dodge/Euse.hs 93;" f
onXY src/Geometry/Vector3D.hs 130;" f
oneH src/Dodge/Creature/Test.hs 95;" f
openCursorAt src/Dodge/Render/HUD/Carte.hs 54;" f
@@ -5052,7 +5051,7 @@ orthogonalPointOnSeg src/Geometry/Intersect.hs 291;" f
outLink src/Dodge/RoomLink.hs 105;" f
outsideScreenPolygon src/Dodge/Debug/Picture.hs 44;" f
outwardIntegers src/Dodge/Base.hs 159;" f
overCID src/Dodge/Euse.hs 176;" f
overCID src/Dodge/Euse.hs 174;" f
overCol src/Picture/Base.hs 308;" f
overColObj src/Shape.hs 271;" f
overColSH src/Shape.hs 239;" f
@@ -5234,7 +5233,7 @@ postUniverseLoadSideEffect src/Dodge/WorldLoad.hs 11;" f
postWorldLoad src/Dodge/WorldLoad.hs 14;" f
powerFakeout src/Dodge/Room/Start.hs 27;" f
powerFakeout' src/Dodge/Room/Start.hs 24;" f
powerLegs src/Dodge/Item/Equipment.hs 149;" f
powerLegs src/Dodge/Item/Equipment.hs 148;" f
powlist src/Multiset.hs 61;" f
powlistUpToN src/Multiset.hs 23;" f
powlistUpToN' src/Multiset.hs 12;" f
@@ -5280,7 +5279,7 @@ psj src/Dodge/LevelGen/PlacementHelper.hs 70;" f
psposAddLabel src/Dodge/PlacementSpot.hs 69;" f
pt0 src/Dodge/LevelGen/PlacementHelper.hs 54;" f
ptCont src/Dodge/LevelGen/PlacementHelper.hs 21;" f
pulseChecker src/Dodge/Item/Equipment.hs 169;" f
pulseChecker src/Dodge/Item/Equipment.hs 168;" f
pushCreatureOutFromWalls src/Dodge/WallCreatureCollisions.hs 53;" f
pushL src/DoubleStack.hs 20;" f
pushOrCrush src/Dodge/WallCreatureCollisions.hs 72;" f
@@ -5380,7 +5379,7 @@ removeAmmoFromMag src/Dodge/HeldUse.hs 333;" f
removeDot src/ShortShow.hs 30;" f
removeHotkey src/Dodge/Hotkey.hs 41;" f
removeInverseWalls src/Dodge/LevelGen/StaticWalls.hs 25;" f
removeShieldWall src/Dodge/Euse.hs 155;" f
removeShieldWall src/Dodge/Euse.hs 153;" f
removeWallsInPolygon src/Dodge/LevelGen/StaticWalls.hs 182;" f
renderDataResizeUpdate src/Preload/Update.hs 26;" f
renderFlatLighting src/Render.hs 104;" f
@@ -5507,7 +5506,7 @@ scale3 src/Picture/Base.hs 145;" f
scaleMat src/MatrixHelper.hs 59;" f
scaleMatrix src/MatrixHelper.hs 56;" f
scaleSH src/Shape.hs 267;" f
scalp src/Dodge/Creature/Picture.hs 93;" f
scalp src/Dodge/Creature/Picture.hs 96;" f
scancodeToHotkey src/Dodge/Creature/YourControl.hs 68;" f
scodeToChar src/Dodge/ScodeToChar.hs 6;" f
scorchSPic src/Dodge/Creature/State.hs 107;" f
@@ -5600,7 +5599,7 @@ setViewDistance src/Dodge/Update/Camera.hs 227;" f
setViewPos src/Dodge/Creature/ReaderUpdate.hs 61;" f
setViewport src/Dodge/Render.hs 388;" f
setVol src/Dodge/Config/Update.hs 30;" f
setWristShieldPos src/Dodge/Euse.hs 103;" f
setWristShieldPos src/Dodge/Euse.hs 101;" f
setupConLoop src/Loop.hs 102;" f
setupConLoop' src/Loop.hs 192;" f
setupEBO src/Shader/Compile.hs 188;" f
@@ -5632,7 +5631,7 @@ shellCollisionEffect src/Dodge/Projectile/Update.hs 48;" f
shellMag src/Dodge/Item/Ammo.hs 67;" f
shellShape src/Dodge/Projectile/Draw.hs 27;" f
shellTrailCloud src/Dodge/WorldEvent/Cloud.hs 65;" f
shieldWall src/Dodge/Euse.hs 117;" f
shieldWall src/Dodge/Euse.hs 115;" f
shiftByV2 src/Dodge/PlacementSpot.hs 239;" f
shiftChildren src/Dodge/Tree/Compose.hs 43;" f
shiftDraw src/Dodge/Render/ShapePicture.hs 67;" f
@@ -5672,7 +5671,7 @@ shortPoint2 src/Dodge/ShortShow.hs 4;" f
shortShow src/ShortShow.hs 10;" f
shotgunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 526;" f
shoulderHeight src/Dodge/Item/HeldOffset.hs 81;" f
shoulderSH src/Dodge/Creature/Picture.hs 136;" f
shoulderSH src/Dodge/Creature/Picture.hs 139;" f
shoulderSP src/Dodge/Creature/HandPos.hs 170;" f
showAttachItem src/Dodge/Item/Display.hs 61;" f
showAutoRechargeProgress src/Dodge/Item/Display.hs 75;" f
@@ -5752,7 +5751,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 360;" f
speedLegs src/Dodge/Item/Equipment.hs 155;" f
speedLegs src/Dodge/Item/Equipment.hs 154;" f
splashMenu src/Dodge/Menu.hs 27;" f
splashMenuOptions src/Dodge/Menu.hs 32;" f
splashScreen src/Dodge/Initialisation.hs 11;" f
@@ -5945,7 +5944,7 @@ topTestPart src/Dodge/TestString.hs 68;" f
torch src/Dodge/Item/Held/Utility.hs 25;" f
torchShape src/Dodge/Item/Draw/SPic.hs 214;" f
torqueCr src/Dodge/WorldEffect.hs 63;" f
torso src/Dodge/Creature/Picture.hs 102;" f
torso src/Dodge/Creature/Picture.hs 105;" f
tractCr src/Dodge/TractorBeam/Update.hs 28;" f
tractFlIt src/Dodge/TractorBeam/Update.hs 23;" f
tractorBeamAt src/Dodge/HeldUse.hs 292;" f
@@ -6002,9 +6001,9 @@ truncFaces src/Polyhedra/Geodesic.hs 53;" f
truncate src/Polyhedra/Geodesic.hs 38;" f
trunkDepth src/TreeHelp.hs 161;" f
tryAssignHotkey src/Dodge/Creature/YourControl.hs 84;" f
tryAttachBulletBelt src/Dodge/Euse.hs 43;" f
tryAttachBulletBelt src/Dodge/Euse.hs 41;" f
tryAttachItems src/Dodge/Item/Grammar.hs 21;" f
tryChargeBattery src/Dodge/Euse.hs 46;" f
tryChargeBattery src/Dodge/Euse.hs 44;" f
tryCombine src/Dodge/Update/Input/InGame.hs 569;" f
tryDropSelected src/Dodge/Update/Input/InGame.hs 114;" f
tryGetChannel src/Sound.hs 96;" f
@@ -6017,7 +6016,7 @@ tryPutFloorItemIDInInv src/Dodge/Inventory/Add.hs 26;" f
tryPutItemInInv src/Dodge/Inventory/Add.hs 42;" f
tryPutItemInInvAt src/Dodge/Inventory/Add.hs 32;" f
trySeedFromClipboard src/Dodge/Menu.hs 88;" f
trySiphonFuel src/Dodge/Euse.hs 49;" f
trySiphonFuel src/Dodge/Euse.hs 47;" f
trySpinByCID src/Dodge/Projectile/Update.hs 95;" f
trySynthBullet src/Dodge/Creature/State.hs 194;" f
tryUseParent src/Dodge/Creature/State.hs 187;" f
@@ -6166,7 +6165,7 @@ updateWheelEvent src/Dodge/Update/Scroll.hs 19;" f
updateWheelEvents src/Dodge/Update.hs 402;" f
updateWorldEventFlag src/Dodge/Update.hs 117;" f
updateWorldEventFlags src/Dodge/Update.hs 105;" f
upperBody src/Dodge/Creature/Picture.hs 132;" f
upperBody src/Dodge/Creature/Picture.hs 135;" f
upperBox src/Shape.hs 154;" f
upperBoxHalf src/Shape.hs 220;" f
upperBoxMT src/Shape.hs 145;" f
@@ -6197,7 +6196,7 @@ useItemLeftClick src/Dodge/Creature/Impulse/UseItem.hs 99;" f
useL src/Dodge/Luse.hs 11;" f
useLnkRoomPos src/Dodge/PlacementSpot.hs 244;" f
useLoadedAmmo src/Dodge/HeldUse.hs 231;" f
useMagShield src/Dodge/Euse.hs 72;" f
useMagShield src/Dodge/Euse.hs 70;" f
useNormalCamera src/Dodge/Camera.hs 6;" f
usePayload src/Dodge/Payload.hs 7;" f
useRewindGun src/Dodge/Luse.hs 39;" f
@@ -6301,8 +6300,8 @@ worldSPic src/Dodge/Render/ShapePicture.hs 23;" f
worldToGenWorld src/Dodge/LevelGen/LevelStructure.hs 14;" f
wpAdd src/Dodge/Room/RezBox.hs 137;" f
wrench1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 402;" f
wristArmour src/Dodge/Item/Equipment.hs 49;" f
wristInvisibility src/Dodge/Item/Equipment.hs 161;" f
wristArmour src/Dodge/Item/Equipment.hs 48;" f
wristInvisibility src/Dodge/Item/Equipment.hs 160;" f
writeConfig src/Dodge/Menu.hs 159;" f
writeSaveSlot src/Dodge/Save.hs 34;" f
xCylinder src/Shape.hs 136;" f