Merge branch 'testing', resolved conflicts

src/Dodge/Data.hs

@@ -74,6 +74,8 @@ data World = World
     , _seenLocations        :: IM.IntMap (World -> Point2,String)
     , _selLocation          :: Int
     , _keyConfig            :: KeyConfigSDL
+    , _varMovementSpeedModifier :: Float
+    , _varMovementStrafeSpeedModifier :: Float
     } 
 
 data Corpse = Corpse
@@ -109,11 +111,11 @@ data Cloud = Cloud
     }
 
 data LightSource = LS  
-    { _lsID :: !Int
-    , _lsPos :: !Point2
-    , _lsDir :: !Float
-    , _lsRad :: !Float
-    , _lsIntensity :: !Float
+    { _lsID         :: !Int
+    , _lsPos        :: !Point2
+    , _lsDir        :: !Float
+    , _lsRad        :: !Float
+    , _lsIntensity  :: !Float
     }
 
 data TempLightSource = TLS 
@@ -475,14 +477,24 @@ type HitEffect = Particle' -> [(Point2, (Either3 Creature Wall ForceField))] ->
                     -> (World,Maybe Particle')
 
 
-data Projectile = Projectile    
-    { _ptPos :: Point2
-    , _ptStartPos :: Point2
-    , _ptVel :: Point2
-    , _ptPict :: Picture
-    , _ptID :: Int
-    , _ptUpdate :: World -> World
-    }
+data Projectile 
+    = Projectile    
+        { _ptPos :: Point2
+        , _ptStartPos :: Point2
+        , _ptVel :: Point2
+        , _ptPict :: Picture
+        , _ptID :: Int
+        , _ptUpdate :: World -> World
+        }
+    | Shell 
+        { _ptPos :: Point2
+        , _ptStartPos :: Point2
+        , _ptVel :: Point2
+        , _ptPict :: Picture
+        , _ptID :: Int
+        , _ptUpdate :: World -> World
+        , _ptExplosion :: Point2-> World -> World
+        }
 
 data DamageType
     = Piercing {_dmAmount :: Int , _dmFrom :: Point2 , _dmAt :: Point2 , _dmTo :: Point2 }