Abstract out block placement

src/Dodge/Room/LasTurret.hs

@@ -10,24 +10,15 @@ import Dodge.Room.Door
 import Dodge.Room.Corridor
 import Dodge.Room.Link
 import Dodge.Room.Ngon
---import Dodge.Room.Procedural
-import Dodge.Room.Foreground
---import Dodge.Room.RoadBlock
+--import Dodge.Room.Foreground
+import Dodge.Wire
 import Dodge.Placement.Instance
 import Dodge.Placement.Instance.Analyser
 import Dodge.Default.Room
 import Dodge.Item.Consumable
---import Dodge.Machine
---import Dodge.Item.Weapon.Utility
---import Dodge.LevelGen.Data
---import Geometry.Data
 import Geometry
---import Padding
-import Color
-import Shape
 import LensHelp
 import RandomHelp
---import Dodge.SoundLogic
 
 import qualified Data.Set as S
 import Data.Maybe
@@ -39,15 +30,15 @@ cenLasTur = roomNgon 8 200 & rmPmnts .~
     , mntLightLnkCond $ rprBool $ const . isInLnk
     ]
   where
-    covershape = reverse $ rectNSWE 10 (-10) (-20) 20
+    covershape = rectNSWE 10 (-10) (-20) 20
 
 lightSensInsideDoor :: Int -> Room -> Room
 lightSensInsideDoor outplid rm = rm 
-    & rmPmnts .:~ psPt atFstLnkOut 
-        (PutShape $ colorSH yellow $
-        thinHighBar 0 (V2 20 (-1)) (V2 20 (-100))
-        <> thinHighBar 0 (V2 0 (-100)) (V2 20 (-100))
-        <> barPP 1.5 (V3 20 (-1) 0) (V3 20 (-1) 80))
+    & rmPmnts .++~ 
+        [ psPt atFstLnkOut (PutForeground $ floorWire (V2 20 0) (V2 20 (-100)))
+        , psPt atFstLnkOut (PutForeground $ floorWire (V2 0 (-100)) (V2 20 (-100)))
+        , psPt atFstLnkOut (PutForeground $ verticalWire (V2 20 0) 0 80)
+        ]
     & rmOutPmnt .~ [OutPlacement (lasSensLightAboveDoor 10 (atFstLnkOutShiftInward 100)) outplid]
 
 lasSensLightAboveDoor :: Float -> PlacementSpot -> Placement
@@ -61,14 +52,13 @@ lasSensLightAboveDoor wth ps = extTrigLitPos
 lightSensByDoor :: Int -> Room -> Room
 lightSensByDoor outplid rm = rm
     & rmPmnts .++~ 
-        [ psPt atFstLnkOut $ PutShape $ colorSH yellow 
-            $ barPP 1.5 (V3 20 (-1) 0) (V3 20 (-1) 80)
+        [ psPt atFstLnkOut $ PutForeground $ verticalWire (V2 20 0) 0 80
         , heightWallPS (atNthLnkOutShiftInward 1 100) 30 covershape
         , heightWallPS (atFstLnkOutShiftInward 100)   30 covershape
         ]
     & rmOutPmnt .~ [OutPlacement (lasSensLightAboveDoor 20 (atFstLnkOutShiftBy sensorshift)) outplid]
   where
-    covershape = reverse $ rectNSWE 10 (-10) (-20) 20
+    covershape = rectNSWE 10 (-10) (-20) 20
     sensorshift (p,a) = (p +.+ rotateV a (V2 60 (-20)), a)
 
 keyCardRoomRunPast :: RandomGen g => Int -> Int -> State g (MetaTree Room String)
@@ -90,8 +80,7 @@ healthAnalyserByDoor = analyserByDoor (RequireHealth 1100)
 analyserByDoor :: ProximityRequirement -> Int -> Room -> Room
 analyserByDoor proxreq outplid rm = rm 
     & rmPmnts .++~ 
-        [ psPt atFstLnkOut $ PutShape $ colorSH yellow 
-            $ barPP 1.5 (V3 20 (-1) 0) (V3 20 (-1) 80)
+        [ psPt atFstLnkOut $ PutForeground $ verticalWire (V2 20 0) 0 80
         ]
     & rmOutPmnt .~ 
         [OutPlacement