justin/loop
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Improve inventory management, item pickup to cursor pos

Browse Source
This commit is contained in:
justin
2021-03-08 19:26:12 +01:00
parent c8705a88c2
commit 13cc9501a7
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Dodge/CreatureActions.hs
+1 -1
View File
@@ -322,7 +322,7 @@ pickUpItem' flit w = case maybeInvSlot of
& creatures . ix 0 . crInv . ix i %~ addItem it & creatures . ix 0 . crInv . ix i %~ addItem it
where where
it = _flIt flit it = _flIt flit
maybeInvSlot = checkInvSlots it (_crInv (_creatures w IM.! 0)) maybeInvSlot = checkInvSlotsYou it w
updateItLocation invid w' updateItLocation invid w'
= case _itID it of Nothing -> w' = case _itID it of Nothing -> w'
Just j -> w' & itemPositions . ix j .~ InInv 0 invid Just j -> w' & itemPositions . ix j .~ InInv 0 invid
src/Dodge/Rendering.hs
+1 -1
View File
@@ -82,7 +82,7 @@ activeObjectText w = case closestActiveObject w of
theIt = _flIt flit theIt = _flIt flit
itScreenPos = sc $ rotateV (0 - _cameraRot w) $ _cameraZoom w *.* (_flItPos flit -.- _cameraPos w) itScreenPos = sc $ rotateV (0 - _cameraRot w) $ _cameraZoom w *.* (_flItPos flit -.- _cameraPos w)
freeSlot = checkInvSlots theIt $ _crInv $ you w freeSlot = checkInvSlotsYou theIt w
t = case freeSlot of t = case freeSlot of
Just i -> translate (pushout - halfWidth w) (halfHeight w - 20* (fromIntegral i +1)) Just i -> translate (pushout - halfWidth w) (halfHeight w - 20* (fromIntegral i +1))
Nothing -> translate (0.25*_windowX w) (0.25*_windowY w) Nothing -> translate (0.25*_windowX w) (0.25*_windowY w)