Gunsmoke as clouds

2021-03-24 03:02:39 +01:00
parent 03587a7906
commit 48e6779503
4 changed files with 53 additions and 72 deletions
@@ -1131,69 +1131,6 @@ rateIncAB startRate fastRate shooteff1 shooteff2 cid w
            reloadCondition = _wpLoadedAmmo item == 0


-withThinSmoke :: (Int -> World -> World) -> Int -> World -> World
-withThinSmoke eff cid w = eff cid $ foldr ($) w smokeGen
-    where
-          cr = _creatures w IM.! cid
-          dir = _crDir cr
-          pos = _crPos cr +.+ ((_crRad cr +0.5) *.* unitVectorAtAngle dir)
-          (vs,_) = runState ((sequence . repeat . randInCirc) 0.4) $ _randGen w
-          (sps,_) = runState ((sequence . repeat . randInCirc) 8) $ _randGen w
-          ts = randomRs (250,1000) $ _randGen w
-          ss = take 3 $ randomRs (10,20) $ _randGen w
-          smokeGen = zipWith4 (\ v s t sp -> makeThinSmokeAt (greyN 0.1) v s t (pos +.+ sp))
-                        vs ss ts sps
-
-withThickSmoke :: (Int -> World -> World) -> Int -> World -> World
-withThickSmoke eff cid w = eff cid $ foldr ($) w smokeGen
-    where
-          cr = _creatures w IM.! cid
-          dir = _crDir cr
-          pos = _crPos cr +.+ ((_crRad cr +0.5) *.* unitVectorAtAngle dir)
-          (vs,_) = runState ((sequence . repeat . randInCirc) 0.4) $ _randGen w
-          (sps,_) = runState ((sequence . repeat . randInCirc) 8) $ _randGen w
-          ts = randomRs (18,20) $ _randGen w
-          ss = take 20 $ randomRs (0.1,1) $ _randGen w
-          smokeGen = zipWith4 (\ v s t sp -> makeColorSmokeAt (greyN 0.1) v s t (pos +.+ sp))
-                        vs ss ts sps
-
-
-makeThinSmokeAt :: Color -> Point2 -> Float -> Int -> Point2 -> World -> World
-makeThinSmokeAt col vel scal time p w = over projectiles (IM.insert n smP) w
-    where n = newProjectileKey w
-          smP = Projectile
-                { _ptPos = p
-                , _ptStartPos = p
-                , _ptVel = vel
-                , _ptPict = onLayer PtLayer $ uncurry translate p $ color col $ circleSolid 1
-                , _ptID = n
-                , _ptUpdate = moveThinSmoke col scal time n
-                }
-
-moveThinSmoke :: Color -> Float -> Int -> Int -> World -> World
-moveThinSmoke col scal time i w
-    | time > 0 
-        = set (projectiles . ix i . ptPict) pic 
-            . set (projectiles . ix i . ptUpdate) (moveThinSmoke col scal (time-1) i)
-            . set (projectiles . ix i . ptPos) newPos
-            . setVel
-            $ w
-    | time > -10 
-        = set (projectiles . ix i . ptPict) pi1 
-            . set (projectiles . ix i . ptUpdate) (moveThinSmoke col scal (time-1) i)
-            . set (projectiles . ix i . ptPos) newPos
-            . setVel
-            $ w
-    | otherwise 
-        = over projectiles (IM.delete i) w
-    where oldPos = _ptPos $ _projectiles w IM.! i
-          newPos = oldPos +.+ (_ptVel $ _projectiles w IM.! i)
-          setVel = over (projectiles . ix i . ptVel) $ (*.*) 0.99
-          pic = onLayer PtLayer $ uncurry translate newPos $ color (withAlpha 0.1 col) $ circleSolid scal
-          pi1 = onLayer PtLayer $ uncurry translate newPos 
-                    $ color (withAlpha (0.1 + fromIntegral time /100) col) 
-                    $ circleSolid $ scal
-
 makeLaserAt :: Float -> Point2 -> Float -> Maybe Int -> Particle'
 makeLaserAt phaseV pos dir mcid = Particle'
    { _ptPict' = blank