Merge branch 'master' into testing

2021-03-29 23:28:27 +01:00
parent c722b6f38f b709aad2a6
commit e264857831
18 changed files with 649 additions and 596 deletions
@@ -127,21 +127,26 @@ data TempLightSource = TLS
    }

 data Creature = Creature
-    { _crPos :: Point2
-    , _crOldPos :: Point2
-    , _crDir :: Float
-    , _crID :: Int
-    , _crPict :: Creature -> Picture
-    , _crUpdate :: World -> (World -> World,StdGen) -> Creature 
-                -> ((World -> World,StdGen), Maybe Creature)
-    , _crRad :: Float
-    , _crMass :: Float
-    , _crHP :: Int
-    , _crMaxHP :: Int
-    , _crInv :: IM.IntMap Item
-    , _crInvSel :: Int
-    , _crState :: CreatureState
-    , _crCorpse :: Picture
+    { _crPos        :: Point2
+    , _crOldPos     :: Point2
+    , _crVel        :: Point2
+    , _crDir        :: Float
+    , _crID         :: Int
+    , _crPict       :: Creature -> Picture
+    , _crUpdate     
+        :: World 
+        -> (World -> World,StdGen) 
+        -> Creature 
+        -> ((World -> World,StdGen), Maybe Creature)
+    , _crRad        :: Float
+    , _crMass       :: Float
+    , _crHP         :: Int
+    , _crMaxHP      :: Int
+    , _crInv        :: IM.IntMap Item
+    , _crInvSel     :: Int
+    , _crState      :: CreatureState
+    , _crCorpse     :: Picture
+    , _crIsAnimate  :: Bool
    }

 data CreatureState = CrSt 
@@ -480,21 +485,21 @@ type HitEffect = Particle' -> [(Point2, (Either3 Creature Wall ForceField))] ->

 data Projectile 
    = Projectile    
-        { _ptPos :: Point2
-        , _ptStartPos :: Point2
-        , _ptVel :: Point2
-        , _ptPict :: Picture
-        , _ptID :: Int
-        , _ptUpdate :: World -> World
+        { _pjPos :: Point2
+        , _pjStartPos :: Point2
+        , _pjVel :: Point2
+        , _pjPict :: Picture
+        , _pjID :: Int
+        , _pjUpdate :: World -> World
        }
    | Shell 
-        { _ptPos :: Point2
-        , _ptStartPos :: Point2
-        , _ptVel :: Point2
-        , _ptPict :: Picture
-        , _ptID :: Int
-        , _ptUpdate :: World -> World
-        , _ptExplosion :: Point2-> World -> World
+        { _pjPos :: Point2
+        , _pjStartPos :: Point2
+        , _pjVel :: Point2
+        , _pjPict :: Picture
+        , _pjID :: Int
+        , _pjUpdate :: World -> World
+        , _pjPayload :: Point2-> World -> World
        }

 data DamageType