Stardew Valley: Fix a bug where locations in logic would disappear from universal tracker as items get sent (#4230)

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>

worlds/stardew_valley/test/rules/TestStateRules.py

@@ -1,12 +1,22 @@
-import unittest
-
-from BaseClasses import ItemClassification
-from ...test import solo_multiworld
+from .. import SVTestBase, allsanity_mods_6_x_x
+from ...stardew_rule import HasProgressionPercent
 
 
-class TestHasProgressionPercent(unittest.TestCase):
-    def test_max_item_amount_is_full_collection(self):
-        # Not caching because it fails too often for some reason
-        with solo_multiworld(world_caching=False) as (multiworld, world):
-            progression_item_count = sum(1 for i in multiworld.get_items() if i.classification & ItemClassification.progression)
-            self.assertEqual(world.total_progression_items, progression_item_count - 1)  # -1 to skip Victory
+class TestHasProgressionPercentWithVictory(SVTestBase):
+    options = allsanity_mods_6_x_x()
+
+    def test_has_100_progression_percent_is_false_while_items_are_missing(self):
+        has_100_progression_percent = HasProgressionPercent(1, 100)
+
+        for i, item in enumerate([i for i in self.multiworld.get_items() if i.advancement and i.code][1:]):
+            if item.name != "Victory":
+                self.collect(item)
+            self.assertFalse(has_100_progression_percent(self.multiworld.state),
+                             f"Rule became true after {i} items, total_progression_items is {self.world.total_progression_items}")
+
+    def test_has_100_progression_percent_account_for_victory_not_being_collected(self):
+        has_100_progression_percent = HasProgressionPercent(1, 100)
+
+        self.collect_all_except("Victory")
+
+        self.assert_rule_true(has_100_progression_percent, self.multiworld.state)