Cleanup

src/Dodge/Machine/Update.hs

@@ -62,7 +62,7 @@ mcUseItem :: Machine -> World -> World
 mcUseItem mc = fromMaybe id $ do
     tu <- mc ^? mcType . _McTurret
     let it = tu ^. tuWeapon
-    hit <- it ^? itType . iyBase . ibtHeld
+    hit <- it ^? itType . ibtHeld
     guard (_tuFireTime tu > 0)
     return $ mcUseHeld hit it mc
 
@@ -126,7 +126,7 @@ mcProximitySensorUpdate mc w = case ( _proxStatus sens
 mcProxTest :: Machine -> World -> Bool
 mcProxTest mc w = case mc ^? mcType . _McSensor . proxRequirement of
     Just (RequireHealth x) -> _crHP cr >= x
-    Just (RequireEquipment ct) -> any (\itm -> _iyBase (_itType itm) == ct) (_crInv cr)
+    Just (RequireEquipment ct) -> any (\itm -> _itType itm == ct) (_crInv cr)
     _ -> False
   where
     cr = you w