apply suggestions

ArchipelagoMW · Jul 25, 2024 · e1e8186 · e1e8186
1 parent 87d5dd8
commit e1e8186
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/worlds/mm2/__init__.py b/worlds/mm2/__init__.py
@@ -184,6 +184,7 @@ def generate_early(self) -> None:
                 robot_master_pool.append(4)
             self.options.starting_robot_master.value = self.random.choice(robot_master_pool)
             logger.warning(
+                f"Mega Man 2 ({self.player_name}): "
                 f"Incompatible starting Robot Master, changing to "
                 f"{self.options.starting_robot_master.current_key.replace('_', ' ').title()}")
 

diff --git a/worlds/mm2/rules.py b/worlds/mm2/rules.py
@@ -71,12 +71,7 @@
 
 
 def can_defeat_enough_rbms(state: "CollectionState", player: int, required: int) -> bool:
-    can_defeat = 0
-
-    for boss in robot_masters:
-        if state.has(robot_masters[boss], player):
-            can_defeat += 1
-    return can_defeat >= required
+    return state.has_from_list(robot_masters.values(), player, required)
 
 
 def set_rules(world: "MM2World") -> None: