Merge pull request ArchipelagoMW#4 from Extra-2-Dew/bug-fixes-and-cleanup

Bug fixes and cleanup

Author: Chris-Is-Awesome

ArchipelagoRandomizer.csproj

@@ -31,6 +31,36 @@
 		<Reference Include="$(GameDataPath)\BepInEx\plugins\ModCore\ModCore.dll">
 			<Private>false</Private>
 		</Reference>
+		<None Update="c-wspp.dll">
+		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+		<None Update="Assets\APFiller.png">
+		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+		<None Update="Assets\APProgression.png">
+		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+		<None Update="Assets\APTrap.png">
+		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+		<None Update="Assets\APUseful.png">
+		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+		<None Update="Assets\Roll.png">
+		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+		<None Update="Assets\Stick.png">
+		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+		<None Update="Assets\SuitApaFrog.png">
+		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+		<None Update="Assets\SuitJennyBerry.png">
+		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+		<None Update="Assets\SuitThatGuy.png">
+		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
 
 		<None Update="Data\itemData.json">
 		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -45,6 +75,9 @@
 		<None Update="thumbnail.png">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</None>
+		<None Update="websocket-sharp.dll">
+		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
 
 		<Publicize Include="Assembly-CSharp" />
 	</ItemGroup>

CustomArt/ItemIcon_APFiller.png Assets/APFiller.png

@@ -5,19 +5,20 @@
 using Archipelago.MultiClient.Net.Models;
 using ModCore;
 using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace ArchipelagoRandomizer
 {
 	public class APHandler
 	{
 		private static APHandler instance;
 		private const int baseId = 238492834;
-		private ArchipelagoSession session;
-		private PlayerInfo currentPlayer;
+		private List<ScoutedItemInfo> scoutedItems;
 
 		public static APHandler Instance { get { return instance; } }
-		public static ArchipelagoSession Session { get { return instance.session; } }
-		public PlayerInfo CurrentPlayer { get { return currentPlayer; } }
+		public static ArchipelagoSession Session { get; private set; }
+		public PlayerInfo CurrentPlayer { get; private set; }
 
 		public APHandler()
 		{
@@ -26,13 +27,13 @@ public APHandler()
 
 		public bool TryCreateSession(string url, string slot, string password, out string message)
 		{
-			if (session != null)
+			if (Session != null)
 			{
-				session.MessageLog.OnMessageReceived -= OnReceiveMessage;
+				Session.MessageLog.OnMessageReceived -= OnReceiveMessage;
 			}
 			try
 			{
-				session = ArchipelagoSessionFactory.CreateSession(url);
+				Session = ArchipelagoSessionFactory.CreateSession(url);
 			}
 			catch (Exception ex)
 			{
@@ -44,7 +45,7 @@ public bool TryCreateSession(string url, string slot, string password, out strin
 
 			try
 			{
-				result = session.TryConnectAndLogin("Ittle Dew 2", slot, ItemsHandlingFlags.AllItems, password: password);
+				result = Session.TryConnectAndLogin("Ittle Dew 2", slot, ItemsHandlingFlags.AllItems, password: password);
 			}
 			catch (Exception ex)
 			{
@@ -68,38 +69,63 @@ public bool TryCreateSession(string url, string slot, string password, out strin
 			}
 
 			var loginSuccess = (LoginSuccessful)result;
-			currentPlayer = session.Players.GetPlayerInfo(session.ConnectionInfo.Slot);
-			session.MessageLog.OnMessageReceived += OnReceiveMessage;
-			message = "Successfully connected!\n" +
-				"Now that you are connected, you can use !help to list commands to run via the server.";
-			session.Items.ItemReceived += OnReceivedItem;
+			CurrentPlayer = Session.Players.GetPlayerInfo(Session.ConnectionInfo.Slot);
+			Session.MessageLog.OnMessageReceived += OnReceiveMessage;
+			Session.Locations.CheckedLocationsUpdated += OnLocationChecked;
+			Session.Items.ItemReceived += OnReceivedItem;
+			message = "Successfully connected!\nNow that you are connected, you can use !help to list commands to run via the server.";
+			ScoutLocations();
 			return true;
 		}
 
+		public void LocationChecked(int offset)
+		{
+			if (Session == null)
+			{
+				Plugin.Log.LogError("Error in APHandler.LocationChecked(): No session exists yet!");
+				return;
+			}
+
+			Session.Locations.CompleteLocationChecks(baseId + offset);
+		}
+
+		private void OnLocationChecked(System.Collections.ObjectModel.ReadOnlyCollection<long> newCheckedLocations)
+		{
+			long id = newCheckedLocations[newCheckedLocations.Count - 1];
+			string locationName = Session.Locations.GetLocationNameFromId(id);
+			ScoutedItemInfo item = scoutedItems.FirstOrDefault(x => x.LocationId == id);
+
+			// If sending item
+			if (item != null && item.Player.Slot != CurrentPlayer.Slot)
+				ItemRandomizer.Instance.ItemSent(item.ItemDisplayName, item.Player.Name);
+
+			Plugin.Log.LogInfo($"Checked location: {locationName}");
+		}
+
 		private void OnReceivedItem(ReceivedItemsHelper helper)
 		{
-			ItemInfo receivedItem = session.Items.AllItemsReceived[session.Items.AllItemsReceived.Count - 1];
+			ItemInfo receivedItem = Session.Items.AllItemsReceived[Session.Items.AllItemsReceived.Count - 1];
 			int itemOffset = (int)receivedItem.ItemId - baseId;
-			ItemRandomizer.Instance.ItemReceived(itemOffset, receivedItem.Player.Name);
+			ItemRandomizer.Instance.ItemReceived(itemOffset, receivedItem.ItemDisplayName, receivedItem.Player.Name);
 		}
 
-		public void LocationChecked(int offset)
+		private void ScoutLocations()
 		{
-			if (session == null)
+			if (Session == null)
 			{
-				Plugin.Log.LogError("Attempted to interact with Archipelago server, but no session has been started yet!");
+				Plugin.Log.LogError($"Error in APHandler.ScoutLocations(): No session exists yet!");
 				return;
 			}
 
-			int id = baseId + offset;
-			session.Locations.CompleteLocationChecksAsync((completed) =>
+			scoutedItems = new();
+
+			Session.Locations.ScoutLocationsAsync((scoutResult) =>
 			{
-				if (completed)
+				foreach (ScoutedItemInfo item in scoutResult.Values)
 				{
-					string locationName = session.Locations.GetLocationNameFromId(id);
-					Plugin.Log.LogInfo($"Checked location: {locationName} ({offset})");
+					scoutedItems.Add(item);
 				}
-			}, id);
+			}, Session.Locations.AllLocations.ToArray());
 		}
 
 		private void OnReceiveMessage(LogMessage message)