diff --git a/worlds/archipidle/Rules.py b/worlds/archipidle/Rules.py index 1d9efd4d..a2464a53 100644 --- a/worlds/archipidle/Rules.py +++ b/worlds/archipidle/Rules.py @@ -14,26 +14,26 @@ class ArchipIDLELogic(LogicMixin): def set_rules(world: MultiWorld, player: int): - for i in range(1, 11): + for i in range(1, 16): set_rule( - world.get_location(f"Location {i}", player), + world.get_location(f"IDLE for {int(i / 2)} minutes {30 if (i % 2) > 0 else 0} seconds", player), lambda state: state._archipidle_location_is_accessible(player, 0) ) - for i in range(11, 31): + for i in range(16, 31): set_rule( - world.get_location(f"Location {i}", player), + world.get_location(f"IDLE for {int(i / 2)} minutes {30 if (i % 2) > 0 else 0} seconds", player), lambda state: state._archipidle_location_is_accessible(player, 4) ) for i in range(31, 51): set_rule( - world.get_location(f"Location {i}", player), - lambda state: state._archipidle_location_is_accessible(player, 20) + world.get_location(f"IDLE for {int(i / 2)} minutes {30 if (i % 2) > 0 else 0} seconds", player), + lambda state: state._archipidle_location_is_accessible(player, 10) ) for i in range(51, 101): set_rule( - world.get_location(f"Location {i}", player), - lambda state: state._archipidle_location_is_accessible(player, 35) + world.get_location(f"IDLE for {int(i / 2)} minutes {30 if (i % 2) > 0 else 0} seconds", player), + lambda state: state._archipidle_location_is_accessible(player, 20) ) diff --git a/worlds/archipidle/__init__.py b/worlds/archipidle/__init__.py index 1146fc2a..7b2f8717 100644 --- a/worlds/archipidle/__init__.py +++ b/worlds/archipidle/__init__.py @@ -18,7 +18,7 @@ class ArchipIDLEWorld(World): location_name_to_id = {} start_id = 9000 for i in range(1, 101): - location_name_to_id[f"Location {i}"] = start_id + location_name_to_id[f"IDLE for {int(i / 2)} minutes {30 if (i % 2) > 0 else 0} seconds"] = start_id start_id += 1 def generate_basic(self): @@ -27,11 +27,16 @@ class ArchipIDLEWorld(World): item_pool = [] for i in range(100): - item = Item(item_table[i], True, self.item_name_to_id[item_table[i]], self.player) + item = Item( + item_table_copy[i], + i < 20, + self.item_name_to_id[item_table_copy[i]], + self.player + ) item.game = 'ArchipIDLE' item_pool.append(item) - self.world.itempool = item_pool + self.world.itempool += item_pool def set_rules(self): set_rules(self.world, self.player)