Abbreviation of items part 4 w/ rules adjusted with new abbreviations

This commit is contained in:
MarioSpore
2025-09-30 00:58:59 -04:00
parent dcdf168618
commit 2572a25089
2 changed files with 49 additions and 49 deletions

View File

@@ -59,7 +59,7 @@ SC: str = "Scissors"
GB: str = "Glue Bucket" GB: str = "Glue Bucket"
CCAC: str = "Cable Car Access Card" CCAC: str = "Cable Car Access Card"
DRL: str = "Drill" DRL: str = "Drill"
RPE: str = "Rope" RP: str = "Rope"
HK: str = "Hook" HK: str = "Hook"
ST: str = "Sculpting Tools" ST: str = "Sculpting Tools"
HMR: str = "Hammer" HMR: str = "Hammer"
@@ -168,8 +168,8 @@ MISSION_ITEMS_TABLE: dict[str, GrinchItemData] = {
#Access Keys #Access Keys
KEYS_TABLE: dict[str, GrinchItemData] = { KEYS_TABLE: dict[str, GrinchItemData] = {
# "Whoville Vacuum Tube": GrinchItemData(["Vacuum Tubes"], 400, IC.progression, "Whoville Vacuum Tube": GrinchItemData(["Vacuum Tubes"], 400, IC.progression,
# [GrinchRamData(010200, binary_bit_pos=1)]), [GrinchRamData(0x010200, binary_bit_pos=1)]),
"Who Forest Vacuum Tube": GrinchItemData(["Vacuum Tubes"], 401, IC.progression, "Who Forest Vacuum Tube": GrinchItemData(["Vacuum Tubes"], 401, IC.progression,
[GrinchRamData(0x0100AA, binary_bit_pos=2)]), [GrinchRamData(0x0100AA, binary_bit_pos=2)]),
"Who Dump Vacuum Tube": GrinchItemData(["Vacuum Tubes"], 402, IC.progression, "Who Dump Vacuum Tube": GrinchItemData(["Vacuum Tubes"], 402, IC.progression,

View File

@@ -87,26 +87,26 @@ rules_dict: dict[str,list[list[str]]] = {
[] []
], ],
"WV - Painting The Mayor's Posters": [ "WV - Painting The Mayor's Posters": [
["Painting Bucket"] [PB]
], ],
"WV - Launching Eggs Into Houses": [ "WV - Launching Eggs Into Houses": [
[REL] [REL]
], ],
"WV - City Hall - Modifying The Mayor's Statue": [ "WV - City Hall - Modifying The Mayor's Statue": [
["Sculpting Tools"] [ST]
], ],
"WV - Clock Tower - Advancing The Countdown-To-Xmas Clock": [ "WV - Clock Tower - Advancing The Countdown-To-Xmas Clock": [
["Hammer", RS] [HMR, RS]
], ],
"WV - Squashing All Gifts": [ "WV - Squashing All Gifts": [
[GC, SS, REL, "Who Cloak", RS] [GC, SS, REL, WC, RS]
], ],
"WF - Making Xmas Trees Droop": [ "WF - Making Xmas Trees Droop": [
[REL] [REL]
], ],
"WF - Sabotaging Snow Cannon With Glue": [ "WF - Sabotaging Snow Cannon With Glue": [
["Glue Bucket", RS], [GB, RS],
["Glue Bucket", GC] [GB, GC]
], ],
"WF - Putting Beehives In Cabins": [ "WF - Putting Beehives In Cabins": [
[REL, RS], [REL, RS],
@@ -120,8 +120,8 @@ rules_dict: dict[str,list[list[str]]] = {
[REL, OCD, RS] [REL, OCD, RS]
], ],
"WF - Squashing All Gifts": [ "WF - Squashing All Gifts": [
[GC, "Cable Car Access Card", SS, REL], [GC, CCAC, SS, REL],
[OCD, RS, "Cable Car Access Card", SS, REL] [OCD, RS, CCAC, SS, REL]
], ],
"WD - Stealing Food From Birds": [ "WD - Stealing Food From Birds": [
[RS, REL] [RS, REL]
@@ -137,8 +137,8 @@ rules_dict: dict[str,list[list[str]]] = {
[RS, REL] [RS, REL]
], ],
"WD - Minefield - Shaving Who Dump Guardian": [ "WD - Minefield - Shaving Who Dump Guardian": [
["Scissors", GC], [SC, GC],
["Scissors", SS, RS] [SC, SS, RS]
], ],
"WD - Generator Building - Short-Circuiting Power-Plant": [ "WD - Generator Building - Short-Circuiting Power-Plant": [
[REL, GC], [REL, GC],
@@ -157,18 +157,18 @@ rules_dict: dict[str,list[list[str]]] = {
[GC] [GC]
], ],
"WL - North Shore - Drilling Holes In Canoes": [ "WL - North Shore - Drilling Holes In Canoes": [
["Drill"] [DRL]
# ["Drill", "Max"] # [DRL, MX]
], ],
"WL - Submarine World - Modifying The Marine Mobile": [ "WL - Submarine World - Modifying The Marine Mobile": [
[] []
], ],
"WL - Mayor's Villa - Hooking The Mayor's Bed To The Motorboat": [ "WL - Mayor's Villa - Hooking The Mayor's Bed To The Motorboat": [
["Rope", "Hook", REL, "Scout Clothes"] [RP, HK, REL, SCL]
], ],
"WL - Squashing All Gifts": [ "WL - Squashing All Gifts": [
[GC, MM, "Scout Clothes", REL, "Hook", "Rope"], [GC, MM, SCL, REL, HK, RP],
[OCD, RS, MM, "Scout Clothes", REL, "Hook", "Rope"] [OCD, RS, MM, SCL, REL, HK, RP]
], ],
"WV - Binoculars BP on Post Office Roof": [ "WV - Binoculars BP on Post Office Roof": [
[] []
@@ -189,12 +189,12 @@ rules_dict: dict[str,list[list[str]]] = {
[] []
], ],
"WV - Post Office - REL BP inside Silver Room": [ "WV - Post Office - REL BP inside Silver Room": [
["Who Cloak"] [WC]
# ["Who Cloak", "Max"] # [WC, MX]
], ],
"WV - Post Office - REL BP at Entrance Door after Mission Completion": [ "WV - Post Office - REL BP at Entrance Door after Mission Completion": [
["Who Cloak"] [WC]
# ["Who Cloak", "Max"] # [WC, MX]
], ],
"WF - RS BP behind Vacuum Tube": [ "WF - RS BP behind Vacuum Tube": [
[] []
@@ -293,7 +293,7 @@ rules_dict: dict[str,list[list[str]]] = {
[] []
# [REL, GC], # [REL, GC],
# [REL, SS, RS] # [REL, SS, RS]
# ["Max"] # [MX]
], ],
"WD - Minefield - OCD BP on Right Side of Shack": [ "WD - Minefield - OCD BP on Right Side of Shack": [
[GC], [GC],
@@ -303,7 +303,7 @@ rules_dict: dict[str,list[list[str]]] = {
[] []
# [REL, GC], # [REL, GC],
# [REL, SS, RS] # [REL, SS, RS]
# ["Max"] # [MX]
], ],
"WL - South Shore - MM BP on Bridge to Scout's Hut": [ "WL - South Shore - MM BP on Bridge to Scout's Hut": [
[] []
@@ -341,11 +341,11 @@ rules_dict: dict[str,list[list[str]]] = {
], ],
"WL - North Shore - MM BP inside Skunk Hut": [ "WL - North Shore - MM BP inside Skunk Hut": [
[] []
# ["Max"] # [MX]
], ],
"WL - North Shore - MM BP inside House's Fence": [ "WL - North Shore - MM BP inside House's Fence": [
[] []
# ["Max"] # [MX]
], ],
"WL - North Shore - MM BP inside Boulder Box near Bridge": [ "WL - North Shore - MM BP inside Boulder Box near Bridge": [
[] []
@@ -367,7 +367,7 @@ rules_dict: dict[str,list[list[str]]] = {
], ],
"WV - Clock Tower - GC BP in Bedroom": [ "WV - Clock Tower - GC BP in Bedroom": [
[RS] [RS]
# ["Max", RS] # [MX, RS]
], ],
"WV - Clock Tower - GC BP in Bell Room": [ "WV - Clock Tower - GC BP in Bell Room": [
[RS] [RS]
@@ -377,7 +377,7 @@ rules_dict: dict[str,list[list[str]]] = {
], ],
"WF - Ski Resort - GC BP in Max Cave": [ "WF - Ski Resort - GC BP in Max Cave": [
[] []
# ["Max"] # [MX]
], ],
"WF - Civic Center - GC BP on Left Side in Bat Cave Wall": [ "WF - Civic Center - GC BP on Left Side in Bat Cave Wall": [
[GC], [GC],
@@ -391,12 +391,12 @@ rules_dict: dict[str,list[list[str]]] = {
], ],
"WD - Power Plant - GC BP in Max Cave": [ "WD - Power Plant - GC BP in Max Cave": [
[] []
# ["Max"] # [MX]
], ],
"WD - Power Plant - GC BP After First Gate": [ "WD - Power Plant - GC BP After First Gate": [
[REL, RS], [REL, RS],
[GC] [GC]
# ["Max", REL, RS] # [MX, REL, RS]
], ],
"WD - Generator Building - GC BP on the Highest Platform": [ "WD - Generator Building - GC BP on the Highest Platform": [
[REL, GC], [REL, GC],
@@ -422,11 +422,11 @@ rules_dict: dict[str,list[list[str]]] = {
], ],
"MC - Sleigh Ride - Stealing All Gifts": [ "MC - Sleigh Ride - Stealing All Gifts": [
# ["Exhaust Pipes", "Tires", "Skis", "Twin-End Tuba"] # ["Exhaust Pipes", "Tires", "Skis", "Twin-End Tuba"]
[REL, "Who Forest Vacuum Tube", "Who Dump Vacuum Tube", "Who Lake Vacuum Tube", RS, MM] [REL, WV, WF, WD, WL, RS, MM]
], ],
"MC - Sleigh Ride - Neutralizing Santa": [ "MC - Sleigh Ride - Neutralizing Santa": [
# ["Exhaust Pipes", "Tires", "Skis", "Twin-End Tuba"] # ["Exhaust Pipes", "Tires", "Skis", "Twin-End Tuba"]
[REL, "Who Forest Vacuum Tube", "Who Dump Vacuum Tube", "Who Lake Vacuum Tube", RS, MM] [REL, WV, WF, WD, WL, RS, MM]
], ],
"WV - Post Office - Heart of Stone": [ "WV - Post Office - Heart of Stone": [
[] []
@@ -440,7 +440,7 @@ rules_dict: dict[str,list[list[str]]] = {
], ],
"WL - North Shore - Heart of Stone": [ "WL - North Shore - Heart of Stone": [
[] []
# ["Max"] # [MX]
], ],
"Spin N' Win - Easy": [ "Spin N' Win - Easy": [
[] []
@@ -482,16 +482,16 @@ rules_dict: dict[str,list[list[str]]] = {
[REL] [REL]
], ],
"WF - Skis": [ "WF - Skis": [
["Who Forest Vacuum Tube"] [WF]
], ],
"WD - Tires": [ "WD - Tires": [
["Who Dump Vacuum Tube", RS, REL] [WD, RS, REL]
], ],
"WL - Submarine World - Twin-End Tuba": [ "WL - Submarine World - Twin-End Tuba": [
["Who Lake Vacuum Tube", MM] [WL, MM]
], ],
"WL - South Shore - GPS": [ "WL - South Shore - GPS": [
["Who Lake Vacuum Tube", REL] [WL, REL]
], ],
"MC - 1st Crate Squashed": [ "MC - 1st Crate Squashed": [
[] []
@@ -527,10 +527,10 @@ rules_dict: dict[str,list[list[str]]] = {
access_rules_dict: dict[str,list[list[str]]] = { access_rules_dict: dict[str,list[list[str]]] = {
"Whoville": [ "Whoville": [
[] [WV]
], ],
"Post Office": [ "Post Office": [
["Who Cloak"] [WC]
], ],
"City Hall": [ "City Hall": [
[REL] [REL]
@@ -539,19 +539,19 @@ access_rules_dict: dict[str,list[list[str]]] = {
[] []
], ],
"Who Forest": [ "Who Forest": [
["Who Forest Vacuum Tube"], [WF],
# ["Progressive Vacuum Tube": 1] # [VT: 1]
], ],
"Ski Resort": [ "Ski Resort": [
["Cable Car Access Card"] [CCAC]
], ],
"Civic Center": [ "Civic Center": [
[GC], [GC],
[OCD] [OCD]
], ],
"Who Dump": [ "Who Dump": [
["Who Dump Vacuum Tube"], [WD],
# ["Progressive Vacuum Tube": 2] # [VT: 2]
], ],
"Minefield": [ "Minefield": [
[REL, RS], [REL, RS],
@@ -567,24 +567,24 @@ access_rules_dict: dict[str,list[list[str]]] = {
[REL, OCD, SS, RS] [REL, OCD, SS, RS]
], ],
"Who Lake": [ "Who Lake": [
["Who Lake Vacuum Tube"], [WL],
# ["Progressive Vacuum Tube": 3] # [VT: 3]
], ],
"Scout's Hut": [ "Scout's Hut": [
[GC], [GC],
[RS] [RS]
], ],
"North Shore": [ "North Shore": [
["Scout Clothes"] [SCL]
], ],
"Mayor's Villa": [ "Mayor's Villa": [
["Scout Clothes"] [SCL]
], ],
"Submarine World": [ "Submarine World": [
[MM] [MM]
], ],
"Sleigh Room": [ "Sleigh Room": [
["Sleigh Room Key"] [SR]
], ],
"Spin N' Win": [ "Spin N' Win": [
[] []