Add fix bug in terminal destruction effects
This commit is contained in:
+7
-7
@@ -416,11 +416,6 @@ data TerminalLine
|
||||
{_tlPause :: Int
|
||||
,_tlTermEffect :: Terminal -> Terminal
|
||||
}
|
||||
| TerminalLineInput
|
||||
{_tlPause :: Int
|
||||
-- ,_tlScrollCommands :: [TerminalCommand]
|
||||
-- ,_tlWriteCommands :: [TerminalCommand]
|
||||
}
|
||||
| TerminalLineEffect
|
||||
{_tlPause :: Int
|
||||
,_tlEffect :: Terminal -> World -> World
|
||||
@@ -960,6 +955,12 @@ data Terminal = Terminal
|
||||
, _tmWriteCommands :: [TerminalCommand]
|
||||
, _tmDeathEffect :: Terminal -> World -> World
|
||||
, _tmStatus :: TerminalStatus
|
||||
, _tmCommandHistory :: [String]
|
||||
, _tmToggles :: M.Map String TerminalToggle
|
||||
}
|
||||
data TerminalToggle = TerminalToggle
|
||||
{ _ttTriggerID :: Int
|
||||
, _ttDeathEffect :: (World -> Bool) -> (World -> Bool)
|
||||
}
|
||||
data Machine = Machine
|
||||
{ _mcID :: Int
|
||||
@@ -1382,10 +1383,9 @@ data TerminalCommand = TerminalCommand
|
||||
, _tcHelp :: String
|
||||
, _tcArgumentType :: Maybe String
|
||||
, _tcArguments :: Terminal -> World -> [String]
|
||||
, _tcEffect :: [String] -> Terminal -> World -> Either String World
|
||||
, _tcEffect :: [String] -> Terminal -> World -> Either String [TerminalLine]
|
||||
}
|
||||
|
||||
|
||||
---- ROOM DATATYPES
|
||||
data PSType = PutCrit {_unPutCrit :: Creature}
|
||||
| PutMachine { _putMachinePoly :: [Point2], _unPutMachine :: Machine }
|
||||
|
||||
Reference in New Issue
Block a user