update guis
This commit is contained in:
parent
ff9b24e88e
commit
8a395a3021
|
@ -6,7 +6,6 @@ import textwrap
|
|||
import sys
|
||||
import time
|
||||
|
||||
from AdjusterMain import adjust
|
||||
from worlds.alttp.Rom import Sprite, LocalRom, apply_rom_settings
|
||||
from Utils import output_path
|
||||
|
||||
|
@ -161,7 +160,7 @@ def adjustGUI():
|
|||
else:
|
||||
messagebox.showinfo(title="Success", message=f"Rom patched successfully to {path}")
|
||||
from Utils import persistent_store
|
||||
from Rom import Sprite
|
||||
from worlds.alttp.Rom import Sprite
|
||||
if isinstance(guiargs.sprite, Sprite):
|
||||
guiargs.sprite = guiargs.sprite.name
|
||||
persistent_store("adjuster", "last_settings_3", guiargs)
|
||||
|
|
|
@ -10,10 +10,6 @@ from typing import *
|
|||
import secrets
|
||||
import random
|
||||
|
||||
from worlds.alttp.EntranceShuffle import indirect_connections
|
||||
from worlds.alttp.Items import item_name_groups
|
||||
from worlds.generic import PlandoItem, PlandoConnection
|
||||
|
||||
|
||||
class MultiWorld():
|
||||
debug_types = False
|
||||
|
@ -513,6 +509,7 @@ class CollectionState(object):
|
|||
self.collect(item, True)
|
||||
|
||||
def update_reachable_regions(self, player: int):
|
||||
from worlds.alttp.EntranceShuffle import indirect_connections
|
||||
self.stale[player] = False
|
||||
rrp = self.reachable_regions[player]
|
||||
bc = self.blocked_connections[player]
|
||||
|
@ -1467,28 +1464,5 @@ class Spoiler(object):
|
|||
|
||||
outfile.write('\n'.join(path_listings))
|
||||
|
||||
|
||||
class PlandoItem(NamedTuple):
|
||||
item: str
|
||||
location: str
|
||||
world: Union[bool, str] = False # False -> own world, True -> not own world
|
||||
from_pool: bool = True # if item should be removed from item pool
|
||||
force: str = 'silent' # false -> warns if item not successfully placed. true -> errors out on failure to place item.
|
||||
|
||||
def warn(self, warning: str):
|
||||
if self.force in ['true', 'fail', 'failure', 'none', 'false', 'warn', 'warning']:
|
||||
logging.warning(f'{warning}')
|
||||
else:
|
||||
logging.debug(f'{warning}')
|
||||
|
||||
def failed(self, warning: str, exception=Exception):
|
||||
if self.force in ['true', 'fail', 'failure']:
|
||||
raise exception(warning)
|
||||
else:
|
||||
self.warn(warning)
|
||||
|
||||
|
||||
class PlandoConnection(NamedTuple):
|
||||
entrance: str
|
||||
exit: str
|
||||
direction: str # entrance, exit or both
|
||||
from worlds.alttp.Items import item_name_groups
|
||||
from worlds.generic import PlandoItem, PlandoConnection
|
1
Gui.py
1
Gui.py
|
@ -14,7 +14,6 @@ from concurrent.futures import ThreadPoolExecutor, as_completed
|
|||
import ModuleUpdate
|
||||
ModuleUpdate.update()
|
||||
|
||||
from worlds.alttp.AdjusterMain import adjust
|
||||
from worlds.alttp.EntranceRandomizer import parse_arguments
|
||||
from GuiUtils import ToolTips, set_icon, BackgroundTaskProgress
|
||||
from Main import main, get_seed, __version__ as MWVersion
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
import unittest
|
||||
|
||||
from BaseClasses import CollectionState
|
||||
from BaseClasses import MultiWorld
|
||||
from BaseClasses import MultiWorld, CollectionState
|
||||
from worlds.alttp.Items import ItemFactory
|
||||
|
||||
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
from typing import Optional
|
||||
|
||||
from BaseClasses import Location, Item
|
||||
from worlds.generic import World
|
||||
|
||||
|
||||
#class ALTTPWorld(World):
|
||||
|
|
Loading…
Reference in New Issue