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
@@ -172,10 +172,10 @@ drawRBOptions cfig w EquipOptions{_opEquip = es,_opSel=i, _opAllocateEquipment=a
    midtext str = listTextPictureAt 252 0 cfig curpos (text str)
    extratext str = listTextPictureAt 432 0 cfig curpos (text (str ++ deactivatetext))
    deactivatetext = case w ^? rbOptions . opActivateEquipment . deactivateEquipment of
-        Just k -> " DEACTIVATES " ++ _itName (_crInv (you w) IM.! k)
+        Just k -> " DEACTIVATES " ++ show (_iyBase $ _itType (_crInv (you w) IM.! k))
        Nothing -> ""
    curpos = invSelPos w
-    otheritem j = _itName (_crInv (you w) IM.! j)
+    otheritem j = show $ _iyBase $ _itType (_crInv (you w) IM.! j)
 drawRBOptions _ _ _ = mempty

 eqPosText :: EquipPosition -> String