Defunction-ify item modules, requires more cleanup

2022-06-08 12:28:11 +01:00
parent d91a53f76c
commit bcbfd7d2fa
48 changed files with 762 additions and 740 deletions
@@ -78,7 +78,7 @@ mcProximitySensorUpdate mc w = case
 mcProxTest :: Machine -> World -> Bool
 mcProxTest mc w = case mc ^? mcSensor . proxRequirement of
    Just (RequireHealth x)      -> _crHP cr >= x
-    Just (RequireEquipment ct)  -> any (\itm -> _itType itm == ct) (_crInv cr)
+    Just (RequireEquipment ct)  -> any (\itm -> _iyBase (_itType itm) == ct) (_crInv cr)
    _ -> False
  where
    cr = you w