Work on weapon positioning, analyser terminal positioning
This commit is contained in:
+112
-53
@@ -2,9 +2,8 @@
|
||||
|
||||
module Dodge.Room.Tutorial where
|
||||
|
||||
import Dodge.Room.Foreground
|
||||
import Data.Foldable
|
||||
import Control.Monad
|
||||
import Data.Foldable
|
||||
import qualified Data.IntMap.Strict as IM
|
||||
import qualified Data.IntSet as IS
|
||||
import Data.Maybe
|
||||
@@ -26,6 +25,7 @@ import Dodge.Room.Airlock
|
||||
import Dodge.Room.Boss
|
||||
import Dodge.Room.Corridor
|
||||
import Dodge.Room.Door
|
||||
import Dodge.Room.Foreground
|
||||
import Dodge.Room.LasTurret
|
||||
import Dodge.Room.Link
|
||||
import Dodge.Room.LongDoor
|
||||
@@ -55,33 +55,35 @@ tutAnoTree = do
|
||||
foldMTRS
|
||||
[ tToBTree "TutStartRez" . return . cleatOnward <$> tutRezBox
|
||||
, corDoor
|
||||
, loadAmmoTut
|
||||
, corDoor
|
||||
, tToBTree "slowCrush" . return . cleatOnward <$> pushCaverns
|
||||
, corDoor
|
||||
, chasmSpitTerminal
|
||||
--a , return $ tToBTree "cor" $ return $ cleatOnward corridor
|
||||
--a , corDoor
|
||||
--a , tToBTree "sdr" . return . cleatOnward
|
||||
--a <$> (shuffleLinks =<< distributerRoom BulletAmmo 100000)
|
||||
--a , -- , return $ tToBTree "cor" $ return $ cleatOnward corridor
|
||||
--a -- --, tToBTree "sdr" . return . cleatOnward <$> slowDoorRoom
|
||||
--a ---- , tToBTree "sr" . return . cleatOnward <$> tanksRoom [] []
|
||||
--a -- , return $ tToBTree "door" $ return $ cleatOnward door
|
||||
--a -- , return $ tToBTree "cor" $ return $ cleatOnward corridor
|
||||
--a -- , tToBTree "sdr" . return . cleatOnward <$>
|
||||
--a -- (shuffleLinks =<< tanksPipesRoom)
|
||||
--a -- , return $ tToBTree "cor" $ return $ cleatOnward corridor
|
||||
--a -- , return $ tToBTree "cor" $ return $ cleatOnward corridor
|
||||
--a -- , return $ tToBTree "cor" $ return $ cleatOnward corridor
|
||||
--a return $ tToBTree "door" $ return $ cleatOnward door
|
||||
--a , return $ tToBTree "cor" $ return $ cleatOnward corridor
|
||||
--a , tutHub
|
||||
--a , chasmSpitTerminal
|
||||
--a , return $ tToBTree "cor" $ return $ cleatOnward corridor
|
||||
--a , tutLight
|
||||
--a , tutDrop
|
||||
--a , return $ tToBTree "cor" $ return $ cleatOnward corridor
|
||||
--a ---- , AnTree $ pickupTut
|
||||
--a ---- , AnTree $ weaponTut
|
||||
-- a , return $ tToBTree "cor" $ return $ cleatOnward corridor
|
||||
-- a , corDoor
|
||||
-- a , tToBTree "sdr" . return . cleatOnward
|
||||
-- a <$> (shuffleLinks =<< distributerRoom BulletAmmo 100000)
|
||||
-- a , -- , return $ tToBTree "cor" $ return $ cleatOnward corridor
|
||||
-- a -- --, tToBTree "sdr" . return . cleatOnward <$> slowDoorRoom
|
||||
-- a ---- , tToBTree "sr" . return . cleatOnward <$> tanksRoom [] []
|
||||
-- a -- , return $ tToBTree "door" $ return $ cleatOnward door
|
||||
-- a -- , return $ tToBTree "cor" $ return $ cleatOnward corridor
|
||||
-- a -- , tToBTree "sdr" . return . cleatOnward <$>
|
||||
-- a -- (shuffleLinks =<< tanksPipesRoom)
|
||||
-- a -- , return $ tToBTree "cor" $ return $ cleatOnward corridor
|
||||
-- a -- , return $ tToBTree "cor" $ return $ cleatOnward corridor
|
||||
-- a -- , return $ tToBTree "cor" $ return $ cleatOnward corridor
|
||||
-- a return $ tToBTree "door" $ return $ cleatOnward door
|
||||
-- a , return $ tToBTree "cor" $ return $ cleatOnward corridor
|
||||
-- a , tutHub
|
||||
-- a , chasmSpitTerminal
|
||||
-- a , return $ tToBTree "cor" $ return $ cleatOnward corridor
|
||||
-- a , tutLight
|
||||
-- a , tutDrop
|
||||
-- a , return $ tToBTree "cor" $ return $ cleatOnward corridor
|
||||
-- a ---- , AnTree $ pickupTut
|
||||
-- a ---- , AnTree $ weaponTut
|
||||
]
|
||||
|
||||
foldMTRS ::
|
||||
@@ -240,8 +242,8 @@ sqPlatformChasm b a =
|
||||
sqSpitChasm :: Float -> Float -> ([[Point2]], [[Point2]])
|
||||
sqSpitChasm b a =
|
||||
( [[ibr, obr, otr, itr], [itr, otr, otl, itl], [itl, otl, obl, ibl]]
|
||||
-- ( earClip clfs
|
||||
, [clfs]
|
||||
, -- ( earClip clfs
|
||||
[clfs]
|
||||
)
|
||||
where
|
||||
clfs = [ibr, obr, otr, otl, obl, ibl, itl, itr]
|
||||
@@ -253,6 +255,7 @@ sqSpitChasm b a =
|
||||
ibl = V2 (-b) (-a)
|
||||
itl = V2 (-b) b
|
||||
itr = V2 b b
|
||||
|
||||
-- otl---------otr
|
||||
-- | itl-itr |
|
||||
-- obr-ibl ibr-obl
|
||||
@@ -272,15 +275,19 @@ midChasmSpit = do
|
||||
isMidEdgeLink r North rl
|
||||
|| isMidEdgeLink r East rl
|
||||
|| isMidEdgeLink r West rl
|
||||
, \rl -> OnEdge North `S.member` (rl ^. rlType)
|
||||
&& not (FromEdge East 0 `S.member` (rl ^. rlType))
|
||||
&& not (FromEdge West 0 `S.member` (rl ^. rlType))
|
||||
, \rl ->
|
||||
OnEdge North `S.member` (rl ^. rlType)
|
||||
&& not (FromEdge East 0 `S.member` (rl ^. rlType))
|
||||
&& not (FromEdge West 0 `S.member` (rl ^. rlType))
|
||||
]
|
||||
shuffleLinks $
|
||||
r
|
||||
& rmLinks %~ setOutLinks foutlnks
|
||||
& rmLinks %~ setInLinks (isMidEdgeLink r South)
|
||||
& rmPmnts .~ cs
|
||||
& rmLinks
|
||||
%~ setOutLinks foutlnks
|
||||
& rmLinks
|
||||
%~ setInLinks (isMidEdgeLink r South)
|
||||
& rmPmnts
|
||||
.~ cs
|
||||
where
|
||||
censquare x y = do
|
||||
z <- state $ randomR (40, 60)
|
||||
@@ -300,26 +307,31 @@ chasmSpitTerminal = do
|
||||
i1 <- nextLayoutInt
|
||||
y <- midChasmSpit
|
||||
shp <- takeOne [vShape, lShape, jShape, liShape]
|
||||
let l1 = mntLightLnkShape shp $ resetPLUse $ rprBool $ \rp _ -> f rp North East
|
||||
let l1 = mntLightLnkShape shp $ resetPLUse $ rprBool $ \rp _ -> f rp North East
|
||||
l2 = mntLightLnkShape shp $ resetPLUse $ rprBool $ \rp _ -> f rp North West
|
||||
l3 = mntLightLnkShape shp $ resetPLUse $ rprBool $ \rp _ -> f rp East North
|
||||
l3 = mntLightLnkShape shp $ resetPLUse $ rprBool $ \rp _ -> f rp East North
|
||||
l4 = mntLightLnkShape shp $ resetPLUse $ rprBool $ \rp _ -> f rp East South
|
||||
ls <- takeOne [[l1,l2],[l3,l4]
|
||||
-- ,[spanLightI (V2 120 0) (V2 120 300)]
|
||||
-- , [spanLightI (V2 0 128) (V2 300 128)]
|
||||
-- , [spanLightI (V2 300 0) (V2 0 300), sps0 $ putShape $ thinHighBar 95 0 300]
|
||||
]
|
||||
gh <- takeOne [55,75,97]
|
||||
gird <- takeOne [girderZ gh 30 10,girder gh 30 10,girderV gh 30 10]
|
||||
dec <- takeOne $ replicate 3 [] <>
|
||||
[[sps0 $ putShape $ gird (V2 30 0) (V2 30 300)]
|
||||
,[sps0 $ putShape $ gird (V2 270 0) (V2 270 300)]
|
||||
,[sps0 $ putShape $ gird (V2 30 0) (V2 30 300),sps0 $ putShape $ gird (V2 270 0) (V2 270 300)]
|
||||
,[sps0 $ putShape $ gird (V2 0 20) (V2 300 20)]
|
||||
,[sps0 $ putShape $ gird (V2 0 200) (V2 300 200)]
|
||||
,[sps0 $ putShape $ gird (V2 0 280) (V2 300 280)]
|
||||
,[sps0 $ putShape $ gird (V2 0 20) (V2 300 20),sps0 $ putShape $ gird (V2 0 280) (V2 300 280)]
|
||||
ls <-
|
||||
takeOne
|
||||
[ [l1, l2]
|
||||
, [l3, l4]
|
||||
-- ,[spanLightI (V2 120 0) (V2 120 300)]
|
||||
-- , [spanLightI (V2 0 128) (V2 300 128)]
|
||||
-- , [spanLightI (V2 300 0) (V2 0 300), sps0 $ putShape $ thinHighBar 95 0 300]
|
||||
]
|
||||
gh <- takeOne [55, 75, 97]
|
||||
gird <- takeOne [girderZ gh 30 10, girder gh 30 10, girderV gh 30 10]
|
||||
dec <-
|
||||
takeOne $
|
||||
replicate 3 []
|
||||
<> [ [sps0 $ putShape $ gird (V2 30 0) (V2 30 300)]
|
||||
, [sps0 $ putShape $ gird (V2 270 0) (V2 270 300)]
|
||||
, [sps0 $ putShape $ gird (V2 30 0) (V2 30 300), sps0 $ putShape $ gird (V2 270 0) (V2 270 300)]
|
||||
, [sps0 $ putShape $ gird (V2 0 20) (V2 300 20)]
|
||||
, [sps0 $ putShape $ gird (V2 0 200) (V2 300 200)]
|
||||
, [sps0 $ putShape $ gird (V2 0 280) (V2 300 280)]
|
||||
, [sps0 $ putShape $ gird (V2 0 20) (V2 300 20), sps0 $ putShape $ gird (V2 0 280) (V2 300 280)]
|
||||
]
|
||||
let y' = y & rmPmnts <>~ ls <> dec
|
||||
return $
|
||||
tToBTree "chasmTerm" $
|
||||
@@ -330,8 +342,9 @@ chasmSpitTerminal = do
|
||||
, return $ cleatOnward $ triggerDoorRoom i1
|
||||
]
|
||||
where
|
||||
f rp a b = FromEdge a 2 `S.member` fold (rp ^? rpType . rplsType)
|
||||
&& OnEdge b `S.member` fold (rp ^? rpType . rplsType)
|
||||
f rp a b =
|
||||
FromEdge a 2 `S.member` fold (rp ^? rpType . rplsType)
|
||||
&& OnEdge b `S.member` fold (rp ^? rpType . rplsType)
|
||||
|
||||
polyChasm :: Int -> Float -> State LayoutVars Room
|
||||
polyChasm n x =
|
||||
@@ -409,6 +422,52 @@ tutLight = do
|
||||
)
|
||||
_ -> Nothing
|
||||
|
||||
loadAmmoTut :: State LayoutVars (MetaTree Room String)
|
||||
loadAmmoTut = do
|
||||
i <- nextLayoutInt
|
||||
amrm <-
|
||||
putSingleLight
|
||||
. analyserByDoor (RequireEquipment (AMMOMAG DRUMMAG)) i
|
||||
=<< shuffleLinks
|
||||
=<< roomRectAutoLights 100 100
|
||||
j <- nextLayoutInt
|
||||
wprm <-
|
||||
putSingleLight
|
||||
. addDoorAtNthLinkToggleInterrupt 0 ["DOOR LOCKDOWN ACTIVE"] j
|
||||
=<< shuffleLinks
|
||||
=<< roomRectAutoLights 100 100
|
||||
return $
|
||||
tToBTree "loadAmmoTest" $
|
||||
treeFromPost
|
||||
[amrm & rmPmnts .:~ sps (PS 50 0) (PutFlIt (drumMag & itConsumables ?~ 90))
|
||||
, triggerDoorRoom i
|
||||
, wprm & rmPmnts .:~ sps (PS 50 0) (PutFlIt burstRifle)
|
||||
] (triggerDoorRoom j)
|
||||
|
||||
putSingleLight :: Room -> State LayoutVars Room
|
||||
putSingleLight rm = do
|
||||
f <- case rm ^. rmType of
|
||||
DefaultRoomType -> pure id
|
||||
RectRoomType{_rmWidth = x, _rmHeight = y, _numLinkEW = nx, _numLinkNS = ny} -> do
|
||||
x' <-
|
||||
if odd nx
|
||||
then pure $ x / 2
|
||||
else takeOne [x / 2 + 21, x / 2 - 21]
|
||||
y' <-
|
||||
if odd ny
|
||||
then pure $ y / 2
|
||||
else takeOne [y / 2 + 21, y / 2 - 21]
|
||||
ps <-
|
||||
takeOne
|
||||
[ (V2 x' 0, V2 x' y)
|
||||
, (V2 0 y', V2 x y')
|
||||
]
|
||||
return $ rmPmnts .:~ uncurry spanLightI ps
|
||||
RoomNgon{_rmngonSize = x} -> do
|
||||
y <- takeOne [21, -21]
|
||||
return $ rmPmnts .:~ spanLightI (V2 (-x) y) (V2 x y)
|
||||
return . f $ removeLights rm
|
||||
|
||||
tutHub :: State LayoutVars (MetaTree Room String)
|
||||
tutHub = do
|
||||
(is, wbp) <- setTreeInts =<< critsRoom 1
|
||||
|
||||
Reference in New Issue
Block a user