diff options
Diffstat (limited to 'apworld')
-rw-r--r-- | apworld/__init__.py | 6 | ||||
-rw-r--r-- | apworld/client/worldportListener.gd | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/apworld/__init__.py b/apworld/__init__.py index 9e445c7..57e3d9b 100644 --- a/apworld/__init__.py +++ b/apworld/__init__.py | |||
@@ -4,6 +4,7 @@ Archipelago init file for Lingo 2 | |||
4 | from typing import ClassVar | 4 | from typing import ClassVar |
5 | 5 | ||
6 | from BaseClasses import ItemClassification, Item, Tutorial | 6 | from BaseClasses import ItemClassification, Item, Tutorial |
7 | from Options import OptionError | ||
7 | from settings import Group, UserFilePath | 8 | from settings import Group, UserFilePath |
8 | from worlds.AutoWorld import WebWorld, World | 9 | from worlds.AutoWorld import WebWorld, World |
9 | from .items import Lingo2Item, ANTI_COLLECTABLE_TRAPS | 10 | from .items import Lingo2Item, ANTI_COLLECTABLE_TRAPS |
@@ -109,6 +110,11 @@ class Lingo2World(World): | |||
109 | for i in range(0, item_difference): | 110 | for i in range(0, item_difference): |
110 | pool.append(self.create_item(self.get_filler_item_name())) | 111 | pool.append(self.create_item(self.get_filler_item_name())) |
111 | 112 | ||
113 | if not any(ItemClassification.progression in item.classification for item in pool): | ||
114 | raise OptionError(f"Lingo 2 player {self.player} has no progression items. Please enable at least one " | ||
115 | f"option that would add progression gating to your world, such as Shuffle Doors or " | ||
116 | f"Shuffle Letters.") | ||
117 | |||
112 | self.multiworld.itempool += pool | 118 | self.multiworld.itempool += pool |
113 | 119 | ||
114 | def create_item(self, name: str) -> Item: | 120 | def create_item(self, name: str) -> Item: |
diff --git a/apworld/client/worldportListener.gd b/apworld/client/worldportListener.gd index 5c2faff..4cff8e9 100644 --- a/apworld/client/worldportListener.gd +++ b/apworld/client/worldportListener.gd | |||
@@ -2,7 +2,7 @@ extends "res://scripts/nodes/listeners/worldportListener.gd" | |||
2 | 2 | ||
3 | 3 | ||
4 | func handleTriggered(): | 4 | func handleTriggered(): |
5 | if exit == "menus/credits": | 5 | if exit.begins_with("menus/credits"): |
6 | return | 6 | return |
7 | 7 | ||
8 | super.handleTriggered() | 8 | super.handleTriggered() |