From a6141fd79a3d24acfc6056b9c5d6a9043d392511 Mon Sep 17 00:00:00 2001
From: justin <justin.g.kruger@gmail.com>
Date: Sun, 5 Jun 2022 12:05:16 +0100
Subject: [PATCH] Commit before explicit terminals list

---
 src/Dodge/Data.hs                        | 2 +-
 src/Dodge/Placement/Instance/Analyser.hs | 6 +++---
 src/Dodge/Placement/Instance/Terminal.hs | 2 +-
 src/Dodge/Room/LasTurret.hs              | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Dodge/Data.hs b/src/Dodge/Data.hs
index da95a6561..63ee0c078 100644
--- a/src/Dodge/Data.hs
+++ b/src/Dodge/Data.hs
@@ -948,7 +948,7 @@ data Block = Block
 data BlockMaterial = WoodBlock | DirtBlock | StoneBlock | GlassBlock | MetalBlock
 data Terminal = Terminal
     { _tmID         :: Int 
-    , _tmParams     :: TerminalParams
+    , _tmProgram    :: Terminal -> World -> TerminalParams
     , _tmButtonID   :: Int
     , _tmMachineID  :: Int
     , _tmName       :: String
diff --git a/src/Dodge/Placement/Instance/Analyser.hs b/src/Dodge/Placement/Instance/Analyser.hs
index 2cf8352d7..4e82cd563 100644
--- a/src/Dodge/Placement/Instance/Analyser.hs
+++ b/src/Dodge/Placement/Instance/Analyser.hs
@@ -1,5 +1,5 @@
 module Dodge.Placement.Instance.Analyser 
-    ( analyser'
+    ( analyser
     , testYouHave
     , testYourHealth
     ) where
@@ -48,7 +48,7 @@ initMCUpdate initup f mc
     = (machines . ix (_mcID mc) . mcUpdate .~ f)
     . initup mc
 
-analyser' 
+analyser 
     :: [String] -- | initial text
     -> String   -- | succeed text
     -> String   -- | fail text
@@ -57,7 +57,7 @@ analyser'
     -> PlacementSpot
     -> PlacementSpot
     -> Placement
-analyser' starts sucs fails afters upf pslight psmc = extTrigLitPos pslight $ \tp ->
+analyser starts sucs fails afters upf pslight psmc = extTrigLitPos pslight $ \tp ->
     Just $ updatebuttonname $ plSpot .~ psmc $ putTerminal' aquamarine (termupdate tp)
   where
     termupdate tp btid = initMCUpdate
diff --git a/src/Dodge/Placement/Instance/Terminal.hs b/src/Dodge/Placement/Instance/Terminal.hs
index 7843381f9..2d184c832 100644
--- a/src/Dodge/Placement/Instance/Terminal.hs
+++ b/src/Dodge/Placement/Instance/Terminal.hs
@@ -42,7 +42,7 @@ putTerminal col f = ps0PushPSw PutNothing $ \_ _ -> Just $
     $ \pl -> Just $ pt0 (PutMachine col (reverse $ square 10) defaultMachine
     { _mcDraw = noPic . terminalShape col
     , _mcHP = 100
-    , _mcUpdate = basicMachineUpdate $ machineAddSound fridgeHumS (\_ -> id)
+    , _mcUpdate = basicMachineUpdate $ machineAddSound fridgeHumS (const id)
     , _mcDeath = \mc -> (buttons . at (fromJust (_plMID pl)) .~ Nothing)
         . makeExplosionAt (_mcPos mc)
     })
diff --git a/src/Dodge/Room/LasTurret.hs b/src/Dodge/Room/LasTurret.hs
index 40f8ffb77..b5df0ebea 100644
--- a/src/Dodge/Room/LasTurret.hs
+++ b/src/Dodge/Room/LasTurret.hs
@@ -118,7 +118,7 @@ analyserByDoor sa sb sc sd mcf outplid rm = rm
         ]
     & rmOutPmnt .~ 
         [OutPlacement 
-            (analyser' sa sb sc sd
+            (analyser sa sb sc sd
                 mcf
                 (atFstLnkOutShiftBy (\(p,a) -> (p +.+ rotateV a (V2 18.5 (-2.5)), a)))
                 (atFstLnkOutShiftBy sensorshift)