Cleanup

src/Dodge/Item.hs

@@ -40,12 +40,12 @@ itemFromEquipType et = case et of
     INVISIBILITYEQUIPMENT GoesOnWrist -> wristInvisibility
     INVISIBILITYEQUIPMENT _ -> error "need to define invisibility for more than wrist"
     BRAINHAT        -> brainHat
+    HAT             -> hat
     HEADLAMP        -> headLamp
     HEADLAMP1       -> headLamp1
     POWERLEGS       -> powerLegs
     SPEEDLEGS       -> speedLegs
     JUMPLEGS        -> jumpLegs
-    FLATSHIELD      -> flatShield
     JETPACK     -> jetPack
     AUTODETECTOR  d -> autoDetector d
 itemFromLeftType :: LeftItemType -> Item
@@ -59,6 +59,7 @@ itemFromLeftType lt = case lt of
     -- Equipment
 itemFromHeldType :: HeldItemType -> Item
 itemFromHeldType ht = case ht of
+    TORCH       -> torch
     SHATTERGUN        -> shatterGun
     BANGSTICK i -> bangStick i
     PISTOL      -> pistol
@@ -116,6 +117,8 @@ itemFromHeldType ht = case ht of
     FORCEFIELDGUN       -> forceFieldGun
 
     HELDDETECTOR d -> clickDetector d
+
+    FLATSHIELD      -> flatShield
 baseToFamily :: ItemBaseType -> ItemFamily
 baseToFamily ibt = case ibt of
     NOTDEFINED -> undefined