Fix no damage to walls bug
This commit is contained in:
@@ -96,7 +96,7 @@ healthTest n = do
|
||||
return $
|
||||
treePost
|
||||
[ door
|
||||
, corridor & rmPmnts .:~ spNoID (PS 20 0) (PutFlIt (medkit 100))
|
||||
, corridor & rmPmnts .:~ psPtPl (PS 20 0) (PutFlIt (medkit 100))
|
||||
, cenroom
|
||||
, triggerDoorRoom n
|
||||
, cleatOnward door
|
||||
|
||||
@@ -101,8 +101,8 @@ glassSwitchBack = do
|
||||
glassSwitchBackCrits :: RandomGen g => State g Room
|
||||
glassSwitchBackCrits =
|
||||
glassSwitchBack <&> rmPmnts
|
||||
.++~ [ spNoID (PSRoomRand 0 (uncurry PS)) (PutCrit miniGunCrit)
|
||||
, spNoID (PSRoomRand 1 (uncurry PS)) randC1
|
||||
.++~ [ psPtPl (PSRoomRand 0 (uncurry PS)) (PutCrit miniGunCrit)
|
||||
, psPtPl (PSRoomRand 1 (uncurry PS)) randC1
|
||||
]
|
||||
|
||||
miniTree2 :: RandomGen g => State g (Tree Room)
|
||||
@@ -262,7 +262,7 @@ weaponRoom i =
|
||||
roomCCrits :: RandomGen g => Int -> State g Room
|
||||
roomCCrits i =
|
||||
roomC 200 200
|
||||
<&> rmPmnts .++~ replicate i (spNoID (PSRoomRand 0 (uncurry PS)) randC1)
|
||||
<&> rmPmnts .++~ replicate i (psPtPl (PSRoomRand 0 (uncurry PS)) randC1)
|
||||
|
||||
doubleCorridorBarrels :: RandomGen g => State g Room
|
||||
doubleCorridorBarrels = do
|
||||
@@ -310,14 +310,14 @@ shootersRoom1 =
|
||||
.:~ RandomPlacement
|
||||
( takeOne $
|
||||
map
|
||||
(\i -> spNoID (PSRoomRand i (uncurry PS)) (PutCrit autoCrit))
|
||||
(\i -> psPtPl (PSRoomRand i (uncurry PS)) (PutCrit autoCrit))
|
||||
[0, 1, 2]
|
||||
)
|
||||
|
||||
shootersRoom :: RandomGen g => State g Room
|
||||
shootersRoom =
|
||||
shootersRoom' <&> rmPmnts
|
||||
.++~ map (\i -> spNoID (PSRoomRand i (uncurry PS)) (PutCrit autoCrit)) [0, 1, 2]
|
||||
.++~ map (\i -> psPtPl (PSRoomRand i (uncurry PS)) (PutCrit autoCrit)) [0, 1, 2]
|
||||
|
||||
-- TODO stop from spawning on inlinks fromedge
|
||||
pistolerRoom :: RandomGen g => State g Room
|
||||
@@ -326,7 +326,7 @@ pistolerRoom = do
|
||||
roomPillars 10 w 200 wn 3 <&> rmPmnts
|
||||
.++~ replicate
|
||||
3
|
||||
( spNoID
|
||||
( psPtPl
|
||||
(rprBool $ \rp _ -> _rpPlacementUse rp == 0 && rpIsOnPath rp)
|
||||
(PutCrit pistolCrit)
|
||||
)
|
||||
@@ -365,7 +365,7 @@ spawnerRoom = do
|
||||
y <- state $ randomR (300, 400)
|
||||
roomWithSpawner <-
|
||||
roomC x y <&> rmPmnts
|
||||
.:~ spNoID
|
||||
.:~ psPtPl
|
||||
( rprBool $ \rp _ ->
|
||||
_rpPlacementUse rp == 0 && rpIsOnPath rp
|
||||
&& xV2 (_rpPos rp) < x / 2
|
||||
|
||||
Reference in New Issue
Block a user