From 44086152a248b44dcb3a6940c9cf798711524826 Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Mon, 30 Mar 2020 08:47:53 +0200 Subject: [PATCH] add remote_items to Mystery.py --- Mystery.py | 6 +++++- easy.yaml | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Mystery.py b/Mystery.py index e165f8f9..114da3db 100644 --- a/Mystery.py +++ b/Mystery.py @@ -273,7 +273,9 @@ def roll_settings(weights): startitems = [] for item in inventoryweights.keys(): itemvalue = get_choice(item, inventoryweights) - if item.startswith(('Progressive ', 'Small Key ', 'Rupee', 'Piece of Heart', 'Boss Heart Container', 'Sanctuary Heart Container', 'Arrow', 'Bombs ', 'Bomb ', 'Bottle')) and isinstance(itemvalue, int): + if item.startswith(('Progressive ', 'Small Key ', 'Rupee', 'Piece of Heart', 'Boss Heart Container', + 'Sanctuary Heart Container', 'Arrow', 'Bombs ', 'Bomb ', 'Bottle')) and isinstance( + itemvalue, int): for i in range(int(itemvalue)): startitems.append(item) elif itemvalue: @@ -282,6 +284,8 @@ def roll_settings(weights): startitems.append('Pegasus Boots') ret.startinventory = ','.join(startitems) + ret.remote_items = get_choice('remote_items', weights) if 'remote_items' in weights else False + if 'rom' in weights: romweights = weights['rom'] ret.sprite = get_choice('sprite', romweights) diff --git a/easy.yaml b/easy.yaml index 966eac36..775d3cb9 100644 --- a/easy.yaml +++ b/easy.yaml @@ -118,6 +118,9 @@ timer: ohko: 0 timed_countdown: 0 display: 0 +remote_items: # Stores all your items on the server, effectively sending them to you as if another player picked it up + on: 0 # intended for racing, as the item information is missing from the ROM + off: 1 rom: sprite: random: 1