Skip to content

Data Storage Fixes #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SchwartzGandhi wants to merge 2 commits into
base: portrait-of-ruin
Choose a base branch
from
Open

Data Storage Fixes #10

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b51b95b
put data storage in its own key
SchwartzGandhi Jun 17, 2026
bf65ebf
turn events into a bitfield
SchwartzGandhi Jun 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 53 additions & 44 deletions worlds/cv_por/Client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class PoRClient(BizHawkClient):
client_version: str = world_version
has_received_death: bool = False
has_reset_from_death: bool = True
seen_events: list = []
seen_events_bitfield: int = 0
cur_map: int = 0

def __init__(self) -> None:
Expand Down Expand Up @@ -49,7 +49,7 @@ async def validate_rom(self, ctx: "BizHawkClientContext") -> bool:
return False

post_validation_data = await bizhawk.read(ctx.bizhawk_ctx, [(0x309187, 0x01, "Main RAM")])

death_link_flag = int.from_bytes(post_validation_data[0])
if death_link_flag:
await ctx.update_death_link(True)
Expand Down Expand Up @@ -197,50 +197,59 @@ async def check_events(self, read_state, ctx):
boss_death_flags = struct.unpack("I", read_state[7])[0]
elevator_switch = read_state[9][0]
map_id = read_state[10][0]
events_key = f"cv_por_events_{ctx.team}_{ctx.slot}"

if map_id != self.cur_map:
await ctx.send_msgs(
[{
"cmd": "Set",
"key": "map_id",
"default": 0,
"want_reply": True,
"operations": [{"operation": "replace", "value": map_id}],
}])
"cmd": "Set",
"key": f"{events_key}",
"default": {"map_id": 0},
"want_reply": True,
"operations": [{"operation": "update", "value": {"map_id": map_id}}],
}])
self.cur_map = map_id

events = {
# We don't really need everyone, just people who lock quests/portrait clears
"ElevatorSwitch": (elevator_switch >> 4) & 1,
# "Behemoth": (boss_death_flags >> 1) & 1,
"Dullahan": (boss_death_flags >> 2) & 1,
"Keremet": (boss_death_flags >> 4) & 1,
"Legion": (boss_death_flags >> 5) & 1,
"Dagon": (boss_death_flags >> 6) & 1,
"Astarte": (boss_death_flags >> 7) & 1,
"Werewolf": (boss_death_flags >> 8) & 1,
"TheCreature": (boss_death_flags >> 9) & 1,
"MummyMan": (boss_death_flags >> 10) & 1,
"Medusa": (boss_death_flags >> 11) & 1,
# "Richter": (boss_death_flags >> 12) & 1,
"Stella": (boss_death_flags >> 13) & 1,
"Stella&Loretta": (boss_death_flags >> 14) & 1,
"Brauner": (boss_death_flags >> 15) & 1,
"Death": (boss_death_flags >> 16) & 1,
"Dracula": (boss_death_flags >> 18) & 1,
# "Balore": (boss_death_flags >> 19) & 1,
# "Gergoth": (boss_death_flags >> 20) & 1,
# "Zephyr": (boss_death_flags >> 21) & 1,
# "Aguni": (boss_death_flags >> 22) & 1,
# "Abaddon": (boss_death_flags >> 23) & 1,
"Doppelganger": (boss_death_flags >> 25) & 1,
}
for event, seen in events.items():
if bool(seen) != (event in self.seen_events):
await ctx.send_msgs([{
"cmd": "Set",
"key": f"{event}",
"default": 0,
"want_reply": True,
"operations": [{"operation": "replace", "value": seen}],
}])
self.seen_events = [e for e in events if events[e]]
events = [
# We don't really need everyone, just people who lock quests/portrait clears. But who cares?
(elevator_switch >> 4 ) & 1, # Elevator Switch Flipped
(boss_death_flags >> 0 ) & 1,
(boss_death_flags >> 1 ) & 1, # Dullahan
(boss_death_flags >> 2 ) & 1, # Behemoth
(boss_death_flags >> 3 ) & 1,
(boss_death_flags >> 4 ) & 1, # Keremt
(boss_death_flags >> 5 ) & 1, # Legion
(boss_death_flags >> 6 ) & 1, # Dagon
(boss_death_flags >> 7 ) & 1, # Astarte
(boss_death_flags >> 8 ) & 1, # Werewolf
(boss_death_flags >> 9 ) & 1, # The Creature
(boss_death_flags >> 10) & 1, # Mummy Man
(boss_death_flags >> 11) & 1, # Medusa
(boss_death_flags >> 12) & 1, # Richter
(boss_death_flags >> 13) & 1, # Stella
(boss_death_flags >> 14) & 1, # Stella & Loretta
(boss_death_flags >> 15) & 1, # Brauner
(boss_death_flags >> 16) & 1, # Death
(boss_death_flags >> 17) & 1,
(boss_death_flags >> 18) & 1, # Dracula
(boss_death_flags >> 19) & 1, # Balore
(boss_death_flags >> 20) & 1, # Gergoth
(boss_death_flags >> 21) & 1, # Zephyr
(boss_death_flags >> 22) & 1, # Aguni
(boss_death_flags >> 23) & 1, # Abaddon
(boss_death_flags >> 24) & 1, # Trevor, Grant and Sypha? idk it didn't proc for me
(boss_death_flags >> 25) & 1, # Doppelganger
]
event_bitfield = 0
for i, event in enumerate(events):
event_bitfield |= event << i
if event_bitfield != self.seen_events_bitfield:
await ctx.send_msgs(
[{
"cmd": "Set",
"key": f"{events_key}",
"default": {"events": 0},
"want_reply": True,
"operations": [{"operation": "update", "value": {"events": event_bitfield}}],
}])
self.seen_events_bitfield = event_bitfield
Loading