Commit 7599c25 1 parent 7ad8bb6 commit 7599c25 Copy full SHA for 7599c25
File tree 2 files changed +4
-3
lines changed
2 files changed +4
-3
lines changed Original file line number Diff line number Diff line change @@ -263,7 +263,7 @@ async def handle_trap_queue(self, ctx):
263
263
if active_boss [0 ] != 0x00 :
264
264
return
265
265
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 )) :
267
267
self .add_message_to_queue (message )
268
268
269
269
@@ -498,7 +498,7 @@ async def game_watcher(self, ctx):
498
498
color (ctx .player_names [item .player ], 'yellow' ),
499
499
ctx .location_names [item .location ], recv_index , len (ctx .items_received )))
500
500
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 )) :
502
502
if item .item != 0xBC0012 and item .item not in trap_rom_data :
503
503
# Don't send messages for Boss Tokens
504
504
item_name = ctx .item_names [item .item ]
Original file line number Diff line number Diff line change @@ -182,7 +182,8 @@ class DisplayReceivedItemPopups(Choice):
182
182
option_none = 0
183
183
option_all = 1
184
184
option_progression = 2
185
- default = 2
185
+ option_progression_minus_yoshi_eggs = 3
186
+ default = 3
186
187
187
188
188
189
class JunkFillPercentage (Range ):
You can’t perform that action at this time.
0 commit comments