Start moving hotkeys out from creatures into world

2024-12-19 15:16:47 +00:00
parent 11b5ef74c5
commit 4526119fcd
11 changed files with 131 additions and 108 deletions
@@ -69,7 +69,8 @@ rmInvItem cid invid w =
 --        & pointcid . crInvEquipped %~ IM.delete invid
 --        & pointcid . crInvEquipped %~ IM.mapKeys g
        & removeanyactivation
-        & pointcid . crHotkeys . each %~ g
+--        & pointcid . crHotkeys . each %~ g
+        & cWorld . lWorld . hotkeys . each %~ g
        & pointcid . crInvHotkeys %~ IM.delete invid
        & pointcid . crInvHotkeys %~ IM.mapKeys g
        & updateselection
@@ -101,7 +102,8 @@ rmInvItem cid invid w =
        return $ pointcid . crEquipment . at epos .~ Nothing
    removeanyactivation = fromMaybe id $ do
        epos <- w ^? cWorld . lWorld . creatures . ix cid . crInvHotkeys . ix invid
-        return $ pointcid . crHotkeys . at epos .~ Nothing
+        --return $ pointcid . crHotkeys . at epos .~ Nothing
+        return $ cWorld . lWorld . hotkeys . at epos .~ Nothing
    maxk = fmap fst $ IM.lookupMax $ cr ^. crInv
    f inv =
        let (xs, ys) = IM.split invid inv