morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Mystery: mention failing option name

Browse Source
This commit is contained in:
Fabian Dill
2021-07-09 03:06:16 +02:00
parent 172c1789a8
commit 6ac74f5686
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CommonClient.py
View File

@@ -4,9 +4,7 @@ import typing
import asyncio import asyncio
import urllib.parse import urllib.parse
import prompt_toolkit
import websockets import websockets
from prompt_toolkit.patch_stdout import patch_stdout
import Utils import Utils
from MultiServer import CommandProcessor from MultiServer import CommandProcessor
@@ -210,8 +208,6 @@ class CommonContext():
logger.info(args["text"]) logger.info(args["text"])
def on_print_json(self, args: dict): def on_print_json(self, args: dict):
if not self.found_items and args.get("type", None) == "ItemSend" and args["receiving"] == args["sending"]:
pass # don't want info on other player's local pickups.
logger.info(self.jsontotextparser(args["data"])) logger.info(self.jsontotextparser(args["data"]))

11
Mystery.py
View File

@@ -550,10 +550,13 @@ def roll_settings(weights: dict, plando_options: typing.Set[str] = frozenset(("b
if ret.game in AutoWorldRegister.world_types: if ret.game in AutoWorldRegister.world_types:
for option_name, option in AutoWorldRegister.world_types[ret.game].options.items(): for option_name, option in AutoWorldRegister.world_types[ret.game].options.items():
if option_name in game_weights: if option_name in game_weights:
if issubclass(option, Options.OptionDict): try:
setattr(ret, option_name, option.from_any(game_weights[option_name])) if issubclass(option, Options.OptionDict):
else: setattr(ret, option_name, option.from_any(game_weights[option_name]))
setattr(ret, option_name, option.from_any(get_choice(option_name, game_weights))) else:
setattr(ret, option_name, option.from_any(get_choice(option_name, game_weights)))
except Exception as e:
raise Exception(f"Error generating option {option_name} in {ret.game}")
else: else:
setattr(ret, option_name, option(option.default)) setattr(ret, option_name, option(option.default))
if ret.game == "Minecraft": if ret.game == "Minecraft":