Major item refactor, still broken

2025-08-24 19:34:09 +01:00
parent 22b4be440a
commit 94f6d5c630
62 changed files with 820 additions and 805 deletions
@@ -153,7 +153,8 @@ 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 -> _itType itm == ct) (_crInv cr)
+    Just (RequireEquipment ct) -> any (\itm -> _itType itm == ct) 
+        (fmap (\k -> w ^?! cWorld . lWorld . items . ix k) $ _crInv cr)
    _ -> False
  where
    cr = you w