Add bullet damages field, move bullet data into own file

src/Dodge/Data/Bullet.hs

@@ -0,0 +1,38 @@
+{-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE StrictData #-}
+module Dodge.Data.Bullet where
+import Dodge.Data.DamageType
+import Geometry.Data
+import Control.Lens
+data Bullet = Bullet
+    { _buState      :: BulletState
+    , _buEffect     :: BulletEffect
+    , _buSpawn      :: BulletSpawn
+    , _buUpdateMod  :: BulletUpdateMod
+    , _buTrajectory :: BulletTrajectory
+    , _buVel        :: Point2
+    , _buDrag       :: Float
+    , _buPos        :: Point2
+    , _buOldPos     :: Point2
+    , _buWidth      :: Float 
+    , _buTimer      :: Int
+    , _buDamages    :: [Damage]
+    }
+data EnergyBall = IncBall | TeslaBall | ConcBall
+data BulletState = NormalBulletState
+    | DyingBulletState
+    | DelayedBullet Float
+data BulletUpdateMod = NoBulletUpdateMod
+
+data BulletEffect = DestroyBullet
+    | BounceBullet
+    | PenetrateBullet
+data BulletSpawn = BulBall EnergyBall | BulSpark
+
+data BulletTrajectory
+    = BasicBulletTrajectory
+    | BezierTrajectory Point2 Point2 Point2
+    | FlechetteTrajectory Point2
+    | MagnetTrajectory Point2
+
+makeLenses ''Bullet

src/Dodge/Data/DamageType.hs

@@ -1,9 +1,12 @@
+{-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE StrictData #-}
 {- 
 Datatypes describing the type of damage effects that are to be applied to
 creatures.
 -}
 module Dodge.Data.DamageType where
+import Geometry.Data
+import Control.Lens
 data DamageType 
     = PIERCING 
     | BLUNT    
@@ -21,3 +24,33 @@ data DamageType
     | POISONDAM 
     | ENTERREMENT
   deriving (Eq,Ord,Show,Read)
+data DamageEffect
+    = PushDamage 
+        { _dePush :: Float 
+        , _dePushExp :: Float
+        , _dePushRadius :: Float
+        }
+    | TorqueDamage { _deTorque :: Float }
+    | PushBackDamage {_dePushBack :: Float }
+    | NoDamageEffect
+  deriving (Eq,Ord,Show)
+
+data Damage = Damage 
+    { _dmType :: DamageType
+    , _dmAmount :: Int , _dmFrom :: Point2 , _dmAt :: Point2 , _dmTo :: Point2 
+    , _dmEffect :: DamageEffect
+    }
+  deriving (Eq,Ord,Show)
+
+isElectrical :: Damage -> Bool
+isElectrical dm = case _dmType dm of
+    ELECTRICAL -> True
+    _ -> False
+
+isMovementDam :: Damage -> Bool
+isMovementDam dm = case _dmType dm of
+    TORQUEDAM -> True
+    PUSHDAM -> True
+    _ -> False
+makeLenses ''Damage
+makeLenses ''DamageEffect