Tweak starting rooms

2021-11-16 22:48:45 +00:00
parent 5d0b48829c
commit 559d7e3a23
6 changed files with 102 additions and 92 deletions
@@ -35,58 +35,58 @@ import qualified Data.IntMap.Strict as IM
 initialAnoTree :: RandomGen g => Tree [Annotation g]
 initialAnoTree = padSucWithCorridors $ treeFromTrunk 
    [[StartRoom]
-    ,[ChainAnos 
-        [[SetLabel 0 $ return $ roomRectAutoLinks 200 200 
-            & rmExtPmnt ?~ triggerSwitchSPicLight (drawSwitchWire red red)
-                (anyLnkInPS 5 & psLnkRoomEff .~ (putWireStart 0 . extractRoomPos) )
-            & rmLinkEff .~ [putWireEnd 0]
-         ]
-        ,[UseLabel 0 $ return switchDoorRoom]
-        ]
-     ]
-    ,[SpecificRoom $ return $ connectRoom lasTunnel ]
-    ,[SpecificRoom $ fmap connectRoom slowDoorRoom ]
-    ,[Corridor]
-    ,[Corridor]
-    ,[SpecificRoom $ fmap connectRoom roomCCrits]
-    ,[AirlockAno]
-    ,[Corridor]
----    ,[SpecificRoom roomCCrits]
----    ,[Corridor]
----    ,[SpecificRoom . pure . pure . Right $ roomGlassOctogon 400 
----        & rmPS %~ ([sPS (V2 0 50) 0 $ PutCrit armourChaseCrit 
----                    ,sPS (V2 50 25) 0 $ PutCrit armourChaseCrit 
----                    ,sPS (V2 50 0) 0 $ PutCrit armourChaseCrit 
----                    ]++)
----     ]
----    --,[SpecificRoom . pure . pure . Right $ roomGlassOctogon 400 
----    --    & rmPS %~ ([swarmPS 0 (x,y) 0 swarmCrit | x <- [-20,-19.5.. 20] , y <- [200,202] ]++)
----    -- ]
----    ,[SpecificRoom . pure . pure . Right $ roomGlassOctogon 400 
----        & rmPS %~ ([sPS (V2 0 50) 0 $ PutCrit pistolCrit ]++)
----     ]
----    ,[Corridor]
--    --,[SpecificRoom $ pure . Right <$> twinSlowDoorChasers]
---    ,[SpecificRoom $ pure $ (pure . Right) (twinSlowDoorRoom 80 200 40)]
---    ,[DoorAno]
---    ,[SpecificRoom $ pure . Right <$> centerVaultExplosiveExit]
---    ,[SpecificRoom blockedCorridor]
---    ,[OrAno [[DoorAno]
---            ,[Corridor]
---            ,[DoorNumAno 0,AirlockAno]] 
---            ]
---    ,[FirstWeapon]
---    ,[CorridorDebug]
---    ,[SpecificRoom $ fmap (pure . Right) randomFourCornerRoom]
-    ,[OrAno 
-        [[SpecificRoom $ branchRectWith $ fmap (fmap Left) armouredChasers]
-        ,[BossAno $ addArmour launcherCrit & crHP +~ 800
-            & crState . crDropsOnDeath .~ DropSpecific [0] ]
-        ]
-     ]
--    ,[SpecificRoom $ fmap (pure . Right) armouredCorridor]
-    ,[Corridor]
-    ,[TreasureAno [addArmour autoCrit,addArmour autoCrit] [launcher]]
+--    ,[ChainAnos 
+--        [[SetLabel 0 $ return $ roomRectAutoLinks 200 200 
+--            & rmExtPmnt ?~ triggerSwitchSPicLight (drawSwitchWire red red)
+--                (anyLnkInPS 5 & psLnkRoomEff .~ (putWireStart 0 . extractRoomPos) )
+--            & rmLinkEff .~ [putWireEnd 0]
+--         ]
+--        ,[UseLabel 0 $ return switchDoorRoom]
+--        ]
+--     ]
+--    ,[SpecificRoom $ return $ connectRoom lasTunnel ]
+--    ,[SpecificRoom $ fmap connectRoom slowDoorRoom ]
+--    ,[Corridor]
+--    ,[Corridor]
+--    ,[SpecificRoom $ fmap connectRoom roomCCrits]
+--    ,[AirlockAno]
+--    ,[Corridor]
+------    ,[SpecificRoom roomCCrits]
+------    ,[Corridor]
+------    ,[SpecificRoom . pure . pure . Right $ roomGlassOctogon 400 
+------        & rmPS %~ ([sPS (V2 0 50) 0 $ PutCrit armourChaseCrit 
+------                    ,sPS (V2 50 25) 0 $ PutCrit armourChaseCrit 
+------                    ,sPS (V2 50 0) 0 $ PutCrit armourChaseCrit 
+------                    ]++)
+------     ]
+------    --,[SpecificRoom . pure . pure . Right $ roomGlassOctogon 400 
+------    --    & rmPS %~ ([swarmPS 0 (x,y) 0 swarmCrit | x <- [-20,-19.5.. 20] , y <- [200,202] ]++)
+------    -- ]
+------    ,[SpecificRoom . pure . pure . Right $ roomGlassOctogon 400 
+------        & rmPS %~ ([sPS (V2 0 50) 0 $ PutCrit pistolCrit ]++)
+------     ]
+------    ,[Corridor]
+----    --,[SpecificRoom $ pure . Right <$> twinSlowDoorChasers]
+-----    ,[SpecificRoom $ pure $ (pure . Right) (twinSlowDoorRoom 80 200 40)]
+-----    ,[DoorAno]
+-----    ,[SpecificRoom $ pure . Right <$> centerVaultExplosiveExit]
+-----    ,[SpecificRoom blockedCorridor]
+-----    ,[OrAno [[DoorAno]
+-----            ,[Corridor]
+-----            ,[DoorNumAno 0,AirlockAno]] 
+-----            ]
+-----    ,[FirstWeapon]
+-----    ,[CorridorDebug]
+-----    ,[SpecificRoom $ fmap (pure . Right) randomFourCornerRoom]
+--    ,[OrAno 
+--        [[SpecificRoom $ branchRectWith $ fmap (fmap Left) armouredChasers]
+--        ,[BossAno $ addArmour launcherCrit & crHP +~ 800
+--            & crState . crDropsOnDeath .~ DropSpecific [0] ]
+--        ]
+--     ]
+----    ,[SpecificRoom $ fmap (pure . Right) armouredCorridor]
+--    ,[Corridor]
+--    ,[TreasureAno [addArmour autoCrit,addArmour autoCrit] [launcher]]
    ] 
    $ treeFromPost [[Corridor,SpecificRoom $ fmap (pure . Right) randomFourCornerRoom]] 
                                [EndRoom]