Rename ItemAttachments

src/Dodge/Room/Containing.hs

@@ -3,8 +3,10 @@ module Dodge.Room.Containing where
 import Dodge.Data
 import Dodge.Tree
 import Dodge.LevelGen.Data
+import Dodge.PlacementSpot
 import RandomHelp
 import Dodge.Room.Procedural
+import Dodge.Room.Pillar
 import Dodge.Room.Tanks
 import Dodge.Room.Link
 import Dodge.Room.Ngon
@@ -13,25 +15,28 @@ import LensHelp
 import Geometry
 --import Dodge.Item.Equipment
 
-import Data.List
-
 roomsContaining :: RandomGen g => [Creature] -> [Item] -> State g (MetaTree Room String)
-roomsContaining crs its = do
-    endroom <- join $ takeOne
-        [ randomFourCornerRoomCrsIts crs its 
-        , tanksRoom crs its
-        ]
-    rToOnward ("roomsContaining-creatures:" ++ intercalate "," (map _crName crs) 
-            ++ "-items:" ++ intercalate "," (map (show . _iyBase . _itType) its))
-        $ pure $ cleatOnward endroom
+roomsContaining crs its = tToBTree "roomsContaining" <$> roomsContaining' crs its
+
 roomsContaining' :: RandomGen g => [Creature] -> [Item] -> State g (Tree Room)
 roomsContaining' crs its = do
     endroom <- join $ takeOne
         [ randomFourCornerRoomCrsIts crs its 
         , tanksRoom crs its
+        , roomPillarsContaining crs its
         ]
     return (pure $ cleatOnward endroom)
 
+roomPillarsContaining :: RandomGen g => [Creature] -> [Item] -> State g Room
+roomPillarsContaining crs itms = do
+    (w,wn) <- takeOne [(240,2),(340,3)]
+    (h,hn) <- takeOne [(240,2),(340,3)]
+    let plmnts = 
+            map (\it -> sps0 (PutFlIt it) & plSpot .~ anyUnusedSpot) itms
+            ++ map (\cr -> sps0 (PutCrit cr) & plSpot .~ unusedSpotAwayFromLink 50) crs
+    roomPillars 30 w h wn hn <&> rmPmnts .++~ plmnts
+
+
 pedestalRoom :: RandomGen g => Item -> State g Room
 pedestalRoom it = do
     let flit = PutFlIt it