From 444be7b49cb2c50ef471e232e1aece44977f6db8 Mon Sep 17 00:00:00 2001 From: justin Date: Tue, 24 Jun 2025 13:28:17 +0100 Subject: [PATCH] Refactor clouds --- src/Dodge/Cloud.hs | 29 +++++++---- src/Dodge/Data/Cloud.hs | 5 +- src/Dodge/Flame.hs | 2 +- src/Dodge/Material/Damage.hs | 15 +++--- src/Dodge/Projectile/Update.hs | 5 +- src/Dodge/Update.hs | 3 +- src/Dodge/Wall/Dust.hs | 10 ++-- src/Dodge/WorldEffect.hs | 2 +- src/Dodge/WorldEvent/Cloud.hs | 69 ++------------------------- src/Dodge/WorldEvent/SpawnParticle.hs | 10 +--- src/Shader/Poke/Cloud.hs | 6 ++- tags | 64 ++++++++++++------------- 12 files changed, 80 insertions(+), 140 deletions(-) diff --git a/src/Dodge/Cloud.hs b/src/Dodge/Cloud.hs index 40a082c2a..f7db36809 100644 --- a/src/Dodge/Cloud.hs +++ b/src/Dodge/Cloud.hs @@ -1,13 +1,24 @@ -module Dodge.Cloud where +module Dodge.Cloud (clAlt) where import Dodge.Data.Cloud -cRad :: Cloud -> Float -cRad cl = case _clType cl of - SmokeCloud -> 0 - FlamerSmokeCloud -> 6 - RocketCloud -> 15 - StoneDust -> 15 - CryoReleaseCloud -> 10 - GasCloud -> 15 +clAlt :: Cloud -> Float +clAlt cl = case _clType cl of + SmokeCloud -> 30 + FlamerSmokeCloud -> 30 + RocketCloud -> 30 + StoneDust -> 1 + DirtDust -> 1 + CryoReleaseCloud -> 50 + GasCloud -> 20 + BloodCloud -> 1 +--clRad :: Cloud -> Float +--clRad cl = case _clType cl of +-- SmokeCloud -> 15 +-- FlamerSmokeCloud -> 6 +-- RocketCloud -> 15 +-- StoneDust -> 15 +-- CryoReleaseCloud -> 10 +-- GasCloud -> 15 +-- BloodCloud -> 10 diff --git a/src/Dodge/Data/Cloud.hs b/src/Dodge/Data/Cloud.hs index 6bfb2be36..5ca04af2c 100644 --- a/src/Dodge/Data/Cloud.hs +++ b/src/Dodge/Data/Cloud.hs @@ -5,7 +5,6 @@ module Dodge.Data.Cloud where -import Color import Control.Lens import Data.Aeson import Data.Aeson.TH @@ -20,7 +19,7 @@ data Cloud = Cloud , _clVel :: Point3 -- , _clPict :: CloudDraw -- , _clRad :: Float - , _clAlt :: Float +-- , _clAlt :: Float , _clTimer :: Int , _clType :: CloudType } @@ -33,6 +32,8 @@ data CloudType | CryoReleaseCloud | GasCloud | StoneDust + | DirtDust + | BloodCloud deriving (Eq, Ord, Show, Read) --Generic, Flat) makeLenses ''Cloud diff --git a/src/Dodge/Flame.hs b/src/Dodge/Flame.hs index 2bff2a2c4..0ccb613f9 100644 --- a/src/Dodge/Flame.hs +++ b/src/Dodge/Flame.hs @@ -18,7 +18,7 @@ import RandomHelp updateFlame :: World -> Flame -> (World, Maybe Flame) updateFlame w pt - | _flTimer pt <= 0 = (makeFlamerSmokeAt (addZ 20 ep) w, Nothing) + | _flTimer pt <= 0 = (makeCloudAt FlamerSmokeCloud 200 (addZ 20 ep) w, Nothing) | Just (_, Right wl) <- thit = (doupdate, Just $ reflame wl) -- might want to move differently if we hit a creature? | otherwise = (flFlicker pt doupdate, Just mvflame) diff --git a/src/Dodge/Material/Damage.hs b/src/Dodge/Material/Damage.hs index af4486632..75513348f 100644 --- a/src/Dodge/Material/Damage.hs +++ b/src/Dodge/Material/Damage.hs @@ -1,6 +1,5 @@ module Dodge.Material.Damage (damMatSideEffect) where -import Color import Control.Lens import Dodge.Data.World import Dodge.SoundLogic @@ -29,10 +28,10 @@ damageStone dm ecw w = Lasering _ p t -> makeSpark FireSpark (outTo p t) (rdir p t) Piercing _ p t -> makeSpark NormalSpark (outTo p t) (rdir p t) - . smokeCloudAt white 200 1 (addZ 20 (outTo p t)) + . makeCloudAt StoneDust 200 (addZ 20 (outTo p t)) . randsound p [slapS, slap1S] - Blunt _ p t -> smokeCloudAt white 200 1 (addZ 20 (outTo p t)) - Shattering _ p t -> smokeCloudAt white 200 1 (addZ 20 (outTo p t)) + Blunt _ p t -> makeCloudAt StoneDust 200 (addZ 20 (outTo p t)) + Shattering _ p t -> makeCloudAt StoneDust 200 (addZ 20 (outTo p t)) Crushing{} -> id Explosive{} -> id Sparking{} -> id @@ -101,7 +100,7 @@ damageFlesh dm _ w = w & case dm of , bloodShort7S , bloodShort8S ] - . smokeCloudAt red 200 1 (addZ 20 (outTo p t)) + . makeCloudAt BloodCloud 50 (addZ 20 (outTo p t)) Blunt _ p _ -> randsound p [hitS] Shattering _ _ _ -> id Crushing{} -> id @@ -124,10 +123,10 @@ damageDirt dm ecw w = w & case dm of Lasering _ p t -> makeSpark FireSpark (outTo p t) (rdir p t) Piercing _ p t -> - smokeCloudAt orange 200 1 (addZ 20 (outTo p t)) + makeCloudAt DirtDust 200 (addZ 20 (outTo p t)) . randsound p [slapS, slap1S] - Blunt _ p t -> smokeCloudAt orange 200 1 (addZ 20 (outTo p t)) - Shattering _ p t -> smokeCloudAt orange 200 1 (addZ 20 (outTo p t)) + Blunt _ p t -> makeCloudAt DirtDust 200 (addZ 20 (outTo p t)) + Shattering _ p t -> makeCloudAt DirtDust 200 (addZ 20 (outTo p t)) Crushing{} -> id Explosive{} -> id Sparking{} -> id diff --git a/src/Dodge/Projectile/Update.hs b/src/Dodge/Projectile/Update.hs index b3373c335..314afca73 100644 --- a/src/Dodge/Projectile/Update.hs +++ b/src/Dodge/Projectile/Update.hs @@ -154,16 +154,15 @@ doThrust pj smoke w = & soundContinue (ShellSound i) newPos missileLaunchS (Just 1) -- & makeFlamelet (oldPos -.- vel) (vel + 2 * rotateV (pi + sparkD) accel) 3 10 & makeFlamelet (oldPos -.- vel) (vel +.+ rotateV (pi + sparkD) accel) 3 10 - & shellTrailCloud + & makeCloudAt RocketCloud lifetime - trailfadetime (addZ 20 (oldPos +.+ r1 +.+ 30 *.* normalizeV (oldPos -.- newPos))) where lifetime = fst . randomR lt $ _randGen w lt | smoke == Just ReducedRocketSmoke = (50, 200) | otherwise = (300, 500) - trailfadetime = fst . randomR (100, 300) $ _randGen w +-- trailfadetime = fst . randomR (100, 300) $ _randGen w accel = rotateV (pj ^. pjDir) (V2 3 0) i = _pjID pj oldPos = _pjPos pj diff --git a/src/Dodge/Update.hs b/src/Dodge/Update.hs index d029fd225..c5faec93d 100644 --- a/src/Dodge/Update.hs +++ b/src/Dodge/Update.hs @@ -7,6 +7,7 @@ Description : Simulation update -} module Dodge.Update (updateUniverse) where +import Dodge.Cloud import Dodge.Creature.Radius import Dodge.Creature.Mass import Dodge.Damage @@ -748,7 +749,7 @@ updateCloud w c where newVel@(V3 _ _ nvz) = (0.95 *.*.* springVels) +.+.+ V3 0 0 (0.001 * vertVel) newVel2 = stripZ newVel - vertVel = _clAlt c - opz + vertVel = clAlt c - opz springVels = foldl' (clClSpringVel c) (_clVel c) (clsNearPoint oldPos2 w) oldPos@(V3 _ _ opz) = _clPos c oldPos2 = stripZ oldPos diff --git a/src/Dodge/Wall/Dust.hs b/src/Dodge/Wall/Dust.hs index c0713897c..2d0031574 100644 --- a/src/Dodge/Wall/Dust.hs +++ b/src/Dodge/Wall/Dust.hs @@ -8,17 +8,17 @@ import Geometry import RandomHelp wlDustAt :: Wall -> Point2 -> World -> World -wlDustAt wl = smokeCloudAt dustcol 200 1 . addZ 20 - where - dustcol = _wlColor wl & _4 .~ 1 +wlDustAt _ = makeCloudAt StoneDust 200 . addZ 20 +-- where +-- dustcol = _wlColor wl & _4 .~ 1 muchWlDustAt :: Wall -> Point2 -> World -> World muchWlDustAt wl p = flip (foldl' f) [10, 20 .. 100] where f w h = w - & smokeCloudAt dustcol 200 1 (addZ h (p +.+ off)) + & makeCloudAt StoneDust 200 (addZ h (p +.+ off)) & randGen .~ g where (off, g) = runState (randInCirc 1) (_randGen w) - dustcol = _wlColor wl & _4 .~ 1 +-- dustcol = _wlColor wl & _4 .~ 1 diff --git a/src/Dodge/WorldEffect.hs b/src/Dodge/WorldEffect.hs index b0dfcde6c..42fe72385 100644 --- a/src/Dodge/WorldEffect.hs +++ b/src/Dodge/WorldEffect.hs @@ -34,7 +34,7 @@ doWdWd we = case we of AccessTerminal mtmid -> accessTerminal mtmid WorldEffects wes -> \w -> foldr doWdWd w wes UnlockInv -> unlockInv - MakeStartCloudAt p -> makeStartCloudAt p + MakeStartCloudAt p -> makeCloudAt CryoReleaseCloud 400 p TorqueCr x cid -> torqueCr x cid SoundStart so p sid mi -> soundStart so p sid mi WdWdNegateTrig trid -> cWorld . lWorld . triggers . ix trid %~ not diff --git a/src/Dodge/WorldEvent/Cloud.hs b/src/Dodge/WorldEvent/Cloud.hs index ed6899a60..1fb8fbeba 100644 --- a/src/Dodge/WorldEvent/Cloud.hs +++ b/src/Dodge/WorldEvent/Cloud.hs @@ -1,76 +1,15 @@ -module Dodge.WorldEvent.Cloud ( - makeFlamerSmokeAt, - smokeCloudAt, --- makeThinSmokeAt, --- makeThickSmokeAt, - shellTrailCloud, - spawnSmokeAtCursor, - makeStartCloudAt, -) where +module Dodge.WorldEvent.Cloud (makeCloudAt) where -import Dodge.Base import Dodge.Data.World import Geometry.Data import LensHelp -import Picture ---import System.Random -makeCloudAt :: --- CloudDraw -> --- -- | radius --- Float -> - -- | timer - Int -> - -- | resting altitude - Float -> - Point3 -> -- start position - World -> - World -makeCloudAt t alt p = +makeCloudAt :: CloudType -> Int -> Point3 -> World -> World +makeCloudAt ct t p = cWorld . lWorld . clouds .:~ Cloud { _clPos = p , _clVel = V3 0 0 0 --- , _clPict = drawFunc --- , _clRad = rad - , _clAlt = alt , _clTimer = t - , _clType = SmokeCloud + , _clType = ct } - -smokeCloudAt :: - Color -> - -- | radius --- Float -> - -- | timer - Int -> - -- | resting altitude - Float -> - Point3 -> -- start position - World -> - World -smokeCloudAt col = makeCloudAt - ---makeThickSmokeAt :: Point3 -> World -> World ---makeThickSmokeAt = makeCloudAt 50 30 --- ---makeThinSmokeAt :: Point3 -> World -> World ---makeThinSmokeAt = makeCloudAt 400 50 - -makeStartCloudAt :: Point3 -> World -> World ---makeStartCloudAt = makeCloudAt (CloudColor 2 800 white) 10 400 5 ---makeStartCloudAt = makeCloudAt (CloudColor 2 200 white) 10 400 50 -makeStartCloudAt = makeCloudAt 400 50 - -shellTrailCloud :: Int -> Float -> Point3 -> World -> World -shellTrailCloud age fadet = makeCloudAt age 30 - -makeFlamerSmokeAt :: Point3 -> World -> World -makeFlamerSmokeAt p w = makeCloudAt 200 40 p w --- where --- x = fst $ randomR (0.5, 0.8) (_randGen w) - -spawnSmokeAtCursor :: World -> World -spawnSmokeAtCursor w = shellTrailCloud 400 100 (V3 x y 20) w - where - V2 x y = mouseWorldPos (w ^. input) (w ^. wCam) diff --git a/src/Dodge/WorldEvent/SpawnParticle.hs b/src/Dodge/WorldEvent/SpawnParticle.hs index 409ef015a..c38f44c5e 100644 --- a/src/Dodge/WorldEvent/SpawnParticle.hs +++ b/src/Dodge/WorldEvent/SpawnParticle.hs @@ -15,22 +15,14 @@ makeGasCloud :: Point2 -> World -> World -makeGasCloud pos vel w = - w - & cWorld . lWorld . clouds .:~ theCloud +makeGasCloud pos vel = cWorld . lWorld . clouds .:~ theCloud where - -- & randGen .~ g - theCloud = Cloud { _clPos = addZ 20 pos , _clVel = addZ 0 vel --- , _clPict = CloudColor 50 -- (withAlpha 0.5 col) - , _clAlt = 25 , _clTimer = 400 , _clType = GasCloud } --- (col, g) = runState (takeOne [green, yellow]) $ _randGen w - {- Attach poison cloud damage to creatures near cloud. -} diff --git a/src/Shader/Poke/Cloud.hs b/src/Shader/Poke/Cloud.hs index 0e40dd654..28a999ab1 100644 --- a/src/Shader/Poke/Cloud.hs +++ b/src/Shader/Poke/Cloud.hs @@ -34,11 +34,13 @@ pokeCloudVerx ptr cl nv i (dx, dy) = clColor :: CloudType -> Color clColor = \case SmokeCloud -> white - FlamerSmokeCloud -> black + FlamerSmokeCloud -> greyN 0.7 RocketCloud -> greyN 0.5 - CryoReleaseCloud -> blue + CryoReleaseCloud -> mixColorsFrac blue cyan 0.5 GasCloud -> green StoneDust -> white + DirtDust -> dark orange + BloodCloud -> red pokeCloudFloat :: Ptr Float -> Int -> Int -> Float -> IO () {-# INLINE pokeCloudFloat #-} diff --git a/tags b/tags index 9eab5c8e3..0a08ae4d0 100644 --- a/tags +++ b/tags @@ -197,6 +197,7 @@ BlockDraws src/Dodge/Data/Block.hs 41;" C BlockObstacle src/Dodge/Data/PathGraph.hs 49;" C BlockPart src/Dodge/Data/Wall/Structure.hs 16;" C BlockedLink src/Dodge/Data/Room.hs 48;" C +BloodCloud src/Dodge/Data/Cloud.hs 36;" C BloomLayer src/Picture/Data.hs 25;" C BloomNoZWrite src/Picture/Data.hs 26;" C Blunt src/Dodge/Data/Damage.hs 21;" C @@ -311,16 +312,16 @@ Clock src/Dodge/Clock.hs 1;" m CloseToMelee src/Dodge/Data/ActionPlan.hs 187;" C CloseToggle src/Dodge/Data/Machine/Sensor.hs 44;" t Close_shape_culling src/Dodge/Data/Config.hs 79;" C -Cloud src/Dodge/Data/Cloud.hs 18;" t +Cloud src/Dodge/Data/Cloud.hs 17;" t Cloud src/Dodge/Cloud.hs 1;" m Cloud src/Dodge/Data/Cloud.hs 6;" m Cloud src/Dodge/Update/Cloud.hs 1;" m Cloud src/Dodge/WorldEvent/Cloud.hs 1;" m Cloud src/Dodge/Zoning/Cloud.hs 1;" m Cloud src/Shader/Poke/Cloud.hs 3;" m -CloudColor src/Dodge/Data/Cloud.hs 15;" C -CloudDraw src/Dodge/Data/Cloud.hs 14;" t -CloudType src/Dodge/Data/Cloud.hs 29;" t +CloudColor src/Dodge/Data/Cloud.hs 14;" C +CloudDraw src/Dodge/Data/Cloud.hs 13;" t +CloudType src/Dodge/Data/Cloud.hs 28;" t ClusterLink src/Dodge/Data/RoomCluster.hs 14;" t ClusterStatus src/Dodge/Data/RoomCluster.hs 9;" t Cognizant src/Dodge/Data/Creature/Perception.hs 67;" C @@ -433,7 +434,7 @@ CreaturePart src/Dodge/Data/Wall/Structure.hs 17;" C CreatureShape src/Dodge/Data/Creature/Misc.hs 76;" t CreatureType src/Dodge/Data/Creature/Misc.hs 60;" t Crushing src/Dodge/Data/Damage.hs 23;" C -CryoReleaseCloud src/Dodge/Data/Cloud.hs 33;" C +CryoReleaseCloud src/Dodge/Data/Cloud.hs 32;" C CryostatisSS src/Dodge/Data/Scenario.hs 91;" C Crystal src/Dodge/Data/Material.hs 11;" C Cull_more_lights src/Dodge/Data/Config.hs 78;" C @@ -509,6 +510,7 @@ DestroyBullet src/Dodge/Data/Bullet.hs 31;" C DestroyItem src/Dodge/Data/Scenario.hs 7;" C Detector src/Dodge/Data/Item/Combine.hs 182;" t Dirt src/Dodge/Data/Material.hs 11;" C +DirtDust src/Dodge/Data/Cloud.hs 35;" C DisasterType src/Dodge/Data/Scenario.hs 24;" t Display src/Dodge/Item/Display.hs 3;" m DisplayInventory src/Dodge/Data/HUD.hs 19;" C @@ -591,7 +593,7 @@ Dungeon src/Dodge/Data/Scenario.hs 66;" C Dust src/Dodge/Wall/Dust.hs 1;" m EBO src/Shader/Data.hs 88;" t EBSound src/Dodge/Data/SoundOrigin.hs 39;" C -ECW src/Dodge/Material/Damage.hs 12;" t +ECW src/Dodge/Material/Damage.hs 11;" t EDoNothing src/Dodge/Data/Item/HeldUse.hs 20;" C EHeadLamp src/Dodge/Data/Item/HeldUse.hs 23;" C ELEPHANTGUN src/Dodge/Data/Item/Combine.hs 157;" C @@ -688,7 +690,7 @@ FlameBeamCombine src/Dodge/Data/Beam.hs 39;" C FlameSound src/Dodge/Data/SoundOrigin.hs 27;" C FlameletBall src/Dodge/Data/EnergyBall/Type.hs 14;" C Flamer src/Dodge/Data/SoundOrigin.hs 25;" C -FlamerSmokeCloud src/Dodge/Data/Cloud.hs 31;" C +FlamerSmokeCloud src/Dodge/Data/Cloud.hs 30;" C Flaming src/Dodge/Data/Damage.hs 25;" C Flank src/Dodge/Data/ActionPlan.hs 177;" C FlareType src/Dodge/Data/Muzzle.hs 21;" t @@ -759,7 +761,7 @@ GameRoom src/Dodge/GameRoom.hs 15;" t GameRoom src/Dodge/GameRoom.hs 8;" m Gas src/Dodge/Gas.hs 1;" m GasAmmo src/Dodge/Data/AmmoType.hs 11;" C -GasCloud src/Dodge/Data/Cloud.hs 34;" C +GasCloud src/Dodge/Data/Cloud.hs 33;" C GasCreate src/Dodge/Data/Item/Use/Consumption/Ammo.hs 17;" t GasFuel src/Dodge/Data/Item/Use/Consumption/Ammo.hs 14;" t GasParams src/Dodge/Data/Item/Use.hs 56;" C @@ -1656,7 +1658,7 @@ RightForward src/Dodge/Data/Creature/Stance.hs 33;" C RightwardLDT src/Dodge/Data/DoubleTree.hs 58;" C RoadBlock src/Dodge/Room/RoadBlock.hs 2;" m Rocket src/Dodge/Data/Projectile.hs 43;" C -RocketCloud src/Dodge/Data/Cloud.hs 32;" C +RocketCloud src/Dodge/Data/Cloud.hs 31;" C RocketHoming src/Dodge/Data/Projectile.hs 50;" t RocketSmoke src/Dodge/Data/Projectile.hs 63;" t Rod src/Dodge/Item/Held/Rod.hs 1;" m @@ -1813,7 +1815,7 @@ SizeInvariant src/Dodge/Picture/SizeInvariant.hs 1;" m SkiffBaySS src/Dodge/Data/Scenario.hs 108;" C SleepingQuatersSS src/Dodge/Data/Scenario.hs 90;" C Small src/Shape/Data.hs 31;" C -SmokeCloud src/Dodge/Data/Cloud.hs 30;" C +SmokeCloud src/Dodge/Data/Cloud.hs 29;" C SmokeReducerLink src/Dodge/Data/ComposedItem.hs 27;" C SmokeReducerSF src/Dodge/Data/ComposedItem.hs 54;" C SmoothScroll src/Dodge/SmoothScroll.hs 1;" m @@ -1875,7 +1877,7 @@ Statistics src/Dodge/Creature/Statistics.hs 2;" m StayInArea src/Dodge/Data/Scenario.hs 13;" C Stick src/Dodge/Item/Held/Stick.hs 1;" m Stone src/Dodge/Data/Material.hs 11;" C -StoneDust src/Dodge/Data/Cloud.hs 35;" C +StoneDust src/Dodge/Data/Cloud.hs 34;" C StorageSS src/Dodge/Data/Scenario.hs 94;" C Story src/Dodge/Story.hs 1;" m Strategy src/Dodge/Data/ActionPlan.hs 176;" t @@ -2368,12 +2370,10 @@ _ciItem src/Dodge/Data/Combine.hs 7;" f _ciSections src/Dodge/Data/HUD.hs 37;" f _ciSelection src/Dodge/Data/HUD.hs 38;" f _cigType src/Dodge/Data/Camera.hs 19;" f -_clAlt src/Dodge/Data/Cloud.hs 23;" f -_clPict src/Dodge/Data/Cloud.hs 21;" f -_clPos src/Dodge/Data/Cloud.hs 19;" f -_clTimer src/Dodge/Data/Cloud.hs 24;" f -_clType src/Dodge/Data/Cloud.hs 25;" f -_clVel src/Dodge/Data/Cloud.hs 20;" f +_clPos src/Dodge/Data/Cloud.hs 18;" f +_clTimer src/Dodge/Data/Cloud.hs 23;" f +_clType src/Dodge/Data/Cloud.hs 24;" f +_clVel src/Dodge/Data/Cloud.hs 19;" f _clZoning src/Dodge/Data/World.hs 48;" f _cldtCloseLeft src/Dodge/Data/DoubleTree.hs 52;" f _cldtCloseLeft src/Dodge/Data/DoubleTree.hs 61;" f @@ -3564,7 +3564,6 @@ bulletWeapons src/Dodge/Combine/Combinations.hs 248;" f burstRifle src/Dodge/Item/Held/Cane.hs 45;" f buzzS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 626;" f cFilledRect src/Dodge/CharacterEnums.hs 6;" f -cRad src/Dodge/Cloud.hs 5;" f cWireRect src/Dodge/CharacterEnums.hs 10;" f calcSmoothScroll src/Dodge/SmoothScroll.hs 11;" f calcTexCoord src/Tile.hs 19;" f @@ -3629,6 +3628,7 @@ circle src/Picture/Base.hs 180;" f circleDecoration src/Dodge/Placement/TopDecoration.hs 56;" f circleSolid src/Picture/Base.hs 164;" f circleSolidCol src/Picture/Base.hs 168;" f +clAlt src/Dodge/Cloud.hs 5;" f clClSpringVel src/Dodge/Update.hs 762;" f clColor src/Shader/Poke/Cloud.hs 34;" f clZoneSize src/Dodge/Zone/Size.hs 3;" f @@ -3831,7 +3831,7 @@ cylinderOnSeg src/Geometry.hs 122;" f cylinderPoly src/Shape.hs 87;" f cylinderRoundIndices src/Shader/Poke.hs 389;" f dShadCol src/Dodge/Render/List.hs 215;" f -damMatSideEffect src/Dodge/Material/Damage.hs 14;" f +damMatSideEffect src/Dodge/Material/Damage.hs 13;" f damThingHitWith src/Dodge/Damage.hs 72;" f damToExpBarrel src/Dodge/Barreloid.hs 49;" f damageCircle src/Dodge/DamageCircle.hs 12;" f @@ -3840,13 +3840,13 @@ damageCrCircle src/Dodge/DamageCircle.hs 33;" f damageCrWl src/Dodge/Damage.hs 29;" f damageCrWlID src/Dodge/Damage.hs 23;" f damageDirection src/Dodge/Damage.hs 35;" f -damageDirt src/Dodge/Material/Damage.hs 122;" f -damageFlesh src/Dodge/Material/Damage.hs 89;" f +damageDirt src/Dodge/Material/Damage.hs 121;" f +damageFlesh src/Dodge/Material/Damage.hs 88;" f damageHP src/Dodge/Creature/Damage.hs 33;" f damageInCircle src/Dodge/Damage.hs 61;" f -damageMetal src/Dodge/Material/Damage.hs 56;" f +damageMetal src/Dodge/Material/Damage.hs 55;" f damageSensor src/Dodge/Placement/Instance/Sensor.hs 15;" f -damageStone src/Dodge/Material/Damage.hs 26;" f +damageStone src/Dodge/Material/Damage.hs 25;" f damageThingHit src/Dodge/Bullet.hs 178;" f damageTypeThreshold src/Dodge/Placement/Instance/Sensor.hs 45;" f damageWall src/Dodge/Wall/Damage.hs 15;" f @@ -3891,7 +3891,7 @@ dedaS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 602;" f dededaS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 404;" f dededumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 558;" f dedumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 396;" f -defDamageMaterial src/Dodge/Material/Damage.hs 23;" f +defDamageMaterial src/Dodge/Material/Damage.hs 22;" f defLSPic src/Dodge/LightSource/Draw.hs 10;" f defSPic src/Dodge/Item/Draw/SPic.hs 299;" f defaultAimMvType src/Dodge/Creature/MoveType.hs 16;" f @@ -4899,7 +4899,7 @@ makeBullet src/Dodge/HeldUse.hs 1004;" f makeBullet' src/Dodge/HeldUse.hs 946;" f makeButton src/Dodge/LevelGen/Switch.hs 16;" f makeByteStringShaderUsingVAO src/Shader/Compile.hs 128;" f -makeCloudAt src/Dodge/WorldEvent/Cloud.hs 18;" f +makeCloudAt src/Dodge/WorldEvent/Cloud.hs 16;" f makeColorTermLine src/Dodge/Terminal.hs 129;" f makeColorTermPara src/Dodge/Terminal.hs 126;" f makeCorpse src/Dodge/Corpse/Make.hs 13;" f @@ -4915,7 +4915,7 @@ makeFlak src/Dodge/Bullet.hs 143;" f makeFlame src/Dodge/Flame.hs 43;" f makeFlameExplosionAt src/Dodge/WorldEvent/Explosion.hs 54;" f makeFlamelet src/Dodge/EnergyBall.hs 21;" f -makeFlamerSmokeAt src/Dodge/WorldEvent/Cloud.hs 68;" f +makeFlamerSmokeAt src/Dodge/WorldEvent/Cloud.hs 29;" f makeFlashBall src/Dodge/EnergyBall.hs 84;" f makeFragBullets src/Dodge/Bullet.hs 128;" f makeGasCloud src/Dodge/WorldEvent/SpawnParticle.hs 11;" f @@ -4938,7 +4938,6 @@ makeShockwaveAt src/Dodge/WorldEvent/Shockwave.hs 12;" f makeShrapnelAt src/Dodge/Payload.hs 24;" f makeSourcedShader src/Shader/Compile.hs 167;" f makeSpark src/Dodge/Spark.hs 45;" f -makeStartCloudAt src/Dodge/WorldEvent/Cloud.hs 60;" f makeSubmenuOption src/Dodge/Menu/OptionType.hs 19;" f makeSwitch src/Dodge/LevelGen/Switch.hs 52;" f makeSwitchSPic src/Dodge/LevelGen/Switch.hs 40;" f @@ -4948,8 +4947,6 @@ makeTeslaArc src/Dodge/Tesla.hs 29;" f makeTeslaArc src/Dodge/Tesla/Arc.hs 65;" f makeTeslaBallAt src/Dodge/Tesla/Ball.hs 6;" f makeTeslaExplosionAt src/Dodge/WorldEvent/Explosion.hs 38;" f -makeThickSmokeAt src/Dodge/WorldEvent/Cloud.hs 54;" f -makeThinSmokeAt src/Dodge/WorldEvent/Cloud.hs 57;" f makeTileFromPoly src/Tile.hs 34;" f makeTypeCraft src/Dodge/Item/Craftable.hs 18;" f makeTypeCraftNum src/Dodge/Item/Craftable.hs 12;" f @@ -5288,8 +5285,8 @@ pokeArrayOff src/Shader/Poke.hs 517;" f pokeBox src/Shader/Poke.hs 227;" f pokeBoxSurface src/Shader/Poke.hs 262;" f pokeCloud src/Shader/Poke/Cloud.hs 13;" f -pokeCloudFloat src/Shader/Poke/Cloud.hs 43;" f -pokeCloudIndex src/Shader/Poke/Cloud.hs 47;" f +pokeCloudFloat src/Shader/Poke/Cloud.hs 45;" f +pokeCloudIndex src/Shader/Poke/Cloud.hs 49;" f pokeCloudVerx src/Shader/Poke/Cloud.hs 19;" f pokeCylinder src/Shader/Poke.hs 172;" f pokeCylinderCaps src/Shader/Poke.hs 215;" f @@ -5749,7 +5746,7 @@ shellCollisionCheck src/Dodge/Projectile/Update.hs 85;" f shellMag src/Dodge/Item/Ammo.hs 48;" f shellModule src/Dodge/Item/Scope.hs 123;" f shellShape src/Dodge/Projectile/Draw.hs 34;" f -shellTrailCloud src/Dodge/WorldEvent/Cloud.hs 65;" f +shellTrailCloud src/Dodge/WorldEvent/Cloud.hs 26;" f shieldWall' src/Dodge/Item/BackgroundEffect.hs 74;" f shiftByV2 src/Dodge/PlacementSpot.hs 239;" f shiftChildren src/Dodge/Tree/Compose.hs 43;" f @@ -5836,7 +5833,6 @@ smallGlass4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 414;" f smallPillar src/Dodge/Room/Pillar.hs 37;" f smallRoom src/Dodge/Room/RunPast.hs 31;" f smg src/Dodge/Item/Held/Stick.hs 61;" f -smokeCloudAt src/Dodge/WorldEvent/Cloud.hs 41;" f smokeReducer src/Dodge/Item/Scope.hs 162;" f sndV2 src/Geometry/Data.hs 52;" f sniperRifle src/Dodge/Item/Held/Rod.hs 44;" f @@ -5871,7 +5867,7 @@ sparkToDamage src/Dodge/Spark.hs 39;" f spawnCrNextTo src/Dodge/Item/Weapon/Spawn.hs 20;" f spawnElectricalSparks src/Dodge/PosEvent.hs 19;" f spawnGun src/Dodge/Item/Weapon/Spawn.hs 12;" f -spawnSmokeAtCursor src/Dodge/WorldEvent/Cloud.hs 73;" f +spawnSmokeAtCursor src/Dodge/WorldEvent/Cloud.hs 34;" f spawnerCrit src/Dodge/Creature.hs 57;" f spawnerRoom src/Dodge/Room/Room.hs 360;" f speedLegs src/Dodge/Item/Equipment.hs 90;" f