Simplify item placement during generation

src/Dodge/Creature/Inanimate.hs

@@ -16,7 +16,7 @@ import Picture
 import qualified Data.IntMap.Strict as IM
 import Control.Lens
 
-defaultInanimate = defaultCreature & crIsAnimate .~ False
+defaultInanimate = defaultCreature & crState . crIsAnimate .~ False
 
 lamp :: Creature
 lamp = defaultInanimate
@@ -72,7 +72,7 @@ explosiveBarrel = defaultInanimate
     , _crState = defaultState {_goals = [[Wait]]
                             ,_faction = ChaseCritters
                             ,_crSpState = Barrel []
-                            ,_crApplyDamage = \_ c -> (id, c)
                             }
     , _crInv = IM.empty -- IM.fromList [(0,frontArmour)]
+    ,_crApplyDamage = \_ c -> (id, c)
     }

src/Dodge/Creature/State.hs

@@ -56,13 +56,6 @@ stateUpdate u w (f,g) cr =
     addCorpse = insertNewKey $ uncurry translate (_crOldPos cr) 
                              $ rotate (_crDir cr)
                              (_crCorpse cr)
---    maybeIt = evalState (maybeTakeOne $ IM.elems (_crInv cr)) (_randGen w)
---    insertIt = case maybeIt of 
---                  Just it -> createItemAt (offset +.+ _crOldPos cr) 
---                                          (FlIt {_flIt=it,_flItPos=(0,0),_flItRot=rot,_flItID=0})
---                  Nothing -> id
---    offset = _crRad cr *.* unitVectorAtAngle rot
---    (rot,_) = randomR (-pi,pi) g
 
 -- | Drop items accoring to the creature state.
 dropByState :: Creature -> World -> World
@@ -93,17 +86,12 @@ copyItemToFloor cr i w = case _crInv cr IM.! i of
             _ -> w
         flid = newKey $ _floorItems w
         theflit = FlIt 
-            {_flIt = set itAmount 1 it
+            {_flIt = it
             ,_flItPos = offset +.+ _crPos cr
             ,_flItRot = rot
             ,_flItID = flid
             }
 
-createItemAt :: Point2 -> FloorItem -> World -> World
-createItemAt p it w = over floorItems (IM.insert i (set flItPos p 
-                                                    $ set flItID i it)) w
-    where i = newKey (_floorItems w)
-
 
 setOldPos :: Creature -> Creature
 setOldPos cr = set crOldPos (_crPos cr) cr
@@ -120,7 +108,7 @@ doDamage cr = set (crState . crDamage) [] $ over (crState . crPastDamage) (+ hpL
                                             damagedCr
     where dams = _crDamage $ _crState cr
           startHP = _crHP cr
-          damagedCr = snd $ (_crApplyDamage (_crState cr)) dams cr
+          damagedCr = snd $ (_crApplyDamage cr) dams cr
           afterHP = _crHP damagedCr
           hpLost = startHP - afterHP  -- note this can be negative 
 
@@ -269,9 +257,10 @@ updateExpBarrel w (f,g) cr
 
 damToExpBarrel :: [DamageType] -> Creature -> Creature
 damToExpBarrel ds cr = foldr damToExpBarrel' (foldr damToExpBarrel' cr pierceDam) otherDam
-    where (pierceDam,otherDam) = partition isPierce ds
-          isPierce (Piercing {}) = True
-          isPierce _             = False
+  where 
+    (pierceDam,otherDam) = partition isPierce ds
+    isPierce (Piercing {}) = True
+    isPierce _             = False
 
 damToExpBarrel' :: DamageType -> Creature -> Creature
 damToExpBarrel' (Piercing amount sp int ep) cr 

src/Dodge/Creature/State/Data.hs

@@ -3,10 +3,22 @@
 module Dodge.Creature.State.Data
   where
 import Geometry
+import Dodge.Data.DamageType
 
 import Control.Lens
 
-data ItemDropType
+data CreatureState = CrSt 
+    { _goals    :: [[Goal]]
+    , _stance  :: Stance
+    , _faction :: Faction
+    , _crDamage  :: [DamageType]
+    , _crPastDamage :: Int
+    , _crSpState :: CrSpState
+    , _crDropsOnDeath :: CreatureDropType
+    , _crIsAnimate  :: Bool
+    }
+
+data CreatureDropType
     = DropAll
     | DropAmount Int
     | DropSpecific [Int]
@@ -89,6 +101,7 @@ data Faction
     | NoFaction
   deriving (Eq,Show)
 
+makeLenses ''CreatureState
 makeLenses ''CrSpState
 makeLenses ''Goal
 makeLenses ''Carriage