Commit before rethinking item positioning, broken item hammer

src/Dodge/Default/Weapon.hs

@@ -34,31 +34,29 @@ defaultChargeable = ChargeableAmmo 100 100
 
 ruseRate :: Int 
     -> (Item -> Creature -> World -> World) 
-    -> HammerType
     -> [(Item -> Creature -> World -> World) -> Item -> Creature -> World -> World]
     -> ItemUse
-ruseRate i f ht usemods = RightUse
+ruseRate i f usemods = RightUse
     { _rUse = f
     , _useDelay = FixedRate
         { _rateMax = i
         , _rateTime = 0
         }
     , _useMods = usemods
-    , _useHammer = ht
+    , _useHammer' = HammerUp
     , _useAim = defaultAimParams
     , _heldScroll = \_ _ -> id
     }
 
 ruseInstant 
     :: (Item -> Creature -> World -> World) 
-    -> HammerType
     -> [(Item -> Creature -> World -> World) -> Item -> Creature -> World -> World]
     -> ItemUse
-ruseInstant f ht usemods = RightUse
+ruseInstant f usemods = RightUse
     { _rUse = f
     , _useDelay = NoDelay
     , _useMods  = usemods
-    , _useHammer = ht
+    , _useHammer' = HammerUp
     , _useAim = defaultAimParams
     , _heldScroll = \_ _ -> id
     }
@@ -68,7 +66,7 @@ defaultrUse = RightUse
     { _rUse = \_ _ -> id
     , _useDelay = FixedRate {_rateMax = 8, _rateTime = 0}
     , _useMods = []
-    , _useHammer  = HasHammer HammerUp
+    , _useHammer'  = HammerUp
     , _useAim = defaultAimParams
     , _heldScroll = \_ _ -> id
     }