diff options
| author | Star Rauchenberger <fefferburbia@gmail.com> | 2025-12-13 07:10:05 -0500 |
|---|---|---|
| committer | Star Rauchenberger <fefferburbia@gmail.com> | 2025-12-13 07:10:05 -0500 |
| commit | c5a564bfc9bcf422d04c9016f56d65260b007c67 (patch) | |
| tree | 9360c9d81c59418510c9beb1048a8ec93c10bfa2 /apworld/player_logic.py | |
| parent | b5cff95338c2ce6c35d0cc5a01ac51476885e4de (diff) | |
| download | lingo2-archipelago-loc-refactor.tar.gz lingo2-archipelago-loc-refactor.tar.bz2 lingo2-archipelago-loc-refactor.zip | |
Refactor AccessRequirements loc-refactor
Diffstat (limited to 'apworld/player_logic.py')
| -rw-r--r-- | apworld/player_logic.py | 169 |
1 files changed, 1 insertions, 168 deletions
| diff --git a/apworld/player_logic.py b/apworld/player_logic.py index 3ee8f38..892dac5 100644 --- a/apworld/player_logic.py +++ b/apworld/player_logic.py | |||
| @@ -5,6 +5,7 @@ from .items import SYMBOL_ITEMS | |||
| 5 | from typing import TYPE_CHECKING, NamedTuple | 5 | from typing import TYPE_CHECKING, NamedTuple |
| 6 | 6 | ||
| 7 | from .options import ShuffleLetters, CyanDoorBehavior | 7 | from .options import ShuffleLetters, CyanDoorBehavior |
| 8 | from .rules import AccessRequirements | ||
| 8 | 9 | ||
| 9 | if TYPE_CHECKING: | 10 | if TYPE_CHECKING: |
| 10 | from . import Lingo2World | 11 | from . import Lingo2World |
| @@ -20,174 +21,6 @@ def calculate_letter_histogram(solution: str) -> dict[str, int]: | |||
| 20 | return histogram | 21 | return histogram |
| 21 | 22 | ||
| 22 | 23 | ||
| 23 | class AccessRequirements: | ||
| 24 | items: set[str] | ||
| 25 | progressives: dict[str, int] | ||
| 26 | rooms: set[str] | ||
| 27 | letters: dict[str, int] | ||
| 28 | cyans: bool | ||
| 29 | |||
| 30 | # This is an AND of ORs. | ||
| 31 | or_logic: list[list["AccessRequirements"]] | ||
| 32 | |||
| 33 | # When complete_at is set, at least that many of the requirements in possibilities must be accessible. This should | ||
| 34 | # only be used for doors with complete_at > 1, as or_logic is more efficient for complete_at == 1. | ||
| 35 | complete_at: int | None | ||
| 36 | possibilities: list["AccessRequirements"] | ||
| 37 | |||
| 38 | def __init__(self): | ||
| 39 | self.items = set() | ||
| 40 | self.progressives = dict() | ||
| 41 | self.rooms = set() | ||
| 42 | self.letters = dict() | ||
| 43 | self.cyans = False | ||
| 44 | self.or_logic = list() | ||
| 45 | self.complete_at = None | ||
| 46 | self.possibilities = list() | ||
| 47 | |||
| 48 | def copy(self) -> "AccessRequirements": | ||
| 49 | reqs = AccessRequirements() | ||
| 50 | reqs.items = self.items.copy() | ||
| 51 | reqs.progressives = self.progressives.copy() | ||
| 52 | reqs.rooms = self.rooms.copy() | ||
| 53 | reqs.letters = self.letters.copy() | ||
| 54 | reqs.cyans = self.cyans | ||
| 55 | reqs.or_logic = [[other_req.copy() for other_req in disjunction] for disjunction in self.or_logic] | ||
| 56 | reqs.complete_at = self.complete_at | ||
| 57 | reqs.possibilities = self.possibilities.copy() | ||
| 58 | return reqs | ||
| 59 | |||
| 60 | def merge(self, other: "AccessRequirements"): | ||
| 61 | for item in other.items: | ||
| 62 | self.items.add(item) | ||
| 63 | |||
| 64 | for item, amount in other.progressives.items(): | ||
| 65 | self.progressives[item] = max(amount, self.progressives.get(item, 0)) | ||
| 66 | |||
| 67 | for room in other.rooms: | ||
| 68 | self.rooms.add(room) | ||
| 69 | |||
| 70 | for letter, level in other.letters.items(): | ||
| 71 | self.letters[letter] = max(self.letters.get(letter, 0), level) | ||
| 72 | |||
| 73 | self.cyans = self.cyans or other.cyans | ||
| 74 | |||
| 75 | for disjunction in other.or_logic: | ||
| 76 | self.or_logic.append([sub_req.copy() for sub_req in disjunction]) | ||
| 77 | |||
| 78 | if other.complete_at is not None: | ||
| 79 | # Merging multiple requirements that use complete_at sucks, and is part of why we want to minimize use of | ||
| 80 | # it. If both requirements use complete_at, we will cheat by using the or_logic field, which supports | ||
| 81 | # conjunctions of requirements. | ||
| 82 | if self.complete_at is not None: | ||
| 83 | print("Merging requirements with complete_at > 1. This is messy and should be avoided!") | ||
| 84 | |||
| 85 | left_req = AccessRequirements() | ||
| 86 | left_req.complete_at = self.complete_at | ||
| 87 | left_req.possibilities = [sub_req.copy() for sub_req in self.possibilities] | ||
| 88 | self.or_logic.append([left_req]) | ||
| 89 | |||
| 90 | self.complete_at = None | ||
| 91 | self.possibilities = list() | ||
| 92 | |||
| 93 | right_req = AccessRequirements() | ||
| 94 | right_req.complete_at = other.complete_at | ||
| 95 | right_req.possibilities = [sub_req.copy() for sub_req in other.possibilities] | ||
| 96 | self.or_logic.append([right_req]) | ||
| 97 | else: | ||
| 98 | self.complete_at = other.complete_at | ||
| 99 | self.possibilities = [sub_req.copy() for sub_req in other.possibilities] | ||
| 100 | |||
| 101 | def is_empty(self) -> bool: | ||
| 102 | return (len(self.items) == 0 and len(self.progressives) == 0 and len(self.rooms) == 0 and len(self.letters) == 0 | ||
| 103 | and not self.cyans and len(self.or_logic) == 0 and self.complete_at is None) | ||
| 104 | |||
| 105 | def __eq__(self, other: "AccessRequirements"): | ||
| 106 | return (self.items == other.items and self.progressives == other.progressives and self.rooms == other.rooms and | ||
| 107 | self.letters == other.letters and self.cyans == other.cyans and self.or_logic == other.or_logic and | ||
| 108 | self.complete_at == other.complete_at and self.possibilities == other.possibilities) | ||
| 109 | |||
| 110 | def simplify(self): | ||
| 111 | resimplify = False | ||
| 112 | |||
| 113 | if len(self.or_logic) > 0: | ||
| 114 | old_or_logic = self.or_logic | ||
| 115 | |||
| 116 | def remove_redundant(sub_reqs: "AccessRequirements"): | ||
| 117 | new_reqs = sub_reqs.copy() | ||
| 118 | new_reqs.letters = {l: v for l, v in new_reqs.letters.items() if self.letters.get(l, 0) < v} | ||
| 119 | if new_reqs != sub_reqs: | ||
| 120 | return new_reqs | ||
| 121 | else: | ||
| 122 | return sub_reqs | ||
| 123 | |||
| 124 | self.or_logic = [] | ||
| 125 | for disjunction in old_or_logic: | ||
| 126 | new_disjunction = [] | ||
| 127 | for ssr in disjunction: | ||
| 128 | new_ssr = remove_redundant(ssr) | ||
| 129 | if not new_ssr.is_empty(): | ||
| 130 | new_disjunction.append(new_ssr) | ||
| 131 | else: | ||
| 132 | new_disjunction.clear() | ||
| 133 | break | ||
| 134 | if len(new_disjunction) == 1: | ||
| 135 | self.merge(new_disjunction[0]) | ||
| 136 | resimplify = True | ||
| 137 | elif len(new_disjunction) > 1: | ||
| 138 | if all(cjr == new_disjunction[0] for cjr in new_disjunction): | ||
| 139 | self.merge(new_disjunction[0]) | ||
| 140 | resimplify = True | ||
| 141 | else: | ||
| 142 | self.or_logic.append(new_disjunction) | ||
| 143 | |||
| 144 | if resimplify: | ||
| 145 | self.simplify() | ||
| 146 | |||
| 147 | def get_referenced_rooms(self): | ||
| 148 | result = set(self.rooms) | ||
| 149 | |||
| 150 | for disjunction in self.or_logic: | ||
| 151 | for sub_req in disjunction: | ||
| 152 | result = result.union(sub_req.get_referenced_rooms()) | ||
| 153 | |||
| 154 | for sub_req in self.possibilities: | ||
| 155 | result = result.union(sub_req.get_referenced_rooms()) | ||
| 156 | |||
| 157 | return result | ||
| 158 | |||
| 159 | def remove_room(self, room: str): | ||
| 160 | if room in self.rooms: | ||
| 161 | self.rooms.remove(room) | ||
| 162 | |||
| 163 | for disjunction in self.or_logic: | ||
| 164 | for sub_req in disjunction: | ||
| 165 | sub_req.remove_room(room) | ||
| 166 | |||
| 167 | for sub_req in self.possibilities: | ||
| 168 | sub_req.remove_room(room) | ||
| 169 | |||
| 170 | def __repr__(self): | ||
| 171 | parts = [] | ||
| 172 | if len(self.items) > 0: | ||
| 173 | parts.append(f"items={self.items}") | ||
| 174 | if len(self.progressives) > 0: | ||
| 175 | parts.append(f"progressives={self.progressives}") | ||
| 176 | if len(self.rooms) > 0: | ||
| 177 | parts.append(f"rooms={self.rooms}") | ||
| 178 | if len(self.letters) > 0: | ||
| 179 | parts.append(f"letters={self.letters}") | ||
| 180 | if self.cyans: | ||
| 181 | parts.append(f"cyans=True") | ||
| 182 | if len(self.or_logic) > 0: | ||
| 183 | parts.append(f"or_logic={self.or_logic}") | ||
| 184 | if self.complete_at is not None: | ||
| 185 | parts.append(f"complete_at={self.complete_at}") | ||
| 186 | if len(self.possibilities) > 0: | ||
| 187 | parts.append(f"possibilities={self.possibilities}") | ||
| 188 | return "AccessRequirements(" + ", ".join(parts) + ")" | ||
| 189 | |||
| 190 | |||
| 191 | class PlayerLocation(NamedTuple): | 24 | class PlayerLocation(NamedTuple): |
| 192 | code: int | None | 25 | code: int | None |
| 193 | reqs: AccessRequirements | 26 | reqs: AccessRequirements |
