Refactor, try to limit dependencies

src/Dodge/Item.hs

@@ -3,21 +3,20 @@ module Dodge.Item (
     module Dodge.Item.Held,
     module Dodge.Item.Consumable,
     module Dodge.Item.Equipment,
-    module Dodge.Item.PassKey,
     module Dodge.Item.Craftable,
     itemFromBase,
 ) where
 
-import Dodge.Data
+import Dodge.Data.Item
 import Dodge.Item.Consumable
 import Dodge.Item.Craftable
 import Dodge.Item.Equipment
 import Dodge.Item.Held
-import Dodge.Item.PassKey
 import Dodge.Item.Weapon
 
 itemFromBase :: ItemBaseType -> Item
 itemFromBase ibt = case ibt of
+    NoItemType -> undefined
     HELD ht -> itemFromHeldType ht
     LEFT lt -> itemFromLeftType lt
     EQUIP et -> itemFromEquipType et
@@ -55,51 +54,3 @@ itemFromLeftType lt = case lt of
     SHRINKER -> shrinkGun
     SPAWNER -> error "need to datify creatures first"
 
--- Equipment
-itemFromHeldType :: HeldItemType -> Item
-itemFromHeldType ht = case ht of
-    KEYCARD i -> keyCard i
-    TORCH -> torch
-    SHATTERGUN -> shatterGun
-    BANGSTICK i -> bangStick i
-    PISTOL -> pistol
-    REVOLVER -> revolver
-    REVOLVERX i -> revolverX i
-    MACHINEPISTOL -> machinePistol
-    AUTOPISTOL -> autoPistol
-    SMG -> smg
-    BANGCONE -> bangCone
-    BLUNDERBUSS -> blunderbuss
-    GRAPECANNON i -> grapeCannon i
-    MINIGUNX i -> miniGunX i
-    VOLLEYGUN i -> volleyGun i
-    RIFLE -> rifle
-    REPEATER -> repeater
-    AUTORIFLE -> autoRifle
-    BURSTRIFLE -> burstRifle
-    BANGROD -> bangRod
-    ELEPHANTGUN -> elephantGun
-    AMR -> amr
-    AUTOAMR -> autoAmr
-    SNIPERRIFLE -> sniperRifle
-    MACHINEGUN -> machineGun
-    FLAMESPITTER -> flameSpitter
-    FLAMETHROWER -> flameThrower
-    FLAMETORRENT -> flameTorrent
-    FLAMEWALL -> flameWall
-    BLOWTORCH -> blowTorch
-    SPARKGUN -> sparkGun
-    TESLAGUN -> teslaGun
-    LASGUN -> lasGun
-    LASCIRCLE -> lasCircle
-    DUALBEAM -> dualBeam
-    LASWIDE i -> lasWide i
-    TRACTORGUN -> tractorGun
-    LAUNCHER -> launcher
-    LAUNCHERX i -> launcherX i
-    REMOTELAUNCHER -> remoteLauncher
-    POISONSPRAYER -> poisonSprayer
-    DRONELAUNCHER -> droneLauncher
-    FORCEFIELDGUN -> forceFieldGun
-    HELDDETECTOR d -> clickDetector d
-    FLATSHIELD -> flatShield