Commit before partial cleanup, continue weapon effect refactor
This commit is contained in:
@@ -51,7 +51,8 @@ basicItemDisplay :: Item -> [String]
|
||||
basicItemDisplay itm =
|
||||
Prelude.take (itSlotsTaken itm) $
|
||||
itemBaseName itm :
|
||||
catMaybes [maybeWarmupStatus itm, maybeRateStatus itm]
|
||||
--catMaybes [maybeWarmupStatus itm, maybeRateStatus itm]
|
||||
catMaybes [maybeWarmupStatus itm]
|
||||
++ moduleStrings itm
|
||||
++ repeat "*"
|
||||
|
||||
@@ -75,6 +76,8 @@ showAttachItem t = case t of
|
||||
SCROLLATTACH x -> show x
|
||||
TARGETATTACH x -> show x
|
||||
BULLETSYNTHESIZER -> "BSYNTH"
|
||||
ROCKETREMOTESCREEN -> "REMOTE SCREEN"
|
||||
ROCKETHOMER -> "HOMING MOD"
|
||||
|
||||
showEquipItem :: EquipItemType -> String
|
||||
showEquipItem eit = case eit of
|
||||
@@ -182,7 +185,7 @@ maybeWarmupStatus it = case it ^? itUse . heldDelay . warmMax of
|
||||
let n = show x
|
||||
in Just $ Prelude.take (5 - Prelude.length n) "*WARM" ++ n
|
||||
|
||||
maybeRateStatus :: Item -> Maybe String
|
||||
maybeRateStatus it = case it ^? itUse . heldDelay . rateMaxMax of
|
||||
Nothing -> Nothing
|
||||
_ -> Just $ leftPad 3 ' ' (show (_rateMax . _heldDelay $ _itUse it))
|
||||
--maybeRateStatus :: Item -> Maybe String
|
||||
--maybeRateStatus it = case it ^? itUse . heldDelay . rateMaxMax of
|
||||
-- Nothing -> Nothing
|
||||
-- _ -> Just $ leftPad 3 ' ' (show (_rateMax . _heldDelay $ _itUse it))
|
||||
|
||||
Reference in New Issue
Block a user