Fixed missing items in kittyboss and dynamo works rooms preventing pr…

…ogression
Jarno458 · Jan 12, 2022 · 9d55c32 · 9d55c32
1 parent e09baff
commit 9d55c32
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/TsRandomizer/LevelObjects/ItemManipulator.cs b/TsRandomizer/LevelObjects/ItemManipulator.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using Timespinner.GameAbstractions.Inventory;
 using Timespinner.GameObjects.BaseClasses;
 using TsRandomizer.Extensions;
 using TsRandomizer.IntermediateObjects;
@@ -23,14 +21,14 @@ abstract class ItemManipulator : LevelObject
 	{
 		static ItemLocationMap itemLocationMap;
 
-		public bool IsPickedUp => itemLocation.IsPickedUp;
+		public bool IsPickedUp => ItemLocation.IsPickedUp;
 
 		public readonly ItemInfo ItemInfo;
-		readonly ItemLocation itemLocation;
+		public readonly ItemLocation ItemLocation;
 
 		protected ItemManipulator(Mobile typedObject, ItemLocation itemLocation) : base(typedObject)
 		{
-			this.itemLocation = itemLocation;
+			ItemLocation = itemLocation;
 			ItemInfo = itemLocation?.ItemInfo;
 		}
 
@@ -47,16 +45,13 @@ protected void AwardContainedItem()
 		protected void OnItemPickup()
 		{
 			ItemInfo.OnPickup(Level);
-			itemLocation.SetPickedUp();
+			ItemLocation.SetPickedUp();
 
 			if (ItemInfo.IsProgression)
 				ItemTrackerUplink.UpdateState(ItemTrackerState.FromItemLocationMap(itemLocationMap));
 		}
 
-		public static void Initialize(ItemLocationMap itemLocations)
-		{
-			itemLocationMap = itemLocations;
-		}
+		public static void Initialize(ItemLocationMap itemLocations) => itemLocationMap = itemLocations;
 
 		public static ItemManipulator GenerateShadowObject(Type levelObjectType, Mobile obj, ItemLocationMap itemLocations)
 		{

diff --git a/TsRandomizer/LevelObjects/ItemManipulators/OrbPedestal.cs b/TsRandomizer/LevelObjects/ItemManipulators/OrbPedestal.cs
@@ -42,7 +42,9 @@ protected override void Initialize(SeedOptions options)
 			if (ItemInfo == null)
 				return;
 
-			if (IsPickedUp)
+			if (IsPickedUp 
+			    && ItemLocation.Key != new RoomItemKey(1, 5) //Kitty boss
+			    && ItemLocation.Key != new RoomItemKey(11, 39)) //Dynamo Works
 			{
 				Level.RequestRemoveObject(TypedObject);
 				return;