AutoWorld: remove Games Enum (AutoWorldRegister.world_types replaces it)

This commit is contained in:
Fabian Dill
2021-07-12 14:10:49 +02:00
parent 31c550d410
commit b53d6c370b
4 changed files with 11 additions and 18 deletions

View File

@@ -1,11 +1,9 @@
import enum
import importlib
import os
__all__ = {"lookup_any_item_id_to_name",
"lookup_any_location_id_to_name",
"network_data_package",
"Games"}
"network_data_package"}
# all of the below should be moved to AutoWorld functionality
from .alttp.Items import lookup_id_to_name as alttp
@@ -34,18 +32,9 @@ network_data_package = {"lookup_any_location_id_to_name": lookup_any_location_id
"lookup_any_item_id_to_name": lookup_any_item_id_to_name,
"version": 9}
@enum.unique
class Games(str, enum.Enum):
HK = "Hollow Knight"
LTTP = "A Link to the Past"
Factorio = "Factorio"
Minecraft = "Minecraft"
# end of TODO block
# import all submodules to trigger AutoWorldRegister
for file in os.scandir(os.path.dirname(__file__)):
if file.is_dir():
importlib.import_module(f".{file.name}", "worlds")
importlib.import_module(f".{file.name}", "worlds")

View File

@@ -578,14 +578,13 @@ class Sprite():
return name
def to_ap_sprite(self, path):
from .. import Games
import yaml
payload = {"format_version": 1,
"min_format_version": 1,
"sprite_version": 1,
"name": self.name,
"author": self.author_name,
"game": Games.LTTP.value,
"game": "A Link to the Past",
"data": self.get_delta()}
with open(path, "w") as f:
f.write(yaml.safe_dump(payload))
@@ -778,7 +777,7 @@ def patch_rom(world, rom, player, team, enemized):
if not location.crystal:
if location.item is not None:
if location.item.game != "A Link to the Past":
if not location.native_item:
itemid = get_nonnative_item_sprite(location.item.game)
# Keys in their native dungeon should use the orignal item code for keys
elif location.parent_region.dungeon: