Merge branch 'master' into testing

src/Dodge/Default.hs

@@ -50,20 +50,22 @@ defaultDoor = Door { _wlLine = [(0,0),(50,0)]
                    }
 defaultCreature :: Creature
 defaultCreature = Creature
-    { _crPos = (0,0)
+    { _crPos    = (0,0)
     , _crOldPos = (0,0)
-    , _crDir = 0
-    , _crID = 1
-    , _crPict = const $ onLayer CrLayer $ circleSolid 10
+    , _crVel    = (0,0)
+    , _crDir    = 0
+    , _crID     = 1
+    , _crPict   = const $ onLayer CrLayer $ circleSolid 10
     , _crUpdate = \ w f cr -> (f , Just cr)
-    , _crRad = 10
-    , _crMass = 10
-    , _crHP = 100
-    , _crMaxHP = 150
-    , _crInv = IM.empty
+    , _crRad    = 10
+    , _crMass   = 10
+    , _crHP     = 100
+    , _crMaxHP  = 150
+    , _crInv    = IM.empty
     , _crInvSel = 0
-    , _crState = defaultState
+    , _crState  = defaultState
     , _crCorpse = onLayer CorpseLayer $ color (greyN 0.5) $ circleSolid 10
+    , _crIsAnimate = True
     }
 defaultState = CrSt { _goals = []
                   , _stance = Stance {_carriage=Walking 0 0,_posture=AtEase}
@@ -161,12 +163,12 @@ defaultButton = Button
     , _btState = BtOff
     }
 defaultPT = Projectile
-    { _ptPos = (0,0)
-    , _ptStartPos = (0,0)
-    , _ptVel = (0,0)
-    , _ptPict = blank
-    , _ptID = 0
-    , _ptUpdate = id
+    { _pjPos = (0,0)
+    , _pjStartPos = (0,0)
+    , _pjVel = (0,0)
+    , _pjPict = blank
+    , _pjID = 0
+    , _pjUpdate = id
     }
 defaultPP = PressPlate
     { _ppPict = onLayer PressPlateLayer $ color (dim $ dim $ bright $ blue) $ circleSolid 5