justin/loop
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Cleanup, use pattern guards

Browse Source
This commit is contained in:
justin
2024-12-20 17:28:42 +00:00
parent 58635466ae
commit e34a17a027
1 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Dodge/Item/Display.hs
+9 -17
View File
@@ -71,23 +71,15 @@ showEquipItem eit = case eit of
_ -> show eit _ -> show eit
itemNumberDisplay :: Creature -> ComposedItem -> [String] itemNumberDisplay :: Creature -> ComposedItem -> [String]
itemNumberDisplay cr ci = case (ci ^. _2, itm ^?! itUse, itm ^. itType) of itemNumberDisplay cr ci
_ | EQUIP WRIST_ECG <- itm ^. itType | EQUIP WRIST_ECG <- ci ^. _1 . itType
-> [displayPulse $ cr ^?! crType . avatarPulse . pulseProgress] = [displayPulse $ cr ^?! crType . avatarPulse . pulseProgress]
-- (_,_,EQUIP WRIST_ECG) -> [displayPulse $ cr ^?! crType . avatarPulse . pulseProgress] | WeaponTargetingSF <- ci ^. _2
-- (WeaponTargetingSF,_,_) = [maybe "" (const "!TARG!") (ci ^? _1 . itTargeting . itTgPos . _Just)]
_ | WeaponTargetingSF <- ci ^. _2 | Just x <- ci ^? _1 . itConsumables . magLoadStatus . iaLoaded = [shortShow x]
-> [maybe "" (const "!TARG!") (itm ^? itTargeting . itTgPos . _Just)] | UseAttach (APInt i) <- ci ^. _1 . itUse = [show i]
_ | hasammo -> [maybe "" shortShow | UseScope OpticScope {_opticZoom = x} <- ci ^. _1 . itUse = [shortShow x]
$ itm ^? itConsumables . magLoadStatus . iaLoaded] | otherwise = mempty
--(_,UseAttach (APInt i),_) -> [show i]
_ | UseAttach (APInt i) <- itm ^. itUse -> [show i]
_ | UseScope OpticScope {_opticZoom = x} <- itm ^. itUse -> [shortShow x]
-- (_,UseScope OpticScope {_opticZoom = x},_) -> [shortShow x]
(_,_,_) -> mempty
where
itm = ci ^. _1
hasammo = isJust $ itm ^? itConsumables . magLoadStatus . iaLoaded
displayPulse :: Int -> String displayPulse :: Int -> String
displayPulse 0 = "*****" displayPulse 0 = "*****"