Cleanup barrels

src/Dodge/Data/Creature/Misc.hs

@@ -84,17 +84,23 @@ data CreatureShape
     | NonDrawnCreature
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
-data BarrelType = PlainBarrel | ExplosiveBarrel
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+data BarrelType
+    = PlainBarrel
+    | ExplosiveBarrel {_piercedPoints :: [Point2]}
+    deriving (Eq, Show, Read) --Generic, Flat)
 
 makeLenses ''Pulse
+makeLenses ''BarrelType
+
 --makeLenses ''CreatureStatistics
 makeLenses ''Vocalization
 makeLenses ''CrMvType
 makeLenses ''CreatureType
 deriveJSON defaultOptions ''Pulse
+
 --deriveJSON defaultOptions ''CreatureStatistics
 deriveJSON defaultOptions ''Vocalization
+
 --deriveJSON defaultOptions ''CrMvType
 deriveJSON defaultOptions ''HumanoidAI
 deriveJSON defaultOptions ''BarrelType

src/Dodge/Data/Creature/State.hs

@@ -11,18 +11,17 @@ import Data.Aeson
 import Data.Aeson.TH
 import qualified Data.IntSet as IS
 import Dodge.Data.Damage
-import Geometry.Data
 
 data CreatureState = CrSt
     { _csDamage :: [Damage]
-    , _csSpState :: CrSpState
+--    , _csSpState :: CrSpState
     }
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
-data CrSpState
-    = Barrel {_piercedPoints :: [Point2]}
-    | GenCr
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+--data CrSpState
+--    = Barrel -- {_piercedPoints :: [Point2]}
+--    | GenCr
+--    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Faction
     = GenericFaction Int
@@ -46,9 +45,9 @@ data CrGroup
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''CreatureState
-makeLenses ''CrSpState
+--makeLenses ''CrSpState
 makeLenses ''CrGroup
-deriveJSON defaultOptions ''CrSpState
+--deriveJSON defaultOptions ''CrSpState
 deriveJSON defaultOptions ''Faction
 deriveJSON defaultOptions ''CrGroup
 deriveJSON defaultOptions ''CreatureState