diff --git a/apworld/Rules.py b/apworld/Rules.py index 2f0a2ca..db11349 100644 --- a/apworld/Rules.py +++ b/apworld/Rules.py @@ -2086,7 +2086,6 @@ def rules(ultrakillworld): add_rule(multiworld.get_location("5-2: Secret #1", player), lambda state: ( can_slide(state, player, slide) - or slam_storage(state, player, slam, walljump) or rock0_fire2(state, player, fire2) )) diff --git a/mod/Core.cs b/mod/Core.cs index 3339997..b2cf754 100644 --- a/mod/Core.cs +++ b/mod/Core.cs @@ -22,7 +22,7 @@ public class Core : BaseUnityPlugin { public const string PluginGUID = "trpg.archipelagoultrakill"; public const string PluginName = "Archipelago"; - public const string PluginVersion = "2.2.1"; + public const string PluginVersion = "2.2.2"; public static string workingPath; public static string workingDir; diff --git a/mod/LocationManager.cs b/mod/LocationManager.cs index 8a1bbee..48b901d 100644 --- a/mod/LocationManager.cs +++ b/mod/LocationManager.cs @@ -367,6 +367,7 @@ public static void GetRandomHint() Multiworld.Session.Locations.ScoutLocationsAsync(true, locationId); ScoutedItemInfo info = Multiworld.Session.Locations.ScoutLocationsAsync(false, locationId).Result[locationId]; + string locationName = Multiworld.Session.Locations.GetLocationNameFromId(info.LocationId, Multiworld.Session.Players.GetPlayerInfo(Multiworld.Session.ConnectionInfo.Slot).Game); string itemColor = ColorUtility.ToHtmlStringRGB(GetUKMessageColor(info.ItemName)); Color color = GetUKMessageColor(info.ItemName); @@ -376,7 +377,7 @@ public static void GetRandomHint() color = GetAPMessageColor(info.Flags); } string playerColor = ColorUtility.ToHtmlStringRGB(Colors.PlayerOther); - string locationColor = ColorUtility.ToHtmlStringRGB(GetUKMessageColor(info.LocationName.Substring(0, 3))); + string locationColor = ColorUtility.ToHtmlStringRGB(GetUKMessageColor(locationName.Substring(0, 3))); string hint = "HINT: "; hint += info.ItemName.ToUpper() + " "; @@ -390,7 +391,7 @@ public static void GetRandomHint() color = color, message = hint }); - if (!UIManager.displayingMessage && Core.IsPlaying) Core.uim.StartCoroutine("DisplayMessage"); + if (!UIManager.displayingMessage && (Core.IsPlaying || SceneHelper.CurrentScene == "Endless")) Core.uim.StartCoroutine("DisplayMessage"); } else { diff --git a/mod/Properties/AssemblyInfo.cs b/mod/Properties/AssemblyInfo.cs index 9183b70..ad4f5ad 100644 --- a/mod/Properties/AssemblyInfo.cs +++ b/mod/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.2.1")] -[assembly: AssemblyFileVersion("2.2.1")] +[assembly: AssemblyVersion("2.2.2")] +[assembly: AssemblyFileVersion("2.2.2")] diff --git a/package/CHANGELOG.md b/package/CHANGELOG.md index 9d7244c..fea4526 100644 --- a/package/CHANGELOG.md +++ b/package/CHANGELOG.md @@ -1,3 +1,8 @@ +## 2.2.2 + +- Fixed a logic error for 5-2: Secret #1. +- Fixed The Cyber Grind soft locking when using Hint Mode to unlock hints for other game slots. + ## 2.2.1 - Updated Archipelago.MultiClient.Net to `6.0.0-rc5`. diff --git a/package/manifest.json b/package/manifest.json index 3bab42e..e9d7d36 100644 --- a/package/manifest.json +++ b/package/manifest.json @@ -1,6 +1,6 @@ { "name": "Archipelago", - "version_number": "2.2.1", + "version_number": "2.2.2", "website_url": "https://github.com/TRPG0/ArchipelagoULTRAKILL", "description": "Connect to an Archipelago server to play ULTRAKILL randomizer.", "dependencies": [