YGO06: add Item groups (#3737)
* YGO06: adds item groups * YGO06: Change lists to sets Co-authored-by: Scipio Wright <scipiowright@gmail.com> * YGO06: fix imports --------- Co-authored-by: Scipio Wright <scipiowright@gmail.com>
This commit is contained in:
parent
a67688749f
commit
992657750c
|
@ -1,6 +1,6 @@
|
||||||
import os
|
import os
|
||||||
import pkgutil
|
import pkgutil
|
||||||
from typing import Any, ClassVar, Dict, List
|
from typing import Any, ClassVar, Dict, List, Set
|
||||||
|
|
||||||
import settings
|
import settings
|
||||||
from BaseClasses import Entrance, Item, ItemClassification, Location, MultiWorld, Region, Tutorial
|
from BaseClasses import Entrance, Item, ItemClassification, Location, MultiWorld, Region, Tutorial
|
||||||
|
@ -17,12 +17,14 @@ from .items import (
|
||||||
draft_opponents,
|
draft_opponents,
|
||||||
excluded_items,
|
excluded_items,
|
||||||
item_to_index,
|
item_to_index,
|
||||||
tier_1_opponents,
|
|
||||||
useful,
|
useful,
|
||||||
|
tier_1_opponents,
|
||||||
|
tier_2_opponents,
|
||||||
|
tier_3_opponents,
|
||||||
|
tier_4_opponents,
|
||||||
|
tier_5_opponents,
|
||||||
)
|
)
|
||||||
from .items import (
|
from .items import challenges as challenges
|
||||||
challenges as challenges,
|
|
||||||
)
|
|
||||||
from .locations import (
|
from .locations import (
|
||||||
Bonuses,
|
Bonuses,
|
||||||
Campaign_Opponents,
|
Campaign_Opponents,
|
||||||
|
@ -109,9 +111,17 @@ class Yugioh06World(World):
|
||||||
for k, v in Required_Cards.items():
|
for k, v in Required_Cards.items():
|
||||||
location_name_to_id[k] = v + start_id
|
location_name_to_id[k] = v + start_id
|
||||||
|
|
||||||
item_name_groups = {
|
item_name_groups: Dict[str, Set[str]] = {
|
||||||
"Core Booster": core_booster,
|
"Core Booster": set(core_booster),
|
||||||
"Campaign Boss Beaten": ["Tier 1 Beaten", "Tier 2 Beaten", "Tier 3 Beaten", "Tier 4 Beaten", "Tier 5 Beaten"],
|
"Campaign Boss Beaten": {"Tier 1 Beaten", "Tier 2 Beaten", "Tier 3 Beaten", "Tier 4 Beaten", "Tier 5 Beaten"},
|
||||||
|
"Challenge": set(challenges),
|
||||||
|
"Tier 1 Opponent": set(tier_1_opponents),
|
||||||
|
"Tier 2 Opponent": set(tier_2_opponents),
|
||||||
|
"Tier 3 Opponent": set(tier_3_opponents),
|
||||||
|
"Tier 4 Opponent": set(tier_4_opponents),
|
||||||
|
"Tier 5 Opponent": set(tier_5_opponents),
|
||||||
|
"Campaign Opponent": set(tier_1_opponents + tier_2_opponents + tier_3_opponents +
|
||||||
|
tier_4_opponents + tier_5_opponents)
|
||||||
}
|
}
|
||||||
|
|
||||||
removed_challenges: List[str]
|
removed_challenges: List[str]
|
||||||
|
|
|
@ -183,6 +183,35 @@ tier_1_opponents: List[str] = [
|
||||||
"Campaign Tier 1 Column 5",
|
"Campaign Tier 1 Column 5",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
tier_2_opponents: List[str] = [
|
||||||
|
"Campaign Tier 2 Column 1",
|
||||||
|
"Campaign Tier 2 Column 2",
|
||||||
|
"Campaign Tier 2 Column 3",
|
||||||
|
"Campaign Tier 2 Column 4",
|
||||||
|
"Campaign Tier 2 Column 5",
|
||||||
|
]
|
||||||
|
|
||||||
|
tier_3_opponents: List[str] = [
|
||||||
|
"Campaign Tier 3 Column 1",
|
||||||
|
"Campaign Tier 3 Column 2",
|
||||||
|
"Campaign Tier 3 Column 3",
|
||||||
|
"Campaign Tier 3 Column 4",
|
||||||
|
"Campaign Tier 3 Column 5",
|
||||||
|
]
|
||||||
|
|
||||||
|
tier_4_opponents: List[str] = [
|
||||||
|
"Campaign Tier 4 Column 1",
|
||||||
|
"Campaign Tier 4 Column 2",
|
||||||
|
"Campaign Tier 4 Column 3",
|
||||||
|
"Campaign Tier 4 Column 4",
|
||||||
|
"Campaign Tier 4 Column 5",
|
||||||
|
]
|
||||||
|
|
||||||
|
tier_5_opponents: List[str] = [
|
||||||
|
"Campaign Tier 5 Column 1",
|
||||||
|
"Campaign Tier 5 Column 2",
|
||||||
|
]
|
||||||
|
|
||||||
Banlist_Items: List[str] = [
|
Banlist_Items: List[str] = [
|
||||||
"No Banlist",
|
"No Banlist",
|
||||||
"Banlist September 2003",
|
"Banlist September 2003",
|
||||||
|
|
Loading…
Reference in New Issue