add the ability to check whether an entry is contained in a variable contition

Author: CodeTriangle

worlds/crosscode/codegen/parse.py

@@ -14,7 +14,7 @@
 from ..types.locations import AccessInfo, Condition
 from ..types.regions import RegionConnection, RegionsData
 from ..types.condition import ChestKeyCondition, ItemCondition, LocationCondition, NeverCondition, QuestCondition, RegionCondition, AnyElementCondition, \
-    OrCondition, ShopSlotCondition, VariableCondition
+    OrCondition, ShopSlotCondition, VariableCondition, VariableEntryCondition
 
 class JsonParserError(Exception):
     """
@@ -112,6 +112,8 @@ def parse_condition(self, raw: list[typing.Any]) -> list[Condition]:
             elif cond[0] == "var":
                 if num_args == 1:
                     result.append(VariableCondition(cond[1]))
+                elif num_args == 2:
+                    result.append(VariableEntryCondition(cond[1], cond[2]))
                 else:
                     raise JsonParserError(
                         raw,

worlds/crosscode/types/condition.py

@@ -108,6 +108,16 @@ def satisfied(self, state: CollectionState, player: int, location: int | None, a
 
         return True
 
+@dataclass
+class VariableEntryCondition(Condition):
+    name: str
+    value: str
+
+    def satisfied(self, state: CollectionState, player: int, location: int | None, args: LogicDict) -> bool:
+        variables = args["variables"]
+
+        return self.value in variables[self.name]
+
 @dataclass
 class ChestKeyCondition(Condition):
     default_level: str
@@ -160,6 +170,7 @@ def satisfied(self, state: CollectionState, player: int, location: int | None, a
     "AnyElementCondition",
     "OrCondition",
     "VariableCondition",
+    "VariableEntryCondition",
     "ChestKeyCondition",
     "ShopSlotCondition",
     "NeverCondition"