mirror/Archipelago
1
0
Fork 1
mirror of https://github.com/ArchipelagoMW/Archipelago.git synced 2026-03-23 14:23:32 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/Satisfactory' into Satisfactory_ToBeVerified

Browse Source 
# Conflicts:
#	worlds/satisfactory/docs/setup_en.md
This commit is contained in:
Jarno
2025-07-14 16:39:57 +02:00
parent 0292ab2fb2 476f01eb27
commit c778e4d0ab
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
worlds/satisfactory/Web.py
View File

@@ -6,7 +6,7 @@ class SatisfactoryWebWorld(WebWorld):
theme = "dirt"
setup = Tutorial(
"Multiworld Setup Guide",
"A guide to setting up the Satisfactory Archipelago mod and connect it to an Archipelago Multiworld",
"A guide to setting up the Satisfactory Archipelago mod and connecting it to an Archipelago Multiworld",
"English",
"setup_en.md",
"setup/en",

12
worlds/satisfactory/__init__.py
View File

@@ -48,12 +48,6 @@ class SatisfactoryWorld(World):
if self.critical_path_seed == None:
self.critical_path_seed = self.random.random()
self.critical_path = CriticalPathCalculator(self.game_logic, self.critical_path_seed, self.options)
self.critical_path.calculate()
self.state_logic = StateLogic(self.player, self.options, self.critical_path)
self.items = Items(self.player, self.game_logic, self.random, self.options, self.critical_path)
if self.options.mam_logic_placement.value == Placement.starting_inventory:
self.push_precollected("Building: MAM")
if self.options.awesome_logic_placement.value == Placement.starting_inventory:
@@ -68,6 +62,12 @@ class SatisfactoryWorld(World):
if not self.options.trap_selection_override.value:
self.options.trap_selection_override.value = self.options.trap_selection_preset.get_selected_list()
self.critical_path = CriticalPathCalculator(self.game_logic, self.critical_path_seed, self.options)
self.critical_path.calculate()
self.state_logic = StateLogic(self.player, self.options, self.critical_path)
self.items = Items(self.player, self.game_logic, self.random, self.options, self.critical_path)
starting_inventory: list[str] = self.options.starting_inventory_preset.get_selected_list()
for item_name in starting_inventory:
self.push_precollected(item_name)