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

Re-add machine hum to all terminals

Browse Source
This commit is contained in:
justin
2022-06-07 11:11:48 +01:00
parent 5117fb2a1a
commit 19852119ab
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Dodge/Placement/Instance/Terminal.hs
+4 -5
View File
@@ -20,7 +20,7 @@ import Geometry
import ShapePicture import ShapePicture
import LensHelp import LensHelp
import Shape import Shape
import ShapePicture --import ShapePicture
--import Sound.Data --import Sound.Data
import Data.Maybe import Data.Maybe
@@ -33,7 +33,7 @@ putTerminal''
putTerminal'' mc tm mcf = ps0PushPS (PutTerminal tm) putTerminal'' mc tm mcf = ps0PushPS (PutTerminal tm)
$ \tmpl -> Just $ ps0PushPS (PutButton termButton) $ \tmpl -> Just $ ps0PushPS (PutButton termButton)
$ \btpl -> Just $ pt0 (PutMachine (reverse $ square 10) $ \btpl -> Just $ pt0 (PutMachine (reverse $ square 10)
(mc & mcUpdate %~ (\fmu mc' -> (mcf (fromJust $ _plMID btpl) mc' . fmu mc')) (mc & mcUpdate %~ (\fmu mc' -> (mcf (fromJust $ _plMID btpl) mc' . fmu mc')) . machineAddSound fridgeHumS
& mcDeath %~ (\fd mc' -> mcKillTerm mc' . (buttons . at (fromJust (_plMID btpl)) .~ Nothing) . fd mc') & mcDeath %~ (\fd mc' -> mcKillTerm mc' . (buttons . at (fromJust (_plMID btpl)) .~ Nothing) . fd mc')
) ) ) )
$ \mcpl -> Just $ sps0 $ PutWorldUpdate $ const (setids tmpl btpl mcpl) $ \mcpl -> Just $ sps0 $ PutWorldUpdate $ const (setids tmpl btpl mcpl)
@@ -48,8 +48,6 @@ putTerminal'' mc tm mcf = ps0PushPS (PutTerminal tm)
btid = fromJust (_plMID btpl) btid = fromJust (_plMID btpl)
mcid = fromJust (_plMID mcpl) mcid = fromJust (_plMID mcpl)
-- machineAddSound fridgeHumS
mcKillTerm :: Machine -> World -> World mcKillTerm :: Machine -> World -> World
mcKillTerm mc w = fromMaybe w $ do mcKillTerm mc w = fromMaybe w $ do
tmid <- _mcTermMID mc tmid <- _mcTermMID mc
@@ -62,7 +60,8 @@ putTerminal'
-> Terminal -> Terminal
-> (Int -> Machine -> World -> World) -- | machine update, takes button id as input -> (Int -> Machine -> World -> World) -- | machine update, takes button id as input
-> Placement -> Placement
putTerminal' col = putTerminal'' (defaultMachine & mcColor .~ col) putTerminal' col = putTerminal'' (defaultMachine
& mcColor .~ col)
{ _mcDraw = noPic . terminalShape { _mcDraw = noPic . terminalShape
, _mcHP = 100 , _mcHP = 100
, _mcSensor = defaultProximitySensor , _mcSensor = defaultProximitySensor