From 8b648ea9f52630bf09ec54b53474032372e4fd16 Mon Sep 17 00:00:00 2001 From: trevorleslie <80716066+TRPG0@users.noreply.github.com> Date: Sat, 10 Aug 2024 12:53:07 -0600 Subject: [PATCH] More suggested changes --- worlds/blasphemous/Items.py | 4 ++-- worlds/blasphemous/__init__.py | 13 +++++-------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/worlds/blasphemous/Items.py b/worlds/blasphemous/Items.py index b29a012c7108..4843a99f2d12 100644 --- a/worlds/blasphemous/Items.py +++ b/worlds/blasphemous/Items.py @@ -739,7 +739,7 @@ class ItemDict(TypedDict): "Broken Left Eye of the Traitor"} } -tears_set: Set[str] = { +tears_list: List[str] = [ "Tears of Atonement (500)", "Tears of Atonement (625)", "Tears of Atonement (750)", @@ -760,7 +760,7 @@ class ItemDict(TypedDict): "Tears of Atonement (11250)", "Tears of Atonement (18000)", "Tears of Atonement (30000)" -} +] reliquary_set: Set[str] = { "Reliquary of the Fervent Heart", diff --git a/worlds/blasphemous/__init__.py b/worlds/blasphemous/__init__.py index 651488a0ee6c..7af3ee72a864 100644 --- a/worlds/blasphemous/__init__.py +++ b/worlds/blasphemous/__init__.py @@ -2,7 +2,7 @@ from collections import Counter from BaseClasses import Region, Location, Item, Tutorial, ItemClassification from worlds.AutoWorld import World, WebWorld -from .Items import base_id, item_table, group_table, tears_set, reliquary_set +from .Items import base_id, item_table, group_table, tears_list, reliquary_set from .Locations import location_names from .Rules import BlasRules from worlds.generic.Rules import set_rule @@ -61,7 +61,7 @@ def create_event(self, event: str): def get_filler_item_name(self) -> str: - return self.random.choice(tears_set) + return self.random.choice(tears_list) def generate_early(self): @@ -211,8 +211,7 @@ def pre_fill(self): self.place_items_from_set(thorn_set, "Thorn Upgrade") if self.options.start_wheel: - self.multiworld.get_location("Beginning gift", self.player)\ - .place_locked_item(self.create_item("The Young Mason's Wheel")) + self.get_location("Beginning gift").place_locked_item(self.create_item("The Young Mason's Wheel")) if not self.options.skill_randomizer: self.place_items_from_dict(skill_dict) @@ -223,14 +222,12 @@ def pre_fill(self): def place_items_from_set(self, location_set: Set[str], name: str): for loc in location_set: - self.multiworld.get_location(loc, self.player)\ - .place_locked_item(self.create_item(name)) + self.get_location(loc).place_locked_item(self.create_item(name)) def place_items_from_dict(self, option_dict: Dict[str, str]): for loc, item in option_dict.items(): - self.multiworld.get_location(loc, self.player)\ - .place_locked_item(self.create_item(item)) + self.get_location(loc).place_locked_item(self.create_item(item)) def create_regions(self) -> None: