diff --git a/src/Dodge/Creature/State.hs b/src/Dodge/Creature/State.hs index cb43b5bef..077a28501 100644 --- a/src/Dodge/Creature/State.hs +++ b/src/Dodge/Creature/State.hs @@ -275,6 +275,7 @@ crGetTargeting :: Creature -> Maybe TargetType crGetTargeting cr = do i <- cr ^? crManipulation . manObject . inInventory . ispItem itm <- cr ^? crInv . ix i + --(cr ^? crInv . ix (i+1) . itUse . equipTargeting . _Just) itm ^? itType . iyModules . ix ModTarget . imtTargetType <|> (guard (canAttachTargetingBelow itm) >> cr ^? crInv . ix (i+1) . itUse . equipTargeting . _Just) diff --git a/src/Dodge/Item/Equipment.hs b/src/Dodge/Item/Equipment.hs index 09a3bc45d..3cc4b46c8 100644 --- a/src/Dodge/Item/Equipment.hs +++ b/src/Dodge/Item/Equipment.hs @@ -111,7 +111,7 @@ targetingHat tt = defaultEquipment & itUse . equipEffect . eeSite .~ GoesOnHead & itType . iyBase .~ EQUIP (TARGETINGHAT tt) --- & itUse . useTargeting ?~ tt + & itUse . equipTargeting ?~ tt headLamp :: Item headLamp = diff --git a/src/Dodge/TestString.hs b/src/Dodge/TestString.hs index bb5e25d54..863b92882 100644 --- a/src/Dodge/TestString.hs +++ b/src/Dodge/TestString.hs @@ -1,6 +1,7 @@ {-# OPTIONS_GHC -Wno-unused-imports #-} module Dodge.TestString where +import Dodge.Item.Display import AesonHelp import Dodge.SmoothScroll import HelpNum @@ -18,7 +19,13 @@ import Dodge.Data.Universe --import qualified Data.Map.Strict as M --import qualified IntMapHelp as IM testStringInit :: Universe -> [String] -testStringInit _ = mempty +testStringInit u = [fromMaybe "" $ do + cr <- u ^? uvWorld . cWorld . lWorld . creatures . ix 0 + i <- cr ^? crManipulation . manObject . inInventory . ispItem + fmap (show . canAttachTargetingBelow) (cr ^? crInv . ix i) + ] + + -- getPrettyShort (u ^? uvWorld . cWorld . lWorld . creatures . ix 0 . crHotkeys) -- <> ["---"] -- <> getPrettyShort ( u ^? uvWorld . cWorld . lWorld . creatures . ix 0 . crInvHotkeys)