diff --git a/worlds/kdl3/__init__.py b/worlds/kdl3/__init__.py index 457f455dc1..6dbd62b554 100644 --- a/worlds/kdl3/__init__.py +++ b/worlds/kdl3/__init__.py @@ -9,12 +9,12 @@ from .items import item_table, item_names, copy_ability_table, animal_friend_tab trap_item_table, copy_ability_access_table, star_item_weights, total_filler_weights, animal_friend_spawn_table,\ lookup_item_to_id from .locations import location_table, KDL3Location, level_consumables, consumable_locations, star_locations -from .Names.AnimalFriendSpawns import animal_friend_spawns -from .Names.EnemyAbilities import vanilla_enemies, enemy_mapping, enemy_restrictive +from .names.animal_friend_spawns import animal_friend_spawns +from .names.enemy_abilities import vanilla_enemies, enemy_mapping, enemy_restrictive from .regions import create_levels, default_levels from .options import KDL3Options, kdl3_option_groups from .presets import kdl3_options_presets -from .Names import LocationName +from .names import location_name from .room import KDL3Room from .rules import set_rules from .rom import KDL3ProcedurePatch, get_base_rom_path, patch_rom, KDL3JHASH, KDL3UHASH diff --git a/worlds/kdl3/locations.py b/worlds/kdl3/locations.py index 8b576ccf10..bca5f12eb8 100644 --- a/worlds/kdl3/locations.py +++ b/worlds/kdl3/locations.py @@ -1,6 +1,6 @@ import typing from BaseClasses import Location, Region -from .Names import LocationName +from .names import location_name if typing.TYPE_CHECKING: from .room import KDL3Room diff --git a/worlds/kdl3/Names/__init__.py b/worlds/kdl3/names/__init__.py similarity index 100% rename from worlds/kdl3/Names/__init__.py rename to worlds/kdl3/names/__init__.py diff --git a/worlds/kdl3/Names/AnimalFriendSpawns.py b/worlds/kdl3/names/animal_friend_spawns.py similarity index 100% rename from worlds/kdl3/Names/AnimalFriendSpawns.py rename to worlds/kdl3/names/animal_friend_spawns.py diff --git a/worlds/kdl3/Names/EnemyAbilities.py b/worlds/kdl3/names/enemy_abilities.py similarity index 100% rename from worlds/kdl3/Names/EnemyAbilities.py rename to worlds/kdl3/names/enemy_abilities.py diff --git a/worlds/kdl3/Names/LocationName.py b/worlds/kdl3/names/location_name.py similarity index 100% rename from worlds/kdl3/Names/LocationName.py rename to worlds/kdl3/names/location_name.py diff --git a/worlds/kdl3/options.py b/worlds/kdl3/options.py index 9d11b38bf6..f5a9b79efd 100644 --- a/worlds/kdl3/options.py +++ b/worlds/kdl3/options.py @@ -5,7 +5,7 @@ from typing import List from BaseClasses import OptionGroup from Options import DeathLinkMixin, Choice, Toggle, OptionDict, Range, PlandoBosses, DefaultOnToggle, \ PerGameCommonOptions -from .Names import LocationName +from .names import location_name class RemoteItems(DefaultOnToggle): diff --git a/worlds/kdl3/regions.py b/worlds/kdl3/regions.py index c1384746ad..b7311cb94b 100644 --- a/worlds/kdl3/regions.py +++ b/worlds/kdl3/regions.py @@ -6,7 +6,7 @@ from typing import TYPE_CHECKING, List, Dict, Optional, Union, Callable from BaseClasses import Region, CollectionState from worlds.generic.Rules import add_item_rule from .locations import KDL3Location -from .Names import LocationName +from .names import location_name from .options import BossShuffle from .room import KDL3Room diff --git a/worlds/kdl3/rules.py b/worlds/kdl3/rules.py index a0a54cb1c0..c16564df3a 100644 --- a/worlds/kdl3/rules.py +++ b/worlds/kdl3/rules.py @@ -1,5 +1,5 @@ from worlds.generic.Rules import set_rule, add_rule -from .Names import LocationName, EnemyAbilities +from .names import location_name, enemy_abilities from .locations import location_table from .options import GoalSpeed import typing diff --git a/worlds/kdl3/test/test_locations.py b/worlds/kdl3/test/test_locations.py index 6254b83963..25b7898f4c 100644 --- a/worlds/kdl3/test/test_locations.py +++ b/worlds/kdl3/test/test_locations.py @@ -1,6 +1,6 @@ from . import KDL3TestBase from worlds.generic import PlandoConnection -from ..Names import LocationName +from ..names import location_name import typing