Skip to content

Commit 7599c25

Browse files
committed
Add new popup option
1 parent 7ad8bb6 commit 7599c25

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

worlds/smw/Client.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ async def handle_trap_queue(self, ctx):
263263
if active_boss[0] != 0x00:
264264
return
265265

266-
if ctx.receive_option == 1 or (ctx.receive_option == 2 and ((next_trap.flags & 1) != 0)):
266+
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)):
267267
self.add_message_to_queue(message)
268268

269269

@@ -498,7 +498,7 @@ async def game_watcher(self, ctx):
498498
color(ctx.player_names[item.player], 'yellow'),
499499
ctx.location_names[item.location], recv_index, len(ctx.items_received)))
500500

501-
if ctx.receive_option == 1 or (ctx.receive_option == 2 and ((item.flags & 1) != 0)):
501+
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)):
502502
if item.item != 0xBC0012 and item.item not in trap_rom_data:
503503
# Don't send messages for Boss Tokens
504504
item_name = ctx.item_names[item.item]

worlds/smw/Options.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,8 @@ class DisplayReceivedItemPopups(Choice):
182182
option_none = 0
183183
option_all = 1
184184
option_progression = 2
185-
default = 2
185+
option_progression_minus_yoshi_eggs = 3
186+
default = 3
186187

187188

188189
class JunkFillPercentage(Range):

0 commit comments

Comments
 (0)