Merge pull request #2502 from 2dos/dev

Dev to Master

Author: AlmostSeagull

.bumpversion.cfg

@@ -1,7 +1,7 @@
 [bumpversion]
 commit = True
 tag = False
-current_version = 4.10.65
+current_version = 4.10.66
 
 [bumpversion:file:version.py]
 search = version = "{current_version}"

randomizer/Fill.py

@@ -1215,7 +1215,13 @@ def CalculateWothPaths(spoiler: Spoiler, WothLocations: List[Union[Locations, in
                 raise Ex.FillException("Rare path calculation error - report this to the devs with your settings string. Error code PL-2")
     for goal, path in spoiler.rap_win_con_paths.items():
         if len(path) < 1:
-            raise Ex.FillException("Rare path calculation error - report this to the devs with your settings string. Error code PL-3")
+            # One verse is sometimes expected to have no items on the path
+            expectedEmptyPathVerses = []
+            # If your training moves are unshuffled, they don't end up on paths. Chunky Verse only requires barrels, so it no longer has any path requirements.
+            if spoiler.settings.training_barrels == TrainingBarrels.normal:
+                expectedEmptyPathVerses.append(Events.ChunkyVerse)
+            if rap_assoc_name[goal] not in expectedEmptyPathVerses:
+                raise Ex.FillException("Rare path calculation error - report this to the devs with your settings string. Error code PL-3")
 
 
 def CalculateFoolish(spoiler: Spoiler, WothLocations: List[Union[Locations, int]], MajorItems: List[Items]) -> None:

randomizer/Spoiler.py

@@ -862,7 +862,6 @@ def createJson(self) -> None:
             phase_name = boss_map_names.get(map_id, Maps(map_id).name)
             humanspoiler["WotH Paths"][phase_name] = path_dict
         if self.settings.win_condition_item == WinConditionComplex.dk_rap_items:
-            print(self.rap_win_con_paths)
             for verse_name, path in self.rap_win_con_paths.items():
                 path_dict = {}
                 for path_loc_id in path:

version.py

@@ -1,3 +1,3 @@
 """Holds the version for DK64 Rando."""
 
-version = "4.10.65"
+version = "4.10.66"