Tweak pillar room

This commit is contained in:
2021-10-03 17:52:35 +01:00
parent 0c6fa80ce0
commit 2c5cdbdc73
8 changed files with 44 additions and 35 deletions
+7 -5
View File
@@ -10,6 +10,7 @@ import Dodge.Item.Weapon
import Dodge.Item.Weapon.AutoGun
import Dodge.Item.Weapon.Launcher
import Dodge.Creature
import Dodge.Room.Foreground
--import Dodge.Creature.Inanimate
--import Dodge.LevelGen
import Dodge.LevelGen.Data
@@ -21,6 +22,7 @@ import Dodge.Default.Wall
--import Dodge.Layout
import Dodge.Layout.Tree.Polymorphic
import Dodge.Layout.Tree.Either
import Dodge.LightSources.Fitting
--import Dodge.LightSources
--import Dodge.SoundLogic
import Dodge.Room.Data
@@ -78,9 +80,11 @@ roomPadCut ps p = defaultRoom
roomPillars :: Room
roomPillars = over rmLinks init $ set rmPS plmnts $ roomRect 240 240 2 2
where
plmnts = sPS (V2 120 120) 0 putLamp
: sPS (V2 12 12) 0 putLamp
: sPS (V2 228 228) 0 putLamp
plmnts = mountedLightI 70 (V2 120 24) (V2 120 216)
: mountedLightV (V2 12 12) (V3 25 25 70)
: mountedLightV (V2 228 228) (V3 215 215 70)
: sps0 (PutForeground $ thinHighBar 75 (V2 26 25) (V2 120 25))
: sps0 (PutForeground $ thinHighBar 75 (V2 214 215) (V2 120 215))
: g 180 150 90 60
f a x b y = putBlockRect a x b y
g a b c d = f a b a b ++ f a b c d ++ f c d a b ++ f c d c d
@@ -321,11 +325,9 @@ weaponBetweenPillars = do
,sPS crPos2 (d crPos2) randC1
]
theRoom = roomPillars & rmPS %~ (++ plmnts)
-- & rmPolys %~ (rectNSWE 300 0 0 300 :)
(fmap connectRoom . randomiseOutLinks) =<< filterLinks f theRoom
where
f (_,a) = a == 0
--f (_,_) = True -- this is probably preferable...
weaponLongCorridor :: RandomGen g => State g (Tree (Either Room Room))
weaponLongCorridor = do