From 264651d34a44cf3af1e85a43f38a941860ac6c0e Mon Sep 17 00:00:00 2001 From: justin Date: Sat, 25 Apr 2026 09:04:01 +0100 Subject: [PATCH] Prevent rooted creatures from being pushed by other creatures --- src/Dodge/Room/Tutorial.hs | 4 ++-- src/Dodge/Update.hs | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Dodge/Room/Tutorial.hs b/src/Dodge/Room/Tutorial.hs index 3793114fe..93da4770f 100644 --- a/src/Dodge/Room/Tutorial.hs +++ b/src/Dodge/Room/Tutorial.hs @@ -56,8 +56,8 @@ tutAnoTree :: State LayoutVars MTRS tutAnoTree = do foldMTRS [ tToBTree "TutStartRez" . return . cleatOnward <$> tutRezBox - , corDoor - , tToBTree "" . return . cleatOnward <$> slowDoorRoom +-- , corDoor +-- , tToBTree "" . return . cleatOnward <$> slowDoorRoom , corDoor --, tToBTree "" . return . cleatOnward <$> (xChasm 200 200 , tToBTree "" . return . cleatOnward <$> ((putSingleLight =<< roomRectAutoLights 300 300) diff --git a/src/Dodge/Update.hs b/src/Dodge/Update.hs index b90496896..76b17af7d 100644 --- a/src/Dodge/Update.hs +++ b/src/Dodge/Update.hs @@ -1015,6 +1015,10 @@ crCrSpring c1 c2 | vec == V2 0 0 = id | diff >= comRad = id | diffheight = id + | Rooted <- c2 ^. crStance . carriage = id + | Rooted <- c1 ^. crStance . carriage + = cWorld . lWorld . creatures . ix id2 . crPos . _xy +~ + (diff - comRad) *^ signorm vec | SlimeCrit{} <- c1 ^. crType , SlimeCrit{} <- c2 ^. crType , id2 > id1