Unify PutDoor PSType

src/Dodge/Placement/Instance/Door.hs

@@ -4,7 +4,7 @@ module Dodge.Placement.Instance.Door (
     putDoubleDoorThen,
 ) where
 
-import Linear
+import Dodge.Door.PutSlideDoor
 import Control.Lens
 import Dodge.Data.CreatureEffect
 import Dodge.Data.GenWorld
@@ -12,6 +12,7 @@ import Dodge.Default.Door
 import Dodge.Default.Wall
 import Dodge.LevelGen.PlacementHelper
 import Geometry
+import Linear
 
 putDoubleDoor ::
     Bool ->
@@ -53,15 +54,16 @@ doorBetween ::
     (Placement -> Maybe Placement) ->
     Placement
 doorBetween isauto wl cond soff pa pb speed g = case divideLine 40 pa pb of
-    [x, y] -> ptCont (PutSlideDr adoor wl soff x y) g
+    [x, y] -> ptCont (putSlideDr adoor wl soff x y) g
     (x : y : zs) -> divideDoorPane isauto Nothing wl cond (soff - dist y pb) speed (zip (x : y : zs) (y : zs)) g
-    _ -> undefined
+    _ -> error "tried to create doorBetween with too few points"
   where
     adoor =
         defaultDoor
             & drTrigger .~ cond
             & drUpdate . drLerpSpeed .~ speed
 
+
 divideDoorPane ::
     Bool ->
     Maybe Int ->
@@ -77,7 +79,7 @@ divideDoorPane isauto mid wl cond soff speed ppairs g = case ppairs of
     (p : ps) -> ptCont (adoor p) $ \pl -> Just $ divideDoorPane isauto (_plMID pl) wl cond soff speed ps g
     _ -> undefined
   where
-    adoor (x, y) = PutSlideDr thedoor wl soff x y
+    adoor (x, y) = putSlideDr thedoor wl soff x y
     thedoor =
         defaultDoor & drUpdate . drLerpSpeed .~ speed & drTrigger .~ cond
             & drPushedBy .~ maybe PushesItself PushedBy mid

src/Dodge/Placement/PlaceSpot.hs

@@ -134,9 +134,9 @@ placeSpotID rid ps pt w = case pt of
     PutMachine pps mc mitm -> plMachine (map doShift pps) mc mitm p rot w
     PutLS ls -> plNewUpID (gwWorld . cWorld . lWorld . lightSources) lsID (mvLS p' rot ls) w
     RandPS _ -> error "RandPS should not be reachable here" --evaluateRandPS rid rgn ps w
-    PutDoor f l p1 p2 -> plDoor f l (pashift p1) (pashift p2) w
+--    PutDoor f l p1 p2 -> plDoor f l (pashift p1) (pashift p2) w
     PutDoor' dr wl -> plDoor' (dr & drZeroPos %~ pashift & drOnePos %~ pashift) wl w
-    PutSlideDr wl dr off a b -> plSlideDoor wl dr off (doShift a) (doShift b) w
+--    PutSlideDr wl dr off a b -> plSlideDoor wl dr off (doShift a) (doShift b) w
     PutCoord cp -> plNewID (gwWorld . coordinates) (doShift cp) w
     PutBlock bl wl ps' ->
         plBlock