Start cleanup of room in-links

src/Dodge/LockAndKey.hs

@@ -11,13 +11,11 @@ import Dodge.Item.Craftable
 import System.Random
 import Control.Monad.State
 
--- (const $ return $ chainUses $ map singleUseAll [door,lasTunnel,door] , return FlatShield )
---    ,
-
 lockRoomKeyItems :: RandomGen g => [ (Int -> State g (SubCompTree Room) , State g CombineType ) ]
 lockRoomKeyItems = 
-    [(lasCenSensEdge, takeOne [LAUNCHER,LASGUN,SPARKGUN] )
+    [(lasCenSensEdge, takeOne [LAUNCHER,LASGUN,SPARKGUN,FLATSHIELD] )
     ,(const slowDoorRoomRunPast, return MINIGUN)
+--    ,(longRoom or something, [sniper])
     ]
 
 itemRooms :: RandomGen g => [(CombineType, State g (SubCompTree Room))]
@@ -36,6 +34,11 @@ itemRooms =
         [roomsContaining $ map makeTypeCraft [TRANSFORMER,CAN,CAN]
         ]
       )
+    , (FLATSHIELD   , join $ takeOne 
+        [roomsContaining $ map makeTypeCraft [PLATE,PLATE]
+        ,roomsContaining $ map makeTypeCraft [DRUM,DRUM,PLATE]
+        ]
+      )
     ]
 
 roomsContaining :: RandomGen g => [Item] -> State g (SubCompTree Room)