Fix bug in flame wall damages, cleanup

src/Dodge/Data/EnergyBall.hs

@@ -19,7 +19,6 @@ data EnergyBall = EnergyBall
     , _ebPos :: Point2
     , _ebTimer :: Int
     , _ebEff :: EnergyBallType
-    , _ebRot :: Float
     }
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 

src/Dodge/Data/EnergyBall/Type.hs

@@ -5,15 +5,17 @@
 
 module Dodge.Data.EnergyBall.Type where
 
+import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 
 data EnergyBallType
     = FlamingBall
-    | FlameletBall Float
+    | FlameletBall {_fbSize :: Float, _fbRot :: Float}
     | ElectricalBall
     | ExplosiveBall
     | FlashBall
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
+makeLenses ''EnergyBallType
 deriveJSON defaultOptions ''EnergyBallType

src/Dodge/Data/Flame.hs

@@ -11,10 +11,9 @@ import Data.Aeson.TH
 import Geometry.Data
 
 data Flame = Flame
-    { _flVel :: Point2
+    { _flTimer :: Int
     , _flPos :: Point2
-    , _flTimer :: Int
---    , _flOriginalVel :: Point2
+    , _flVel :: Point2
     }
     deriving (Eq, Ord, Show, Read) --Generic, Flat)