- Add some exceptions to item indicators

agilbert1412 · Apr 28, 2024 · 2401fea · 2401fea
1 parent e9d11dc
commit 2401fea
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 7 deletions.
diff --git a/StardewArchipelago/Locations/GingerIsland/Parrots/IslandNorthInjections.cs b/StardewArchipelago/Locations/GingerIsland/Parrots/IslandNorthInjections.cs
@@ -11,7 +11,7 @@ public class IslandNorthInjections : IParrotReplacer
     {
         private const string AP_BRIDGE_PARROT = "Dig Site Bridge";
         private const string AP_TRADER_PARROT = "Island Trader";
-        private const string AP_PROF_SNAIL_CAVE = "Open Professor Snail Cave";
+        public const string AP_PROF_SNAIL_CAVE = "Open Professor Snail Cave";
 
         private static IMonitor _monitor;
         private static IModHelper _modHelper;

diff --git a/StardewArchipelago/Locations/LocationNameMatcher.cs b/StardewArchipelago/Locations/LocationNameMatcher.cs
@@ -1,13 +1,30 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using StardewArchipelago.Locations.Festival;
+using StardewArchipelago.Locations.GingerIsland.Parrots;
 
 namespace StardewArchipelago.Locations
 {
     public class LocationNameMatcher
     {
         private Dictionary<string, string[]> _wordFilterCache;
 
+        private static readonly Dictionary<string, string[]> _exceptions = new()
+        {
+            { "Snail", new[] { IslandNorthInjections.AP_PROF_SNAIL_CAVE } },
+            {
+                "Stone",
+                new[]
+                {
+                    FestivalLocationNames.STRENGTH_GAME, "Lemon Stone",
+                    "Ocean Stone", "Fairy Stone", "Swirl Stone"
+                }
+            },
+            { "Trash", new[] { "Trash Can Upgrade" } },
+            { "Hardwood", new[] { "Hardwood Display" } },
+        };
+
         public LocationNameMatcher()
         {
             _wordFilterCache = new Dictionary<string, string[]>();
@@ -30,12 +47,20 @@ public string[] GetAllLocationsContainingWord(IEnumerable<string> allLocations,
                 return _wordFilterCache[wordFilter];
             }
 
-            var filteredLocations = FilterForWord(GetAllLocationsMatching(allLocations, wordFilter), wordFilter).ToArray();
-
+            var filteredLocations = FilterForWord(GetAllLocationsMatching(allLocations, wordFilter), wordFilter);
+
+            if (_exceptions.ContainsKey(wordFilter))
+            {
+                foreach (var exceptionName in _exceptions[wordFilter])
+                {
+                    filteredLocations = filteredLocations.Where(x =>
+                        !x.Contains(exceptionName, StringComparison.InvariantCultureIgnoreCase));
+                }
+            }
 
-
-            _wordFilterCache.Add(wordFilter, filteredLocations);
-            return filteredLocations;
+            var filteredArray = filteredLocations.ToArray();
+            _wordFilterCache.Add(wordFilter, filteredArray);
+            return filteredArray;
         }
 
         public bool IsAnyLocationMatching(IEnumerable<string> allLocations, string filter)

diff --git a/StardewArchipelagoTests/LocationNameMatcherTests.cs b/StardewArchipelagoTests/LocationNameMatcherTests.cs
@@ -38,7 +38,7 @@ public void GetAllLocationsContainingWordTruePositivesTest(string itemName, stri
 
         [TestCase("Snail", new[] { "Open Professor Snail Cave" }, TestName = "Professor Snail Cave")]
         [TestCase("Stone", new[] { "Shipsanity: Swirl Stone", "Smashing Stone" }, TestName = "Swirl Stone")]
-        [TestCase("Hardwood", new[] { "Shipsanity: Hardwood Display: Amphibian Fossil", "Shipsanity: Wooden Display: Dinosaur Egg", "Craft Hardwood Preservation Chamber", "Craft Hardwood Display", "Shipsanity: Hardwood Fence" }, TestName = "Hardwood Displays")]
+        [TestCase("Hardwood", new[] { "Shipsanity: Hardwood Display: Amphibian Fossil" }, TestName = "Hardwood Displays")]
         public void GetAllLocationsContainingWordFalsePositivesTest(string itemName, string[] locationsNotMatching)
         {
             // Arrange