Remove unnecessary projectile code
This commit is contained in:
@@ -26,9 +26,8 @@ updateProjectile pj w = foldl' (\w' pu -> upProjectile pu pj w') w (_prjUpdates
|
||||
|
||||
upProjectile :: ProjectileUpdate -> Projectile -> World -> World
|
||||
upProjectile pu pj = case pu of
|
||||
CollisionEffectPU mcontrolid mdetonatorid mscreenid ->
|
||||
CollisionEffectPU mdetonatorid mscreenid ->
|
||||
shellCollisionCheck
|
||||
mcontrolid
|
||||
mdetonatorid
|
||||
mscreenid
|
||||
pj
|
||||
@@ -82,20 +81,17 @@ applyGravityPU pj w
|
||||
|
||||
--shellCollisionCheck :: (Projectile -> World -> World) -> Projectile -> World -> World
|
||||
shellCollisionCheck ::
|
||||
Maybe (NewInt ItmInt) ->
|
||||
Maybe (NewInt ItmInt) ->
|
||||
Maybe (NewInt ItmInt) ->
|
||||
Projectile ->
|
||||
World ->
|
||||
World
|
||||
shellCollisionCheck controlid detid screenid pj w
|
||||
-- | time > 330 && circOnSomeWall oldPos 4 w = g
|
||||
-- | time <= 330 && anythingHitCirc 2 oldPos newPos w = g
|
||||
shellCollisionCheck detid screenid pj w
|
||||
| anythingHitCirc 2 oldPos newPos w = g
|
||||
| time <= 0 = g
|
||||
| otherwise = w
|
||||
where
|
||||
g = explodeShell controlid detid screenid pj w
|
||||
g = explodeShell detid screenid pj w
|
||||
time = _prjTimer pj
|
||||
oldPos = _prjPos pj
|
||||
newPos = oldPos +.+ _prjVel pj
|
||||
@@ -188,27 +184,21 @@ decTimMvVel pj =
|
||||
pjid = _prjID pj
|
||||
|
||||
explodeShell ::
|
||||
Maybe (NewInt ItmInt) ->
|
||||
Maybe (NewInt ItmInt) ->
|
||||
Maybe (NewInt ItmInt) ->
|
||||
Projectile ->
|
||||
World ->
|
||||
World
|
||||
explodeShell controlid mdetid screenid pj w =
|
||||
explodeShell mdetid screenid pj w =
|
||||
w
|
||||
& cWorld . lWorld . projectiles . ix pjid . prjUpdates .~ [DestroyPU screenid 30]
|
||||
-- & cWorld . lWorld . projectiles . ix pjid . prjDraw .~ DrawBlankProjectile
|
||||
& usePayload (_prjPayload pj) (_prjPos pj) (_prjVel pj)
|
||||
& stopSoundFrom (ShellSound pjid)
|
||||
& updatedetonator
|
||||
& updatecontroller
|
||||
where
|
||||
updatedetonator = fromMaybe id $ do
|
||||
detid <- mdetid
|
||||
return $ pointerToItemID detid . itUse . uaParams . apProjectiles %~ delete pjid
|
||||
deleteif (Just x) | x == pjid = Nothing
|
||||
deleteif x = x
|
||||
updatecontroller = fromMaybe id $ do
|
||||
cid <- controlid
|
||||
return $ pointerToItemID cid . itUse . uaParams . apLinkedProjectile %~ deleteif
|
||||
pjid = pj ^. prjID
|
||||
|
||||
Reference in New Issue
Block a user