about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--apworld/__init__.py10
-rw-r--r--apworld/docs/en_Lingo_2.md4
-rw-r--r--apworld/player_logic.py6
-rw-r--r--apworld/requirements.txt2
-rw-r--r--data/maps/the_owl/doors.txtpb2
5 files changed, 20 insertions, 4 deletions
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 @@
1""" 1"""
2Archipelago init file for Lingo 2 2Archipelago init file for Lingo 2
3""" 3"""
4from BaseClasses import ItemClassification, Item 4from BaseClasses import ItemClassification, Item, Tutorial
5from worlds.AutoWorld import WebWorld, World 5from worlds.AutoWorld import WebWorld, World
6from .items import Lingo2Item 6from .items import Lingo2Item
7from .options import Lingo2Options 7from .options import Lingo2Options
@@ -13,6 +13,14 @@ from .static_logic import Lingo2StaticLogic
13class Lingo2WebWorld(WebWorld): 13class Lingo2WebWorld(WebWorld):
14 rich_text_options_doc = True 14 rich_text_options_doc = True
15 theme = "grass" 15 theme = "grass"
16 tutorials = [Tutorial(
17 "Multiworld Setup Guide",
18 "A guide to playing Lingo 2 with Archipelago.",
19 "English",
20 "en_Lingo_2.md",
21 "setup/en",
22 ["hatkirby"]
23 )]
16 24
17 25
18class Lingo2World(World): 26class 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 @@
1# Lingo 2
2
3See [the project README](https://code.fourisland.com/lingo2-archipelago/about/)
4for 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:
335 335
336 for ending_id in door.endings: 336 for ending_id in door.endings:
337 ending = self.world.static_logic.objects.endings[ending_id] 337 ending = self.world.static_logic.objects.endings[ending_id]
338 reqs.items.add(f"{ending.name.capitalize()} Ending (Achieved)") 338
339 if self.world.options.victory_condition.current_key.removesuffix("_ending").upper() == ending.name:
340 reqs.items.add("Victory")
341 else:
342 reqs.items.add(f"{ending.name.capitalize()} Ending (Achieved)")
339 343
340 for sub_door_id in door.doors: 344 for sub_door_id in door.doors:
341 sub_reqs = self.get_door_open_reqs(sub_door_id) 345 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 {
235 type: EVENT 235 type: EVENT
236 #receivers: "Panels/Colors/owl_2/animationListener2" 236 #receivers: "Panels/Colors/owl_2/animationListener2"
237 panels { room: "Connected Area" name: "RANGE" } 237 panels { room: "Connected Area" name: "RANGE" }
238 panels { room: "R2C3 Bottom" name: "BLACK" } 238 panels { room: "Connected Area" name: "WHITE" }
239 panels { room: "Blue Room" name: "SKY" } 239 panels { room: "Blue Room" name: "SKY" }
240} 240}
241doors { 241doors {