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

HK: Removes Vanilla Items from ItemPool and Uses Grimmchild1 when relevant #2898

Merged
merged 7 commits into from
Mar 13, 2024
Merged

HK: Removes Vanilla Items from ItemPool and Uses Grimmchild1 when relevant #2898

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e0e5bd5
adding logic to not add non-randomized items to the itempool (removin…
qwint Mar 4, 2024
5cd0ee4
Hardcode in Grimmchild1 when flames+charms are randomized instead of …
qwint Mar 4, 2024
9f5ebd8
move item creation back to a (more complex) oneliner
qwint Mar 5, 2024
84efec9
Add Option to go back to fully AP items for one-slot co-op
qwint Mar 5, 2024
3ba51f8
Add Grimmchild item group for easier reference/hinting
qwint Mar 10, 2024
44d4e2e
simplifying indentation with an if Continue for readability
qwint Mar 11, 2024
5c1b66a
suggested naming and description changes
qwint Mar 12, 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
72 changes: 43 additions & 29 deletions worlds/hk/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ def create_items(self):
randomized_starting_items.update(items)

# noinspection PyShadowingNames
def _add(item_name: str, location_name: str):
def _add(item_name: str, location_name: str, randomized: bool):
"""
Adds a pairing of an item and location, doing appropriate checks to see if it should be vanilla or not.
"""
Expand All @@ -252,21 +252,21 @@ def _add(item_name: str, location_name: str):
if item_name in junk_replace:
item_name = self.get_filler_item_name()

item = self.create_item(item_name)
qwint marked this conversation as resolved.
Show resolved Hide resolved

if location_name == "Start":
if item_name in randomized_starting_items:
if item_name == "Focus":
self.create_location("Focus")
unfilled_locations += 1
pool.append(item)
pool.append(self.create_item(item_name))
else:
self.multiworld.push_precollected(item)
self.multiworld.push_precollected(self.create_item(item_name))
qwint marked this conversation as resolved.
Show resolved Hide resolved
return

if vanilla:
item = self.create_event(item_name)
location = self.create_vanilla_location(location_name, item)
else:
item = self.create_item(item_name)
pool.append(item)
if location_name in multi_locations: # Create shop locations later.
return
Expand All @@ -277,30 +277,34 @@ def _add(item_name: str, location_name: str):

for option_key, option in hollow_knight_randomize_options.items():
randomized = getattr(self.multiworld, option_key)[self.player]
for item_name, location_name in zip(option.items, option.locations):
if item_name in junk_replace:
item_name = self.get_filler_item_name()

if (item_name == "Crystal_Heart" and self.multiworld.SplitCrystalHeart[self.player]) or \
(item_name == "Mothwing_Cloak" and self.multiworld.SplitMothwingCloak[self.player]):
_add("Left_" + item_name, location_name)
_add("Right_" + item_name, "Split_" + location_name)
continue
if item_name == "Mantis_Claw" and self.multiworld.SplitMantisClaw[self.player]:
_add("Left_" + item_name, "Left_" + location_name)
_add("Right_" + item_name, "Right_" + location_name)
continue
if item_name == "Shade_Cloak" and self.multiworld.SplitMothwingCloak[self.player]:
if self.multiworld.random.randint(0, 1):
item_name = "Left_Mothwing_Cloak"
else:
item_name = "Right_Mothwing_Cloak"

_add(item_name, location_name)
if randomized or option_key not in logicless_options:
qwint marked this conversation as resolved.
Show resolved Hide resolved
for item_name, location_name in zip(option.items, option.locations):
if item_name in junk_replace:
item_name = self.get_filler_item_name()

if (item_name == "Crystal_Heart" and self.multiworld.SplitCrystalHeart[self.player]) or \
(item_name == "Mothwing_Cloak" and self.multiworld.SplitMothwingCloak[self.player]):
_add("Left_" + item_name, location_name, randomized)
_add("Right_" + item_name, "Split_" + location_name, randomized)
continue
if item_name == "Mantis_Claw" and self.multiworld.SplitMantisClaw[self.player]:
_add("Left_" + item_name, "Left_" + location_name, randomized)
_add("Right_" + item_name, "Right_" + location_name, randomized)
continue
if item_name == "Shade_Cloak" and self.multiworld.SplitMothwingCloak[self.player]:
if self.multiworld.random.randint(0, 1):
item_name = "Left_Mothwing_Cloak"
else:
item_name = "Right_Mothwing_Cloak"
if item_name == "Grimmchild2" and self.multiworld.RandomizeGrimmkinFlames[self.player] and self.multiworld.RandomizeCharms[self.player]:
_add("Grimmchild1", location_name, randomized)
continue

_add(item_name, location_name, randomized)

if self.multiworld.RandomizeElevatorPass[self.player]:
randomized = True
_add("Elevator_Pass", "Elevator_Pass")
_add("Elevator_Pass", "Elevator_Pass", randomized)

for shop, locations in self.created_multi_locations.items():
for _ in range(len(locations), getattr(self.multiworld, shop_to_option[shop])[self.player].value):
Expand Down Expand Up @@ -475,6 +479,10 @@ def create_item(self, name: str) -> HKItem:
item_data = item_table[name]
return HKItem(name, item_data.advancement, item_data.id, item_data.type, self.player)

def create_event(self, name: str) -> HKItem:
item_data = item_table[name]
return HKItem(name, item_data.advancement, None, item_data.type, self.player)

def create_location(self, name: str, vanilla=False) -> HKLocation:
costs = None
basename = name
Expand All @@ -493,9 +501,15 @@ def create_location(self, name: str, vanilla=False) -> HKLocation:
name = f"{name}_{i}"

region = self.multiworld.get_region("Menu", self.player)
loc = HKLocation(self.player, name,
self.location_name_to_id[name], region, costs=costs, vanilla=vanilla,
basename=basename)

if vanilla:
loc = HKLocation(self.player, name,
None, region, costs=costs, vanilla=vanilla,
basename=basename)
else:
loc = HKLocation(self.player, name,
self.location_name_to_id[name], region, costs=costs, vanilla=vanilla,
basename=basename)

if multi is not None:
multi.append(loc)
Expand Down