Add looping sound, add sound to terminals
This commit is contained in:
+14
-4
@@ -129,7 +129,7 @@ data World = World
|
||||
|
||||
data HUDElement = DisplayInventory {_subInventory :: SubInventory}
|
||||
| DisplayCarte
|
||||
deriving (Eq,Ord,Show)
|
||||
-- deriving (Eq,Ord,Show)
|
||||
|
||||
data SubInventory
|
||||
= NoSubInventory
|
||||
@@ -141,7 +141,7 @@ data SubInventory
|
||||
{_termParams :: TerminalParams
|
||||
,_termID :: Int
|
||||
}
|
||||
deriving (Eq,Ord,Show)
|
||||
-- deriving (Eq,Ord,Show)
|
||||
|
||||
data HUD = HUD
|
||||
{ _hudElement :: HUDElement
|
||||
@@ -319,10 +319,19 @@ data Button = Button
|
||||
}
|
||||
data TerminalParams = NoTerminalParams | TerminalParams
|
||||
{ _termDisplayedLines :: [(String,Color)]
|
||||
, _termFutureLines :: [(Int,(String,Color))]
|
||||
, _termFutureLines :: [TerminalLine]
|
||||
, _termMaxLines :: Int
|
||||
}
|
||||
deriving (Eq,Ord,Show)
|
||||
data TerminalLine
|
||||
= TerminalLineDisplay
|
||||
{_tlPause :: Int
|
||||
,_tlString :: String
|
||||
,_tlColor :: Color
|
||||
}
|
||||
| TerminalLineEffect
|
||||
{_tlPause :: Int
|
||||
,_tlEffect :: SubInventory -> World -> World
|
||||
}
|
||||
data ButtonState = BtOn | BtOff | BtNoLabel
|
||||
deriving (Eq, Show)
|
||||
data PressPlate = PressPlate
|
||||
@@ -1009,3 +1018,4 @@ makeLenses ''HUD
|
||||
makeLenses ''HUDElement
|
||||
makeLenses ''SubInventory
|
||||
makeLenses ''TerminalParams
|
||||
makeLenses ''TerminalLine
|
||||
|
||||
Reference in New Issue
Block a user