Cleanup

src/Dodge/Creature/State.hs

@@ -81,10 +81,11 @@ checkDeath cr w
     removecr
         | _crID cr == 0 = (creatures . ix (_crID cr) . crUpdate .~ const id)
             . (creatures . ix (_crID cr) . crPict .~ const mempty)
-            . (creatures . ix (_crID cr) . crHP   .~ 0) -- hack to get around player creature being killed but left with more than 0 hp
+            . (creatures . ix (_crID cr) . crHP   .~ 0) 
+            -- hack to get around player creature being killed but left with more than 0 hp
         | otherwise  = creatures . at (_crID cr) .~ Nothing
 corpseOrGib :: Creature -> World -> World
-corpseOrGib cr w = case maxDamageType (_crDamage (_crState cr)) of
+corpseOrGib cr w = case maxDamageType (_csDamage (_crState cr)) of
     Just (FLAMING,_) -> w & plNew corpses cpID (thecorpse & cpPict %~ fmap scorchSPic)
     Just (ELECTRICAL,_) -> w & plNew corpses cpID thecorpse
     Just (POISONDAM,_) -> w & plNew corpses cpID (thecorpse & cpPict %~ fmap poisonSPic)
@@ -139,21 +140,21 @@ internalUpdate cr = creatures . ix (_crID cr) %~
 -- | Drop items according to the creature state.
 -- TODO make sure this doesn't mess up any ItemPosition
 dropByState :: Creature -> World -> World
-dropByState cr w = foldr (dropItem cr) w $ case cr ^. crState . crDropsOnDeath of
+dropByState cr w = foldr (dropItem cr) w $ case cr ^. crState . csDropsOnDeath of
     DropAll -> IM.keys $ _crInv cr
     DropSpecific xs -> xs
     DropAmount n -> take n $ evalState (shuffle $ IM.keys $ _crInv cr) (_randGen w)
 
 clearDamage :: Creature -> World -> World
 clearDamage cr w = w
-    & creatures . ix (_crID cr) . crState . crDamage .~ [] 
+    & creatures . ix (_crID cr) . crState . csDamage .~ [] 
 
 doDamage :: Creature -> World -> World
 doDamage cr w = w
     & applyPastDamages cr
     & _crApplyDamage cr dams cr
   where 
-    dams = _crDamage $ _crState cr
+    dams = _csDamage $ _crState cr
 
 -- TODO generalise shake to arbitrary damage amounts
 applyPastDamages :: Creature -> World -> World