And some more pushes after git confused me

Jarno458 · Nov 24, 2021 · 75e06c5 · 75e06c5
1 parent 41e5f37
commit 75e06c5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/ReadMe.md b/ReadMe.md
@@ -67,11 +67,11 @@ The item tracker features a few options:
 
 # Known bugs
 ##### I am aware of these issues, but i found them small enough not to fix at this moment
-* When you already got the blade-orb and kill the kitty boss while standing at the items spawn point you will trigger the item pickup message but no item is rewarded
 * Orb pedestal in room before emperor always spawn even if you didn't kill him yet
 * If Timespinner is placed in the incorrect folder it will not display the FileNotFoundMessage as it needs SDL library to do that
 * Entering a door backwards with a higher level keycard will permanently open it even when specific keycards are on
 * Music wont play in lake desolation until you have done the "oh i lost my mother" cutscene
+* Killing Cantoran and leaving his room without picking up the reward, will sometimes yield duplicate items when you return to the room
 
 # Todo
 ##### Things i plan on doing in the future

diff --git a/TsRandomizer/Archipelago/LocationMap.cs b/TsRandomizer/Archipelago/LocationMap.cs
@@ -216,8 +216,9 @@ static LocationMap()
 				{1337173, new RoomItemKey(8, 21)}, //new
 				{1337174, new ItemKey(7, 3, 120, 204)}, //new
 				{1337175, new RoomItemKey(7, 28)}, //new
+				{1337176, new RoomItemKey(7, 5)}, //new
 
-				// 1337176 - 1337236 Reserved
+				// 1337177 - 1337236 Reserved
 
 				// Pyramid
 				// Temporal Gyre

diff --git a/TsRandomizer/Properties/AssemblyInfo.cs b/TsRandomizer/Properties/AssemblyInfo.cs
@@ -12,8 +12,8 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("694e46c5-fd46-4cc8-8b71-d381e154ccf7")]
-[assembly: AssemblyVersion("0.1.1.3")]
-[assembly: AssemblyFileVersion("0.1.1.3")]
+[assembly: AssemblyVersion("0.1.1.4")]
+[assembly: AssemblyFileVersion("0.1.1.4")]
 
 [assembly: InternalsVisibleTo("TsRandomizer.Tests")]
 [assembly: InternalsVisibleTo("TsRandomizerSeedGeneratah")]
diff --git a/TsRandomizer/Randomisation/ItemLocationMap.cs b/TsRandomizer/Randomisation/ItemLocationMap.cs
@@ -136,7 +136,7 @@ void SetupGates()
 			ForwardDashDoubleJump = (R.ForwardDash & R.DoubleJump) | R.UpwardDash;
 
 			//past
-			LeftSideForestCaves = (AccessToPast & (R.TimespinnerWheel | R.ForwardDash | R.DoubleJump)) | R.GateLakeSereneRight | R.GateLakeSereneLeft;
+			LeftSideForestCaves = (AccessToPast & (R.TimeStop | R.ForwardDash)) | R.GateLakeSereneRight | R.GateLakeSereneLeft;
 			UpperLakeSirine = (LeftSideForestCaves & (R.TimeStop | R.Swimming)) | R.GateLakeSereneLeft;
 			LowerlakeSirine = (LeftSideForestCaves | R.GateLakeSereneLeft) & R.Swimming;
 			LowerCavesOfBanishment = LowerlakeSirine | R.GateCavesOfBanishment | (R.GateMaw & R.DoubleJump);
@@ -295,9 +295,8 @@ void AddPresentItemLocations()
 
 		void AddCantoran()
         {
-			// Move to AddPastItemLocations if this ever becomes a default flag
 			areaName = "Upper Lake Sirine";
-			Add(new RoomItemKey(7, 5), "Cantoran", ItemProvider.Get(EInventoryOrbType.Barrier, EOrbSlot.Melee), UpperLakeSirine);
+			Add(new RoomItemKey(7, 5), "Cantoran", ItemProvider.Get(EInventoryOrbType.Barrier, EOrbSlot.Melee), LeftSideForestCaves);
 		}
 
 		void AddPastItemLocations()