diff --git a/src/Dodge/Placement/Instance/Block.hs b/src/Dodge/Placement/Instance/Block.hs index 8aeda5c90..2bed01fda 100644 --- a/src/Dodge/Placement/Instance/Block.hs +++ b/src/Dodge/Placement/Instance/Block.hs @@ -12,13 +12,11 @@ decoratedBlock decf mat col h ps = PutBlock bl wl $ reverse ps where bl = defaultBlock - & blDraw .~ BlockDraws [BlockDrawColHeightPoss col h (reverse ps), BlockDrawBlSh decf] - --(\bl' -> noPic (colorSH col (upperPrismPoly h $ reverse ps) <> decf bl')) + & blDraw .~ BlockDraws [BlockDrawColHeightPoss col h ps, BlockDrawBlSh decf] & blHeight .~ h & blMaterial .~ mat wl = defaultWall --- & wlColor .~ col & wlRotateTo .~ False & wlOpacity .~ SeeAbove & wlMaterial .~ mat diff --git a/src/Dodge/Placement/PlaceSpot.hs b/src/Dodge/Placement/PlaceSpot.hs index fe8cbd873..8a27001cf 100644 --- a/src/Dodge/Placement/PlaceSpot.hs +++ b/src/Dodge/Placement/PlaceSpot.hs @@ -131,11 +131,9 @@ placeSpotID rid ps pt w = case pt of fsID (mvFS p rot fs) w - --PutMachine pps mc wl mitm -> plMachine (map doShift pps) mc wl mitm p rot w PutMachine pps mc mitm -> plMachine (map doShift pps) mc mitm p rot w PutLS ls -> plNewUpID (gwWorld . cWorld . lWorld . lightSources) lsID (mvLS p' rot ls) w RandPS _ -> error "RandPS should not be reachable here" --evaluateRandPS rid rgn ps w - --PutDoor col eo f pss -> plDoor col eo f (map (bimap doShift doShift) pss) w PutDoor eo f l p1 p2 -> plDoor eo f l (pashift p1) (pashift p2) w PutCoord cp -> plNewID (gwWorld . coordinates) (doShift cp) w PutSlideDr wl dr eo off a b -> @@ -208,7 +206,6 @@ mvFS p a = (fsDir +~ a) . (fsPos %~ ((p +.+) . rotateV a)) plMachine :: [Point2] -> Machine -> --- Wall -> Maybe Item -> Point2 -> Float -> diff --git a/src/Dodge/Room/Tutorial.hs b/src/Dodge/Room/Tutorial.hs index fd48768af..4b95be74f 100644 --- a/src/Dodge/Room/Tutorial.hs +++ b/src/Dodge/Room/Tutorial.hs @@ -44,6 +44,13 @@ tutAnoTree = do [ tToBTree "TutStartRez" . return . cleatOnward <$> tutRezBox , corDoor , return $ tToBTree "cor" $ return $ cleatOnward corridor + , return $ tToBTree "cor" $ return $ cleatOnward corridor + , tToBTree "lastun" . return . cleatOnward <$> cenLasTur + , return $ tToBTree "cor" $ return $ cleatOnward corridor + , return $ tToBTree "cor" $ return $ cleatOnward corridor + , return $ tToBTree "cor" $ return $ cleatOnward corridor + + , return $ tToBTree "cor" $ return $ cleatOnward corridor -- , return $ tToBTree "cor" $ return $ cleatOnward corridor -- , return $ tToBTree "cor" $ return $ cleatOnward corridor -- , return $ tToBTree "cor" $ return $ cleatOnward (twinSlowDoorRoom 80 200 40)