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

Simplify clouds

Browse Source
This commit is contained in:
justin
2025-06-24 09:42:51 +01:00
parent 366b998989
commit b1041d1eb0
12 changed files with 110 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Dodge/Bullet.hs
+9 -9
View File
@@ -1,5 +1,6 @@
module Dodge.Bullet (updateBullet) where module Dodge.Bullet (updateBullet) where
import Dodge.Damage
import Data.Bifunctor import Data.Bifunctor
import Data.Foldable import Data.Foldable
import Data.Maybe import Data.Maybe
@@ -167,21 +168,20 @@ hitEffFromBul w bu = case _buEffect bu of
sp = _buPos bu sp = _buPos bu
hitstream = thingsHit sp (sp + _buVel bu) w hitstream = thingsHit sp (sp + _buVel bu) w
setFromToDams :: Bullet -> Point2 -> [Damage] getBulHitDams :: Bullet -> Point2 -> [Damage]
setFromToDams bu p = case _buPayload bu of getBulHitDams bu p = case _buPayload bu of
BulPlain x -> [Piercing x p v] BulPlain x -> [Piercing x p v]
_ -> [] _ -> []
where where
v = _buVel bu v = _buVel bu
-- f = (dmFrom .~ _buPos bu) . (dmAt .~ p) . (dmTo .~ _buPos bu +.+ _buVel bu)
damageThingHit :: Bullet -> (Point2, Either Creature Wall) -> World -> World damageThingHit :: Bullet -> (Point2, Either Creature Wall) -> World -> World
damageThingHit bu (p, crwl) = case crwl of damageThingHit bu (p, crwl) = damageCrWl (getBulHitDams bu p) crwl
Left cr -> cWorld . lWorld . creatures . ix (_crID cr) . crDamage <>~ dams -- case crwl of
Right wl -> cWorld . lWorld . wallDamages . at (_wlID wl) . non mempty <>~ dams -- Left cr -> cWorld . lWorld . creatures . ix (_crID cr) . crDamage <>~ dams
where -- Right wl -> cWorld . lWorld . wallDamages . at (_wlID wl) . non mempty <>~ dams
dams = setFromToDams bu p -- where
-- dams = setFromToDams bu p
expireAndDamage :: expireAndDamage ::
Bullet -> Bullet ->
src/Dodge/Damage.hs
+4 -4
View File
@@ -20,13 +20,13 @@ import Geometry.Vector
import LensHelp import LensHelp
import ListHelp import ListHelp
damageCrWlID :: Damage -> CrWlID -> World -> World damageCrWlID :: [Damage] -> CrWlID -> World -> World
damageCrWlID dam = \case damageCrWlID dam = \case
NothingID -> id NothingID -> id
CrID cid -> cWorld . lWorld . creatures . ix cid . crDamage .:~ dam CrID cid -> cWorld . lWorld . creatures . ix cid . crDamage <>~ dam
WlID wlid -> cWorld . lWorld . wallDamages . at wlid . non mempty .:~ dam WlID wlid -> cWorld . lWorld . wallDamages . at wlid . non mempty <>~ dam
damageCrWl :: Damage -> Either Creature Wall -> World -> World damageCrWl :: [Damage] -> Either Creature Wall -> World -> World
damageCrWl dam = \case damageCrWl dam = \case
Left cr -> damageCrWlID dam (CrID (_crID cr)) Left cr -> damageCrWlID dam (CrID (_crID cr))
Right wl -> damageCrWlID dam (WlID (_wlID wl)) Right wl -> damageCrWlID dam (WlID (_wlID wl))
src/Dodge/Data/Cloud.hs
+3 -3
View File
@@ -12,14 +12,14 @@ import Data.Aeson.TH
import Geometry import Geometry
data CloudDraw data CloudDraw
= CloudColor Float Float Color -- radius-multiply fade-time color = CloudColor Float-- Color -- radius-multiply fade-time color
deriving (Eq, Ord, Show, Read) --Generic, Flat) deriving (Eq, Ord, Show, Read) --Generic, Flat)
data Cloud = Cloud data Cloud = Cloud
{ _clPos :: Point3 { _clPos :: Point3
, _clVel :: Point3 , _clVel :: Point3
, _clPict :: CloudDraw -- , _clPict :: CloudDraw
, _clRad :: Float -- , _clRad :: Float
, _clAlt :: Float , _clAlt :: Float
, _clTimer :: Int , _clTimer :: Int
, _clType :: CloudType , _clType :: CloudType
src/Dodge/Material/Damage.hs
+7 -7
View File
@@ -29,10 +29,10 @@ damageStone dm ecw w =
Lasering _ p t -> makeSpark FireSpark (outTo p t) (rdir p t) Lasering _ p t -> makeSpark FireSpark (outTo p t) (rdir p t)
Piercing _ p t -> Piercing _ p t ->
makeSpark NormalSpark (outTo p t) (rdir p t) makeSpark NormalSpark (outTo p t) (rdir p t)
. smokeCloudAt white 20 200 1 (addZ 20 (outTo p t)) . smokeCloudAt white 200 1 (addZ 20 (outTo p t))
. randsound p [slapS, slap1S] . randsound p [slapS, slap1S]
Blunt _ p t -> smokeCloudAt white 20 200 1 (addZ 20 (outTo p t)) Blunt _ p t -> smokeCloudAt white 200 1 (addZ 20 (outTo p t))
Shattering _ p t -> smokeCloudAt white 20 200 1 (addZ 20 (outTo p t)) Shattering _ p t -> smokeCloudAt white 200 1 (addZ 20 (outTo p t))
Crushing{} -> id Crushing{} -> id
Explosive{} -> id Explosive{} -> id
Sparking{} -> id Sparking{} -> id
@@ -101,7 +101,7 @@ damageFlesh dm _ w = w & case dm of
, bloodShort7S , bloodShort7S
, bloodShort8S , bloodShort8S
] ]
. smokeCloudAt red 20 200 1 (addZ 20 (outTo p t)) . smokeCloudAt red 200 1 (addZ 20 (outTo p t))
Blunt _ p _ -> randsound p [hitS] Blunt _ p _ -> randsound p [hitS]
Shattering _ _ _ -> id Shattering _ _ _ -> id
Crushing{} -> id Crushing{} -> id
@@ -124,10 +124,10 @@ damageDirt dm ecw w =
w & case dm of w & case dm of
Lasering _ p t -> makeSpark FireSpark (outTo p t) (rdir p t) Lasering _ p t -> makeSpark FireSpark (outTo p t) (rdir p t)
Piercing _ p t -> Piercing _ p t ->
smokeCloudAt orange 20 200 1 (addZ 20 (outTo p t)) smokeCloudAt orange 200 1 (addZ 20 (outTo p t))
. randsound p [slapS, slap1S] . randsound p [slapS, slap1S]
Blunt _ p t -> smokeCloudAt orange 20 200 1 (addZ 20 (outTo p t)) Blunt _ p t -> smokeCloudAt orange 200 1 (addZ 20 (outTo p t))
Shattering _ p t -> smokeCloudAt orange 20 200 1 (addZ 20 (outTo p t)) Shattering _ p t -> smokeCloudAt orange 200 1 (addZ 20 (outTo p t))
Crushing{} -> id Crushing{} -> id
Explosive{} -> id Explosive{} -> id
Sparking{} -> id Sparking{} -> id
src/Dodge/Spark.hs
+4 -4
View File
@@ -36,11 +36,11 @@ updateSpark w sk
sparkDam :: Spark -> Either Creature Wall -> World -> World sparkDam :: Spark -> Either Creature Wall -> World -> World
sparkDam = damageCrWl . sparkToDamage sparkDam = damageCrWl . sparkToDamage
sparkToDamage :: Spark -> Damage sparkToDamage :: Spark -> [Damage]
sparkToDamage sp = case _skType sp of sparkToDamage sp = case _skType sp of
ElectricSpark -> Electrical 10 ElectricSpark -> [Electrical 10]
FireSpark -> Flaming 1 FireSpark -> [Flaming 1]
NormalSpark -> Sparking 10 NormalSpark -> [Sparking 10]
makeSpark :: SparkType -> Point2 -> Float -> World -> World makeSpark :: SparkType -> Point2 -> Float -> World -> World
makeSpark st p d = makeSpark st p d =
src/Dodge/Update.hs
+3 -2
View File
@@ -577,7 +577,7 @@ updateTeslaArc w pt
, randWallReflect ld' wl , randWallReflect ld' wl
) )
| ArcStep lp' ld' _ <- last thearc = (lp', rp ld') | ArcStep lp' ld' _ <- last thearc = (lp', rp ld')
damthings (ArcStep _ _ crwl) = damageCrWlID (Electrical 50) crwl damthings (ArcStep _ _ crwl) = damageCrWlID [Electrical 50] crwl
randWallReflect :: RandomGen g => Float -> Wall -> State g Float randWallReflect :: RandomGen g => Float -> Wall -> State g Float
randWallReflect a wl = randPeaked a1 outa a2 randWallReflect a wl = randPeaked a1 outa a2
@@ -766,7 +766,8 @@ clClSpringVel a v b
where where
pa = _clPos a pa = _clPos a
pb = _clPos b pb = _clPos b
radDist = (_clRad a + _clRad b) / 2 radDist = 10
--radDist = (_clRad a + _clRad b) / 2
simpleCrSprings :: World -> World simpleCrSprings :: World -> World
simpleCrSprings w = IM.foldl' (flip crSpring) w $ w ^. cWorld . lWorld . creatures simpleCrSprings w = IM.foldl' (flip crSpring) w $ w ^. cWorld . lWorld . creatures
src/Dodge/Update/Cloud.hs
+1 -1
View File
@@ -12,5 +12,5 @@ cloudPoisonDamage c w = foldl' (flip doDam) w (filter f $ crsNearPoint clpos w)
where where
doDam cr = doDam cr =
cWorld . lWorld . creatures . ix (_crID cr) . crDamage .:~ Poison 1 cWorld . lWorld . creatures . ix (_crID cr) . crDamage .:~ Poison 1
f cr = dist3 (addZ 20 $ _crPos cr) (_clPos c) < crRad (cr ^. crType) + _clRad c + 10 f cr = dist3 (addZ 20 $ _crPos cr) (_clPos c) < crRad (cr ^. crType) + 20
clpos = stripZ $ _clPos c clpos = stripZ $ _clPos c
src/Dodge/Wall/Dust.hs
+2 -2
View File
@@ -8,7 +8,7 @@ import Geometry
import RandomHelp import RandomHelp
wlDustAt :: Wall -> Point2 -> World -> World wlDustAt :: Wall -> Point2 -> World -> World
wlDustAt wl = smokeCloudAt dustcol 20 200 1 . addZ 20 wlDustAt wl = smokeCloudAt dustcol 200 1 . addZ 20
where where
dustcol = _wlColor wl & _4 .~ 1 dustcol = _wlColor wl & _4 .~ 1
@@ -17,7 +17,7 @@ muchWlDustAt wl p = flip (foldl' f) [10, 20 .. 100]
where where
f w h = f w h =
w w
& smokeCloudAt dustcol 20 200 1 (addZ h (p +.+ off)) & smokeCloudAt dustcol 200 1 (addZ h (p +.+ off))
& randGen .~ g & randGen .~ g
where where
(off, g) = runState (randInCirc 1) (_randGen w) (off, g) = runState (randInCirc 1) (_randGen w)
src/Dodge/WorldEvent/Cloud.hs
+21 -21
View File
@@ -1,8 +1,8 @@
module Dodge.WorldEvent.Cloud ( module Dodge.WorldEvent.Cloud (
makeFlamerSmokeAt, makeFlamerSmokeAt,
smokeCloudAt, smokeCloudAt,
makeThinSmokeAt, -- makeThinSmokeAt,
makeThickSmokeAt, -- makeThickSmokeAt,
shellTrailCloud, shellTrailCloud,
spawnSmokeAtCursor, spawnSmokeAtCursor,
makeStartCloudAt, makeStartCloudAt,
@@ -13,12 +13,12 @@ import Dodge.Data.World
import Geometry.Data import Geometry.Data
import LensHelp import LensHelp
import Picture import Picture
import System.Random --import System.Random
makeCloudAt :: makeCloudAt ::
CloudDraw -> -- CloudDraw ->
-- | radius -- -- | radius
Float -> -- Float ->
-- | timer -- | timer
Int -> Int ->
-- | resting altitude -- | resting altitude
@@ -26,13 +26,13 @@ makeCloudAt ::
Point3 -> -- start position Point3 -> -- start position
World -> World ->
World World
makeCloudAt drawFunc rad t alt p = makeCloudAt t alt p =
cWorld . lWorld . clouds cWorld . lWorld . clouds
.:~ Cloud .:~ Cloud
{ _clPos = p { _clPos = p
, _clVel = V3 0 0 0 , _clVel = V3 0 0 0
, _clPict = drawFunc -- , _clPict = drawFunc
, _clRad = rad -- , _clRad = rad
, _clAlt = alt , _clAlt = alt
, _clTimer = t , _clTimer = t
, _clType = SmokeCloud , _clType = SmokeCloud
@@ -41,7 +41,7 @@ makeCloudAt drawFunc rad t alt p =
smokeCloudAt :: smokeCloudAt ::
Color -> Color ->
-- | radius -- | radius
Float -> -- Float ->
-- | timer -- | timer
Int -> Int ->
-- | resting altitude -- | resting altitude
@@ -49,26 +49,26 @@ smokeCloudAt ::
Point3 -> -- start position Point3 -> -- start position
World -> World ->
World World
smokeCloudAt col = makeCloudAt (CloudColor (4 / 3) 800 col) smokeCloudAt col = makeCloudAt
makeThickSmokeAt :: Point3 -> World -> World --makeThickSmokeAt :: Point3 -> World -> World
makeThickSmokeAt = makeCloudAt (CloudColor 4 50 black) 3 50 30 --makeThickSmokeAt = makeCloudAt 50 30
--
makeThinSmokeAt :: Point3 -> World -> World --makeThinSmokeAt :: Point3 -> World -> World
makeThinSmokeAt = makeCloudAt (CloudColor 4 400 (withAlpha 0.05 black)) 5 400 50 --makeThinSmokeAt = makeCloudAt 400 50
makeStartCloudAt :: Point3 -> World -> World makeStartCloudAt :: Point3 -> World -> World
--makeStartCloudAt = makeCloudAt (CloudColor 2 800 white) 10 400 5 --makeStartCloudAt = makeCloudAt (CloudColor 2 800 white) 10 400 5
--makeStartCloudAt = makeCloudAt (CloudColor 2 200 white) 10 400 50 --makeStartCloudAt = makeCloudAt (CloudColor 2 200 white) 10 400 50
makeStartCloudAt = makeCloudAt (CloudColor 2 200 white) 10 400 50 makeStartCloudAt = makeCloudAt 400 50
shellTrailCloud :: Int -> Float -> Point3 -> World -> World shellTrailCloud :: Int -> Float -> Point3 -> World -> World
shellTrailCloud age fadet = makeCloudAt (CloudColor (3 / 2) fadet (greyN 0.5)) 15 age 30 shellTrailCloud age fadet = makeCloudAt age 30
makeFlamerSmokeAt :: Point3 -> World -> World makeFlamerSmokeAt :: Point3 -> World -> World
makeFlamerSmokeAt p w = makeCloudAt (CloudColor 4 300 (greyN x)) 6 200 40 p w makeFlamerSmokeAt p w = makeCloudAt 200 40 p w
where -- where
x = fst $ randomR (0.5, 0.8) (_randGen w) -- x = fst $ randomR (0.5, 0.8) (_randGen w)
spawnSmokeAtCursor :: World -> World spawnSmokeAtCursor :: World -> World
spawnSmokeAtCursor w = shellTrailCloud 400 100 (V3 x y 20) w spawnSmokeAtCursor w = shellTrailCloud 400 100 (V3 x y 20) w
src/Dodge/WorldEvent/SpawnParticle.hs
+8 -9
View File
@@ -1,13 +1,11 @@
-- | Creation of particles in the world. -- | Creation of particles in the world.
module Dodge.WorldEvent.SpawnParticle ( module Dodge.WorldEvent.SpawnParticle (makeGasCloud) where
makeGasCloud,
) where
import Dodge.Data.World import Dodge.Data.World
import Geometry import Geometry
import LensHelp import LensHelp
import Picture --import Picture
import RandomHelp --import RandomHelp
-- | At writing the radius is half the size of the effect area -- | At writing the radius is half the size of the effect area
makeGasCloud :: makeGasCloud ::
@@ -20,18 +18,19 @@ makeGasCloud ::
makeGasCloud pos vel w = makeGasCloud pos vel w =
w w
& cWorld . lWorld . clouds .:~ theCloud & cWorld . lWorld . clouds .:~ theCloud
& randGen .~ g
where where
-- & randGen .~ g
theCloud = theCloud =
Cloud Cloud
{ _clPos = addZ 20 pos { _clPos = addZ 20 pos
, _clVel = addZ 0 vel , _clVel = addZ 0 vel
, _clPict = CloudColor 3 50 (withAlpha 0.5 col) -- , _clPict = CloudColor 50 -- (withAlpha 0.5 col)
, _clRad = 10
, _clAlt = 25 , _clAlt = 25
, _clTimer = 400 , _clTimer = 400
, _clType = GasCloud , _clType = GasCloud
} }
(col, g) = runState (takeOne [green, yellow]) $ _randGen w
-- (col, g) = runState (takeOne [green, yellow]) $ _randGen w
{- Attach poison cloud damage to creatures near cloud. -} {- Attach poison cloud damage to creatures near cloud. -}
src/Shader/Poke/Cloud.hs
+23 -9
View File
@@ -1,7 +1,9 @@
module Shader.Poke.Cloud ( {-# LANGUAGE LambdaCase #-}
pokeCloud,
) where
module Shader.Poke.Cloud (pokeCloud) where
import Color
import Control.Lens
import qualified Data.Vector.Unboxed as UV import qualified Data.Vector.Unboxed as UV
import Dodge.Data.Cloud import Dodge.Data.Cloud
import Foreign import Foreign
@@ -9,7 +11,7 @@ import Geometry
import Graphics.GL.Core45 import Graphics.GL.Core45
pokeCloud :: Ptr Float -> Ptr GLushort -> (Int, Int) -> Cloud -> IO (Int, Int) pokeCloud :: Ptr Float -> Ptr GLushort -> (Int, Int) -> Cloud -> IO (Int, Int)
pokeCloud vptr iptr (nv,ni) cl = do pokeCloud vptr iptr (nv, ni) cl = do
UV.imapM_ (pokeCloudVerx vptr cl nv) $ UV.fromList [(1, 1), (-1, 1), (-1, -1), (1, -1)] UV.imapM_ (pokeCloudVerx vptr cl nv) $ UV.fromList [(1, 1), (-1, 1), (-1, -1), (1, -1)]
UV.imapM_ (pokeCloudIndex iptr nv ni) $ UV.fromList [0, 1, 2, 2, 0, 3] UV.imapM_ (pokeCloudIndex iptr nv ni) $ UV.fromList [0, 1, 2, 2, 0, 3]
return (nv + 4, ni + 6) return (nv + 4, ni + 6)
@@ -17,14 +19,26 @@ pokeCloud vptr iptr (nv,ni) cl = do
pokeCloudVerx :: Ptr Float -> Cloud -> Int -> Int -> (Float, Float) -> IO () pokeCloudVerx :: Ptr Float -> Cloud -> Int -> Int -> (Float, Float) -> IO ()
{-# INLINE pokeCloudVerx #-} {-# INLINE pokeCloudVerx #-}
pokeCloudVerx ptr cl nv i (dx, dy) = pokeCloudVerx ptr cl nv i (dx, dy) =
UV.imapM_ (pokeCloudFloat ptr (nv + i)) $ UV.fromList UV.imapM_ (pokeCloudFloat ptr (nv + i)) $
[x, y, cz, 1, r, g, b, a, cx, cy, cz, rad, dx, dy, 0, 0] UV.fromList
[x, y, cz, 1, r, g, b, a, cx, cy, cz, rad, dx, dy, 0, 0]
where where
V3 cx cy cz = _clPos cl V3 cx cy cz = _clPos cl
V2 x y = V2 cx cy - rad *.* V2 dx dy V2 x y = V2 cx cy - rad *.* V2 dx dy
CloudColor rad' fadet col = _clPict cl --CloudColor fadet col = _clPict cl
(rad,V4 r g b a') = (rad'*_clRad cl, col) -- CloudColor fadet = _clPict cl
a = a' * min 1 (fromIntegral (_clTimer cl) / fadet) (rad, V4 r g b a') = (20, clColor $ cl ^. clType)
-- (rad,V4 r g b a') = (_clRad cl*rad', col)
a = a' * min 1 (fromIntegral (_clTimer cl) / 100)
clColor :: CloudType -> Color
clColor = \case
SmokeCloud -> white
FlamerSmokeCloud -> black
RocketCloud -> greyN 0.5
CryoReleaseCloud -> blue
GasCloud -> green
StoneDust -> white
pokeCloudFloat :: Ptr Float -> Int -> Int -> Float -> IO () pokeCloudFloat :: Ptr Float -> Int -> Int -> Float -> IO ()
{-# INLINE pokeCloudFloat #-} {-# INLINE pokeCloudFloat #-}
tags
+25 -25
View File
@@ -317,7 +317,7 @@ Cloud src/Dodge/Data/Cloud.hs 6;" m
Cloud src/Dodge/Update/Cloud.hs 1;" m Cloud src/Dodge/Update/Cloud.hs 1;" m
Cloud src/Dodge/WorldEvent/Cloud.hs 1;" m Cloud src/Dodge/WorldEvent/Cloud.hs 1;" m
Cloud src/Dodge/Zoning/Cloud.hs 1;" m Cloud src/Dodge/Zoning/Cloud.hs 1;" m
Cloud src/Shader/Poke/Cloud.hs 1;" m Cloud src/Shader/Poke/Cloud.hs 3;" m
CloudColor src/Dodge/Data/Cloud.hs 15;" C CloudColor src/Dodge/Data/Cloud.hs 15;" C
CloudDraw src/Dodge/Data/Cloud.hs 14;" t CloudDraw src/Dodge/Data/Cloud.hs 14;" t
CloudType src/Dodge/Data/Cloud.hs 29;" t CloudType src/Dodge/Data/Cloud.hs 29;" t
@@ -2371,7 +2371,6 @@ _cigType src/Dodge/Data/Camera.hs 19;" f
_clAlt src/Dodge/Data/Cloud.hs 23;" f _clAlt src/Dodge/Data/Cloud.hs 23;" f
_clPict src/Dodge/Data/Cloud.hs 21;" f _clPict src/Dodge/Data/Cloud.hs 21;" f
_clPos src/Dodge/Data/Cloud.hs 19;" f _clPos src/Dodge/Data/Cloud.hs 19;" f
_clRad src/Dodge/Data/Cloud.hs 22;" f
_clTimer src/Dodge/Data/Cloud.hs 24;" f _clTimer src/Dodge/Data/Cloud.hs 24;" f
_clType src/Dodge/Data/Cloud.hs 25;" f _clType src/Dodge/Data/Cloud.hs 25;" f
_clVel src/Dodge/Data/Cloud.hs 20;" f _clVel src/Dodge/Data/Cloud.hs 20;" f
@@ -2531,10 +2530,10 @@ _drWallIDs src/Dodge/Data/Door.hs 36;" f
_dtLeft src/Dodge/Data/DoubleTree.hs 30;" f _dtLeft src/Dodge/Data/DoubleTree.hs 30;" f
_dtRight src/Dodge/Data/DoubleTree.hs 30;" f _dtRight src/Dodge/Data/DoubleTree.hs 30;" f
_dtValue src/Dodge/Data/DoubleTree.hs 30;" f _dtValue src/Dodge/Data/DoubleTree.hs 30;" f
_ebEff src/Dodge/Data/EnergyBall.hs 21;" f
_ebID src/Dodge/Data/EnergyBall/Type.hs 15;" f _ebID src/Dodge/Data/EnergyBall/Type.hs 15;" f
_ebPos src/Dodge/Data/EnergyBall.hs 19;" f _ebPos src/Dodge/Data/EnergyBall.hs 19;" f
_ebTimer src/Dodge/Data/EnergyBall.hs 20;" f _ebTimer src/Dodge/Data/EnergyBall.hs 20;" f
_ebType src/Dodge/Data/EnergyBall.hs 21;" f
_ebVel src/Dodge/Data/EnergyBall.hs 18;" f _ebVel src/Dodge/Data/EnergyBall.hs 18;" f
_eboName src/Shader/Data.hs 89;" f _eboName src/Shader/Data.hs 89;" f
_eboPtr src/Shader/Data.hs 90;" f _eboPtr src/Shader/Data.hs 90;" f
@@ -3388,7 +3387,7 @@ applyEventIO src/Loop.hs 89;" f
applyGravityPU src/Dodge/Projectile/Update.hs 56;" f applyGravityPU src/Dodge/Projectile/Update.hs 56;" f
applyIndividualDamage src/Dodge/Creature/Damage.hs 16;" f applyIndividualDamage src/Dodge/Creature/Damage.hs 16;" f
applyInvLock src/Dodge/HeldUse.hs 423;" f applyInvLock src/Dodge/HeldUse.hs 423;" f
applyMagnetsToBul src/Dodge/Bullet.hs 29;" f applyMagnetsToBul src/Dodge/Bullet.hs 30;" f
applyPastDamages src/Dodge/Creature/State.hs 131;" f applyPastDamages src/Dodge/Creature/State.hs 131;" f
applyPiercingDamage src/Dodge/Creature/Damage.hs 22;" f applyPiercingDamage src/Dodge/Creature/Damage.hs 22;" f
applyPosition src/Sound.hs 111;" f applyPosition src/Sound.hs 111;" f
@@ -3537,7 +3536,7 @@ blunderbuss src/Dodge/Item/Held/Cone.hs 14;" f
boosterGun src/Dodge/Item/Equipment/Booster.hs 9;" f 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
bounceDir src/Dodge/Bullet.hs 107;" f bounceDir src/Dodge/Bullet.hs 108;" f
bouncePoint src/Dodge/Base/Collide.hs 88;" f bouncePoint src/Dodge/Base/Collide.hs 88;" 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
@@ -3631,6 +3630,7 @@ circleDecoration src/Dodge/Placement/TopDecoration.hs 56;" f
circleSolid src/Picture/Base.hs 164;" f circleSolid src/Picture/Base.hs 164;" f
circleSolidCol src/Picture/Base.hs 168;" f circleSolidCol src/Picture/Base.hs 168;" f
clClSpringVel src/Dodge/Update.hs 762;" f clClSpringVel src/Dodge/Update.hs 762;" f
clColor src/Shader/Poke/Cloud.hs 34;" f
clZoneSize src/Dodge/Zone/Size.hs 3;" f clZoneSize src/Dodge/Zone/Size.hs 3;" f
clZoneSize src/Dodge/Zoning/Cloud.hs 21;" f clZoneSize src/Dodge/Zoning/Cloud.hs 21;" f
clampPath src/Dodge/Room/Procedural.hs 166;" f clampPath src/Dodge/Room/Procedural.hs 166;" f
@@ -3731,7 +3731,7 @@ crAwayFromPost src/Dodge/Creature/Test.hs 81;" f
crBlips src/Dodge/RadarSweep.hs 87;" f crBlips src/Dodge/RadarSweep.hs 87;" f
crCamouflage src/Dodge/Creature/Picture.hs 31;" f crCamouflage src/Dodge/Creature/Picture.hs 31;" f
crCanSeeCr src/Dodge/Creature/Test.hs 50;" f crCanSeeCr src/Dodge/Creature/Test.hs 50;" f
crCrSpring src/Dodge/Update.hs 780;" f crCrSpring src/Dodge/Update.hs 781;" f
crCurrentEquipment src/Dodge/Creature/Statistics.hs 57;" f crCurrentEquipment src/Dodge/Creature/Statistics.hs 57;" f
crDexterity src/Dodge/Creature/Statistics.hs 14;" f crDexterity src/Dodge/Creature/Statistics.hs 14;" f
crDisplayAwareness src/Dodge/Creature/Picture/Awareness.hs 38;" f crDisplayAwareness src/Dodge/Creature/Picture/Awareness.hs 38;" f
@@ -3759,7 +3759,7 @@ crRad src/Dodge/Creature/Radius.hs 7;" f
crSafeDistFromTarg src/Dodge/Creature/Test.hs 71;" f crSafeDistFromTarg src/Dodge/Creature/Test.hs 71;" f
crSetRoots src/Dodge/Inventory/Location.hs 48;" f crSetRoots src/Dodge/Inventory/Location.hs 48;" f
crShape src/Dodge/Creature/Shape.hs 8;" f crShape src/Dodge/Creature/Shape.hs 8;" f
crSpring src/Dodge/Update.hs 775;" f crSpring src/Dodge/Update.hs 776;" f
crStratConMatches src/Dodge/Creature/Test.hs 76;" f crStratConMatches src/Dodge/Creature/Test.hs 76;" f
crStrength src/Dodge/Creature/Statistics.hs 24;" f crStrength src/Dodge/Creature/Statistics.hs 24;" f
crUpdate src/Dodge/Creature/State.hs 62;" f crUpdate src/Dodge/Creature/State.hs 62;" f
@@ -3847,7 +3847,7 @@ damageInCircle src/Dodge/Damage.hs 61;" f
damageMetal src/Dodge/Material/Damage.hs 56;" f damageMetal src/Dodge/Material/Damage.hs 56;" 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 26;" f damageStone src/Dodge/Material/Damage.hs 26;" f
damageThingHit src/Dodge/Bullet.hs 179;" f damageThingHit src/Dodge/Bullet.hs 178;" 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 12;" f damageWallEffect src/Dodge/Wall/DamageEffect.hs 12;" f
@@ -4053,7 +4053,7 @@ doItemTimeScroll src/Dodge/Update.hs 196;" 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 32;" f doMagnetBuBu src/Dodge/Bullet.hs 33;" 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
@@ -4437,6 +4437,7 @@ getArguments' src/Dodge/Update/Scroll.hs 167;" f
getAttachedSFLink src/Dodge/HeldUse.hs 759;" f getAttachedSFLink src/Dodge/HeldUse.hs 759;" f
getAutoSpringLinks src/Dodge/Item/Grammar.hs 121;" f getAutoSpringLinks src/Dodge/Item/Grammar.hs 121;" f
getAvailableListLines src/Dodge/SelectionList.hs 10;" f getAvailableListLines src/Dodge/SelectionList.hs 10;" f
getBulHitDams src/Dodge/Bullet.hs 171;" f
getBulletType src/Dodge/HeldUse.hs 878;" f getBulletType src/Dodge/HeldUse.hs 878;" f
getCloseObj src/Dodge/Update/Input/InGame.hs 515;" f getCloseObj src/Dodge/Update/Input/InGame.hs 515;" f
getCommands src/Dodge/Terminal.hs 117;" f getCommands src/Dodge/Terminal.hs 117;" f
@@ -4572,7 +4573,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 512;" f hit1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 512;" f
hitEffFromBul src/Dodge/Bullet.hs 153;" f hitEffFromBul src/Dodge/Bullet.hs 154;" f
hitS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 468;" f hitS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 468;" f
holdForm src/Dodge/Creature/Boid.hs 137;" f holdForm src/Dodge/Creature/Boid.hs 137;" f
holsterWeapon src/Dodge/Creature/Volition.hs 14;" f holsterWeapon src/Dodge/Creature/Volition.hs 14;" f
@@ -4910,14 +4911,14 @@ makeDefaultCorpse src/Dodge/Corpse/Make.hs 16;" 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 71;" f makeExplosionAt src/Dodge/WorldEvent/Explosion.hs 71;" f
makeFlak src/Dodge/Bullet.hs 142;" f makeFlak src/Dodge/Bullet.hs 143;" f
makeFlame src/Dodge/Flame.hs 43;" f makeFlame src/Dodge/Flame.hs 43;" f
makeFlameExplosionAt src/Dodge/WorldEvent/Explosion.hs 54;" f makeFlameExplosionAt src/Dodge/WorldEvent/Explosion.hs 54;" f
makeFlamelet src/Dodge/EnergyBall.hs 21;" f makeFlamelet src/Dodge/EnergyBall.hs 21;" f
makeFlamerSmokeAt src/Dodge/WorldEvent/Cloud.hs 68;" f makeFlamerSmokeAt src/Dodge/WorldEvent/Cloud.hs 68;" f
makeFlashBall src/Dodge/EnergyBall.hs 84;" f makeFlashBall src/Dodge/EnergyBall.hs 84;" f
makeFragBullets src/Dodge/Bullet.hs 127;" f makeFragBullets src/Dodge/Bullet.hs 128;" f
makeGasCloud src/Dodge/WorldEvent/SpawnParticle.hs 13;" f makeGasCloud src/Dodge/WorldEvent/SpawnParticle.hs 11;" f
makeGrid src/Grid.hs 46;" f makeGrid src/Grid.hs 46;" f
makeIntInterval src/Dodge/Zoning/Base.hs 35;" f makeIntInterval src/Dodge/Zoning/Base.hs 35;" f
makeMovingEB src/Dodge/EnergyBall.hs 74;" f makeMovingEB src/Dodge/EnergyBall.hs 74;" f
@@ -5051,7 +5052,7 @@ mntLightLnkCond src/Dodge/Placement/Instance/LightSource.hs 163;" f
modTo src/Geometry/Zone.hs 10;" f modTo src/Geometry/Zone.hs 10;" f
mouseClickOptionsList src/Dodge/Update/Input/ScreenLayer.hs 60;" f mouseClickOptionsList src/Dodge/Update/Input/ScreenLayer.hs 60;" f
mouseCursorType src/Dodge/Render/Picture.hs 86;" f mouseCursorType src/Dodge/Render/Picture.hs 86;" f
mouseWorldPos' src/Dodge/Base/Coordinate.hs 48;" f mouseWorldPos src/Dodge/Base/Coordinate.hs 48;" f
moveBullet src/Dodge/Bullet.hs 195;" f moveBullet src/Dodge/Bullet.hs 195;" f
moveCombineSel src/Dodge/Update/Scroll.hs 115;" f moveCombineSel src/Dodge/Update/Scroll.hs 115;" f
moveHammerUp src/Dodge/Hammer.hs 5;" f moveHammerUp src/Dodge/Hammer.hs 5;" f
@@ -5286,10 +5287,10 @@ poke34 src/Shader/Poke.hs 506;" f
pokeArrayOff src/Shader/Poke.hs 517;" f pokeArrayOff src/Shader/Poke.hs 517;" f
pokeBox src/Shader/Poke.hs 227;" f pokeBox src/Shader/Poke.hs 227;" f
pokeBoxSurface src/Shader/Poke.hs 262;" f pokeBoxSurface src/Shader/Poke.hs 262;" f
pokeCloud src/Shader/Poke/Cloud.hs 11;" f pokeCloud src/Shader/Poke/Cloud.hs 13;" f
pokeCloudFloat src/Shader/Poke/Cloud.hs 29;" f pokeCloudFloat src/Shader/Poke/Cloud.hs 43;" f
pokeCloudIndex src/Shader/Poke/Cloud.hs 33;" f pokeCloudIndex src/Shader/Poke/Cloud.hs 47;" f
pokeCloudVerx src/Shader/Poke/Cloud.hs 17;" f pokeCloudVerx src/Shader/Poke/Cloud.hs 19;" f
pokeCylinder src/Shader/Poke.hs 172;" f pokeCylinder src/Shader/Poke.hs 172;" f
pokeCylinderCaps src/Shader/Poke.hs 215;" f pokeCylinderCaps src/Shader/Poke.hs 215;" f
pokeF src/Shader/Poke.hs 67;" f pokeF src/Shader/Poke.hs 67;" f
@@ -5634,7 +5635,7 @@ screenBox src/Dodge/Base/Window.hs 53;" f
screenPolygon src/Dodge/Base/Window.hs 17;" f screenPolygon src/Dodge/Base/Window.hs 17;" f
screenPolygonBord src/Dodge/Base/Window.hs 27;" f screenPolygonBord src/Dodge/Base/Window.hs 27;" f
screenPosAbs src/Dodge/ScreenPos.hs 15;" f screenPosAbs src/Dodge/ScreenPos.hs 15;" f
screenToWorldPos src/Dodge/Base/Coordinate.hs 54;" f screenToWorldPos src/Dodge/Base/Coordinate.hs 51;" f
scrollAugInvSel src/Dodge/Inventory.hs 204;" f scrollAugInvSel src/Dodge/Inventory.hs 204;" f
scrollAugNextInSection src/Dodge/Inventory.hs 217;" f scrollAugNextInSection src/Dodge/Inventory.hs 217;" f
scrollCommandStrings src/Dodge/Update/Scroll.hs 162;" f scrollCommandStrings src/Dodge/Update/Scroll.hs 162;" f
@@ -5689,7 +5690,6 @@ setClusterID src/Dodge/Combine/Graph.hs 116;" 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 170;" 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
setInLinksPD src/Dodge/RoomLink.hs 74;" f setInLinksPD src/Dodge/RoomLink.hs 74;" f
@@ -5806,7 +5806,7 @@ shuffleLinks src/Dodge/Room/Link.hs 30;" f
shuffleRoomPos src/Dodge/Layout.hs 78;" f shuffleRoomPos src/Dodge/Layout.hs 78;" f
shuffleTail src/RandomHelp.hs 59;" f shuffleTail src/RandomHelp.hs 59;" f
sigmoid src/Dodge/Base.hs 151;" f sigmoid src/Dodge/Base.hs 151;" f
simpleCrSprings src/Dodge/Update.hs 771;" f simpleCrSprings src/Dodge/Update.hs 772;" f
simpleTermMessage src/Dodge/Terminal.hs 253;" f simpleTermMessage src/Dodge/Terminal.hs 253;" f
sineRaisePitchOneSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 610;" f sineRaisePitchOneSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 610;" f
sineRaisePitchTwoSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 420;" f sineRaisePitchTwoSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 420;" f
@@ -6204,8 +6204,8 @@ updateBarrel src/Dodge/Barreloid.hs 41;" f
updateBarreloid src/Dodge/Barreloid.hs 15;" f updateBarreloid src/Dodge/Barreloid.hs 15;" f
updateBaseWheelEvent src/Dodge/Update/Scroll.hs 29;" f updateBaseWheelEvent src/Dodge/Update/Scroll.hs 29;" f
updateBounds src/Dodge/Update/Camera.hs 250;" f updateBounds src/Dodge/Update/Camera.hs 250;" f
updateBulVel src/Dodge/Bullet.hs 54;" f updateBulVel src/Dodge/Bullet.hs 55;" f
updateBullet src/Dodge/Bullet.hs 19;" f updateBullet src/Dodge/Bullet.hs 20;" f
updateBullets src/Dodge/Update.hs 542;" f updateBullets src/Dodge/Update.hs 542;" f
updateCamera src/Dodge/Update/Camera.hs 29;" f updateCamera src/Dodge/Update/Camera.hs 29;" f
updateCloseObjects src/Dodge/Inventory.hs 116;" f updateCloseObjects src/Dodge/Inventory.hs 116;" f
@@ -6217,7 +6217,7 @@ updateCreature src/Dodge/Creature/Update.hs 13;" f
updateCreatureGroups src/Dodge/Update.hs 514;" f updateCreatureGroups src/Dodge/Update.hs 514;" f
updateCreatureSoundPositions src/Dodge/Update.hs 490;" f updateCreatureSoundPositions src/Dodge/Update.hs 490;" f
updateDebugMessageOffset src/Dodge/Update.hs 94;" f updateDebugMessageOffset src/Dodge/Update.hs 94;" f
updateDelayedEvents src/Dodge/Update.hs 800;" f updateDelayedEvents src/Dodge/Update.hs 801;" f
updateDisplaySections src/Dodge/DisplayInventory.hs 116;" f updateDisplaySections src/Dodge/DisplayInventory.hs 116;" f
updateDistortion src/Dodge/Distortion.hs 5;" f updateDistortion src/Dodge/Distortion.hs 5;" f
updateDistortions src/Dodge/Update.hs 535;" f updateDistortions src/Dodge/Update.hs 535;" f
@@ -6325,7 +6325,7 @@ upperPrismPolyTS src/Shape.hs 120;" f
upperRounded src/Shape.hs 185;" f upperRounded src/Shape.hs 185;" f
useBreakL src/Dodge/Item/Grammar.hs 37;" f useBreakL src/Dodge/Item/Grammar.hs 37;" f
useBreakListsLinkTest src/Dodge/Item/Grammar.hs 45;" f useBreakListsLinkTest src/Dodge/Item/Grammar.hs 45;" f
useBulletPayload src/Dodge/Bullet.hs 112;" f useBulletPayload src/Dodge/Bullet.hs 113;" 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
useDelay src/Dodge/Item/UseDelay.hs 13;" f useDelay src/Dodge/Item/UseDelay.hs 13;" f