Cleanup

src/Dodge/Creature/State.hs

@@ -1,7 +1,6 @@
 module Dodge.Creature.State 
     ( stateUpdate
     , stateUpdateDamage
-    , stateUpdateDamage'
     , doDamage
     , clearDamage
     , invSideEff
@@ -24,7 +23,7 @@ import qualified IntMapHelp as IM
 --import StrictHelp
 
 import qualified Data.IntSet as IS
-import Data.Maybe
+--import Data.Maybe
 import Data.Function
 import Control.Lens
 --import Control.Applicative
@@ -45,34 +44,15 @@ import qualified Data.Vector.Mutable as MV
 -- update shield positions
 stateUpdate :: (Creature -> World -> (World -> World, Creature)) 
     -> Creature -> World -> World
-stateUpdate f cr w = let (fw,mcr) = stateUpdateDamage' doDamage f cr w
-    in fw $ w & creatures . at (_crID cr) .~ mcr
+stateUpdate = stateUpdateDamage doDamage
 
-stateUpdateDamage :: (Creature -> Creature) -> CRUpdate -> CRUpdate
+stateUpdateDamage :: (Creature -> Creature) 
+    -> (Creature -> World -> (World -> World, Creature)) 
+--    -> CRUpdate
+    -> Creature -> World -> World
 stateUpdateDamage damageupdate u cr w = case u (updateMovement cr) w of
-    (f, maybeCr) -> 
-        ( invSideEff (fromMaybe cr maybeCr) . movementSideEff cr . deathEff . f
-        , fmap (stepReloading . damageupdate) $ crOrCorpse =<< maybeCr
-        )
-  where   
-    crOrCorpse cr' 
-        | cr' ^. crHP > 0 = Just cr'
-        | otherwise      = Nothing
-    deathEff 
-        | cr ^.crHP > 0 = id
-        | otherwise = stopSoundFrom (CrWeaponSound (_crID cr) 0) 
-            . over decorations addCorpse 
-            . dropByState cr
-    addCorpse = IM.insertNewKey 
-        $ uncurryV translate (_crOldPos cr) 
-        $ rotate (_crDir cr)
-        (_crCorpse cr)
-stateUpdateDamage' :: (Creature -> Creature) -> CRUpdate' -> CRUpdate
-stateUpdateDamage' damageupdate u cr w = case u (updateMovement cr) w of
-    (f, upcr) -> 
-        ( invSideEff upcr . movementSideEff cr . deathEff . f
-        , stepReloading . damageupdate <$> crOrCorpse upcr
-        )
+    (f, upcr) -> invSideEff upcr . movementSideEff cr . deathEff . f $ w
+        & creatures . at (_crID cr) .~  (stepReloading . damageupdate <$> crOrCorpse upcr)
   where   
     crOrCorpse cr' 
         | cr' ^. crHP > 0 = Just cr'
@@ -88,22 +68,16 @@ stateUpdateDamage' damageupdate u cr w = case u (updateMovement cr) w of
         (_crCorpse cr)
 -- | Drop items according to the creature state.
 dropByState :: Creature -> World -> World
-dropByState cr w = foldr (copyInvItemToFloor cr) w is
-  where
-    is :: [Int]
-    is = case cr ^. crState . crDropsOnDeath of
-        DropAll -> IM.keys $ _crInv cr
-        DropSpecific xs -> xs
-        DropAmount n -> take n $ evalState (shuffle $ IM.keys $ _crInv cr) (_randGen w)
+dropByState cr w = foldr (copyInvItemToFloor cr) w $ case cr ^. crState . crDropsOnDeath of
+    DropAll -> IM.keys $ _crInv cr
+    DropSpecific xs -> xs
+    DropAmount n -> take n $ evalState (shuffle $ IM.keys $ _crInv cr) (_randGen w)
 
 setOldPos :: Creature -> Creature
 setOldPos cr = cr
     & crOldPos .~ _crPos cr
     & crOldDir .~ _crDir cr
 
---meleeCooldown :: CRUpdate -> CRUpdate
---meleeCooldown u cr = u $ cr & crMeleeCooldown . _Just %~ (max 0 . (\x -> x - 1))
-
 clearDamage :: Creature -> Creature
 clearDamage = crState . crDamage .~ []
 
@@ -125,15 +99,15 @@ bpVector = V.fromList $ 0 : [0 .. 18]
 movementSideEff :: Creature -> World -> World
 movementSideEff cr w
     | hasJetPack = case cr ^? crStance . carriage of
-        Just (Boosting v) 
-            -> makeFlameletTimed 
+        Just (Boosting v) -> w
+            & randGen .~ g
+            & makeFlameletTimed 
                         (oldPos +.+ (_crRad cr + 3) *.* unitVectorAtAngle (_crDir cr + pi))
                         20
                         (momentum +.+ 1 *.* rotateV randDir (vInverse v)) 
                         Nothing
                         1
                         20
-                $ set randGen g w
         _   -> w
     | otherwise = footstepSideEffect cr w
   where 
@@ -146,7 +120,6 @@ movementSideEff cr w
     (randDir,g) = randomR (-0.5,0.5) $ _randGen w
     (randAng,_) = randomR (0,2*pi) $ _randGen w
 
-
 heldItemUpdate :: Item -> Item
 heldItemUpdate = invItemUpdate
     . (itUse %~ useupdate)
@@ -220,7 +193,3 @@ isFrictionless cr = case cr ^? crStance . carriage of
     Just (Boosting _) -> True
     Just Floating     -> True
     _                 -> False
-
-    
-
-