mirror of
https://github.com/ArchipelagoMW/Archipelago.git
synced 2026-04-24 17:33:29 -07:00
dc911399fb
* More control over progressive symbols! * Cleanup crew * lol * Make it configurable how second stage items act on their own * only let independent symbols work if they're not progressive * revert defaults * Better description * comment for reviewers * A complicated docstring for a complicated function * More accurate * This probably works more generically * Actually, this would cause other issues anyway, so no need to make this generic yet * :/ * oops * Change the system to use collect/remove override so that plando and start inventory work correctly * Vi stop doing that thing challenge * Make SecondStateSymbolsActIndependently an OptionSet * jank * oop * this is why we make unit tests I guess * More unit tests * More unit tests * Add note about the absence of Rotated Shapers from the independent symbols optionset * More verbose description * More verbose description * slight reword * Ruff ruff :3 I am a good puppy <3 * Remove invis dots * oops * Remove some unused symbols * display name * linecounting -> discard * Make all progressive chains always work * Unfortunately, this optimisation is now unsafe with plando :( * oops * This is now a possible optimisation * optimise optimise optimise * optimise optimise optimise * fix * ruff * oh * fixed frfr * mypy * Clean up the tests a bit * oop * I actually like this better now, so I'm doing it as default * Put stuff on the actual item class for faster collect/remove * giga oops * Make proguseful work * None item left beef * unnecessary change * formatting * add proguseful test to progressive symbols tests * add proguseful test to progressive symbols tests * clean up collect/remove a bit more * giga lmfao * Put stuff in option groups * Add the new symbol items to hint system * bump req client version * fix soft conflict in unit tests * fix more merge errors
93 lines
3.7 KiB
Python
93 lines
3.7 KiB
Python
from typing import Dict, List, Set, cast
|
|
|
|
from BaseClasses import ItemClassification
|
|
|
|
from . import static_logic as static_witness_logic
|
|
from .item_definition_classes import DoorItemDefinition, ItemCategory, ItemData
|
|
from .static_locations import ID_START
|
|
|
|
ITEM_DATA: Dict[str, ItemData] = {}
|
|
ITEM_GROUPS: Dict[str, Set[str]] = {}
|
|
|
|
# Useful items that are treated specially at generation time and should not be automatically added to the player's
|
|
# item list during get_progression_items.
|
|
_special_usefuls: List[str] = ["Puzzle Skip"]
|
|
|
|
|
|
ALL_ITEM_ALIASES: Dict[str, str] = { # Keeping this as str->str for now for efficiency
|
|
"Sparse Dots": "Dots",
|
|
"Simple Stars": "Stars",
|
|
}
|
|
|
|
ALWAYS_GOOD_SYMBOL_ITEMS: Set[str] = {
|
|
"Dots", "Sparse Dots", "Black/White Squares", "Symmetry", "Shapers", "Stars", "Simple Stars"
|
|
}
|
|
|
|
MODE_SPECIFIC_GOOD_ITEMS: Dict[str, Set[str]] = {
|
|
"none": set(),
|
|
"sigma_normal": set(),
|
|
"sigma_expert": {"Triangles"},
|
|
"umbra_variety": {"Triangles"}
|
|
}
|
|
|
|
MODE_SPECIFIC_GOOD_DISCARD_ITEMS: Dict[str, Set[str]] = {
|
|
"none": {"Triangles"},
|
|
"sigma_normal": {"Triangles"},
|
|
"sigma_expert": {"Arrows"},
|
|
"umbra_variety": set() # Variety Discards use both Arrows and Triangles, so neither of them are that useful alone
|
|
}
|
|
|
|
|
|
def populate_items() -> None:
|
|
for item_name, definition in static_witness_logic.ALL_ITEMS.items():
|
|
ap_item_code = definition.local_code + ID_START
|
|
classification: ItemClassification = ItemClassification.filler
|
|
local_only: bool = False
|
|
|
|
if definition.category is ItemCategory.SYMBOL:
|
|
classification = ItemClassification.progression
|
|
ITEM_GROUPS.setdefault("Symbols", set()).add(item_name)
|
|
elif definition.category is ItemCategory.DOOR:
|
|
classification = ItemClassification.progression
|
|
|
|
first_entity_hex = cast(DoorItemDefinition, definition).panel_id_hexes[0]
|
|
entity_type = static_witness_logic.ENTITIES_BY_HEX[first_entity_hex]["entityType"]
|
|
|
|
if entity_type == "Door":
|
|
ITEM_GROUPS.setdefault("Doors", set()).add(item_name)
|
|
elif entity_type == "Panel":
|
|
ITEM_GROUPS.setdefault("Panel Keys", set()).add(item_name)
|
|
elif entity_type in {"EP", "Obelisk Side", "Obelisk"}:
|
|
ITEM_GROUPS.setdefault("Obelisk Keys", set()).add(item_name)
|
|
else:
|
|
raise ValueError(f"Couldn't figure out what type of door item {definition} is.")
|
|
|
|
elif definition.category is ItemCategory.LASER:
|
|
classification = ItemClassification.progression_skip_balancing
|
|
ITEM_GROUPS.setdefault("Lasers", set()).add(item_name)
|
|
elif definition.category is ItemCategory.USEFUL:
|
|
classification = ItemClassification.useful
|
|
elif definition.category is ItemCategory.FILLER:
|
|
if item_name in ["Energy Fill (Small)"]:
|
|
local_only = True
|
|
classification = ItemClassification.filler
|
|
elif definition.category is ItemCategory.TRAP:
|
|
classification = ItemClassification.trap
|
|
elif definition.category is ItemCategory.JOKE:
|
|
classification = ItemClassification.filler
|
|
|
|
ITEM_DATA[item_name] = ItemData(ap_item_code, definition,
|
|
classification, local_only)
|
|
|
|
|
|
def get_item_to_door_mappings() -> Dict[int, List[int]]:
|
|
output: Dict[int, List[int]] = {}
|
|
for item_name, item_data in ITEM_DATA.items():
|
|
if not isinstance(item_data.definition, DoorItemDefinition) or item_data.ap_code is None:
|
|
continue
|
|
output[item_data.ap_code] = [int(hex_string, 16) for hex_string in item_data.definition.panel_id_hexes]
|
|
return output
|
|
|
|
|
|
populate_items()
|