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

progress i think as test passed

Browse Source
This commit is contained in:
Jarno Westhof
2025-03-23 12:56:10 +01:00
parent 26f9574894
commit f6a1519704
3 changed files with 44 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
worlds/satisfactory/GameLogic.py
View File

@@ -483,13 +483,13 @@ class GameLogic:
"Packaged Nitrogen Gas": (
Recipe("Packaged Nitrogen Gas", "Packager", ("Nitrogen Gas", "Empty Fluid Tank")), ),
"Packaged Oil": (
Recipe("Packaged Oil", "Packager", ("Crude Oil", "Empty Fluid Tank")), ),
Recipe("Packaged Oil", "Packager", ("Crude Oil", "Empty Canister")), ),
"Packaged Sulfuric Acid": (
Recipe("Packaged Sulfuric Acid", "Packager", ("Sulfuric Acid", "Empty Fluid Tank")), ),
Recipe("Packaged Sulfuric Acid", "Packager", ("Sulfuric Acid", "Empty Canister")), ),
"Packaged Turbofuel": (
Recipe("Packaged Turbofuel", "Packager", ("Turbofuel", "Empty Fluid Tank")), ),
Recipe("Packaged Turbofuel", "Packager", ("Turbofuel", "Empty Canister")), ),
"Packaged Water": (
Recipe("Packaged Water", "Packager", ("Water", "Empty Fluid Tank")), ),
Recipe("Packaged Water", "Packager", ("Water", "Empty Canister")), ),
"Turbofuel": (
Recipe("Turbofuel", "Refinery", ("Fuel", "Compacted Coal")),
Recipe("Turbo Heavy Fuel", "Refinery", ("Heavy Oil Residue", "Compacted Coal")),

7
worlds/satisfactory/Items.py
View File

@@ -462,6 +462,13 @@ class Items:
"Recipe: Tempered Copper Ingot": ItemData(G.Recipe, 1338458, C.progression),
# 1.0
# Missed
"Recipe: Iron Pipe": ItemData(G.Recipe, 1338459, C.progression),
"Recipe: Biocoal": ItemData(G.Recipe, 1338460, C.useful),
"Recipe: Charcoal": ItemData(G.Recipe, 1338461, C.useful),
"Recipe: Sloppy Alumina": ItemData(G.Recipe, 1338462, C.progression),
# Missed
#1338459 - 1338599 Reserved for future recipes
#1338400 - 1338899 buildings / others

43
worlds/satisfactory/Locations.py
View File

@@ -203,8 +203,9 @@ class Locations():
self.items = items
self.critical_path = critical_path
def get_base_location_table(self) -> List[LocationData]:
return [
def get_base_location_table(self, max_tier: int) -> List[LocationData]:
all_locations = [
MamSlot("Alien Organisms", "Inflated Pocket Dimension", 1338500),
MamSlot("Alien Organisms", "Hostile Organism Detection", 1338501),
MamSlot("Alien Organisms", "Expanded Toolbelt", 1338502),
@@ -273,15 +274,15 @@ class Locations():
MamSlot("Sulfur", "Explosive Rebar", 1338565),
MamSlot("Sulfur", "Cluster Nobelisk", 1338566),
MamSlot("Sulfur", "Experimental Power Generation", 1338567),
MamSlot("Sulfur", "Turbo Rifle Ammo", 1338568),
# 1338568 Turbo Rifle Ammo
MamSlot("Sulfur", "Turbo Fuel", 1338569),
MamSlot("Sulfur", "Expanded Toolbelt", 1338570),
MamSlot("Sulfur", "Nuclear Deterrent Development", 1338571),
# 1338571 Nuclear Deterrent Development
# 1.0
MamSlot("Power Slugs", "Synthetic Power Shards", 1338572),
MamSlot("Sulfur", "Rocket Fuel", 1338573),
MamSlot("Sulfur", "Ionized Fuel", 1338574),
# 1338572 Synthetic Power Shards
# 1338573 Rocket Fuel
# 1338574 Ionized Fuel
MamSlot("Alien Technology", "SAM Analysis", 1338575),
MamSlot("Alien Technology", "SAM Reanimation", 1338576),
MamSlot("Alien Technology", "SAM Fluctuator", 1338577),
@@ -300,7 +301,7 @@ class Locations():
MamSlot("Alien Technology", "Alien Energy Harvesting", 1338590),
MamSlot("Alien Technology", "Production Amplifier", 1338591),
MamSlot("Alien Technology", "Power Augmenter", 1338592),
MamSlot("Alien Technology", "Alien Power Matrix", 1338593),
# 1338593 Alien Power Matrix
# 1.0
# 1338600 - 1338699 - Harddrives - Harddrives
@@ -317,10 +318,32 @@ class Locations():
ShopSlot(self.state_logic, 10, 50, 1338709)
]
#TODO: should be based on self.game_logic
if 4 <= max_tier:
all_locations.append(MamSlot("Power Slugs", "Synthetic Power Shards", 1338572))
if 4 <= max_tier:
all_locations.append(MamSlot("Alien Technology", "Alien Power Matrix", 1338593))
if 2 <= max_tier:
all_locations.append(MamSlot("Sulfur", "Turbo Rifle Ammo", 1338568))
if 2 <= max_tier:
all_locations.append(MamSlot("Sulfur", "Nuclear Deterrent Development", 1338571))
if 3 <= max_tier:
all_locations.append(MamSlot("Sulfur", "Rocket Fuel", 1338573))
if 4 <= max_tier:
all_locations.append(MamSlot("Sulfur", "Ionized Fuel", 1338574))
return all_locations
def get_locations_for_data_package(self) -> Dict[str, int]:
"Must include all possible location names and their id's"
location_table = self.get_base_location_table()
# 1338000 - 1338499 - Milestones
# 1338500 - 1338599 - Mam
# 1338600 - 1338699 - Harddrives
# 1338700 - 1338709 - Shop
# 1338999 - Upper bound
location_table = self.get_base_location_table(self.max_tiers)
location_table.extend(self.get_hub_locations(True, self.max_tiers))
location_table.extend(self.get_drop_pod_locations(True, self.max_tiers, set()))
location_table.append(LocationData("Overworld", "UpperBound", 1338999))
@@ -335,7 +358,7 @@ class Locations():
max_tier_for_game = min(self.options.final_elevator_package * 2, len(self.game_logic.hub_layout))
location_table = self.get_base_location_table()
location_table = self.get_base_location_table(max_tier_for_game)
location_table.extend(self.get_hub_locations(False, max_tier_for_game))
location_table.extend(self.get_drop_pod_locations(False, max_tier_for_game, self.critical_path.potential_required_parts))
location_table.extend(self.get_logical_event_locations(self.options.final_elevator_package))