From 63870d5b89785985d7ca59dbcd4a5b4159d6c00e Mon Sep 17 00:00:00 2001 From: Ixrec Date: Wed, 14 Aug 2024 12:33:50 +0100 Subject: [PATCH] change file/module names from upper camel case to snake case for PEP8 compliance --- worlds/outer_wilds/__init__.py | 20 +++++++++---------- .../{Coordinates.py => coordinates.py} | 0 .../outer_wilds/{DBLayout.py => db_layout.py} | 2 +- worlds/outer_wilds/{Items.py => items.py} | 2 +- ...AndRegions.py => locations_and_regions.py} | 6 +++--- worlds/outer_wilds/{Options.py => options.py} | 0 worlds/outer_wilds/{Orbits.py => orbits.py} | 0 .../outer_wilds/{RuleEval.py => rule_eval.py} | 0 worlds/outer_wilds/test/__init__.py | 2 +- worlds/outer_wilds/test/test_coordinates.py | 2 +- .../outer_wilds/test/test_spawns_and_warps.py | 2 +- worlds/outer_wilds/test/test_trap_settings.py | 2 +- .../{WarpPlatforms.py => warp_platforms.py} | 0 worlds/sc2/ItemGroups.py | 2 +- 14 files changed, 20 insertions(+), 20 deletions(-) rename worlds/outer_wilds/{Coordinates.py => coordinates.py} (100%) rename worlds/outer_wilds/{DBLayout.py => db_layout.py} (99%) rename worlds/outer_wilds/{Items.py => items.py} (99%) rename worlds/outer_wilds/{LocationsAndRegions.py => locations_and_regions.py} (97%) rename worlds/outer_wilds/{Options.py => options.py} (100%) rename worlds/outer_wilds/{Orbits.py => orbits.py} (100%) rename worlds/outer_wilds/{RuleEval.py => rule_eval.py} (100%) rename worlds/outer_wilds/{WarpPlatforms.py => warp_platforms.py} (100%) diff --git a/worlds/outer_wilds/__init__.py b/worlds/outer_wilds/__init__.py index 965b9d7c0ca9..ced65901095c 100644 --- a/worlds/outer_wilds/__init__.py +++ b/worlds/outer_wilds/__init__.py @@ -4,13 +4,13 @@ from BaseClasses import Tutorial from Options import OptionError from worlds.AutoWorld import WebWorld, World -from .Coordinates import coordinate_description, generate_random_coordinates -from .DBLayout import generate_random_db_layout -from .Orbits import generate_random_orbits -from .WarpPlatforms import generate_random_warp_platform_mapping -from .Items import OuterWildsItem, all_non_event_items_table, item_name_groups, create_item, create_items -from .LocationsAndRegions import all_non_event_locations_table, location_name_groups, create_regions -from .Options import OuterWildsGameOptions, RandomizeDarkBrambleLayout, Spawn +from .coordinates import coordinate_description, generate_random_coordinates +from .db_layout import generate_random_db_layout +from .orbits import generate_random_orbits +from .warp_platforms import generate_random_warp_platform_mapping +from .items import OuterWildsItem, all_non_event_items_table, item_name_groups, create_item, create_items +from .locations_and_regions import all_non_event_locations_table, location_name_groups, create_regions +from .options import OuterWildsGameOptions, RandomizeDarkBrambleLayout, Spawn class OuterWildsWebWorld(WebWorld): @@ -73,7 +73,7 @@ def generate_early(self) -> None: self.db_layout = generate_random_db_layout(self.random, db_option) \ if db_option != RandomizeDarkBrambleLayout.option_false else "vanilla" - # members and methods implemented by LocationsAndRegions.py, locations.jsonc and connections.jsonc + # members and methods implemented by locations_and_regions.py, locations.jsonc and connections.jsonc location_name_to_id = all_non_event_locations_table location_name_groups = location_name_groups @@ -81,7 +81,7 @@ def generate_early(self) -> None: def create_regions(self) -> None: create_regions(self) - # members and methods implemented by Items.py and items.jsonc + # members and methods implemented by items.py and items.jsonc item_name_to_id = all_non_event_items_table item_name_groups = item_name_groups @@ -99,7 +99,7 @@ def get_filler_item_name(self) -> str: # the world is configured to have, but it's not worth that much effort. return "Marshmallow" - # members and methods related to Options.py + # members and methods related to options.py options_dataclass = OuterWildsGameOptions options: OuterWildsGameOptions diff --git a/worlds/outer_wilds/Coordinates.py b/worlds/outer_wilds/coordinates.py similarity index 100% rename from worlds/outer_wilds/Coordinates.py rename to worlds/outer_wilds/coordinates.py diff --git a/worlds/outer_wilds/DBLayout.py b/worlds/outer_wilds/db_layout.py similarity index 99% rename from worlds/outer_wilds/DBLayout.py rename to worlds/outer_wilds/db_layout.py index 7be459f3ec6b..501be7757d7d 100644 --- a/worlds/outer_wilds/DBLayout.py +++ b/worlds/outer_wilds/db_layout.py @@ -1,7 +1,7 @@ from enum import Enum from random import Random from typing import List -from .Options import RandomizeDarkBrambleLayout +from .options import RandomizeDarkBrambleLayout # In the stringified layout format we want to output for slot data, the vanilla DB layout is: diff --git a/worlds/outer_wilds/Items.py b/worlds/outer_wilds/items.py similarity index 99% rename from worlds/outer_wilds/Items.py rename to worlds/outer_wilds/items.py index d3ecc83c4bcf..83d445992b45 100644 --- a/worlds/outer_wilds/Items.py +++ b/worlds/outer_wilds/items.py @@ -4,7 +4,7 @@ from BaseClasses import Item, ItemClassification from . import jsonc -from .Options import EarlyKeyItem, Spawn +from .options import EarlyKeyItem, Spawn if typing.TYPE_CHECKING: from . import OuterWildsWorld diff --git a/worlds/outer_wilds/LocationsAndRegions.py b/worlds/outer_wilds/locations_and_regions.py similarity index 97% rename from worlds/outer_wilds/LocationsAndRegions.py rename to worlds/outer_wilds/locations_and_regions.py index a63540d389cb..8111b3625362 100644 --- a/worlds/outer_wilds/LocationsAndRegions.py +++ b/worlds/outer_wilds/locations_and_regions.py @@ -5,9 +5,9 @@ from BaseClasses import CollectionState, Location, MultiWorld, Region from worlds.generic.Rules import set_rule from . import jsonc -from .Options import OuterWildsGameOptions, Spawn -from .RuleEval import eval_rule -from .WarpPlatforms import warp_platform_to_logical_region, warp_platform_required_items +from .options import OuterWildsGameOptions, Spawn +from .rule_eval import eval_rule +from .warp_platforms import warp_platform_to_logical_region, warp_platform_required_items if typing.TYPE_CHECKING: from . import OuterWildsWorld diff --git a/worlds/outer_wilds/Options.py b/worlds/outer_wilds/options.py similarity index 100% rename from worlds/outer_wilds/Options.py rename to worlds/outer_wilds/options.py diff --git a/worlds/outer_wilds/Orbits.py b/worlds/outer_wilds/orbits.py similarity index 100% rename from worlds/outer_wilds/Orbits.py rename to worlds/outer_wilds/orbits.py diff --git a/worlds/outer_wilds/RuleEval.py b/worlds/outer_wilds/rule_eval.py similarity index 100% rename from worlds/outer_wilds/RuleEval.py rename to worlds/outer_wilds/rule_eval.py diff --git a/worlds/outer_wilds/test/__init__.py b/worlds/outer_wilds/test/__init__.py index 17186d557564..4563642a3c30 100644 --- a/worlds/outer_wilds/test/__init__.py +++ b/worlds/outer_wilds/test/__init__.py @@ -1,7 +1,7 @@ from typing import List from test.bases import WorldTestBase, CollectionState -from ..Options import Goal +from ..options import Goal class OuterWildsTestBase(WorldTestBase): diff --git a/worlds/outer_wilds/test/test_coordinates.py b/worlds/outer_wilds/test/test_coordinates.py index 7462c2fa45cf..dff9ce58bd3f 100644 --- a/worlds/outer_wilds/test/test_coordinates.py +++ b/worlds/outer_wilds/test/test_coordinates.py @@ -1,7 +1,7 @@ import json import unittest -from ..Coordinates import get_coordinate_for_number, total_possible_coordinates, validate_coordinate +from ..coordinates import get_coordinate_for_number, total_possible_coordinates, validate_coordinate class TestCoordinateGeneration(unittest.TestCase): diff --git a/worlds/outer_wilds/test/test_spawns_and_warps.py b/worlds/outer_wilds/test/test_spawns_and_warps.py index f3603d61f399..7f8f5bd475d7 100644 --- a/worlds/outer_wilds/test/test_spawns_and_warps.py +++ b/worlds/outer_wilds/test/test_spawns_and_warps.py @@ -1,5 +1,5 @@ from . import OuterWildsTestBase -from ..Options import EarlyKeyItem, Spawn +from ..options import EarlyKeyItem, Spawn class TestRandomWarpDeterminism(OuterWildsTestBase): diff --git a/worlds/outer_wilds/test/test_trap_settings.py b/worlds/outer_wilds/test/test_trap_settings.py index b52d77f5673f..4ce48ac2583d 100644 --- a/worlds/outer_wilds/test/test_trap_settings.py +++ b/worlds/outer_wilds/test/test_trap_settings.py @@ -1,5 +1,5 @@ from . import OuterWildsTestBase -from ..Items import repeatable_filler_weights +from ..items import repeatable_filler_weights trap_names = [ "Ship Damage Trap", diff --git a/worlds/outer_wilds/WarpPlatforms.py b/worlds/outer_wilds/warp_platforms.py similarity index 100% rename from worlds/outer_wilds/WarpPlatforms.py rename to worlds/outer_wilds/warp_platforms.py diff --git a/worlds/sc2/ItemGroups.py b/worlds/sc2/ItemGroups.py index 3a3733044579..c501b5b86f5a 100644 --- a/worlds/sc2/ItemGroups.py +++ b/worlds/sc2/ItemGroups.py @@ -10,7 +10,7 @@ * The exception to this are item names that would be ambiguous (eg. "Resource Efficiency") * Item flaggroups get unique groups as well as combined groups for numbered flaggroups * eg. "Unit" contains all units, "Armory" contains "Armory 1" through "Armory 6" - * The best place to look these up is at the bottom of Items.py + * The best place to look these up is at the bottom of items.py * Items that have a parent are grouped together * eg. "Zergling Items" contains all items that have "Zergling" as a parent * These groups do NOT contain the parent item