From c614a3a6557027081044ede6e8801d1e49fca00e Mon Sep 17 00:00:00 2001 From: justin Date: Thu, 17 Feb 2022 23:09:08 +0000 Subject: [PATCH] Remove left click to equip items --- src/Dodge/Creature/Impulse/UseItem.hs | 12 ++++++------ src/Dodge/Item/Weapon/Booster.hs | 1 + src/Dodge/Item/Weapon/Utility.hs | 2 ++ src/Dodge/Update/UsingInput.hs | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/Dodge/Creature/Impulse/UseItem.hs b/src/Dodge/Creature/Impulse/UseItem.hs index 46c507d23..911140094 100644 --- a/src/Dodge/Creature/Impulse/UseItem.hs +++ b/src/Dodge/Creature/Impulse/UseItem.hs @@ -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 diff --git a/src/Dodge/Item/Weapon/Booster.hs b/src/Dodge/Item/Weapon/Booster.hs index 2be719418..528029745 100644 --- a/src/Dodge/Item/Weapon/Booster.hs +++ b/src/Dodge/Item/Weapon/Booster.hs @@ -113,6 +113,7 @@ boosterGun :: Item boosterGun = defaultGun { _itName = "BOOSTER" , _itType = BOOSTER + , _itInvColor = cyan , _itConsumption = defaultAmmo { _ammoMax = 100 , _ammoLoaded = 100 diff --git a/src/Dodge/Item/Weapon/Utility.hs b/src/Dodge/Item/Weapon/Utility.hs index 9fb0909fd..96c591c53 100644 --- a/src/Dodge/Item/Weapon/Utility.hs +++ b/src/Dodge/Item/Weapon/Utility.hs @@ -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 diff --git a/src/Dodge/Update/UsingInput.hs b/src/Dodge/Update/UsingInput.hs index 2748ae8d5..a9a0eecf2 100644 --- a/src/Dodge/Update/UsingInput.hs +++ b/src/Dodge/Update/UsingInput.hs @@ -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