Talon/chat_grid
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix teleport enter audio and localize wheel result messages

Browse Source
This commit is contained in:
Jage9
2026-02-21 01:26:18 -05:00
parent e0fc798538
commit a63b84f6a1
3 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/public/version.js
View File

@@ -1,3 +1,3 @@
// Maintainer-controlled web client version. // Maintainer-controlled web client version.
// Format: YYYY.MM.DD Rn (example: 2026.02.20 R2) // Format: YYYY.MM.DD Rn (example: 2026.02.20 R2)
window.CHGRID_WEB_VERSION = "2026.02.21 R74"; window.CHGRID_WEB_VERSION = "2026.02.21 R75";

2
client/src/main.ts
View File

@@ -1543,7 +1543,6 @@ function handleListModeInput(code: string): void {
signaling.send({ type: 'update_position', x: peer.x, y: peer.y }); signaling.send({ type: 'update_position', x: peer.x, y: peer.y });
state.mode = 'normal'; state.mode = 'normal';
updateStatus(`Moved to ${peer.nickname}.`); updateStatus(`Moved to ${peer.nickname}.`);
audio.sfxUiConfirm();
return; return;
} }
@@ -1582,7 +1581,6 @@ function handleListItemsModeInput(code: string): void {
signaling.send({ type: 'update_position', x: item.x, y: item.y }); signaling.send({ type: 'update_position', x: item.x, y: item.y });
state.mode = 'normal'; state.mode = 'normal';
updateStatus(`Moved to ${itemLabel(item)}.`); updateStatus(`Moved to ${itemLabel(item)}.`);
audio.sfxUiConfirm();
return; return;
} }
if (code === 'Escape') { if (code === 'Escape') {

38
server/app/server.py
View File

@@ -163,9 +163,23 @@ class SignalingServer:
) )
await self._send(client.websocket, packet) await self._send(client.websocket, packet)
async def _broadcast_wheel_result_after_delay(self, message: str, delay_seconds: float = 3.0) -> None: async def _broadcast_wheel_result_after_delay(
self,
client: ClientConnection,
self_message: str,
others_message: str,
delay_seconds: float = 3.0,
) -> None:
await asyncio.sleep(delay_seconds) await asyncio.sleep(delay_seconds)
await self._broadcast(BroadcastChatMessagePacket(type="chat_message", message=message, system=True)) await self._broadcast(
BroadcastChatMessagePacket(type="chat_message", message=others_message, system=True),
exclude=client.websocket,
)
if client.websocket in self.clients:
await self._send(
client.websocket,
BroadcastChatMessagePacket(type="chat_message", message=self_message, system=True),
)
async def _handle_message(self, client: ClientConnection, raw_message: str) -> None: async def _handle_message(self, client: ClientConnection, raw_message: str) -> None:
try: try:
@@ -409,7 +423,8 @@ class SignalingServer:
) )
return return
self.item_last_use_ms[item.id] = now_ms self.item_last_use_ms[item.id] = now_ms
delayed_wheel_result: str | None = None delayed_wheel_self_result: str | None = None
delayed_wheel_others_result: str | None = None
if item.type == "radio_station": if item.type == "radio_station":
enabled_value = item.params.get("enabled", True) enabled_value = item.params.get("enabled", True)
if isinstance(enabled_value, bool): if isinstance(enabled_value, bool):
@@ -427,7 +442,7 @@ class SignalingServer:
await self._broadcast_item(item) await self._broadcast_item(item)
state_text = "on" if next_enabled else "off" state_text = "on" if next_enabled else "off"
others_message = f"{client.nickname} turns {state_text} {item.title}." others_message = f"{client.nickname} turns {state_text} {item.title}."
self_message = others_message self_message = f"You turn {state_text} {item.title}."
elif item.type == "dice": elif item.type == "dice":
try: try:
sides = max(1, min(100, int(item.params.get("sides", 6)))) sides = max(1, min(100, int(item.params.get("sides", 6))))
@@ -460,8 +475,9 @@ class SignalingServer:
return return
landed = random.choice(spaces) landed = random.choice(spaces)
others_message = f"{client.nickname} spins {item.title}." others_message = f"{client.nickname} spins {item.title}."
self_message = others_message self_message = f"You spin {item.title}."
delayed_wheel_result = str(landed) delayed_wheel_self_result = str(landed)
delayed_wheel_others_result = f"{client.nickname}: {landed}"
await self._broadcast( await self._broadcast(
BroadcastChatMessagePacket(type="chat_message", message=others_message, system=True), BroadcastChatMessagePacket(type="chat_message", message=others_message, system=True),
exclude=client.websocket, exclude=client.websocket,
@@ -477,8 +493,14 @@ class SignalingServer:
) )
) )
await self._send_item_result(client, True, "use", self_message, item.id) await self._send_item_result(client, True, "use", self_message, item.id)
if delayed_wheel_result is not None: if delayed_wheel_self_result is not None and delayed_wheel_others_result is not None:
asyncio.create_task(self._broadcast_wheel_result_after_delay(delayed_wheel_result)) asyncio.create_task(
self._broadcast_wheel_result_after_delay(
client=client,
self_message=delayed_wheel_self_result,
others_message=delayed_wheel_others_result,
)
)
return return
if isinstance(packet, ItemUpdatePacket): if isinstance(packet, ItemUpdatePacket):