From d1ee0f997a119280caf98f0ce336f6af14325383 Mon Sep 17 00:00:00 2001 From: justin Date: Tue, 8 Oct 2024 17:36:00 +0100 Subject: [PATCH] Fix attachment of augmented hud to laser --- ghcidOutput | 2 +- src/Dodge/Creature.hs | 1 + src/Dodge/Item/Display.hs | 2 +- src/Dodge/Item/Grammar.hs | 5 ++--- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ghcidOutput b/ghcidOutput index 493035c7c..dc8c52271 100644 --- a/ghcidOutput +++ b/ghcidOutput @@ -1 +1 @@ -All good (597 modules, at 17:07:08) +All good (597 modules, at 17:30:07) diff --git a/src/Dodge/Creature.hs b/src/Dodge/Creature.hs index 94d71fd85..3b4df54bf 100644 --- a/src/Dodge/Creature.hs +++ b/src/Dodge/Creature.hs @@ -282,6 +282,7 @@ testInventory = stackedInventory :: [Item] stackedInventory = [ torch + , augmentedHUD , smallBattery , makeTypeCraft TRANSFORMER , remoteScreen diff --git a/src/Dodge/Item/Display.hs b/src/Dodge/Item/Display.hs index 7599848cc..59b9cd0d4 100644 --- a/src/Dodge/Item/Display.hs +++ b/src/Dodge/Item/Display.hs @@ -96,7 +96,7 @@ itemNumberDisplay :: Creature -> ComposedItem -> [String] itemNumberDisplay cr ci = case (ci ^. cItemFunction,iu) of -- UseTargeting {_tgPos = mp} -> [maybe "" shortShow mp] -- this could be cleaner here... - (WeaponTargetingSF,_) -> [maybe "" shortShow (itm ^? itTargeting . itTgPos . _Just)] + (WeaponTargetingSF,_) -> [maybe "" (const "!TARG!") (itm ^? itTargeting . itTgPos . _Just)] (_,UseHeld{}) -> [] (_,UseHotkey{}) -> [showAutoRechargeProgress (_leftConsumption iu)] (_,UseEquip{}) -> showEquipmentNumber cr itm diff --git a/src/Dodge/Item/Grammar.hs b/src/Dodge/Item/Grammar.hs index 6de493a73..508fb4e88 100644 --- a/src/Dodge/Item/Grammar.hs +++ b/src/Dodge/Item/Grammar.hs @@ -61,7 +61,6 @@ itemToBreakLists ci = case (itm ^. itType,ci ^. cItemFunction) of , (RemoteScreenSF, RemoteScreenLink) ],[]) (_,WeaponTargetingSF) -> (getAmmoLinks itm ++ [(AugmentedHUDSF,AugmentedHUDLink)],[]) --- TARGETING{} -> ([(AugmentedHUDSF,AugmentedHUDLink)],[]) _ -> ([],[]) where itm = ci ^. cItem @@ -99,12 +98,12 @@ laserLinkTest :: Item -> LinkTest laserLinkTest itm = LTest (llleft itm) (llright itm) llleft :: Item -> PartiallyComposedItem -> Maybe LinkUpdate -llleft itm pci = _tryLeftLink (uncurry useBreakL $ itemToBreakLists (CItem itm (itemToFunction itm))) pci +llleft itm pci = _tryLeftLink (uncurry useBreakL $ itemToBreakLists (CItem itm WeaponTargetingSF)) pci llright :: Item -> PartiallyComposedItem -> Maybe LinkUpdate llright itm pci = case pci ^. _1 . itType of CRAFT TRANSFORMER -> Just (toLasgunUpdate itm) - _ -> _tryRightLink (uncurry useBreakL $ itemToBreakLists (CItem itm (itemToFunction itm))) pci + _ -> _tryRightLink (uncurry useBreakL $ itemToBreakLists (CItem itm WeaponPlatformSF)) pci toLasgunUpdate :: Item -> LinkUpdate toLasgunUpdate itm = LUpdate (ILink FunctionChangeLink orientAttachment)