Prevent getting suit transitions in invalid rooms

randovania · Feb 3, 2024 · 1bfd8b3 · 1bfd8b3
1 parent c63602e
commit 1bfd8b3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,11 @@ All notable changes to this project will be documented in this file.
 
 This format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html)
 
+## [1.2.12] - 2024-02-03
+
+### Fixed
+- When receiving a suit in a Multiworld, the suit transition cutscene will now not play in invalid rooms anymore.
+
 ## [1.2.11] - 2024-01-30
 
 ### Fixed

diff --git a/YAMS-LIB/Program.cs b/YAMS-LIB/Program.cs
@@ -2478,6 +2478,8 @@ void RotateTextureAndSaveToTexturePage(int rotation, UndertaleTexturePageItem te
                                                   global.SuitChange = 0;
                                               if (!(collision_point((x + 8), (y + 8), oSolid, 0, 1)))
                                                   global.SuitChange = 0;
+                                              if (room == rm_transition || room == rm_loading || room == itemroom)
+                                                  global.SuitChange = 0;
                                               global.SuitChangeX = x;
                                               global.SuitChangeY = y;
                                               global.SuitChangeGravity = 0;
@@ -2504,6 +2506,8 @@ void RotateTextureAndSaveToTexturePage(int rotation, UndertaleTexturePageItem te
                                                     global.SuitChange = 0;
                                                 if (!(collision_point((x + 8), (y + 8), oSolid, 0, 1)))
                                                     global.SuitChange = 0;
+                                                if (room == rm_transition || room == rm_loading || room == itemroom)
+                                                    global.SuitChange = 0;
                                                 global.SuitChangeX = x;
                                                 global.SuitChangeY = y;
                                                 global.SuitChangeGravity = 1;
@@ -2526,6 +2530,8 @@ void RotateTextureAndSaveToTexturePage(int rotation, UndertaleTexturePageItem te
                                                              global.SuitChange = 0;
                                                          if (!(collision_point((x + 8), (y + 8), oSolid, 0, 1)))
                                                              global.SuitChange = 0;
+                                                         if (room == rm_transition || room == rm_loading || room == itemroom)
+                                                             global.SuitChange = 0;
                                                          global.SuitChangeX = x;
                                                          global.SuitChangeY = y;