Skip to content

MultiServer: send new read_hints datastore values on change #2558

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

Merged
merged 3 commits into from
Mar 12, 2024
Merged

MultiServer: send new read_hints datastore values on change #2558

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0bcdd34
MultiServer: send new read_hints datastore values on change
Berserker66 Dec 4, 2023
fbe6cd2
MultiServer: undid splitting of function, didn't like the arbitrary cut
Berserker66 Dec 4, 2023
f8b9746
Merge branch 'main' into multiserver_update_read_hints
Berserker66 Mar 5, 2024
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
16 changes: 11 additions & 5 deletions MultiServer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,15 +707,18 @@ def on_goal_achieved(self, client: Client):
self.save() # save goal completion flag

def on_new_hint(self, team: int, slot: int):
key: str = f"_read_hints_{team}_{slot}"
targets: typing.Set[Client] = set(self.stored_data_notification_clients[key])
if targets:
self.broadcast(targets, [{"cmd": "SetReply", "key": key, "value": self.hints[team, slot]}])
self.on_changed_hints(team, slot)
self.broadcast(self.clients[team][slot], [{
"cmd": "RoomUpdate",
"hint_points": get_slot_points(self, team, slot)
}])

def on_changed_hints(self, team: int, slot: int):
key: str = f"_read_hints_{team}_{slot}"
targets: typing.Set[Client] = set(self.stored_data_notification_clients[key])
if targets:
self.broadcast(targets, [{"cmd": "SetReply", "key": key, "value": self.hints[team, slot]}])

def on_client_status_change(self, team: int, slot: int):
key: str = f"_read_client_status_{team}_{slot}"
targets: typing.Set[Client] = set(self.stored_data_notification_clients[key])
Expand Down Expand Up @@ -975,7 +978,10 @@ def register_location_checks(ctx: Context, team: int, slot: int, locations: typi
"hint_points": get_slot_points(ctx, team, slot),
"checked_locations": new_locations, # send back new checks only
}])

old_hints = ctx.hints[team, slot].copy()
ctx.recheck_hints(team, slot)
if old_hints != ctx.hints[team, slot]:
Comment on lines +982 to +983
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't it make sense to use our helper here?

Suggested change
ctx.recheck_hints(team, slot)
if old_hints != ctx.hints[team, slot]:
if old_hints != ctx.get_rechecked_hints(team, slot):

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Style wise, I don't like "hiding" mutations in an if statement.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we get rid of the helper then? any use of the helper will hide mutation

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or potentially rename the helper to be more clear what it does.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

its only other use currently is outside an if statement.

ctx.on_changed_hints(team, slot)
ctx.save()


Expand Down