Separate out ammo data

2022-07-20 15:01:01 +01:00
parent 8142899be1
commit 2755a4ffdd
14 changed files with 242 additions and 262 deletions
@@ -1,69 +1,3 @@
 module Dodge.Projectile where
-import Dodge.Data
+--import Dodge.Data

-createProjectile :: ProjectileCreate -> Item -> Creature -> World -> World 
-createProjectile pt = case pt of
-    CreateShell -> undefined
--
--fireShell :: Item -> Creature -> World -> World
--fireShell it cr = makeShell it cr $ \pj -> pjEffAtTime 35 (trySpinByCID (_crID cr) spinamount) pj 
--    . pjThrust thrustdelay pj 
--    . reduceSpinBy (1-fromIntegral spindrag*2 / 200) pj 
--    . decTimMvVel pj 
--    . moveShell pj
--  where 
--    params = _itParams it
--    spindrag = _shellSpinDrag params
--    spinamount = _shellSpinAmount params
--    thrustdelay = _shellThrustDelay params
--
--makeShell :: Item -> Creature -> (Projectile -> World -> World) -> World -> World
--makeShell it cr theupdate w = w & props %~ IM.insert i Shell 
--    { _prPos = pos
--    , _pjZ   = 20
--    , _pjStartPos = pos
--    , _pjVel = rotateV dir (V2 1 0)
--    , _pjID = i
--    , _pjUpdate = theupdate
--    , _pjAcc = rotateV dir (V2 3 0)
--    , _pjDir = dir
--    , _pjSpin = 0
--    , _pjPayload = _amPayload $ _laAmmoType am
--    , _pjTimer = 50
--    }
--  where
--    i = IM.newKey $ _props w
--    dir = _crDir cr
--    pos = _crPos cr +.+ rotateV dir (V2 (_crRad cr + 1) 0)
--    am = _itConsumption it
--
--moveShell :: Prop   -- ^ Projectile id
--    -> World 
--    -> World
--moveShell pj w 
--    | time > 40 = if circOnSomeWall oldPos 4 w
--        then doExplode
--        else w
--    | anythingHitCirc 2 oldPos newPos w = doExplode
--    | time > -300 = w
--    | otherwise = doExplode
--  where 
--    time = _pjTimer pj
--    doExplode = w
--        & usePayload (_pjPayload pj) oldPos 
--        & stopSoundFrom (ShellSound i)
--        & props %~ IM.delete i
--    i = _pjID pj
--    oldPos   = _prPos pj
--    vel      = _pjVel pj
--    newPos   = oldPos +.+ vel
--
--usePjCreation :: Item -> Creature -> World -> World
--usePjCreation it = createProjectile (_amPjCreation (_laAmmoType (_itConsumption it))) it
--
--usePjCreationX :: Int -> Item -> Creature -> World -> World
--usePjCreationX i it cr = foldr f 
--    (_amPjCreation (_laAmmoType (_itConsumption it)) it cr)
--    [1..i-1]
--  where
--    f n = (. _amPjCreation (_laAmmoType (_itConsumption it)) it (cr & crDir +~ (2*pi*fromIntegral n / fromIntegral i)))