Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gstla settings overhaul #2

Merged
merged 6 commits into from
Nov 2, 2024
Merged

Gstla settings overhaul #2

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dd019ea
Initial setup to set all the flags from the base rando to some degree…
Oct 31, 2024
90c50c7
Alter existing settings and add new settings to match settings from b…
Oct 31, 2024
f0f8089
All settings should now be in place and made consistent with the base…
Nov 1, 2024
6decd4d
First steps to setting base rando settings from ap settings
Nov 2, 2024
aa361e9
Further cleanup, refactoring and hooking up writing to the patchfile …
Nov 2, 2024
1b5d12e
Update comment for showing items over showing chests
Nov 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions worlds/gstla/Items.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def create_events(world: 'GSTLAWorld'):
for event in events:
event_item = create_item(event.name, world.player)

if event.location == LocationName.Lemurian_Ship_Engine_Room and world.options.starter_ship == 0:
if event.location == LocationName.Lemurian_Ship_Engine_Room and world.options.lemurian_ship == 2:
#world.multiworld.push_precollected(event_item)
continue

Expand Down Expand Up @@ -103,7 +103,7 @@ def create_items(world: 'GSTLAWorld', player: int):
vanilla_item = items_by_id[loc.vanilla_contents]

#if vanilla ship logic than this should be Gabomba Statue Black Crystal location
if world.options.starter_ship == 2 and vanilla_item.name == ItemName.Black_Crystal:
if world.options.lemurian_ship == 0 and vanilla_item.name == ItemName.Black_Crystal:
ap_item = create_item_direct(vanilla_item, player)
ap_location = world.get_location(loc_names_by_id[loc.ap_id])
ap_location.place_locked_item(ap_item)
Expand All @@ -119,7 +119,7 @@ def create_items(world: 'GSTLAWorld', player: int):
sum_locations -= 1

# for item in unique_items + psyenergy_as_item_list + psyenergy_list:
# if multiworld.starter_ship[player] != 2 and item.itemName == ItemName.Black_Crystal:
# if multiworld.lemurian_ship[player] != 2 and item.itemName == ItemName.Black_Crystal:
# continue
#
# ap_item = create_item(item.itemName, player)
Expand All @@ -130,7 +130,7 @@ def create_items(world: 'GSTLAWorld', player: int):
sorted_item_list = sorted(djinn_items, key = lambda item: item.id)
sorted_loc_list = sorted(location_type_to_data[LocationType.Djinn], key = lambda location: location.id)

if world.options.djinn_shuffle < 2:
if world.options.shuffle_djinn > 0:
world.random.shuffle(sorted_item_list)
world.random.shuffle(sorted_loc_list)

Expand All @@ -146,7 +146,7 @@ def create_items(world: 'GSTLAWorld', player: int):
sorted_loc_list = sorted(location_type_to_data[LocationType.Character], key = lambda location: location.id)
first_char_locked = False

if world.options.character_shuffle < 2:
if world.options.shuffle_characters > 0:
world.random.shuffle(sorted_item_list)
world.random.shuffle(sorted_loc_list)

Expand All @@ -155,7 +155,7 @@ def create_items(world: 'GSTLAWorld', player: int):
sum_locations -= 1

# Vanilla
if world.options.character_shuffle > 0:
if world.options.shuffle_characters < 2:
location = sorted_loc_list.pop(0)
ap_loc = world.get_location(loc_names_by_id[location.ap_id])

Expand Down
Loading
Loading