From 2a5b512d61c13a0f99b4c14508e68adcbf60fd9c Mon Sep 17 00:00:00 2001 From: justin Date: Thu, 14 Jul 2022 00:41:29 +0100 Subject: [PATCH] Cleanup --- src/Dodge/Combine/Data.hs | 1 + src/Dodge/Item/Display.hs | 4 +++- src/Dodge/Item/Equipment.hs | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Dodge/Combine/Data.hs b/src/Dodge/Combine/Data.hs index 29877cfa6..cf15f8b6c 100644 --- a/src/Dodge/Combine/Data.hs +++ b/src/Dodge/Combine/Data.hs @@ -220,3 +220,4 @@ data ModuleSlot makeLenses ''ItemType makeLenses ''ItemBaseType +makeLenses ''HeldItemType diff --git a/src/Dodge/Item/Display.hs b/src/Dodge/Item/Display.hs index 525678f7a..1b64e255d 100644 --- a/src/Dodge/Item/Display.hs +++ b/src/Dodge/Item/Display.hs @@ -19,7 +19,9 @@ itemString = head . itemDisplay itemBaseName :: Item -> String itemBaseName it = case _iyBase $ _itType it of CRAFT str -> show str - HELD str -> show str + HELD hit -> case hit ^? xNum of + Just i -> takeWhile (/=' ') (show hit) ++ show i + Nothing -> show hit x -> show x itemDisplayWithNumber :: String -> Item -> [String] diff --git a/src/Dodge/Item/Equipment.hs b/src/Dodge/Item/Equipment.hs index 43230e62a..06958fee6 100644 --- a/src/Dodge/Item/Equipment.hs +++ b/src/Dodge/Item/Equipment.hs @@ -109,6 +109,7 @@ setWristShieldPos itm cr w = w torch :: Item torch = defaultWeapon & itEffect .~ effectOnOffHeld createHeldLight (const $ const id) + & itType . iyBase .~ HELD TORCH createHeldLight :: Creature -> Int -> World -> World createHeldLight cr i w = w