Merge branch 'main' into more_readable_test_errors

worlds/dlcquest/__init__.py

@@ -3,7 +3,7 @@
 from BaseClasses import Tutorial, CollectionState
 from worlds.AutoWorld import WebWorld, World
 from . import Options
-from .Items import DLCQuestItem, ItemData, create_items, item_table
+from .Items import DLCQuestItem, ItemData, create_items, item_table, items_by_group, Group
 from .Locations import DLCQuestLocation, location_table
 from .Options import DLCQuestOptions
 from .Regions import create_regions
@@ -60,7 +60,9 @@ def create_items(self):
         created_items = create_items(self, self.options, locations_count + len(items_to_exclude), self.multiworld.random)
 
         self.multiworld.itempool += created_items
-        self.multiworld.early_items[self.player]["Movement Pack"] = 1
+
+        if self.options.campaign == Options.Campaign.option_basic or self.options.campaign == Options.Campaign.option_both:
+            self.multiworld.early_items[self.player]["Movement Pack"] = 1
 
         for item in items_to_exclude:
             if item in self.multiworld.itempool:
@@ -77,6 +79,10 @@ def create_item(self, item: Union[str, ItemData]) -> DLCQuestItem:
 
         return DLCQuestItem(item.name, item.classification, item.code, self.player)
 
+    def get_filler_item_name(self) -> str:
+        trap = self.multiworld.random.choice(items_by_group[Group.Trap])
+        return trap.name
+
     def fill_slot_data(self):
         options_dict = self.options.as_dict(
             "death_link", "ending_choice", "campaign", "coinsanity", "item_shuffle"

worlds/witness/settings/Disable_Unrandomized.txt

@@ -9,7 +9,7 @@ Requirement Changes:
 0x181B3 - 0x00021 | 0x17D28 | 0x17C71
 0x28B39 - True - Reflection
 0x17CAB - True - True
-0x2779A - True - 0x17CFB | 0x3C12B | 0x17CF7
+0x2779A - 0x17CFB | 0x3C12B | 0x17CF7
 
 Disabled Locations:
 0x03505 (Tutorial Gate Close)
@@ -125,4 +125,4 @@ Precompleted Locations:
 0x035F5
 0x000D3
 0x33A20
-0x03BE2
+0x03BE2