Remove left click to equip items

This commit is contained in:
2022-02-17 23:09:08 +00:00
parent c0dcb4a5ec
commit c614a3a655
4 changed files with 10 additions and 7 deletions
+6 -6
View File
@@ -48,12 +48,12 @@ useLeftItem cid w
useLeftItem' :: Int -> World -> World
useLeftItem' cid w = case cr ^? crInv . ix crinvsel . itUse of
Just EquipUse{} -> w
& lSelHammerPosition .~ HammerDown
& case _lSelHammerPosition w of
HammerUp -> creatures . ix cid %~ toggleEquipmentAt crinvsel
_ -> id
Just LeftUse {_lUse = f} -> f cr crinvsel (w & creatures . ix cid . crLeftInvSel ?~ crinvsel)
-- Just EquipUse{} -> w
-- & lSelHammerPosition .~ HammerDown
-- & case _lSelHammerPosition w of
-- HammerUp -> creatures . ix cid %~ toggleEquipmentAt crinvsel
-- _ -> id
-- Just LeftUse {_lUse = f} -> f cr crinvsel (w & creatures . ix cid . crLeftInvSel ?~ crinvsel)
_ -> case _crLeftInvSel cr of
Just invid -> case _itUse $ _crInv cr IM.! invid of
LeftUse {_lUse = f} -> f cr invid w
+1
View File
@@ -113,6 +113,7 @@ boosterGun :: Item
boosterGun = defaultGun
{ _itName = "BOOSTER"
, _itType = BOOSTER
, _itInvColor = cyan
, _itConsumption = defaultAmmo
{ _ammoMax = 100
, _ammoLoaded = 100
+2
View File
@@ -20,6 +20,7 @@ rewindGun :: Item
rewindGun = defaultGun
{ _itName = "REWINDER"
, _itType = REWINDER
, _itInvColor = cyan
, _itConsumption = ChargeableAmmo
{ _wpMaxCharge = 250
, _wpCharge = 0
@@ -86,6 +87,7 @@ blinkGun :: Item
blinkGun = defaultGun
{ _itName = "BLINKER"
, _itType = BLINKER
, _itInvColor = cyan
, _itConsumption = defaultAmmo
{ _ammoMax = 100
, _ammoLoaded = 100
+1 -1
View File
@@ -20,7 +20,7 @@ updatePressedButtons :: S.Set MouseButton -> World -> World
updatePressedButtons pkeys w
| lbPressed && rbPressed = tryUseItem (you w) w
| lbPressed = useLeftItem (_yourID w) w
| lbPressed = w
-- | lbPressed = w
| mbPressed = w & clickMousePos .~ _mousePos w
& cameraRot -~ rotation
| otherwise = w