diff --git a/worlds/grinch/Items.py b/worlds/grinch/Items.py index cb39fc85..4e80847e 100644 --- a/worlds/grinch/Items.py +++ b/worlds/grinch/Items.py @@ -140,15 +140,15 @@ MISSION_ITEMS_TABLE: dict[str, GrinchItemData] = { #Access Keys KEYS_TABLE: dict[str, GrinchItemData] = { - # "Whoville Vacuum Access": GrinchItemData("Vacuum Access", 400, IC.progression, + # "Whoville Vacuum Tube": GrinchItemData("Vacuum Tubes", 400, IC.progression, # [GrinchRamData()]), - "Who Forest Vacuum Access": GrinchItemData("Vacuum Access", 401, IC.progression, + "Who Forest Vacuum Tube": GrinchItemData("Vacuum Tubes", 401, IC.progression, [GrinchRamData(0x0100AA, binary_bit_pos=2)]), - "Who Dump Vacuum Access": GrinchItemData("Vacuum Access", 402, IC.progression, + "Who Dump Vacuum Tube": GrinchItemData("Vacuum Tubes", 402, IC.progression, [GrinchRamData(0x0100AA, binary_bit_pos=3)]), - "Who Lake Vacuum Access": GrinchItemData("Vacuum Access", 403, IC.progression, + "Who Lake Vacuum Tube": GrinchItemData("Vacuum Tubes", 403, IC.progression, [GrinchRamData(0x0100AA, binary_bit_pos=4)]), - # "Progressive Vacuum Access": GrinchItemData("Vacuum Access", 404, IC.progression, + # "Progressive Vacuum Access": GrinchItemData("Vacuum Tubes", 404, IC.progression, # [GrinchRamData()]), # "Spin N' Win Door Unlock": GrinchItemData("Supadow Door Unlocks", 405, IC.progression, # [GrinchRamData()]), diff --git a/worlds/grinch/Rules.py b/worlds/grinch/Rules.py index cc5948f7..41b2e93a 100644 --- a/worlds/grinch/Rules.py +++ b/worlds/grinch/Rules.py @@ -424,11 +424,11 @@ rules_dict: dict[str,list[list[str]]] = { ], "Stealing All Gifts": [ # ["Exhaust Pipes", "Tires", "Skis", "Twin-End Tuba"] - ["Rotten Egg Launcher", "Who Forest Vacuum Access", "Who Dump Vacuum Access", "Who Lake Vacuum Access", "Rocket Spring", "Marine Mobile"] + ["Rotten Egg Launcher", "Who Forest Vacuum Tube", "Who Dump Vacuum Tube", "Who Lake Vacuum Tube", "Rocket Spring", "Marine Mobile"] ], "Neutralizing Santa": [ # ["Exhaust Pipes", "Tires", "Skis", "Twin-End Tuba"] - ["Rotten Egg Launcher", "Who Forest Vacuum Access", "Who Dump Vacuum Access", "Who Lake Vacuum Access", "Rocket Spring", "Marine Mobile"] + ["Rotten Egg Launcher", "Who Forest Vacuum Tube", "Who Dump Vacuum Tube", "Who Lake Vacuum Tube", "Rocket Spring", "Marine Mobile"] ], "Heart of Stone - Whoville's Post Office": [ [] @@ -484,16 +484,16 @@ rules_dict: dict[str,list[list[str]]] = { ["Rotten Egg Launcher"] ], "Skis in Who Forest": [ - ["Who Forest Vacuum Access"] + ["Who Forest Vacuum Tube"] ], "Tires in Who Dump": [ - ["Who Dump Vacuum Access", "Rocket Spring", "Rotten Egg Launcher"] + ["Who Dump Vacuum Tube", "Rocket Spring", "Rotten Egg Launcher"] ], "Twin-End Tuba in Submarine World": [ - ["Who Lake Vacuum Access", "Marine Mobile"] + ["Who Lake Vacuum Tube", "Marine Mobile"] ], "GPS in Who Lake": [ - ["Who Lake Vacuum Access", "Rotten Egg Launcher"] + ["Who Lake Vacuum Tube", "Rotten Egg Launcher"] ], "1st Crate Squashed": [ [] @@ -541,8 +541,8 @@ access_rules_dict: dict[str,list[list[str]]] = { [] ], "Who Forest": [ - ["Who Forest Vacuum Access"], - # ["Progressive Vacuum Access": 1] + ["Who Forest Vacuum Tube"], + # ["Progressive Vacuum Tube": 1] ], "Ski Resort": [ ["Cable Car Access Card"] @@ -552,8 +552,8 @@ access_rules_dict: dict[str,list[list[str]]] = { ["Octopus Climbing Device"] ], "Who Dump": [ - ["Who Dump Vacuum Access"], - # ["Progressive Vacuum Access": 2] + ["Who Dump Vacuum Tube"], + # ["Progressive Vacuum Tube": 2] ], "Minefield": [ ["Rotten Egg Launcher", "Rocket Spring"], @@ -569,8 +569,8 @@ access_rules_dict: dict[str,list[list[str]]] = { ["Rotten Egg Launcher", "Octopus Climbing Device", "Slime Shooter", "Rocket Spring"] ], "Who Lake": [ - ["Who Lake Vacuum Access"], - # ["Progressive Vacuum Access": 3] + ["Who Lake Vacuum Tube"], + # ["Progressive Vacuum Tube": 3] ], "Scout's Hut": [ ["Grinch Copter"],