Move toward data-ifying item SPics

src/Dodge/Combine/Data.hs

@@ -72,7 +72,42 @@ data ItemBaseType
     | EFFGUN String
     | AUTOEFFGUN String
     -- Weapons
-    | BANGSTICK {_xNum :: Int}
+    | HELD {_ibtHeld :: HeldItemType}
+--    | GRENADE
+--    | REMOTEBOMB
+    -- Utility items
+    | BOOSTER
+    | REWINDER
+    | BLINKER
+    | BLINKERUNSAFE
+    | SHRINKER
+    | SPAWNER
+    -- Equipment
+    | CLICKDETECTOR Detector
+    | AUTODETECTOR Detector
+    | MAGSHIELD
+    | FLAMESHIELD
+    | FRONTARMOUR
+    | WRISTARMOUR
+    | INVISIBILITYEQUIPMENT EquipSite
+    | BRAINHAT
+    | HEADLAMP
+    | HEADLAMP1
+    | POWERLEGS
+    | SPEEDLEGS
+    | JUMPLEGS
+    | FLATSHIELD
+    | JETPACK
+    --
+    | KEYCARD Int
+    --
+    | MEDKIT Int
+    | CRAFT CraftType
+    --
+  deriving (Eq,Ord,Show,Read)
+
+data HeldItemType
+    = BANGSTICK {_xNum :: Int}
     | PISTOL
     | REVOLVER
     | REVOLVERX {_xNum :: Int}
@@ -109,9 +144,9 @@ data ItemBaseType
     | TESLAGUN
     | LASGUN
     | LASCIRCLE
-    | LASPULSE
+--    | LASPULSE
     | DUALBEAM
-    | LASGUNSWING
+--    | LASGUNSWING
     -- | LASGUNSWAY
 --    | LASGUNWIDEPULSE
     | LASWIDE {_xNum :: Int}
@@ -126,38 +161,8 @@ data ItemBaseType
     | DRONELAUNCHER
     
     | SHATTERGUN
---    | GRENADE
---    | REMOTEBOMB
-    -- Utility items
-    | BOOSTER
-    | REWINDER
-    | BLINKER
-    | BLINKERUNSAFE
+
     | FORCEFIELDGUN
-    | SHRINKER
-    | SPAWNER
-    -- Equipment
-    | CLICKDETECTOR Detector
-    | AUTODETECTOR Detector
-    | MAGSHIELD
-    | FLAMESHIELD
-    | FRONTARMOUR
-    | WRISTARMOUR
-    | INVISIBILITYEQUIPMENT EquipSite
-    | BRAINHAT
-    | HEADLAMP
-    | HEADLAMP1
-    | POWERLEGS
-    | SPEEDLEGS
-    | JUMPLEGS
-    | FLATSHIELD
-    | JETPACK
-    --
-    | KEYCARD Int
-    --
-    | MEDKIT Int
-    | CRAFT CraftType
-    --
   deriving (Eq,Ord,Show,Read)
 
 data ItemModuleType