Data-ify creature drawing (partially)

src/Dodge/Creature.hs

@@ -59,15 +59,13 @@ spawnerCrit :: Creature
 spawnerCrit = defaultCreature
     { --_crUpdate = stateUpdate $ spawnerAI chaseCrit
      _crHP = 300
-    , _crPict = basicCrPict
     , _crInv = IM.empty -- IM.fromList [(0,frontArmour)]
     }
-    & crSkin . skinUpper .~ light4 blue
+    & crType . skinUpper .~ light4 blue
 
 miniGunCrit :: Creature
 miniGunCrit = defaultCreature
-    { _crPict = basicCrPict
-    , _crUpdate = defaultImpulsive [sentinelFireType (const shootTillEmpty)]
+    { _crUpdate = defaultImpulsive [sentinelFireType (const shootTillEmpty)]
 --    , _crInv = IM.fromList [(0,autoRifle & itConsumption . ammoLoaded .~ 1000)]
     , _crInv = IM.fromList [(0,miniGunX 3)]
 --    , _crInv = IM.fromList [(0,autoRifle)]
@@ -76,12 +74,10 @@ miniGunCrit = defaultCreature
     , _crHP = 500
     , _crMvType = defaultAimMvType
     }
-    & crSkin . skinUpper .~ light4 red
+    & crType . skinUpper .~ light4 red
 longCrit :: Creature
 longCrit = defaultCreature
-    { _crPict = basicCrPict
---    , _crUpdate = stateUpdate sniperAI
-    , _crUpdate = defaultImpulsive [sentinelFireType $ const shootTillEmpty]
+    { _crUpdate = defaultImpulsive [sentinelFireType $ const shootTillEmpty]
     , _crActionPlan = ActionPlan
         { _apImpulse    = []
         , _apAction     = []
@@ -92,12 +88,10 @@ longCrit = defaultCreature
     , _crRad = 10
     , _crHP = 150
     }
-    & crSkin . skinUpper .~ light4 red
+    & crType . skinUpper .~ light4 red
 multGunCrit :: Creature
 multGunCrit = defaultCreature
-    { _crPict = basicCrPict
---    , _crUpdate = stateUpdate (twitchMissAI 300 350)
-    , _crInv = IM.fromList [(0,volleyGun 4),(1,medkit 100)]
+    { _crInv = IM.fromList [(0,volleyGun 4),(1,medkit 100)]
     , _crRad = 10
     , _crHP = 300
     , _crUpdate = defaultImpulsive [sentinelExtraWatchUpdate
@@ -115,7 +109,7 @@ multGunCrit = defaultCreature
             ]
         ]
     }
-    & crSkin . skinUpper .~ light4 red
+    & crType . skinUpper .~ light4 red
   where
     drawwp = DoActionIfElse NoAction (const crIsAiming) (DoActionThen drawWeapon (WaitThen 50 NoAction))
     reloadActions = 
@@ -136,7 +130,6 @@ startCr = defaultCreature
     , _crDir = pi/2
     , _crMvDir  = pi/2
     , _crID = 0
-    , _crPict = basicCrPict
     , _crUpdate = stateUpdate yourControl
     , _crRad = 10
     , _crMass = 10
@@ -147,7 +140,7 @@ startCr = defaultCreature
     , _crFaction = PlayerFaction
     , _crMvType = MvWalking yourDefaultSpeed
     }
-    & crSkin . skinUpper .~ light4 black
+    & crType . skinUpper .~ light4 black
 {- | Items you start with.  -}
 startInvList :: [Item]
 startInvList = [ ]