Gittes-archive/new-horizons
2
0
Fork 0
mirror of https://github.com/Outer-Wilds-New-Horizons/new-horizons.git synced 2025-12-11 20:15:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Account for going back and forth and yanking tons of items

Browse Source
This commit is contained in:
xen-42 2024-10-05 17:31:31 -04:00
parent 5ddcae3d15
commit fafb0a5df0
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
NewHorizons/Handlers/HeldItemHandler.cs
View File

@ -17,7 +17,7 @@ public static class HeldItemHandler
/// Dictionary of system name to item path /// Dictionary of system name to item path
/// If we travel to multiple systems within a single loop, this will hold the items we move between systems /// If we travel to multiple systems within a single loop, this will hold the items we move between systems
/// </summary> /// </summary>
private static Dictionary<string, string> _pathOfItemTakenFromSystem = new(); private static Dictionary<string, List<string>> _pathOfItemTakenFromSystem = new();
private static GameObject _currentlyHeldItem; private static GameObject _currentlyHeldItem;
@ -86,7 +86,11 @@ public static class HeldItemHandler
// Track it so that when we return to this system we can delete the original // Track it so that when we return to this system we can delete the original
if (_trackedPaths.TryGetValue(_currentlyHeldItem, out var path)) if (_trackedPaths.TryGetValue(_currentlyHeldItem, out var path))
{ {
_pathOfItemTakenFromSystem[Main.Instance.CurrentStarSystem] = path; if (!_pathOfItemTakenFromSystem.ContainsKey(Main.Instance.CurrentStarSystem))
{
_pathOfItemTakenFromSystem[Main.Instance.CurrentStarSystem] = new();
}
_pathOfItemTakenFromSystem[Main.Instance.CurrentStarSystem].Add(path);
} }
NHLogger.Log($"Scene unloaded, preserved inactive held item {_currentlyHeldItem.name}"); NHLogger.Log($"Scene unloaded, preserved inactive held item {_currentlyHeldItem.name}");
@ -101,16 +105,19 @@ public static class HeldItemHandler
private static void OnSystemReady(string _) private static void OnSystemReady(string _)
{ {
// If something was taken from this system during this life, remove it // If something was taken from this system during this life, remove it
if (_pathOfItemTakenFromSystem.TryGetValue(Main.Instance.CurrentStarSystem, out var path)) if (_pathOfItemTakenFromSystem.TryGetValue(Main.Instance.CurrentStarSystem, out var paths))
{ {
NHLogger.Log($"Removing item that was taken from this system at {path}"); foreach (var path in paths)
var item = SearchUtilities.Find(path)?.GetComponent<OWItem>();
// Make sure to update the socket it might be in so that it works
if (item.GetComponentInParent<OWItemSocket>() is OWItemSocket socket)
{ {
socket.RemoveFromSocket(); NHLogger.Log($"Removing item that was taken from this system at {path}");
var item = SearchUtilities.Find(path)?.GetComponent<OWItem>();
// Make sure to update the socket it might be in so that it works
if (item.GetComponentInParent<OWItemSocket>() is OWItemSocket socket)
{
socket.RemoveFromSocket();
}
GameObject.Destroy(item.gameObject);
} }
GameObject.Destroy(item.gameObject);
} }
// Give whatever item we were previously holding // Give whatever item we were previously holding