Work on cleaning up item effects/attachments etc

src/Dodge/Data/Item/Combine.hs

@@ -1,14 +1,14 @@
-{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
 module Dodge.Data.Item.Combine where
 
-import Dodge.Data.Item.Use.Consumption
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import qualified Data.Map.Strict as M
 import Dodge.Data.Equipment.Misc
+import Dodge.Data.Item.Use.Consumption
 
 data ItemType = ItemType
     { _iyBase :: ItemBaseType
@@ -79,6 +79,7 @@ data ItemBaseType
 
 data ConsumableItemType
     = MEDKIT Int
+    | EXPLOSIVES
     deriving (Eq, Ord, Show, Read)
 
 data EquipItemType
@@ -90,7 +91,6 @@ data EquipItemType
     | BRAINHAT
     | HAT
     | HEADLAMP
-    | HEADLAMP1
     | POWERLEGS
     | SPEEDLEGS
     | JUMPLEGS
@@ -118,17 +118,13 @@ data HeldItemType
     | BANGCONE
     | BLUNDERBUSS
     | GRAPECANNON {_xNum :: Int}
-    | --    | GRENADELAUNCHER Int -- number of chambers that can be reloaded
-      --    | MORTARCONE / HANDMORTAR
-      MINIGUNX {_xNum :: Int}
+    | MINIGUNX {_xNum :: Int}
     | VOLLEYGUN {_xNum :: Int}
     | RIFLE
     | REPEATER
     | AUTORIFLE
     | BURSTRIFLE
-    | --    | FASTBURSTRIFLE
-      --    | COMPLETEBURSTRIFLE
-      BANGROD
+    | BANGROD
     | ELEPHANTGUN
     | AMR
     | AUTOAMR
@@ -143,20 +139,12 @@ data HeldItemType
     | TESLAGUN
     | LASGUN
     | LASCIRCLE
-    | --    | LASPULSE
-      DUALBEAM
-    | --    | LASGUNSWING
-
-      -- | LASGUNSWAY
-      --    | LASGUNWIDEPULSE
-      LASWIDE {_xNum :: Int}
-    | -- | LASGUNFOCUS Int
-      -- | SONICGUN
-      TRACTORGUN
+    | DUALBEAM
+    | LASWIDE {_xNum :: Int}
+    | TRACTORGUN
     | LAUNCHER
     | LAUNCHERX {_xNum :: Int}
-    | --    | TRACKINGLAUNCHER
-      REMOTELAUNCHER
+    | REMOTELAUNCHER
     | POISONSPRAYER
     | DRONELAUNCHER
     | SHATTERGUN