Add new popup option

TheLX5 · Feb 11, 2024 · 7599c25 · 7599c25
1 parent 7ad8bb6
commit 7599c25
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/worlds/smw/Client.py b/worlds/smw/Client.py
@@ -263,7 +263,7 @@ async def handle_trap_queue(self, ctx):
             if active_boss[0] != 0x00:
                 return
 
-            if ctx.receive_option == 1 or (ctx.receive_option == 2 and ((next_trap.flags & 1) != 0)):
+            if ctx.receive_option == 1 or (ctx.receive_option == 2 and ((next_trap.flags & 1) != 0)) or (ctx.receive_option == 3 and ((item.flags & 1) != 0 and item.item != 0xBC0002)):
                 self.add_message_to_queue(message)
 
 
@@ -498,7 +498,7 @@ async def game_watcher(self, ctx):
                 color(ctx.player_names[item.player], 'yellow'),
                 ctx.location_names[item.location], recv_index, len(ctx.items_received)))
 
-            if ctx.receive_option == 1 or (ctx.receive_option == 2 and ((item.flags & 1) != 0)):
+            if ctx.receive_option == 1 or (ctx.receive_option == 2 and ((item.flags & 1) != 0)) or (ctx.receive_option == 3 and ((item.flags & 1) != 0 and item.item != 0xBC0002)):
                 if item.item != 0xBC0012 and item.item not in trap_rom_data:
                     # Don't send messages for Boss Tokens
                     item_name = ctx.item_names[item.item]

diff --git a/worlds/smw/Options.py b/worlds/smw/Options.py
@@ -182,7 +182,8 @@ class DisplayReceivedItemPopups(Choice):
     option_none = 0
     option_all = 1
     option_progression = 2
-    default = 2
+    option_progression_minus_yoshi_eggs = 3
+    default = 3
 
 
 class JunkFillPercentage(Range):