justin/loop
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Simplify bullets

Browse Source
This commit is contained in:
justin
2024-12-24 13:59:06 +00:00
parent 15317882e6
commit 37da73bf6d
7 changed files with 70 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
saveSlot/LevelStart0
+1 -1
View File
File diff suppressed because one or more lines are too long
src/Dodge/Bullet.hs
+17 -15
View File
@@ -21,7 +21,8 @@ import Data.Bifunctor
updateBullet :: World -> Bullet -> (World, Maybe Bullet) updateBullet :: World -> Bullet -> (World, Maybe Bullet)
updateBullet w bu updateBullet w bu
| magV (_buVel bu) < 1 || _buTimer bu <= 0 = (endspawn w, Nothing) -- | magV (_buVel bu) < 1 || _buTimer bu <= 0 = (endspawn w, Nothing)
| magV (_buVel bu) < 1 = (endspawn w, Nothing)
| otherwise = | otherwise =
second (fmap updateBulVel) second (fmap updateBulVel)
. hitEffFromBul w . hitEffFromBul w
@@ -59,16 +60,17 @@ doMagnetBuBu mg bu = if isclose
isclose = d < 100 isclose = d < 100
updateBulVel :: Bullet -> Bullet updateBulVel :: Bullet -> Bullet
updateBulVel bt = case _buTrajectory bt of updateBulVel bt = bt & buVel .*.*~ _buDrag bt
BasicBulletTrajectory -> bt & buVel .*.*~ _buDrag bt --case _buTrajectory bt of
MagnetTrajectory tpos -> bt -- BasicBulletTrajectory -> bt & buVel .*.*~ _buDrag bt
& buVel %~ (clipV 20 . (+.+ 5 *.* normalizeV (tpos -.- _buPos bt))) -- MagnetTrajectory tpos -> bt
FlechetteTrajectory tpos -> bt & buVel %~ vecTurnTo 0.2 (_buPos bt) tpos -- & buVel %~ (clipV 20 . (+.+ 5 *.* normalizeV (tpos -.- _buPos bt)))
BezierTrajectory spos tpos xpos -> -- FlechetteTrajectory tpos -> bt & buVel %~ vecTurnTo 0.2 (_buPos bt) tpos
let bf tm = bQuadToF (spos, xpos, tpos) $ (100 - tm) * 0.05 -- BezierTrajectory spos tpos xpos ->
in bt & buVel .~ bf (fromIntegral $ t - 1) -.- bf (fromIntegral t) -- let bf tm = bQuadToF (spos, xpos, tpos) $ (100 - tm) * 0.05
where -- in bt & buVel .~ bf (fromIntegral $ t - 1) -.- bf (fromIntegral t)
t = _buTimer bt -- where
-- t = _buTimer bt
-- NOTE THE FOLLOWING HAS BEZIER CURE/FLECHETTE STUFF THAT MIGHT BE USEFUL -- NOTE THE FOLLOWING HAS BEZIER CURE/FLECHETTE STUFF THAT MIGHT BE USEFUL
--shootBullet :: LabelDoubleTree ComposeLinkType Item -> Creature -> World -> World --shootBullet :: LabelDoubleTree ComposeLinkType Item -> Creature -> World -> World
@@ -146,7 +148,7 @@ makeFlak bu _ w = w & cWorld . lWorld . bullets .++~ [f x | x <- xs]
s = min 10 (0.5 * magV (_buVel bu)) s = min 10 (0.5 * magV (_buVel bu))
xs = take 5 $ randomRs (-s,s) $ _randGen w xs = take 5 $ randomRs (-s,s) $ _randGen w
f x = bu & buVel %~ g x f x = bu & buVel %~ g x
& buTimer .~ 97 -- & buTimer .~ 97
& buPayload .~ BulSpark & buPayload .~ BulSpark
& buWidth .~ 0.5 & buWidth .~ 0.5
& buDamages .~ & buDamages .~
@@ -170,8 +172,8 @@ hitEffFromBul w bu = case _buEffect bu of
bu bu
& buPos .~ hp +.+ normalizeV (_buPos bu -.- hp) & buPos .~ hp +.+ normalizeV (_buPos bu -.- hp)
& buVel %~ reflectIn dir & buVel %~ reflectIn dir
& buTrajectory .~ BasicBulletTrajectory -- & buTrajectory .~ BasicBulletTrajectory
& buTimer -~ 1 -- & buTimer -~ 1
) )
DestroyBullet -> expireAndDamage bu hitstream w DestroyBullet -> expireAndDamage bu hitstream w
where where
@@ -206,7 +208,7 @@ moveBullet pt =
pt pt
& buPos %~ (+.+ _buVel pt) & buPos %~ (+.+ _buVel pt)
& buOldPos .~ _buPos pt & buOldPos .~ _buPos pt
& buTimer -~ 1 -- & buTimer -~ 1
destroyAt :: Point2 -> Bullet -> Maybe Bullet destroyAt :: Point2 -> Bullet -> Maybe Bullet
destroyAt hitp pt = destroyAt hitp pt =
src/Dodge/Data/Bullet.hs
+2 -2
View File
@@ -17,13 +17,13 @@ import Geometry.Data
data Bullet = Bullet data Bullet = Bullet
{ _buEffect :: BulletEffect { _buEffect :: BulletEffect
, _buPayload :: BulletPayload , _buPayload :: BulletPayload
, _buTrajectory :: BulletTrajectory -- , _buTrajectory :: BulletTrajectory
, _buVel :: Point2 , _buVel :: Point2
, _buDrag :: Float , _buDrag :: Float
, _buPos :: Point2 , _buPos :: Point2
, _buOldPos :: Point2 , _buOldPos :: Point2
, _buWidth :: Float , _buWidth :: Float
, _buTimer :: Int -- , _buTimer :: Int
, _buDamages :: [Damage] , _buDamages :: [Damage]
} }
deriving (Show, Eq, Ord, Read) --Generic, Flat) deriving (Show, Eq, Ord, Read) --Generic, Flat)
src/Dodge/HeldUse.hs
+7 -7
View File
@@ -414,16 +414,16 @@ getBulletType ::
Maybe Bullet Maybe Bullet
getBulletType itmtree magtree mz cr w = getBulletType itmtree magtree mz cr w =
magtree ^? ldtValue . itConsumables . magParams . ampBullet magtree ^? ldtValue . itConsumables . magParams . ampBullet
<&> buTrajectory .~ btraj -- <&> buTrajectory .~ btraj
<&> buPayload .~ bpayload <&> buPayload .~ bpayload
<&> buEffect .~ beffect <&> buEffect .~ beffect
where where
btraj = fromMaybe BasicBulletTrajectory $ do -- btraj = fromMaybe BasicBulletTrajectory $ do
targetingtree <- lookup WeaponTargetingLink (itmtree ^. ldtRight) -- left or right for these? -- targetingtree <- lookup WeaponTargetingLink (itmtree ^. ldtRight) -- left or right for these?
tp <- targetingtree ^? ldtValue . itTargeting . itTgPos . _Just -- tp <- targetingtree ^? ldtValue . itTargeting . itTgPos . _Just
attree <- lookup AmmoTargetingLink (magtree ^. ldtLeft) -- attree <- lookup AmmoTargetingLink (magtree ^. ldtLeft)
bt <- attree ^? ldtValue . itUse . ubMod . bmTrajectory -- bt <- attree ^? ldtValue . itUse . ubMod . bmTrajectory
return $ getBulletTrajectory mz (itmtree ^. ldtValue) bt tp cr w -- return $ getBulletTrajectory mz (itmtree ^. ldtValue) bt tp cr w
bpayload = fromMaybe BulSpark $ do bpayload = fromMaybe BulSpark $ do
attree <- lookup AmmoPayloadLink (magtree ^. ldtLeft) attree <- lookup AmmoPayloadLink (magtree ^. ldtLeft)
attree ^? ldtValue . itUse . ubMod . bmPayload attree ^? ldtValue . itUse . ubMod . bmPayload
src/Dodge/Item/Weapon/Bullet.hs
+2 -2
View File
@@ -12,13 +12,13 @@ defaultBullet =
Bullet Bullet
{ _buEffect = DestroyBullet { _buEffect = DestroyBullet
, _buPayload = BulSpark , _buPayload = BulSpark
, _buTrajectory = BasicBulletTrajectory -- , _buTrajectory = BasicBulletTrajectory
, _buVel = V2 50 0 , _buVel = V2 50 0
, _buDrag = 1 , _buDrag = 1
, _buPos = 0 , _buPos = 0
, _buOldPos = 0 , _buOldPos = 0
, _buWidth = 2 , _buWidth = 2
, _buTimer = 100 -- , _buTimer = 100
, _buDamages = basicBulDams , _buDamages = basicBulDams
} }
src/Dodge/TestString.hs
+2 -2
View File
@@ -28,8 +28,8 @@ import qualified Data.Map.Strict as M
testStringInit :: Universe -> [String] testStringInit :: Universe -> [String]
testStringInit u = testStringInit u =
(map show $ u ^. uvWorld . cWorld . lWorld . oldMagnets) (map show $ u ^. uvWorld . cWorld . lWorld . oldMagnets)
<> -- <>
(foldMap prettyShort $ u ^. uvWorld . cWorld . lWorld . bullets) -- (foldMap prettyShort $ u ^. uvWorld . cWorld . lWorld . bullets)
-- fromMaybe mempty $ do -- fromMaybe mempty $ do
-- cr <- u ^? uvWorld . cWorld . lWorld . creatures . ix 0 -- cr <- u ^? uvWorld . cWorld . lWorld . creatures . ix 0
-- let itms = IM.elems $ cr ^. crInv -- let itms = IM.elems $ cr ^. crInv
tags
+39 -41
View File
@@ -2247,8 +2247,6 @@ _buEffect src/Dodge/Data/Bullet.hs 18;" f
_buOldPos src/Dodge/Data/Bullet.hs 24;" f _buOldPos src/Dodge/Data/Bullet.hs 24;" f
_buPayload src/Dodge/Data/Bullet.hs 19;" f _buPayload src/Dodge/Data/Bullet.hs 19;" f
_buPos src/Dodge/Data/Bullet.hs 23;" f _buPos src/Dodge/Data/Bullet.hs 23;" f
_buTimer src/Dodge/Data/Bullet.hs 26;" f
_buTrajectory src/Dodge/Data/Bullet.hs 20;" f
_buVel src/Dodge/Data/Bullet.hs 21;" f _buVel src/Dodge/Data/Bullet.hs 21;" f
_buWidth src/Dodge/Data/Bullet.hs 25;" f _buWidth src/Dodge/Data/Bullet.hs 25;" f
_bulGunSound src/Dodge/Data/Item/Use.hs 88;" f _bulGunSound src/Dodge/Data/Item/Use.hs 88;" f
@@ -3347,7 +3345,7 @@ applyEventIO src/Loop.hs 89;" f
applyIndividualDamage src/Dodge/Creature/Damage.hs 49;" f applyIndividualDamage src/Dodge/Creature/Damage.hs 49;" f
applyIndividualDamage' src/Dodge/Creature/Damage.hs 52;" f applyIndividualDamage' src/Dodge/Creature/Damage.hs 52;" f
applyInvLock src/Dodge/HeldUse.hs 140;" f applyInvLock src/Dodge/HeldUse.hs 140;" f
applyMagnetsToBul src/Dodge/Bullet.hs 35;" f applyMagnetsToBul src/Dodge/Bullet.hs 37;" f
applyNoDamage src/Dodge/Creature/Damage.hs 11;" f applyNoDamage src/Dodge/Creature/Damage.hs 11;" f
applyPastDamages src/Dodge/Creature/State.hs 145;" f applyPastDamages src/Dodge/Creature/State.hs 145;" f
applyPiercingDamage src/Dodge/Creature/Damage.hs 57;" f applyPiercingDamage src/Dodge/Creature/Damage.hs 57;" f
@@ -3449,7 +3447,7 @@ basicMachineUpdate src/Dodge/Machine.hs 13;" f
basicMuzFlare src/Dodge/HeldUse.hs 277;" f basicMuzFlare src/Dodge/HeldUse.hs 277;" f
basicTerminal src/Dodge/Terminal.hs 35;" f basicTerminal src/Dodge/Terminal.hs 35;" f
battery src/Dodge/Item/Ammo.hs 91;" f battery src/Dodge/Item/Ammo.hs 91;" f
batteryPack src/Dodge/Item/Equipment.hs 55;" f batteryPack src/Dodge/Item/Equipment.hs 56;" f
belowNumX src/Dodge/Combine/Graph.hs 85;" f belowNumX src/Dodge/Combine/Graph.hs 85;" f
beltMag src/Dodge/Item/Ammo.hs 48;" f beltMag src/Dodge/Item/Ammo.hs 48;" f
bfsNodePoints src/Dodge/Path.hs 58;" f bfsNodePoints src/Dodge/Path.hs 58;" f
@@ -3485,7 +3483,7 @@ boosterGun src/Dodge/Item/Equipment/Booster.hs 9;" f
bossKeyItems src/Dodge/LockAndKey.hs 12;" f bossKeyItems src/Dodge/LockAndKey.hs 12;" f
bossRoom src/Dodge/Room/Boss.hs 60;" f bossRoom src/Dodge/Room/Boss.hs 60;" f
bounceBall src/Dodge/Base/Collide.hs 77;" f bounceBall src/Dodge/Base/Collide.hs 77;" f
bounceDir src/Dodge/Bullet.hs 111;" f bounceDir src/Dodge/Bullet.hs 114;" f
bouncePoint src/Dodge/Base/Collide.hs 87;" f bouncePoint src/Dodge/Base/Collide.hs 87;" f
boundPoints src/Bound.hs 10;" f boundPoints src/Bound.hs 10;" f
boundedGrid src/Grid.hs 19;" f boundedGrid src/Grid.hs 19;" f
@@ -3495,7 +3493,7 @@ boxSurfaces src/Shader/Poke.hs 277;" f
boxSurfacesIndices src/Shader/Poke.hs 290;" f boxSurfacesIndices src/Shader/Poke.hs 290;" f
boxXYZ src/Polyhedra.hs 94;" f boxXYZ src/Polyhedra.hs 94;" f
boxXYZnobase src/Polyhedra.hs 80;" f boxXYZnobase src/Polyhedra.hs 80;" f
brainHat src/Dodge/Item/Equipment.hs 127;" f brainHat src/Dodge/Item/Equipment.hs 128;" f
branchRectWith src/Dodge/Room/Branch.hs 15;" f branchRectWith src/Dodge/Room/Branch.hs 15;" f
branchWith src/Dodge/Room/Room.hs 67;" f branchWith src/Dodge/Room/Room.hs 67;" f
bright src/Color.hs 120;" f bright src/Color.hs 120;" f
@@ -3504,8 +3502,8 @@ btSPic src/Dodge/Render/ShapePicture.hs 127;" f
bufferEBO src/Shader/Bind.hs 28;" f bufferEBO src/Shader/Bind.hs 28;" f
bufferPokedVBO src/Shader/Bind.hs 19;" f bufferPokedVBO src/Shader/Bind.hs 19;" f
bufferShaderLayers src/Shader/Bind.hs 36;" f bufferShaderLayers src/Shader/Bind.hs 36;" f
bulletBeltBracer src/Dodge/Item/Equipment.hs 109;" f bulletBeltBracer src/Dodge/Item/Equipment.hs 110;" f
bulletBeltPack src/Dodge/Item/Equipment.hs 91;" f bulletBeltPack src/Dodge/Item/Equipment.hs 92;" f
bulletModule src/Dodge/Item/Scope.hs 35;" f bulletModule src/Dodge/Item/Scope.hs 35;" f
bulletPayloadModule src/Dodge/Item/Scope.hs 44;" f bulletPayloadModule src/Dodge/Item/Scope.hs 44;" f
bulletSynthesizer src/Dodge/Item/Ammo.hs 121;" f bulletSynthesizer src/Dodge/Item/Ammo.hs 121;" f
@@ -3706,7 +3704,7 @@ createBarrelSpark src/Dodge/Spark.hs 44;" f
createFlIt src/Dodge/Placement/PlaceSpot.hs 180;" f createFlIt src/Dodge/Placement/PlaceSpot.hs 180;" f
createForceField src/Dodge/ForceField.hs 7;" f createForceField src/Dodge/ForceField.hs 7;" f
createGas src/Dodge/Gas.hs 8;" f createGas src/Dodge/Gas.hs 8;" f
createHeadLamp src/Dodge/Euse.hs 131;" f createHeadLamp src/Dodge/Euse.hs 132;" f
createItemYou src/Dodge/Inventory/Add.hs 95;" f createItemYou src/Dodge/Inventory/Add.hs 95;" f
createLightMap src/Render.hs 26;" f createLightMap src/Render.hs 26;" f
createNewArc src/Dodge/Tesla.hs 81;" f createNewArc src/Dodge/Tesla.hs 81;" f
@@ -3714,7 +3712,7 @@ createNewArc src/Dodge/Tesla/Arc.hs 90;" f
createPathGrid src/Dodge/Room/Path.hs 21;" f createPathGrid src/Dodge/Room/Path.hs 21;" f
createProjectile src/Dodge/HeldUse.hs 600;" f createProjectile src/Dodge/HeldUse.hs 600;" f
createShell src/Dodge/Projectile/Create.hs 19;" f createShell src/Dodge/Projectile/Create.hs 19;" f
createShieldWall src/Dodge/Euse.hs 106;" f createShieldWall src/Dodge/Euse.hs 107;" f
createUnusedLinkPos src/Dodge/Tree/Shift.hs 117;" f createUnusedLinkPos src/Dodge/Tree/Shift.hs 117;" f
createWall src/Dodge/Wall/Create.hs 8;" f createWall src/Dodge/Wall/Create.hs 8;" f
creatureDisplayText src/Dodge/Creature/Picture/Awareness.hs 10;" f creatureDisplayText src/Dodge/Creature/Picture/Awareness.hs 10;" f
@@ -3776,7 +3774,7 @@ damageHP src/Dodge/Creature/Damage.hs 65;" f
damageMaterial src/Dodge/Material/Damage.hs 7;" f damageMaterial src/Dodge/Material/Damage.hs 7;" f
damageSensor src/Dodge/Placement/Instance/Sensor.hs 15;" f damageSensor src/Dodge/Placement/Instance/Sensor.hs 15;" f
damageStone src/Dodge/Material/Damage.hs 20;" f damageStone src/Dodge/Material/Damage.hs 20;" f
damageThingHit src/Dodge/Bullet.hs 186;" f damageThingHit src/Dodge/Bullet.hs 189;" f
damageTypeThreshold src/Dodge/Placement/Instance/Sensor.hs 45;" f damageTypeThreshold src/Dodge/Placement/Instance/Sensor.hs 45;" f
damageWall src/Dodge/Wall/Damage.hs 15;" f damageWall src/Dodge/Wall/Damage.hs 15;" f
damageWallEffect src/Dodge/Wall/DamageEffect.hs 11;" f damageWallEffect src/Dodge/Wall/DamageEffect.hs 11;" f
@@ -3897,7 +3895,7 @@ deleteWallFromZones src/Dodge/Wall/Zone.hs 23;" f
deleteWallID src/Dodge/Wall/Delete.hs 13;" f deleteWallID src/Dodge/Wall/Delete.hs 13;" f
deleteWallIDs src/Dodge/Wall/Delete.hs 28;" f deleteWallIDs src/Dodge/Wall/Delete.hs 28;" f
denormalEdges src/Polyhedra.hs 136;" f denormalEdges src/Polyhedra.hs 136;" f
destroyAt src/Dodge/Bullet.hs 210;" f destroyAt src/Dodge/Bullet.hs 213;" f
destroyBlock src/Dodge/Block.hs 56;" f destroyBlock src/Dodge/Block.hs 56;" f
destroyDoor src/Dodge/Block.hs 85;" f destroyDoor src/Dodge/Block.hs 85;" f
destroyInvItem src/Dodge/Inventory.hs 42;" f destroyInvItem src/Dodge/Inventory.hs 42;" f
@@ -3985,7 +3983,7 @@ doItmCrWdWd src/Dodge/Euse.hs 27;" f
doLoop src/Loop.hs 60;" f doLoop src/Loop.hs 60;" f
doMCrAc src/Dodge/CreatureEffect.hs 57;" f doMCrAc src/Dodge/CreatureEffect.hs 57;" f
doMP2Ac src/Dodge/CreatureEffect.hs 73;" f doMP2Ac src/Dodge/CreatureEffect.hs 73;" f
doMagnetBuBu src/Dodge/Bullet.hs 39;" f doMagnetBuBu src/Dodge/Bullet.hs 41;" f
doMagnetBuBu src/Dodge/MagnetBuBu.hs 7;" f doMagnetBuBu src/Dodge/MagnetBuBu.hs 7;" f
doMagnetUpdate src/Dodge/Magnet/Update.hs 6;" f doMagnetUpdate src/Dodge/Magnet/Update.hs 6;" f
doModificationEffect src/Dodge/ModificationEffect.hs 7;" f doModificationEffect src/Dodge/ModificationEffect.hs 7;" f
@@ -4216,7 +4214,7 @@ expandPolyBy src/Dodge/LevelGen/StaticWalls.hs 91;" f
expandPolyByFixed src/Dodge/LevelGen/StaticWalls.hs 97;" f expandPolyByFixed src/Dodge/LevelGen/StaticWalls.hs 97;" f
expandPolyCorners src/Dodge/LevelGen/StaticWalls.hs 103;" f expandPolyCorners src/Dodge/LevelGen/StaticWalls.hs 103;" f
expandToSquare src/Dodge/LevelGen/StaticWalls/Deprecated.hs 83;" f expandToSquare src/Dodge/LevelGen/StaticWalls/Deprecated.hs 83;" f
expireAndDamage src/Dodge/Bullet.hs 193;" f expireAndDamage src/Dodge/Bullet.hs 196;" f
expireAndDamageFL src/Dodge/Flame.hs 47;" f expireAndDamageFL src/Dodge/Flame.hs 47;" f
explodeShell src/Dodge/Projectile/Update.hs 154;" f explodeShell src/Dodge/Projectile/Update.hs 154;" f
explosionS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 410;" f explosionS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 410;" f
@@ -4256,7 +4254,7 @@ fixedCoordPictures src/Dodge/Render/Picture.hs 18;" f
fixedSizePicClampArrow src/Dodge/Picture/SizeInvariant.hs 57;" f fixedSizePicClampArrow src/Dodge/Picture/SizeInvariant.hs 57;" f
flDamageInArea src/Dodge/Flame.hs 109;" f flDamageInArea src/Dodge/Flame.hs 109;" f
flFlicker src/Dodge/Flame.hs 123;" f flFlicker src/Dodge/Flame.hs 123;" f
flameShield src/Dodge/Item/Equipment.hs 34;" f flameShield src/Dodge/Item/Equipment.hs 35;" f
flameSpitter src/Dodge/Item/Held/SprayGuns.hs 29;" f flameSpitter src/Dodge/Item/Held/SprayGuns.hs 29;" f
flameThrower src/Dodge/Item/Held/SprayGuns.hs 72;" f flameThrower src/Dodge/Item/Held/SprayGuns.hs 72;" f
flameTorrent src/Dodge/Item/Held/SprayGuns.hs 40;" f flameTorrent src/Dodge/Item/Held/SprayGuns.hs 40;" f
@@ -4312,9 +4310,9 @@ fromJust' src/MaybeHelp.hs 24;" f
fromListL src/DoubleStack.hs 7;" f fromListL src/DoubleStack.hs 7;" f
fromTopLeft src/Dodge/ScreenPos.hs 9;" f fromTopLeft src/Dodge/ScreenPos.hs 9;" f
fromV3 src/Geometry/Data.hs 43;" f fromV3 src/Geometry/Data.hs 43;" f
frontArmour src/Dodge/Item/Equipment.hs 40;" f frontArmour src/Dodge/Item/Equipment.hs 41;" f
fstV2 src/Geometry/Data.hs 50;" f fstV2 src/Geometry/Data.hs 50;" f
fuelPack src/Dodge/Item/Equipment.hs 73;" f fuelPack src/Dodge/Item/Equipment.hs 74;" f
functionalUpdate src/Dodge/Update.hs 255;" f functionalUpdate src/Dodge/Update.hs 255;" f
fuseFunc src/Dodge/Path.hs 150;" f fuseFunc src/Dodge/Path.hs 150;" f
fusePairs src/Dodge/Path.hs 153;" f fusePairs src/Dodge/Path.hs 153;" f
@@ -4434,9 +4432,9 @@ hasCaneGunDim src/Dodge/Item/InvSize.hs 47;" f
hasFrontArmour src/Dodge/Creature/Test.hs 110;" f hasFrontArmour src/Dodge/Creature/Test.hs 110;" f
hasLOS src/Dodge/Base/Collide.hs 200;" f hasLOS src/Dodge/Base/Collide.hs 200;" f
hasLOSIndirect src/Dodge/Base/Collide.hs 215;" f hasLOSIndirect src/Dodge/Base/Collide.hs 215;" f
hat src/Dodge/Item/Equipment.hs 133;" f hat src/Dodge/Item/Equipment.hs 134;" f
head src/DoubleStack.hs 14;" f head src/DoubleStack.hs 14;" f
headLamp src/Dodge/Item/Equipment.hs 139;" f headLamp src/Dodge/Item/Equipment.hs 140;" f
headLampShape src/Dodge/Item/Draw/SPic.hs 420;" f headLampShape src/Dodge/Item/Draw/SPic.hs 420;" f
headMap src/Dodge/DoubleTree.hs 170;" f headMap src/Dodge/DoubleTree.hs 170;" f
heal src/Dodge/Item/Consumable.hs 17;" f heal src/Dodge/Item/Consumable.hs 17;" f
@@ -4462,7 +4460,7 @@ highBar src/Dodge/Room/Foreground.hs 89;" f
highDiagonalMesh src/Dodge/Room/Foreground.hs 35;" f highDiagonalMesh src/Dodge/Room/Foreground.hs 35;" f
highMesh src/Dodge/Room/Foreground.hs 25;" f highMesh src/Dodge/Room/Foreground.hs 25;" f
hit1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 426;" f hit1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 426;" f
hitEffFromBul src/Dodge/Bullet.hs 156;" f hitEffFromBul src/Dodge/Bullet.hs 159;" f
hitS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 394;" f hitS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 394;" f
holdForm src/Dodge/Creature/Boid.hs 136;" f holdForm src/Dodge/Creature/Boid.hs 136;" f
holsterWeapon src/Dodge/Creature/Volition.hs 14;" f holsterWeapon src/Dodge/Creature/Volition.hs 14;" f
@@ -4633,7 +4631,7 @@ jsps src/Dodge/LevelGen/PlacementHelper.hs 36;" f
jsps0 src/Dodge/LevelGen/PlacementHelper.hs 39;" f jsps0 src/Dodge/LevelGen/PlacementHelper.hs 39;" f
jsps0J src/Dodge/LevelGen/PlacementHelper.hs 48;" f jsps0J src/Dodge/LevelGen/PlacementHelper.hs 48;" f
jspsJ src/Dodge/LevelGen/PlacementHelper.hs 45;" f jspsJ src/Dodge/LevelGen/PlacementHelper.hs 45;" f
jumpLegs src/Dodge/Item/Equipment.hs 155;" f jumpLegs src/Dodge/Item/Equipment.hs 156;" f
justify src/Justify.hs 9;" f justify src/Justify.hs 9;" f
k src/ShortShow.hs 34;" f k src/ShortShow.hs 34;" f
keyCard src/Dodge/Item/Held/Utility.hs 30;" f keyCard src/Dodge/Item/Held/Utility.hs 30;" f
@@ -4756,7 +4754,7 @@ machineAddSound src/Dodge/Machine.hs 49;" f
machinePistol src/Dodge/Item/Held/Stick.hs 65;" f machinePistol src/Dodge/Item/Held/Stick.hs 65;" f
machineUpdateDeathEff src/Dodge/Machine.hs 34;" f machineUpdateDeathEff src/Dodge/Machine.hs 34;" f
machineUpdateLiveDieEff src/Dodge/Machine.hs 16;" f machineUpdateLiveDieEff src/Dodge/Machine.hs 16;" f
magShield src/Dodge/Item/Equipment.hs 26;" f magShield src/Dodge/Item/Equipment.hs 27;" f
magV src/Geometry/Vector.hs 160;" f magV src/Geometry/Vector.hs 160;" f
magV3 src/Geometry/Vector3D.hs 78;" f magV3 src/Geometry/Vector3D.hs 78;" f
magazineCombinations src/Dodge/Combine/Combinations.hs 42;" f magazineCombinations src/Dodge/Combine/Combinations.hs 42;" f
@@ -4786,14 +4784,14 @@ makeDefaultCorpse src/Dodge/Corpse/Make.hs 14;" f
makeDoorDebris src/Dodge/Block/Debris.hs 18;" f makeDoorDebris src/Dodge/Block/Debris.hs 18;" f
makeEnumOption src/Dodge/Menu/OptionType.hs 13;" f makeEnumOption src/Dodge/Menu/OptionType.hs 13;" f
makeExplosionAt src/Dodge/WorldEvent/Explosion.hs 73;" f makeExplosionAt src/Dodge/WorldEvent/Explosion.hs 73;" f
makeFlak src/Dodge/Bullet.hs 142;" f makeFlak src/Dodge/Bullet.hs 145;" f
makeFlame src/Dodge/Flame.hs 131;" f makeFlame src/Dodge/Flame.hs 131;" f
makeFlameExplosionAt src/Dodge/WorldEvent/Explosion.hs 56;" f makeFlameExplosionAt src/Dodge/WorldEvent/Explosion.hs 56;" f
makeFlamelet src/Dodge/EnergyBall.hs 15;" f makeFlamelet src/Dodge/EnergyBall.hs 15;" f
makeFlamerSmokeAt src/Dodge/WorldEvent/Cloud.hs 68;" f makeFlamerSmokeAt src/Dodge/WorldEvent/Cloud.hs 68;" f
makeFlashBall src/Dodge/EnergyBall.hs 73;" f makeFlashBall src/Dodge/EnergyBall.hs 73;" f
makeFootstepSound src/Dodge/Creature/State/WalkCycle.hs 32;" f makeFootstepSound src/Dodge/Creature/State/WalkCycle.hs 32;" f
makeFragBullets src/Dodge/Bullet.hs 127;" f makeFragBullets src/Dodge/Bullet.hs 130;" f
makeGasCloud src/Dodge/WorldEvent/SpawnParticle.hs 80;" f makeGasCloud src/Dodge/WorldEvent/SpawnParticle.hs 80;" f
makeGrid src/Grid.hs 46;" f makeGrid src/Grid.hs 46;" f
makeIntInterval src/Dodge/Zoning/Base.hs 33;" f makeIntInterval src/Dodge/Zoning/Base.hs 33;" f
@@ -4927,13 +4925,13 @@ mouseActionsCr src/Dodge/Creature/YourControl.hs 164;" f
mouseClickOptionsList src/Dodge/Update/Input/ScreenLayer.hs 58;" f mouseClickOptionsList src/Dodge/Update/Input/ScreenLayer.hs 58;" f
mouseCursorType src/Dodge/Render/Picture.hs 80;" f mouseCursorType src/Dodge/Render/Picture.hs 80;" f
mouseWorldPos src/Dodge/Base/Coordinate.hs 48;" f mouseWorldPos src/Dodge/Base/Coordinate.hs 48;" f
moveBullet src/Dodge/Bullet.hs 202;" f moveBullet src/Dodge/Bullet.hs 205;" f
moveCombineSel src/Dodge/Update/Scroll.hs 121;" f moveCombineSel src/Dodge/Update/Scroll.hs 121;" f
moveHammerUp src/Dodge/Hammer.hs 5;" f moveHammerUp src/Dodge/Hammer.hs 5;" f
moveInverseShockwave src/Dodge/Shockwave/Update.hs 53;" f moveInverseShockwave src/Dodge/Shockwave/Update.hs 53;" f
moveLSThen src/Dodge/Placement/Instance/LightSource.hs 30;" f moveLSThen src/Dodge/Placement/Instance/LightSource.hs 30;" f
moveOldHotkey src/Dodge/Hotkey.hs 31;" f moveOldHotkey src/Dodge/Hotkey.hs 31;" f
movePenBullet src/Dodge/Bullet.hs 220;" f movePenBullet src/Dodge/Bullet.hs 223;" f
moveRoomBy src/Dodge/Room/Link.hs 53;" f moveRoomBy src/Dodge/Room/Link.hs 53;" f
moveShockwave src/Dodge/Shockwave/Update.hs 17;" f moveShockwave src/Dodge/Shockwave/Update.hs 17;" f
moveToSideFirstOutLink src/Dodge/Room/Warning.hs 56;" f moveToSideFirstOutLink src/Dodge/Room/Warning.hs 56;" f
@@ -5007,8 +5005,8 @@ numTraversable src/TreeHelp.hs 183;" f
obstacleColor src/Dodge/Debug/Picture.hs 227;" f obstacleColor src/Dodge/Debug/Picture.hs 227;" f
obstructPathsCrossing src/Dodge/Path.hs 138;" f obstructPathsCrossing src/Dodge/Path.hs 138;" f
oldMachineBootS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 516;" f oldMachineBootS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 516;" f
onEquipWristShield src/Dodge/Euse.hs 55;" f onEquipWristShield src/Dodge/Euse.hs 56;" f
onRemoveWristShield src/Dodge/Euse.hs 64;" f onRemoveWristShield src/Dodge/Euse.hs 65;" f
onXY src/Geometry/Vector3D.hs 130;" f onXY src/Geometry/Vector3D.hs 130;" f
oneH src/Dodge/Creature/Test.hs 95;" f oneH src/Dodge/Creature/Test.hs 95;" f
openCursorAt src/Dodge/Render/HUD/Carte.hs 54;" f openCursorAt src/Dodge/Render/HUD/Carte.hs 54;" f
@@ -5071,7 +5069,7 @@ pauseSound src/Dodge/SoundLogic.hs 41;" f
pauseTime src/Dodge/Update.hs 189;" f pauseTime src/Dodge/Update.hs 189;" f
peZoneSize src/Dodge/Zoning/Pathing.hs 46;" f peZoneSize src/Dodge/Zoning/Pathing.hs 46;" f
pedestalRoom src/Dodge/Room/Containing.hs 50;" f pedestalRoom src/Dodge/Room/Containing.hs 50;" f
penThing src/Dodge/Bullet.hs 232;" f penThing src/Dodge/Bullet.hs 235;" f
perMat src/MatrixHelper.hs 49;" f perMat src/MatrixHelper.hs 49;" f
perceptionUpdate src/Dodge/Creature/Perception.hs 22;" f perceptionUpdate src/Dodge/Creature/Perception.hs 22;" f
performAction src/Dodge/Creature/Action.hs 96;" f performAction src/Dodge/Creature/Action.hs 96;" f
@@ -5214,7 +5212,7 @@ postUniverseLoadSideEffect src/Dodge/WorldLoad.hs 11;" f
postWorldLoad src/Dodge/WorldLoad.hs 14;" f postWorldLoad src/Dodge/WorldLoad.hs 14;" f
powerFakeout src/Dodge/Room/Start.hs 27;" f powerFakeout src/Dodge/Room/Start.hs 27;" f
powerFakeout' src/Dodge/Room/Start.hs 24;" f powerFakeout' src/Dodge/Room/Start.hs 24;" f
powerLegs src/Dodge/Item/Equipment.hs 146;" f powerLegs src/Dodge/Item/Equipment.hs 147;" f
powlist src/Multiset.hs 61;" f powlist src/Multiset.hs 61;" f
powlistUpToN src/Multiset.hs 23;" f powlistUpToN src/Multiset.hs 23;" f
powlistUpToN' src/Multiset.hs 12;" f powlistUpToN' src/Multiset.hs 12;" f
@@ -5261,7 +5259,7 @@ psj src/Dodge/LevelGen/PlacementHelper.hs 70;" f
psposAddLabel src/Dodge/PlacementSpot.hs 69;" f psposAddLabel src/Dodge/PlacementSpot.hs 69;" f
pt0 src/Dodge/LevelGen/PlacementHelper.hs 54;" f pt0 src/Dodge/LevelGen/PlacementHelper.hs 54;" f
ptCont src/Dodge/LevelGen/PlacementHelper.hs 21;" f ptCont src/Dodge/LevelGen/PlacementHelper.hs 21;" f
pulseChecker src/Dodge/Item/Equipment.hs 166;" f pulseChecker src/Dodge/Item/Equipment.hs 167;" f
pushCreatureOutFromWalls src/Dodge/WallCreatureCollisions.hs 53;" f pushCreatureOutFromWalls src/Dodge/WallCreatureCollisions.hs 53;" f
pushL src/DoubleStack.hs 20;" f pushL src/DoubleStack.hs 20;" f
pushOrCrush src/Dodge/WallCreatureCollisions.hs 72;" f pushOrCrush src/Dodge/WallCreatureCollisions.hs 72;" f
@@ -5367,7 +5365,7 @@ removeAmmoFromMag src/Dodge/HeldUse.hs 395;" f
removeDot src/ShortShow.hs 30;" f removeDot src/ShortShow.hs 30;" f
removeHotkey src/Dodge/Hotkey.hs 40;" f removeHotkey src/Dodge/Hotkey.hs 40;" f
removeInverseWalls src/Dodge/LevelGen/StaticWalls.hs 25;" f removeInverseWalls src/Dodge/LevelGen/StaticWalls.hs 25;" f
removeShieldWall src/Dodge/Euse.hs 124;" f removeShieldWall src/Dodge/Euse.hs 125;" f
removeWallsInPolygon src/Dodge/LevelGen/StaticWalls.hs 182;" f removeWallsInPolygon src/Dodge/LevelGen/StaticWalls.hs 182;" f
renderDataResizeUpdate src/Preload/Update.hs 26;" f renderDataResizeUpdate src/Preload/Update.hs 26;" f
renderFlatLighting src/Render.hs 104;" f renderFlatLighting src/Render.hs 104;" f
@@ -5557,7 +5555,7 @@ setClusterID src/Dodge/Combine/Graph.hs 115;" f
setDepth src/Picture/Base.hs 128;" f setDepth src/Picture/Base.hs 128;" f
setDirPS src/Dodge/PlacementSpot.hs 49;" f setDirPS src/Dodge/PlacementSpot.hs 49;" f
setFallback src/Dodge/PlacementSpot.hs 127;" f setFallback src/Dodge/PlacementSpot.hs 127;" f
setFromToDams src/Dodge/Bullet.hs 181;" f setFromToDams src/Dodge/Bullet.hs 184;" f
setHotkey src/Dodge/Hotkey.hs 37;" f setHotkey src/Dodge/Hotkey.hs 37;" f
setInLinks src/Dodge/RoomLink.hs 51;" f setInLinks src/Dodge/RoomLink.hs 51;" f
setInLinksByType src/Dodge/RoomLink.hs 54;" f setInLinksByType src/Dodge/RoomLink.hs 54;" f
@@ -5587,7 +5585,7 @@ setViewDistance src/Dodge/Update/Camera.hs 182;" f
setViewPos src/Dodge/Creature/ReaderUpdate.hs 61;" f setViewPos src/Dodge/Creature/ReaderUpdate.hs 61;" f
setViewport src/Dodge/Render.hs 388;" f setViewport src/Dodge/Render.hs 388;" f
setVol src/Dodge/Config/Update.hs 30;" f setVol src/Dodge/Config/Update.hs 30;" f
setWristShieldPos src/Dodge/Euse.hs 72;" f setWristShieldPos src/Dodge/Euse.hs 73;" f
setupConLoop src/Loop.hs 102;" f setupConLoop src/Loop.hs 102;" f
setupConLoop' src/Loop.hs 192;" f setupConLoop' src/Loop.hs 192;" f
setupEBO src/Shader/Compile.hs 188;" f setupEBO src/Shader/Compile.hs 188;" f
@@ -5619,7 +5617,7 @@ shellCollisionEffect src/Dodge/Projectile/Update.hs 48;" f
shellMag src/Dodge/Item/Ammo.hs 61;" f shellMag src/Dodge/Item/Ammo.hs 61;" f
shellShape src/Dodge/Projectile/Draw.hs 27;" f shellShape src/Dodge/Projectile/Draw.hs 27;" f
shellTrailCloud src/Dodge/WorldEvent/Cloud.hs 65;" f shellTrailCloud src/Dodge/WorldEvent/Cloud.hs 65;" f
shieldWall src/Dodge/Euse.hs 86;" f shieldWall src/Dodge/Euse.hs 87;" f
shiftByV2 src/Dodge/PlacementSpot.hs 239;" f shiftByV2 src/Dodge/PlacementSpot.hs 239;" f
shiftChildren src/Dodge/Tree/Compose.hs 43;" f shiftChildren src/Dodge/Tree/Compose.hs 43;" f
shiftDraw src/Dodge/Render/ShapePicture.hs 67;" f shiftDraw src/Dodge/Render/ShapePicture.hs 67;" f
@@ -5736,7 +5734,7 @@ spawnGun src/Dodge/Item/Weapon/Spawn.hs 12;" f
spawnSmokeAtCursor src/Dodge/WorldEvent/Cloud.hs 73;" f spawnSmokeAtCursor src/Dodge/WorldEvent/Cloud.hs 73;" f
spawnerCrit src/Dodge/Creature.hs 55;" f spawnerCrit src/Dodge/Creature.hs 55;" f
spawnerRoom src/Dodge/Room/Room.hs 360;" f spawnerRoom src/Dodge/Room/Room.hs 360;" f
speedLegs src/Dodge/Item/Equipment.hs 152;" f speedLegs src/Dodge/Item/Equipment.hs 153;" f
splashMenu src/Dodge/Menu.hs 27;" f splashMenu src/Dodge/Menu.hs 27;" f
splashMenuOptions src/Dodge/Menu.hs 32;" f splashMenuOptions src/Dodge/Menu.hs 32;" f
splashScreen src/Dodge/Initialisation.hs 11;" f splashScreen src/Dodge/Initialisation.hs 11;" f
@@ -6046,7 +6044,7 @@ updateBackspaceRegex src/Dodge/Update/Input/InGame.hs 455;" f
updateBarrel src/Dodge/Barreloid.hs 45;" f updateBarrel src/Dodge/Barreloid.hs 45;" f
updateBarreloid src/Dodge/Barreloid.hs 13;" f updateBarreloid src/Dodge/Barreloid.hs 13;" f
updateBounds src/Dodge/Update/Camera.hs 206;" f updateBounds src/Dodge/Update/Camera.hs 206;" f
updateBulVel src/Dodge/Bullet.hs 60;" f updateBulVel src/Dodge/Bullet.hs 62;" f
updateBullet src/Dodge/Bullet.hs 22;" f updateBullet src/Dodge/Bullet.hs 22;" f
updateBullets src/Dodge/Update.hs 545;" f updateBullets src/Dodge/Update.hs 545;" f
updateCamera src/Dodge/Update/Camera.hs 31;" f updateCamera src/Dodge/Update/Camera.hs 31;" f
@@ -6172,7 +6170,7 @@ upperPrismPolyTS src/Shape.hs 119;" f
upperRounded src/Shape.hs 184;" f upperRounded src/Shape.hs 184;" f
useBreakL src/Dodge/Item/Grammar.hs 27;" f useBreakL src/Dodge/Item/Grammar.hs 27;" f
useBreakListsLinkTest src/Dodge/Item/Grammar.hs 35;" f useBreakListsLinkTest src/Dodge/Item/Grammar.hs 35;" f
useBulletPayload src/Dodge/Bullet.hs 116;" f useBulletPayload src/Dodge/Bullet.hs 119;" f
useC src/Dodge/Cuse.hs 8;" f useC src/Dodge/Cuse.hs 8;" f
useC' src/Dodge/Cuse.hs 13;" f useC' src/Dodge/Cuse.hs 13;" f
useE src/Dodge/Euse.hs 34;" f useE src/Dodge/Euse.hs 34;" f
@@ -6180,7 +6178,7 @@ useGasParams src/Dodge/HeldUse.hs 502;" f
useHotkey src/Dodge/Creature/YourControl.hs 54;" f useHotkey src/Dodge/Creature/YourControl.hs 54;" f
useLnkRoomPos src/Dodge/PlacementSpot.hs 244;" f useLnkRoomPos src/Dodge/PlacementSpot.hs 244;" f
useLoadedAmmo src/Dodge/HeldUse.hs 288;" f useLoadedAmmo src/Dodge/HeldUse.hs 288;" f
useMagShield src/Dodge/Euse.hs 45;" f useMagShield src/Dodge/Euse.hs 46;" f
useNormalCamera src/Dodge/Camera.hs 6;" f useNormalCamera src/Dodge/Camera.hs 6;" f
usePayload src/Dodge/Payload.hs 7;" f usePayload src/Dodge/Payload.hs 7;" f
useRewindGun src/Dodge/HeldUse.hs 661;" f useRewindGun src/Dodge/HeldUse.hs 661;" f
@@ -6288,8 +6286,8 @@ worldSPic src/Dodge/Render/ShapePicture.hs 23;" f
worldToGenWorld src/Dodge/LevelGen/LevelStructure.hs 14;" f worldToGenWorld src/Dodge/LevelGen/LevelStructure.hs 14;" f
wpAdd src/Dodge/Room/RezBox.hs 137;" f wpAdd src/Dodge/Room/RezBox.hs 137;" f
wrench1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 402;" f wrench1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 402;" f
wristArmour src/Dodge/Item/Equipment.hs 46;" f wristArmour src/Dodge/Item/Equipment.hs 47;" f
wristInvisibility src/Dodge/Item/Equipment.hs 158;" f wristInvisibility src/Dodge/Item/Equipment.hs 159;" f
writeConfig src/Dodge/Menu.hs 159;" f writeConfig src/Dodge/Menu.hs 159;" f
writeSaveSlot src/Dodge/Save.hs 34;" f writeSaveSlot src/Dodge/Save.hs 34;" f
xCylinder src/Shape.hs 136;" f xCylinder src/Shape.hs 136;" f