morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Adventure: Remove unused variables (#4301)

Browse Source 
* Remove unused variables

* Provide old parameters to comment
This commit is contained in:
Nicholas Saylor
2024-12-06 01:15:26 -05:00
committed by GitHub
parent f4b926ebbe
commit ced93022b6
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
worlds/adventure/Locations.py
View File

@@ -47,8 +47,6 @@ class LocationData:
self.local_item: int = None self.local_item: int = None
def get_random_position(self, random): def get_random_position(self, random):
x: int = None
y: int = None
if self.world_positions is None or len(self.world_positions) == 0: if self.world_positions is None or len(self.world_positions) == 0:
if self.room_id is None: if self.room_id is None:
return None return None

6
worlds/adventure/Regions.py
View File

@@ -76,10 +76,9 @@ def create_regions(options: PerGameCommonOptions, multiworld: MultiWorld, player
multiworld.regions.append(credits_room_far_side) multiworld.regions.append(credits_room_far_side)
dragon_slay_check = options.dragon_slay_check.value dragon_slay_check = options.dragon_slay_check.value
priority_locations = determine_priority_locations(multiworld, dragon_slay_check) priority_locations = determine_priority_locations()
for name, location_data in location_table.items(): for name, location_data in location_table.items():
require_sword = False
if location_data.region == "Varies": if location_data.region == "Varies":
if location_data.name == "Slay Yorgle": if location_data.name == "Slay Yorgle":
if not dragon_slay_check: if not dragon_slay_check:
@@ -154,6 +153,7 @@ def create_regions(options: PerGameCommonOptions, multiworld: MultiWorld, player
# Placeholder for adding sets of priority locations at generation, possibly as an option in the future # Placeholder for adding sets of priority locations at generation, possibly as an option in the future
def determine_priority_locations(world: MultiWorld, dragon_slay_check: bool) -> {}: # def determine_priority_locations(multiworld: MultiWorld, dragon_slay_check: bool) -> {}:
def determine_priority_locations() -> {}:
priority_locations = {} priority_locations = {}
return priority_locations return priority_locations

2
worlds/adventure/Rom.py
View File

@@ -86,9 +86,7 @@ class AdventureDeltaPatch(APPatch, metaclass=AutoPatchRegister):
# locations: [], autocollect: [], seed_name: bytes, # locations: [], autocollect: [], seed_name: bytes,
def __init__(self, *args: Any, **kwargs: Any) -> None: def __init__(self, *args: Any, **kwargs: Any) -> None:
patch_only = True
if "autocollect" in kwargs: if "autocollect" in kwargs:
patch_only = False
self.foreign_items: [AdventureForeignItemInfo] = [AdventureForeignItemInfo(loc.short_location_id, loc.room_id, loc.room_x, loc.room_y) self.foreign_items: [AdventureForeignItemInfo] = [AdventureForeignItemInfo(loc.short_location_id, loc.room_id, loc.room_x, loc.room_y)
for loc in kwargs["locations"]] for loc in kwargs["locations"]]