Cleanup

src/Dodge/Item.hs

@@ -1,3 +1,5 @@
+{-# LANGUAGE LambdaCase #-}
+
 module Dodge.Item (
     module Dodge.Item.Weapon,
     module Dodge.Item.Held,
@@ -7,17 +9,17 @@ module Dodge.Item (
     itemFromBase,
 ) where
 
-import Dodge.Item.Ammo
 import Dodge.Data.Item
+import Dodge.Item.Ammo
 import Dodge.Item.Consumable
 import Dodge.Item.Craftable
 import Dodge.Item.Equipment
 import Dodge.Item.Held
-import Dodge.Item.Weapon
 import Dodge.Item.Scope
+import Dodge.Item.Weapon
 
-itemFromBase :: ItemBaseType -> Item
-itemFromBase ibt = case ibt of
+itemFromBase :: ItemType -> Item
+itemFromBase = \case
     HELD ht -> itemFromHeldType ht
     LEFT lt -> itemFromLeftType lt
     EQUIP et -> itemFromEquipType et
@@ -32,7 +34,6 @@ itemFromAmmoMag :: AmmoMagType -> Item
 itemFromAmmoMag at = case at of
     DRUMMAG -> drumMag
     TINMAG -> tinMag
-    REVOLVEMAG -> revolveMag
     BELTMAG -> beltMag
     SHELLMAG -> shellMag
     BATTERY -> battery
@@ -43,11 +44,10 @@ itemFromAttachType at = case at of
     ZOOMSCOPE -> zoomScope
     BULLETSYNTHESIZER -> bulletSynthesizer
     REMOTESCREEN -> remoteScreen
---    ROCKETHOMER -> rocketHomer
+    --    ROCKETHOMER -> rocketHomer
     HOMINGMODULE -> homingModule
     AUGMENTEDHUD -> augmentedHUD
 
-
 itemFromConsumableType :: ConsumableItemType -> Item
 itemFromConsumableType ct = case ct of
     MEDKIT i -> medkit i
@@ -63,7 +63,6 @@ itemFromEquipType et = case et of
     INVISIBILITYEQUIPMENT _ -> error "need to define invisibility for more than wrist"
     BRAINHAT -> brainHat
     HAT -> hat
-    TARGETINGHAT tt -> targetingHat tt
     HEADLAMP -> headLamp
     POWERLEGS -> powerLegs
     SPEEDLEGS -> speedLegs
@@ -85,4 +84,3 @@ itemFromLeftType lt = case lt of
     BLINKERUNSAFE -> unsafeBlinkGun
     SHRINKER -> shrinkGun
     SPAWNER -> error "need to datify creatures first"
-