Allow use of items while examine subinventory shows

Still not sure what to do with right click scrolling, item swapping
This commit is contained in:
2025-01-01 21:58:07 +00:00
parent ff5c4db3ae
commit adc0878a28
15 changed files with 343 additions and 311 deletions
+3 -2
View File
@@ -66,8 +66,9 @@ itemBaseName = \case
BULLETMOD (BulletModPayload btt) -> show btt
BULLETMOD (BulletModEffect btt) -> show btt
STICKYMOD -> "STICKYMOD"
ITEMSCANNER -> "ITEMSCANNER"
ITEMSCAN -> "ITEMSCAN"
INTROSCAN t -> show t
MAPPER -> "MAPPER"
showAttachItem :: AttachType -> String
showAttachItem t = case t of
@@ -95,7 +96,7 @@ showEquipItem eit = case eit of
itemNumberDisplay :: World -> Creature -> ComposedItem -> [String]
itemNumberDisplay w cr ci
| Just x <- ci ^? _1 . itUse . useToggle = [show x]
| ITEMSCANNER <- ci ^. _1 . itType
| ITEMSCAN <- ci ^. _1 . itType
, Just ExamineInventory <- w ^? hud . hudElement . subInventory
= ["ACTIVE"]
| EQUIP WRIST_ECG <- ci ^. _1 . itType =
+2 -1
View File
@@ -41,7 +41,8 @@ itemSPic it = case it ^. itType of
TARGETING{} -> defSPic
BULLETMOD{} -> defSPic
STICKYMOD -> defSPic
ITEMSCANNER -> defSPic
ITEMSCAN -> defSPic
MAPPER -> defSPic
INTROSCAN {} -> defSPic
craftItemSPic :: CraftType -> Shape
+1 -1
View File
@@ -131,7 +131,7 @@ getAmmoLinks itm =
itemToFunction :: Item -> ItemStructuralFunction
itemToFunction itm = case itm ^. itType of
ITEMSCANNER -> ToggleSF
ITEMSCAN -> ToggleSF
INTROSCAN {} -> IntroScanSF
HELD LASER -> WeaponTargetingSF
HELD{} -> case itm ^? itUseCondition of
+11 -4
View File
@@ -15,8 +15,9 @@ module Dodge.Item.Scope (
bulletModule,
bulletPayloadModule,
smokeReducer,
itemScanner,
itemScan,
introScan,
mapper,
) where
--import Dodge.Data.BlBl
@@ -55,13 +56,19 @@ introScan t =
& itType .~ INTROSCAN t
& itUse .~ UseNothing
itemScanner :: Item
itemScanner =
itemScan :: Item
itemScan =
defaultHeldItem
& itType .~ ITEMSCANNER
& itType .~ ITEMSCAN
& itUse .~ UseNothing
& itEffect . ieOnDrop .~ ItemCancelExamineInventory
mapper :: Item
mapper =
defaultHeldItem
& itType .~ MAPPER
& itUse .~ UseNothing
bulletModule :: BulletMod -> Item
bulletModule bm =
defaultHeldItem