diff --git a/worlds/dlcquest/Items.py b/worlds/dlcquest/Items.py index 5496885a..380c5429 100644 --- a/worlds/dlcquest/Items.py +++ b/worlds/dlcquest/Items.py @@ -2,6 +2,7 @@ import csv import enum import math from dataclasses import dataclass, field +from functools import reduce from random import Random from typing import Dict, List, Set @@ -61,7 +62,7 @@ def load_item_csv(): item_reader = csv.DictReader(file) for item in item_reader: id = int(item["id"]) if item["id"] else None - classification = ItemClassification[item["classification"]] + classification = reduce((lambda a, b: a | b), {ItemClassification[str_classification] for str_classification in item["classification"].split(",")}) groups = {Group[group] for group in item["groups"].split(",") if group} items.append(ItemData(id, item["name"], classification, groups)) return items diff --git a/worlds/dlcquest/data/items.csv b/worlds/dlcquest/data/items.csv index 82150254..7d9fdcf3 100644 --- a/worlds/dlcquest/data/items.csv +++ b/worlds/dlcquest/data/items.csv @@ -22,7 +22,7 @@ id,name,classification,groups 20,Wall Jump Pack,progression,"DLC,Freemium" 21,Health Bar Pack,useful,"DLC,Freemium" 22,Parallax Pack,filler,"DLC,Freemium" -23,Harmless Plants Pack,progression,"DLC,Freemium" +23,Harmless Plants Pack,"progression,trap","DLC,Freemium" 24,Death of Comedy Pack,progression,"DLC,Freemium" 25,Canadian Dialog Pack,filler,"DLC,Freemium" 26,DLC NPC Pack,progression,"DLC,Freemium"