Some Important Fixes

JappaWakka · Jun 19, 2023 · 25aed67 · 25aed67
1 parent f1d68f7
commit 25aed67
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/GameModes/Lost Silver/Content/Data/Maps/GoodBye_House.dat b/GameModes/Lost Silver/Content/Data/Maps/GoodBye_House.dat
@@ -143,7 +143,7 @@ ChangeColor
 {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"EntityID"{str[ScriptBlock]}}{"Position"{sngArr[7,0,46]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[0,48,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[GoodBye\GoodBye_House_TurnBlack]}}{"Rotation"{int[0]}}]}}
 {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"EntityID"{str[ScriptBlock]}}{"Position"{sngArr[7,0,45]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[0,48,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[GoodBye\GoodBye_House_TurnWhite]}}{"Rotation"{int[0]}}]}}
 
-{"OffsetMap"{MAP[{"Offset"{sngArr[2,3,-2]}}{"Map"{str[GoodBye\GoodBye_Room.dat]}}]}}
+{"OffsetMap"{MAP[{"Offset"{sngArr[2,3,-2]}}{"Map"{str[GoodBye_Room.dat]}}]}}
 
 Gold:
 {"NPC"{NPC[{"Position"{sngArr[7,0,81]}}{"TextureID"{str[Gold_Regular]}}{"ID"{int[0]}}{"Name"{str[Gold]}}{"Action"{int[1]}}{"AdditionalValue"{str[GoodBye\GoodBye_House_Gold]}}{"Rotation"{int[2]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
diff --git a/GameModes/Lost Silver/Content/Data/Maps/GoodBye_Room.dat b/GameModes/Lost Silver/Content/Data/Maps/GoodBye_Room.dat
@@ -94,4 +94,4 @@ Bookshelf:
 TownMap:
 {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"Scale"{sngArr[0.6,0.6,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[6,0.2,-0.49]}}{"TexturePath"{str[LostHouse]}}{"Textures"{recArr[[48,80,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
 
-{"OffsetMap"{MAP[{"Offset"{sngArr[-2,-3,2]}}{"Map"{str[House.dat]}}]}}
+{"OffsetMap"{MAP[{"Offset"{sngArr[-2,-3,2]}}{"Map"{str[GoodBye_House.dat]}}]}}
diff --git a/GameModes/Lost Silver/Content/Data/Scripts/GoodBye/GoodBye_House_MapScript.dat b/GameModes/Lost Silver/Content/Data/Scripts/GoodBye/GoodBye_House_MapScript.dat
@@ -1,6 +1,6 @@
 version=2
 
-:if:<Register.Registered(SlideShow_Done)>=true
+:if:<Register.Registered(SlideShow_Done)>=true <or> <Register.Registered(Hidden_Done)>=false <or> <Register.Registered(Burned_Done)>=false <or> <Register.Registered(DiedHe_Done)>=false
 	@Entity.SetCollision(1,1)
 	@Entity.SetVisible(1,0)
 :endif

diff --git a/GameModes/Lost Silver/Content/Data/Scripts/Grave_SpinDown.dat b/GameModes/Lost Silver/Content/Data/Scripts/Grave_SpinDown.dat
@@ -39,21 +39,23 @@ version=2
 @Camera.Update
 @Player.ResetMovement
 @Camera.DeFix
-:if:<Pokemon.AdditionalData(0)>=3
-	:if:<Pokemon.AdditionalData(1)>=8
-		:if:<Pokemon.AdditionalData(2)>=4
-			:if:<Pokemon.AdditionalData(3)>=3
-				:if:<Pokemon.AdditionalData(4)>=7
-					:if:<Pokemon.AdditionalData(5)>=4
-						@Player.Warp(DiedHe.dat,4,0.1,6,0)
-						@Level.Update
-						:end
+:if:<Register.Registered(DiedHe_Done)>=false
+	:if:<Pokemon.AdditionalData(0)>=3
+		:if:<Pokemon.AdditionalData(1)>=8
+			:if:<Pokemon.AdditionalData(2)>=4
+				:if:<Pokemon.AdditionalData(3)>=3
+					:if:<Pokemon.AdditionalData(4)>=7
+						:if:<Pokemon.AdditionalData(5)>=4
+							@Player.Warp(DiedHe.dat,4,0.1,6,0)
+							@Level.Update
+							:end
+						:endif
 					:endif
 				:endif
 			:endif
 		:endif
 	:endif
-:endif		
+:endif
 @Player.Warp(RedTower.dat,4,0.1,8,0)
 @Music.Stop
 @Level.Update