Cleanup item combinations, prevent creation of identical items

This commit is contained in:
2022-06-08 21:20:52 +01:00
parent ebf4594bea
commit 91f426e56e
5 changed files with 33 additions and 83 deletions
+7 -4
View File
@@ -123,7 +123,10 @@ makeColorTermLine :: Color -> String -> TerminalLine
makeColorTermLine col str = TerminalLineDisplay 0 $ const (str,col)
makeTermLine :: String -> TerminalLine
makeTermLine = makeColorTermLine (greyN 0.9)
makeTermLine = makeColorTermLine termTextColor
termTextColor :: Color
termTextColor = greyN 0.9
termSoundLine :: SoundID -> TerminalLine
termSoundLine sid = TerminalLineEffect 0 termsound
@@ -239,7 +242,7 @@ doDeathToggle (TerminalToggle trid f) = ix trid %~ f
connectionBlurb1 :: [TerminalLine]
connectionBlurb1 =
[termSoundLine computerBeepingS
,TerminalLineDisplay 0 (const ("CONNECTING ...",white))
,TerminalLineDisplay 10 (const ("...",white))
,TerminalLineDisplay 10 (const ("CONNECTED",white))
,TerminalLineDisplay 0 (const ("CONNECTING",termTextColor))
,TerminalLineDisplay 10 (const ("...",termTextColor))
,TerminalLineDisplay 10 (const ("CONNECTED",termTextColor))
,TerminalLineTerminalEffect 0 (tmStatus .~ TerminalReady)]