mirror/Archipelago
1
0
Fork 1
mirror of https://github.com/ArchipelagoMW/Archipelago.git synced 2026-03-27 18:43:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

Implemented exploration cost in slot_data

Browse Source
This commit is contained in:
Jarno Westhof
2025-04-29 21:27:58 +02:00
parent b1a5ae4939
commit b56c820411
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
worlds/satisfactory/Options.py
View File

@@ -372,7 +372,14 @@ class ExplorationCollectableCount(Range):
"""
Does nothing if *Exploration Collectables* goal is not enabled.
Collect this amount of Mercer Spheres and Summer Sloops each to finish.
Collect this amount of Mercer Spheres, Somersloops, Harddrives, Paleberry, Beryl Nut and Bacon Agaric each to finish.
The amount for Mercer Spheres is 2x the selected amount
The amount for Somersloops is the selected amount
The amount for Harddrives is 1/5th the selected amount
The amount for Paleberry is 10x the selected amount
The amount for Beryl Nut is 20x the selected amount
The amount for Bacon Agaric is the selected amount
"""
display_name = "Exploration Collectables"
default = 20

19
worlds/satisfactory/__init__.py
View File

@@ -109,10 +109,8 @@ class SatisfactoryWorld(World):
for milestone, parts in enumerate(milestones, 1):
slot_hub_layout[tier - 1].append({})
for part, amount in parts.items():
# ItemIDs of bundles are shared with their component item
bundled_name = f"Bundle: {part}"
multiplied_amount = max(amount * (self.options.milestone_cost_multiplier / 100), 1)
slot_hub_layout[tier - 1][milestone - 1][self.item_name_to_id[bundled_name]] = multiplied_amount
multiplied_amount = int(max(amount * (self.options.milestone_cost_multiplier / 100), 1))
slot_hub_layout[tier-1][milestone-1][self.item_id_str(part)] = multiplied_amount
starting_recipes: tuple[int] = tuple(
self.item_name_to_id[recipe_name]
@@ -123,6 +121,14 @@ class SatisfactoryWorld(World):
"Data": {
"HubLayout": slot_hub_layout,
"SlotsPerMilestone": self.game_logic.slots_per_milestone,
"ExplorationCosts": {
self.item_id_str("Mercer Sphere"): int(self.options.goal_exploration_collectables_amount * 2),
self.item_id_str("Somersloop"): self.options.goal_exploration_collectables_amount,
self.item_id_str("Hard Drive"): int(self.options.goal_exploration_collectables_amount / 5),
self.item_id_str("Paleberry"): self.options.goal_exploration_collectables_amount * 10,
self.item_id_str("Beryl Nut"): self.options.goal_exploration_collectables_amount * 20,
self.item_id_str("Bacon Agaric"): self.options.goal_exploration_collectables_amount,
},
"Options": {
"GoalSelection": self.options.goal_selection.value,
"GoalRequirement": self.options.goal_requirement.value,
@@ -171,3 +177,8 @@ class SatisfactoryWorld(World):
def push_precollected(self, item_name: str) -> None:
item = self.create_item(item_name)
self.multiworld.push_precollected(item)
def item_id_str(self, item_name: str) -> str:
# ItemIDs of bundles are shared with their component item
bundled_name = f"Bundle: {item_name}"
return str(self.item_name_to_id[bundled_name])