diff --git a/worlds/kdl3/__init__.py b/worlds/kdl3/__init__.py index 716d7e31e6..457f455dc1 100644 --- a/worlds/kdl3/__init__.py +++ b/worlds/kdl3/__init__.py @@ -5,20 +5,20 @@ from BaseClasses import Tutorial, ItemClassification, MultiWorld, CollectionStat from Fill import fill_restrictive from Options import PerGameCommonOptions from worlds.AutoWorld import World, WebWorld -from .Items import item_table, item_names, copy_ability_table, animal_friend_table, filler_item_weights, KDL3Item, \ +from .items import item_table, item_names, copy_ability_table, animal_friend_table, filler_item_weights, KDL3Item, \ 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 .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 .Regions import create_levels, default_levels -from .Options import KDL3Options, kdl3_option_groups -from .Presets import kdl3_options_presets +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 .Room import KDL3Room -from .Rules import set_rules -from .Rom import KDL3ProcedurePatch, get_base_rom_path, patch_rom, KDL3JHASH, KDL3UHASH -from .Client import KDL3SNIClient +from .room import KDL3Room +from .rules import set_rules +from .rom import KDL3ProcedurePatch, get_base_rom_path, patch_rom, KDL3JHASH, KDL3UHASH +from .client import KDL3SNIClient from typing import Dict, TextIO, Optional, List, Any import os diff --git a/worlds/kdl3/Aesthetics.py b/worlds/kdl3/aesthetics.py similarity index 99% rename from worlds/kdl3/Aesthetics.py rename to worlds/kdl3/aesthetics.py index bcbe903856..289c853131 100644 --- a/worlds/kdl3/Aesthetics.py +++ b/worlds/kdl3/aesthetics.py @@ -1,5 +1,5 @@ import struct -from .Options import KirbyFlavorPreset, GooeyFlavorPreset +from .options import KirbyFlavorPreset, GooeyFlavorPreset from typing import TYPE_CHECKING, Optional, Dict, List, Tuple if TYPE_CHECKING: diff --git a/worlds/kdl3/Client.py b/worlds/kdl3/client.py similarity index 99% rename from worlds/kdl3/Client.py rename to worlds/kdl3/client.py index f701ea10fa..c6df299961 100644 --- a/worlds/kdl3/Client.py +++ b/worlds/kdl3/client.py @@ -11,9 +11,9 @@ from MultiServer import mark_raw from NetUtils import ClientStatus, color from Utils import async_start from worlds.AutoSNIClient import SNIClient -from .Locations import boss_locations -from .Gifting import kdl3_gifting_options, kdl3_trap_gifts, kdl3_gifts, update_object, pop_object, initialize_giftboxes -from .ClientAddrs import consumable_addrs, star_addrs +from .locations import boss_locations +from .gifting import kdl3_gifting_options, kdl3_trap_gifts, kdl3_gifts, update_object, pop_object, initialize_giftboxes +from .client_addrs import consumable_addrs, star_addrs from typing import TYPE_CHECKING if TYPE_CHECKING: diff --git a/worlds/kdl3/ClientAddrs.py b/worlds/kdl3/client_addrs.py similarity index 100% rename from worlds/kdl3/ClientAddrs.py rename to worlds/kdl3/client_addrs.py diff --git a/worlds/kdl3/Compression.py b/worlds/kdl3/compression.py similarity index 100% rename from worlds/kdl3/Compression.py rename to worlds/kdl3/compression.py diff --git a/worlds/kdl3/Gifting.py b/worlds/kdl3/gifting.py similarity index 100% rename from worlds/kdl3/Gifting.py rename to worlds/kdl3/gifting.py diff --git a/worlds/kdl3/Items.py b/worlds/kdl3/items.py similarity index 100% rename from worlds/kdl3/Items.py rename to worlds/kdl3/items.py diff --git a/worlds/kdl3/Locations.py b/worlds/kdl3/locations.py similarity index 99% rename from worlds/kdl3/Locations.py rename to worlds/kdl3/locations.py index 4d039a1349..8b576ccf10 100644 --- a/worlds/kdl3/Locations.py +++ b/worlds/kdl3/locations.py @@ -3,7 +3,7 @@ from BaseClasses import Location, Region from .Names import LocationName if typing.TYPE_CHECKING: - from .Room import KDL3Room + from .room import KDL3Room class KDL3Location(Location): diff --git a/worlds/kdl3/Options.py b/worlds/kdl3/options.py similarity index 100% rename from worlds/kdl3/Options.py rename to worlds/kdl3/options.py diff --git a/worlds/kdl3/Presets.py b/worlds/kdl3/presets.py similarity index 100% rename from worlds/kdl3/Presets.py rename to worlds/kdl3/presets.py diff --git a/worlds/kdl3/Regions.py b/worlds/kdl3/regions.py similarity index 99% rename from worlds/kdl3/Regions.py rename to worlds/kdl3/regions.py index e2faa9a09c..c1384746ad 100644 --- a/worlds/kdl3/Regions.py +++ b/worlds/kdl3/regions.py @@ -5,10 +5,10 @@ from pkgutil import get_data 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 .locations import KDL3Location from .Names import LocationName -from .Options import BossShuffle -from .Room import KDL3Room +from .options import BossShuffle +from .room import KDL3Room if TYPE_CHECKING: from . import KDL3World diff --git a/worlds/kdl3/Rom.py b/worlds/kdl3/rom.py similarity index 99% rename from worlds/kdl3/Rom.py rename to worlds/kdl3/rom.py index f367d01724..aa08cfc644 100644 --- a/worlds/kdl3/Rom.py +++ b/worlds/kdl3/rom.py @@ -9,9 +9,9 @@ import struct import settings from worlds.Files import APProcedurePatch, APTokenMixin, APTokenTypes, APPatchExtension -from .Aesthetics import get_palette_bytes, kirby_target_palettes, get_kirby_palette, gooey_target_palettes, \ +from .aesthetics import get_palette_bytes, kirby_target_palettes, get_kirby_palette, gooey_target_palettes, \ get_gooey_palette -from .Compression import hal_decompress +from .compression import hal_decompress import bsdiff4 if TYPE_CHECKING: diff --git a/worlds/kdl3/Room.py b/worlds/kdl3/room.py similarity index 98% rename from worlds/kdl3/Room.py rename to worlds/kdl3/room.py index 2f32792b74..bcc1c7a709 100644 --- a/worlds/kdl3/Room.py +++ b/worlds/kdl3/room.py @@ -2,10 +2,10 @@ import struct from typing import Optional, Dict, TYPE_CHECKING, List, Union from BaseClasses import Region, ItemClassification, MultiWorld from worlds.Files import APTokenTypes -from .ClientAddrs import consumable_addrs, star_addrs +from .client_addrs import consumable_addrs, star_addrs if TYPE_CHECKING: - from .Rom import KDL3ProcedurePatch + from .rom import KDL3ProcedurePatch animal_map = { "Rick Spawn": 0, diff --git a/worlds/kdl3/Rules.py b/worlds/kdl3/rules.py similarity index 99% rename from worlds/kdl3/Rules.py rename to worlds/kdl3/rules.py index eed3b43433..a0a54cb1c0 100644 --- a/worlds/kdl3/Rules.py +++ b/worlds/kdl3/rules.py @@ -1,7 +1,7 @@ from worlds.generic.Rules import set_rule, add_rule from .Names import LocationName, EnemyAbilities -from .Locations import location_table -from .Options import GoalSpeed +from .locations import location_table +from .options import GoalSpeed import typing if typing.TYPE_CHECKING: diff --git a/worlds/kdl3/test/test_shuffles.py b/worlds/kdl3/test/test_shuffles.py index 9496735f28..852f35dc5c 100644 --- a/worlds/kdl3/test/test_shuffles.py +++ b/worlds/kdl3/test/test_shuffles.py @@ -1,6 +1,6 @@ from typing import List, Tuple, Optional from . import KDL3TestBase -from ..Room import KDL3Room +from ..room import KDL3Room class TestCopyAbilityShuffle(KDL3TestBase):