morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 12:11:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

Logic now requires Sleigh Room Key to goal along with other minor changes to reflect this

Browse Source
This commit is contained in:
MarioSpore
2025-08-19 22:29:00 -04:00
parent 08e9df66de
commit 3dc4802be7
4 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
worlds/grinch/Client.py
View File

@@ -188,10 +188,10 @@ class GrinchClient(BizHawkClient):
"status": NetUtils.ClientStatus.CLIENT_GOAL,
}])
async def constant_address_update(self, ctx: "BizHawkClientContext"):
list_recv_itemids: list[int] = [netItem.item for netItem in ctx.items_received]
if 42369 in list_recv_itemids and 42371 in list_recv_itemids and 42372 in list_recv_itemids and 42373 in list_recv_itemids:
await bizhawk.write(ctx.bizhawk_ctx, [(0x010200, (99).to_bytes(1, "little"), "MainRAM")])
# async def constant_address_update(self, ctx: "BizHawkClientContext"):
# list_recv_itemids: list[int] = [netItem.item for netItem in ctx.items_received]
# if 42369 in list_recv_itemids and 42371 in list_recv_itemids and 42372 in list_recv_itemids and 42373 in list_recv_itemids:
# await bizhawk.write(ctx.bizhawk_ctx, [(0x010200, (99).to_bytes(1, "little"), "MainRAM")])
async def ingame_checker(self, ctx: "BizHawkClientContext"):
demo_mode = int.from_bytes((await bizhawk.read(ctx.bizhawk_ctx, [(

19
worlds/grinch/Items.py
View File

@@ -117,20 +117,15 @@ MISSION_ITEMS_TABLE: dict[str, GrinchItemData] = {
#Sleigh Parts
SLEIGH_PARTS_TABLE: dict[str, GrinchItemData] = {
"Exhaust Pipes": GrinchItemData("Sleigh Parts", 300, IC.progression_skip_balancing,
[GrinchRamData(0x0101FB, binary_bit_pos=2), GrinchRamData(0x0100AA, binary_bit_pos=5),
GrinchRamData(0x010200, value=99)]),
[GrinchRamData(0x0101FB, binary_bit_pos=2)]),
"GPS": GrinchItemData("Sleigh Parts", 301, IC.useful,
[GrinchRamData(0x0101FB, binary_bit_pos=5), GrinchRamData(0x0100AA, binary_bit_pos=5),
GrinchRamData(0x010200, value=99)]),
[GrinchRamData(0x0101FB, binary_bit_pos=5)]),
"Tires": GrinchItemData("Sleigh Parts", 302, IC.progression_skip_balancing,
[GrinchRamData(0x0101FB, binary_bit_pos=4), GrinchRamData(0x0100AA, binary_bit_pos=5),
GrinchRamData(0x010200, value=99)]),
[GrinchRamData(0x0101FB, binary_bit_pos=4)]),
"Skis": GrinchItemData("Sleigh Parts", 303, IC.progression_skip_balancing,
[GrinchRamData(0x0101FB, binary_bit_pos=3), GrinchRamData(0x0100AA, binary_bit_pos=5),
GrinchRamData(0x010200, value=99)]),
[GrinchRamData(0x0101FB, binary_bit_pos=3)]),
"Twin-End Tuba": GrinchItemData("Sleigh Parts", 304, IC.progression_skip_balancing,
[GrinchRamData(0x0101FB, binary_bit_pos=6), GrinchRamData(0x0100AA, binary_bit_pos=5),
GrinchRamData(0x010200, value=99)])
[GrinchRamData(0x0101FB, binary_bit_pos=6)])
}
#Access Keys
@@ -153,8 +148,10 @@ KEYS_TABLE: dict[str, GrinchItemData] = {
# [GrinchRamData()]),
# "Progressive Supadow Door Unlock": GrinchItemData("Supadow Door Unlocks", 408, IC.progression,
# [GrinchRamData()]),
# "Bike Race Door Unlock": GrinchItemData("Supadow Door Unlocks", 409, IC.progression,
# "Bike Race Access": GrinchItemData("Supadow Door Unlocks", 409, IC.progression,
# [GrinchRamData()])
"Sleigh Room Key": GrinchItemData("Sleigh Room", 410, IC.progression_skip_balancing,
[GrinchRamData(0x010200, value=99), GrinchRamData(0x0100AA, binary_bit_pos=5)])
}
#Misc Items

1
worlds/grinch/Regions.py
View File

@@ -91,3 +91,4 @@ def connect_regions(world: "GrinchWorld"):
grinchconnect(world, "Who Lake", "Scout's Hut")
grinchconnect(world, "Who Lake", "North Shore")
grinchconnect(world, "North Shore", "Mayor's Villa")
grinchconnect(world, "Sleigh Room", "Bike Race")

8
worlds/grinch/Rules.py
View File

@@ -418,10 +418,10 @@ rules_dict: dict[str,list[list[str]]] = {
["Rotten Egg Launcher", "Rocket Spring"]
],
"Stealing All Gifts": [
[]
["Exhaust Pipes", "Tires", "Skis", "Twin-End Tuba"]
],
"Neutralizing Santa": [
[]
["Exhaust Pipes", "Tires", "Skis", "Twin-End Tuba"]
],
"Heart of Stone - Whoville": [
[]
@@ -537,7 +537,7 @@ access_rules_dict: dict[str,list[list[str]]] = {
["Marine Mobile"]
],
"Sleigh Room": [
["Exhaust Pipes", "Tires", "Skis", "Twin-End Tuba"]
["Sleigh Room Key"]
],
"Spin N' Win Supadow": [
["Spin N' Win Door Unlock"],
@@ -552,7 +552,7 @@ access_rules_dict: dict[str,list[list[str]]] = {
# ["Progressive Supadow Door Unlock: 3"]
],
"Bike Race": [
["Bike Race Door Unlock"],
["Bike Race Access"],
# ["Progressive Supadow Door Unlock: 4"]
]
}