Remove PickOnePlacements

src/Dodge/Room/Room.hs

@@ -151,9 +151,9 @@ weaponEmptyRoom = do
             restrictRMInLinksPD f (roomRect w h 2 2 & rmPmnts .~ plmnts)
     return $ treePost [corridor, cleatSide $ cleatOnward rm]
 
-weaponUnderCrits :: RandomGen g => Int -> State g (MetaTree Room String)
-weaponUnderCrits i = do
-    let addwpat p = rmPmnts .:~ PickOnePlacement i (sPS p 0 $ RandPS $ fmap PutFlIt randFirstWeapon)
+weaponUnderCrits :: RandomGen g => State g (MetaTree Room String)
+weaponUnderCrits = do
+    let addwpat p = rmPmnts .:~(sPS p 0 $ RandPS $ fmap PutFlIt randFirstWeapon)
         continuationRoom =
             treePost
                 [ addwpat (V2 20 0) corridorN
@@ -246,12 +246,12 @@ deadEndRoom =
     lnks = [(V2 0 30, 0)]
 
 {- A random Either tree with a weapon and melee monster challenge.  -}
-weaponRoom :: Int -> State StdGen (MetaTree Room String)
-weaponRoom i =
+weaponRoom :: State StdGen (MetaTree Room String)
+weaponRoom =
     join $
         takeOne
             [ weaponEmptyRoom >>= rToOnward "weaponEmptyRoom"
-            , weaponUnderCrits i -- this int is used for PickOnePlacement
+            , weaponUnderCrits
             , weaponBehindPillar >>= rToOnward "weaponBehindPillar"
             , weaponBetweenPillars --  >>= rToOnward "weaponBetweenPillars"
             , weaponLongCorridor >>= rToOnward "weaponLongCorridor"

src/Dodge/Room/Start.hs

@@ -54,7 +54,7 @@ startRoom :: Int -> State StdGen (MetaTree Room String)
 startRoom i =
     join $
         takeOne
-            [ attachOnward "startThenWeaponRoom" <$> preCritStart <*> weaponRoom i
+            [ attachOnward "startThenWeaponRoom" <$> preCritStart <*> weaponRoom
             , rezBoxesWpCrit >>= rToOnward "rezBoxesWpCrit"
             , runPastStart i >>= rToOnward ("runPastStart " ++ show i)
             , attachOnward "startThenCraft" <$> preCritStart <*> (startCrafts >>= roomsContaining [])