From 41fd7a8a56445ec4b8c430168c5ca9c0359ceafe Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sun, 13 Mar 2022 14:37:56 -0400 Subject: [PATCH] Fixed failing tests --- worlds/archipidle/Items.py | 25 +++++++++++++++++++++++++ worlds/archipidle/Rules.py | 6 ++++++ worlds/archipidle/__init__.py | 7 +++---- 3 files changed, 34 insertions(+), 4 deletions(-) diff --git a/worlds/archipidle/Items.py b/worlds/archipidle/Items.py index e7498c66..fbed97c4 100644 --- a/worlds/archipidle/Items.py +++ b/worlds/archipidle/Items.py @@ -124,4 +124,29 @@ item_table = ( 'Hoverboard', 'Joycons with No Drift', 'Double Rainbow', + 'Ping Pong Ball', + 'Area 51 Arcade Cabinet', + 'Elephant in the Room', + 'The Pink Panther', + 'Denim Shorts', + 'Tennis Racket', + 'Collection of Stuffed Animals', + 'Old Cell Phone', + 'Nintendo Virtual Boy', + 'Box of 5.25 Inch Floppy Disks', + 'Bag of Miscellaneous Wires', + 'Garden Shovel', + 'Leather Gloves', + 'Knife of +9 VS Ogres', + 'Old, Smelly Cheese', + 'Linksys BEFSR41 Router', + 'Ethernet Cables for a LAN Party', + 'Mechanical Pencil', + 'Book of Graph Paper', + '300 Sheets of Printer Paper', + 'One AAA Battery', + 'Box of Old Game Controllers', + 'Sega Dreamcast', + 'Mario\'s Overalls', + 'Betamax Player', ) diff --git a/worlds/archipidle/Rules.py b/worlds/archipidle/Rules.py index 640a8f3c..1d9efd4d 100644 --- a/worlds/archipidle/Rules.py +++ b/worlds/archipidle/Rules.py @@ -31,3 +31,9 @@ def set_rules(world: MultiWorld, player: int): world.get_location(f"Location {i}", player), lambda state: state._archipidle_location_is_accessible(player, 20) ) + + for i in range(51, 101): + set_rule( + world.get_location(f"Location {i}", player), + lambda state: state._archipidle_location_is_accessible(player, 35) + ) diff --git a/worlds/archipidle/__init__.py b/worlds/archipidle/__init__.py index 1da7e148..1146fc2a 100644 --- a/worlds/archipidle/__init__.py +++ b/worlds/archipidle/__init__.py @@ -17,7 +17,7 @@ class ArchipIDLEWorld(World): location_name_to_id = {} start_id = 9000 - for i in range(1, 51): + for i in range(1, 101): location_name_to_id[f"Location {i}"] = start_id start_id += 1 @@ -26,7 +26,7 @@ class ArchipIDLEWorld(World): self.world.random.shuffle(item_table_copy) item_pool = [] - for i in range(50): + for i in range(100): item = Item(item_table[i], True, self.item_name_to_id[item_table[i]], self.player) item.game = 'ArchipIDLE' item_pool.append(item) @@ -37,8 +37,7 @@ class ArchipIDLEWorld(World): set_rules(self.world, self.player) def create_item(self, name: str) -> Item: - item_data = item_table[name] - return Item(name, item_data.progression, item_data.code, self.player) + return Item(name, True, self.item_name_to_id[name], self.player) def create_regions(self): self.world.regions += [