Add missing file, workaround for placement positions bug

src/Dodge/Room/Start.hs

@@ -3,7 +3,6 @@ import Dodge.LevelGen.Data
 --import Dodge.PlacementSpot
 import Dodge.Room.RunPast
 --import Dodge.RoomLink
-import Dodge.Room.LasTurret
 --import Dodge.Data
 --import Dodge.Default
 --import Dodge.RoomLink
@@ -26,12 +25,12 @@ import Dodge.Item.Weapon.Utility
 import Geometry
 --import Padding
 import Color
-import Shape
+--import Shape
+import LensHelp
 
 --import Data.Maybe
 --import Data.Tree
 import Control.Monad.State
-import Control.Lens
 import System.Random
 --import qualified Data.IntMap.Strict as IM
 
@@ -40,30 +39,18 @@ minigunFakeout = do
     rcol <- rezColor
     ncor <- state $ randomR (0,2)
     roomwithmini <- randomiseAllLinks $ roomRectAutoLinks 150 150
-        & rmPmnts %~ (plRRpt 0 (PutFlIt $ miniGunX 6):)
-    randcors <- replicateM ncor $ (fmap PassDown . randomiseOutLinks) corridor
+        & rmPmnts .:~ plRRpt 0 (PutFlIt $ miniGunX 6)
+    randcors <- replicateM ncor $ (fmap PassDown . shuffleLinks) corridor
     return $ ([PassDown $ rezBox rcol
                 ,PassDown door
                 ,PassDown roomwithmini 
                 ,PassDown door
                 ] 
             ++ randcors
-            ++ [PassDown $ corridor & rmPmnts %~ ( plRRpt 0 (PutFlIt shrinkGun) :)
+            ++ [PassDown $ corridor & rmPmnts .:~ plRRpt 0 (PutFlIt shrinkGun)
                 ,PassDown keyholeCorridor,PassDown corridor])
         `treeFromPost` UseAll door
 
-
-rezThenLasTurret :: RandomGen g => State g (SubCompTree Room)
-rezThenLasTurret = do
-    rbox <- rezBoxStart
-    cenroom <- randomiseOutLinks $ (lightSensInsideDoor cenLasTur) {_rmLabel = Just 0}
-    let doorroom = switchDoorRoom {_rmTakeFrom = Just 0}
-        contTree = treeFromPost [PassDown cenroom,PassDown doorroom] (UseAll door)
-    return $ rbox `passUntilUseAll` [contTree]
-
-room2 :: RandomGen g => Int -> State g (SubCompTree Room)
-room2 = lasCenSensEdge    
-
 startRoom :: RandomGen g => Int -> State g (SubCompTree Room)
 startRoom i = join $ uncurry takeOneWeighted $ unzip 
 --    [ (,) (0.5::Float) $ chainUses <$> sequence [minigunFakeout,weaponRoom]
@@ -113,13 +100,8 @@ startRoom' = do
             , tankSquareEmboss4 (dim orange) 50 (h-60)
             , tankSquare (dim orange) 50 50
             , tankSquare (dim orange) 50 120
-            , lightSensor 10 (const id) (PS (V2 (0.8*w) (0.25*h)) 0)
-            , putLasTurret 0.005 & plSpot .~ PS (V2 (0.8*w) (0.8*h)) 0
-            , sps0 $ PutShape $ colorSH orange $ pipePP 2 (V3 50 50 25) (V3 50 120 25)
+            --, sps0 $ PutShape $ colorSH orange $ pipePP 2 (V3 50 50 25) (V3 50 120 25)
             ]
     thecol <- rezColor
     treeFromPost [PassDown $ rezBox thecol, PassDown door] . UseAll 
-        <$> randomiseOutLinks 
-            (shiftRoomBy (V2 (-20) (-20),0) 
-            ( roomRectAutoLinks w h & rmPmnts %~ (plmnts ++) 
-            ) & rmShift .~ (0,0) )
+        <$> shuffleLinks (roomRectAutoLinks w h & rmPmnts .++~ plmnts)