From a825f800a04334ac8a4338c5fe88d7bbce49c022 Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Mon, 8 Sep 2025 23:52:05 -0400 Subject: Made sure the apworld unit tests pass --- apworld/__init__.py | 10 +++++++++- apworld/docs/en_Lingo_2.md | 4 ++++ apworld/player_logic.py | 6 +++++- apworld/requirements.txt | 2 +- data/maps/the_owl/doors.txtpb | 2 +- 5 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 apworld/docs/en_Lingo_2.md diff --git a/apworld/__init__.py b/apworld/__init__.py index d05bd38..6eeee74 100644 --- a/apworld/__init__.py +++ b/apworld/__init__.py @@ -1,7 +1,7 @@ """ Archipelago init file for Lingo 2 """ -from BaseClasses import ItemClassification, Item +from BaseClasses import ItemClassification, Item, Tutorial from worlds.AutoWorld import WebWorld, World from .items import Lingo2Item from .options import Lingo2Options @@ -13,6 +13,14 @@ from .static_logic import Lingo2StaticLogic class Lingo2WebWorld(WebWorld): rich_text_options_doc = True theme = "grass" + tutorials = [Tutorial( + "Multiworld Setup Guide", + "A guide to playing Lingo 2 with Archipelago.", + "English", + "en_Lingo_2.md", + "setup/en", + ["hatkirby"] + )] class Lingo2World(World): diff --git a/apworld/docs/en_Lingo_2.md b/apworld/docs/en_Lingo_2.md new file mode 100644 index 0000000..977795a --- /dev/null +++ b/apworld/docs/en_Lingo_2.md @@ -0,0 +1,4 @@ +# Lingo 2 + +See [the project README](https://code.fourisland.com/lingo2-archipelago/about/) +for installation instructions and frequently asked questions. \ No newline at end of file diff --git a/apworld/player_logic.py b/apworld/player_logic.py index c94b809..dbd340c 100644 --- a/apworld/player_logic.py +++ b/apworld/player_logic.py @@ -335,7 +335,11 @@ class Lingo2PlayerLogic: for ending_id in door.endings: ending = self.world.static_logic.objects.endings[ending_id] - reqs.items.add(f"{ending.name.capitalize()} Ending (Achieved)") + + if self.world.options.victory_condition.current_key.removesuffix("_ending").upper() == ending.name: + reqs.items.add("Victory") + else: + reqs.items.add(f"{ending.name.capitalize()} Ending (Achieved)") for sub_door_id in door.doors: sub_reqs = self.get_door_open_reqs(sub_door_id) diff --git a/apworld/requirements.txt b/apworld/requirements.txt index 49ca0a7..dbc395b 100644 --- a/apworld/requirements.txt +++ b/apworld/requirements.txt @@ -1 +1 @@ -protobuf==3.20.3 \ No newline at end of file +protobuf==3.20.3 diff --git a/data/maps/the_owl/doors.txtpb b/data/maps/the_owl/doors.txtpb index 5ec34c6..9254c2a 100644 --- a/data/maps/the_owl/doors.txtpb +++ b/data/maps/the_owl/doors.txtpb @@ -235,7 +235,7 @@ doors { type: EVENT #receivers: "Panels/Colors/owl_2/animationListener2" panels { room: "Connected Area" name: "RANGE" } - panels { room: "R2C3 Bottom" name: "BLACK" } + panels { room: "Connected Area" name: "WHITE" } panels { room: "Blue Room" name: "SKY" } } doors { -- cgit 1.4.1