monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Overcooked 2: Revert OC2Level world references to be named correctly, optimize location scouting. (#1175) 

* fix oc2 level world references

* optimize the local items discovery a bit
This commit is contained in:
alwaysintreble 2022-11-02 10:11:46 -05:00 committed by GitHub
parent da392239a0
commit c378933274
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
worlds/overcooked2/Overcooked2Levels.py
View File

@ -159,7 +159,7 @@ class Overcooked2Level:
sublevel: int
def __init__(self):
self.multiworld = Overcooked2GameWorld.ONE
self.world = Overcooked2GameWorld.ONE
self.sublevel = 0
def __iter__(self):
@ -167,21 +167,21 @@ class Overcooked2Level:
def __next__(self):
self.sublevel += 1
if self.sublevel > self.multiworld.sublevel_count:
if self.multiworld == Overcooked2GameWorld.KEVIN:
if self.sublevel > self.world.sublevel_count:
if self.world == Overcooked2GameWorld.KEVIN:
raise StopIteration
self.multiworld = Overcooked2GameWorld(self.multiworld.value + 1)
self.world = Overcooked2GameWorld(self.world.value + 1)
self.sublevel = 1
return self
@property
def level_id(self) -> int:
return self.multiworld.base_id + (self.sublevel - 1)
return self.world.base_id + (self.sublevel - 1)
@property
def level_name(self) -> str:
return self.multiworld.as_str + "-" + str(self.sublevel)
return self.world.as_str + "-" + str(self.sublevel)
@property
def location_name_item(self) -> str:

19
worlds/overcooked2/__init__.py
View File

@ -376,17 +376,14 @@ class Overcooked2World(World):
# Place Items at Level Completion Screens (local only)
on_level_completed: Dict[str, list[Dict[str, str]]] = dict()
regions = self.multiworld.get_regions(self.player)
for region in regions:
for location in region.locations:
if location.item is None:
continue
if location.item.code is None:
continue # it's an event
if location.item.player != self.player:
continue # not for us
level_id = str(oc2_location_name_to_id[location.name])
on_level_completed[level_id] = [item_to_unlock_event(location.item.name)]
locations = self.multiworld.get_filled_locations(self.player)
for location in locations:
if location.item.code is None:
continue # it's an event
if location.item.player != self.player:
continue # not for us
level_id = str(oc2_location_name_to_id[location.name])
on_level_completed[level_id] = [item_to_unlock_event(location.item.name)]
# Put it all together
star_threshold_scale = self.options["StarThresholdScale"] / 100