Merge commit 'ea5302cb5f95ed7cb0c4535878736a2b69e755f1' into wario_la…

…nd_4
ArchipelagoMW · Nov 10, 2024 · 13db04b · 13db04b
2 parents 0da40ca + ea5302c
commit 13db04b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/worlds/wl4/__init__.py b/worlds/wl4/__init__.py
@@ -113,15 +113,15 @@ def generate_early(self):
         if self.options.goal in (Goal.option_local_golden_treasure_hunt, Goal.option_local_golden_diva_treasure_hunt):
             self.options.local_items.value.update(self.item_name_groups['Golden Treasure'])
         if self.options.required_jewels > self.options.pool_jewels:
-            logging.warn(f'{self.player_name} has Required Jewels set to '
-                         f'{self.options.required_jewels.value} but Pool Jewels set to '
-                         f'{self.options.pool_jewels.value}. Setting Pool Jewels to '
-                         f'{self.options.required_jewels.value}')
+            logging.warning(f'{self.player_name} has Required Jewels set to '
+                            f'{self.options.required_jewels.value} but Pool Jewels set to '
+                            f'{self.options.pool_jewels.value}. Setting Pool Jewels to '
+                            f'{self.options.required_jewels.value}')
             self.options.pool_jewels = PoolJewels(self.options.required_jewels.value)
         if self.options.required_jewels >= 1 and self.options.golden_jewels == 0:
-            logging.warn(f'{self.player_name} has Required Jewels set to at least 1 but '
-                         f'Golden Jewels set to {self.options.golden_jewels}. Setting Golden '
-                         'Jewels to 1.')
+            logging.warning(f'{self.player_name} has Required Jewels set to at least 1 but '
+                            f'Golden Jewels set to {self.options.golden_jewels}. Setting Golden '
+                            'Jewels to 1.')
             self.options.golden_jewels = GoldenJewels(1)
 
         if self.options.required_jewels == 4 and self.options.difficulty != Difficulty.option_normal:

diff --git a/worlds/wl4/test/__init__.py b/worlds/wl4/test/__init__.py
@@ -23,7 +23,7 @@ def get_state(self, items):
         for item in items:
             item.classification = ItemClassification.progression
             state.collect(item)
-        state.sweep_for_events()
+        state.sweep_for_advancements()
         self._state_cache[self.multiworld, tuple(items)] = state
         return state