From 6108211860bb390125d35eb99b6dbf2ab9fdf74a Mon Sep 17 00:00:00 2001 From: coelacanth657 <210202793+coelacanth657@users.noreply.github.com> Date: Fri, 14 Nov 2025 21:32:36 +0900 Subject: [PATCH 1/9] =?UTF-8?q?=E7=9B=A4=E9=9D=A2=E3=83=AD=E3=83=BC?= =?UTF-8?q?=E3=83=89=E6=99=82=E3=81=AB=E3=80=81=E7=9B=A4=E9=9D=A2=E3=82=B5?= =?UTF-8?q?=E3=82=A4=E3=82=BA=E3=82=92=E6=9B=B4=E6=96=B0=E3=81=99=E3=82=8B?= =?UTF-8?q?=E6=A9=9F=E8=83=BD=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/iframe/life-game.js | 1 - src/routes/+page.svelte | 1 - 2 files changed, 2 deletions(-) diff --git a/src/iframe/life-game.js b/src/iframe/life-game.js index f4860d4..0090e8e 100644 --- a/src/iframe/life-game.js +++ b/src/iframe/life-game.js @@ -280,7 +280,6 @@ on.save_board = async () => { }; on.apply_board = (newBoard) => { - boardSize = newBoard.length; board = newBoard; renderBoard(); generationChange(0); diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index b13d903..ec42b1d 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -97,7 +97,6 @@ async function onBoardSelect(id: number) { const board = await boardManager.load(id, isJapanese); if (board) { - sizeValue = board.length; sendEvent("apply_board", board); } } From 5e6f84e1084def30011dfa4fe2f245f97442349f Mon Sep 17 00:00:00 2001 From: coelacanth657 <210202793+coelacanth657@users.noreply.github.com> Date: Fri, 14 Nov 2025 22:49:17 +0900 Subject: [PATCH 2/9] =?UTF-8?q?=E3=83=86=E3=83=B3=E3=83=97=E3=83=AC?= =?UTF-8?q?=E3=83=BC=E3=83=88=E3=82=AF=E3=83=AA=E3=83=83=E3=82=AF=E6=99=82?= =?UTF-8?q?=E3=80=81sizeValue=E3=81=AE=E6=9B=B4=E6=96=B0=E3=81=8C=E5=AE=8C?= =?UTF-8?q?=E4=BA=86=E3=81=99=E3=82=8B=E5=89=8D=E3=81=AB=E5=88=A4=E5=AE=9A?= =?UTF-8?q?=E3=81=8C=E8=A1=8C=E3=82=8F=E3=82=8C=E3=81=A6=E3=81=84=E3=81=9F?= =?UTF-8?q?=E3=83=90=E3=82=B0=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/routes/+page.svelte | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index ec42b1d..5b07c14 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -62,6 +62,9 @@ const data = event.data.data as { generationFigure: number; boardSize: number }; generationFigure = data.generationFigure; sizeValue = data.boardSize; + if (resolveSync) { + resolveSync(); + } break; } case "Size shortage": { @@ -107,6 +110,13 @@ editingCode = code; } } + + let resolveSync: (value: void | PromiseLike) => void; + function waitForSync(): Promise { + return new Promise((resolve) => { + resolveSync = resolve; + }); + }
@@ -156,8 +166,9 @@

diff --git a/src/lib/components/CodeModals.svelte b/src/lib/components/CodeModals.svelte index a1efac5..a7ee468 100644 --- a/src/lib/components/CodeModals.svelte +++ b/src/lib/components/CodeModals.svelte @@ -37,7 +37,7 @@ > diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index fe023fb..882a3db 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -418,7 +418,9 @@
{isJapanese ? "コード" : "Code"}:
-
- {isJapanese ? "第" + generationFigure + "世代" : "Generation:" + generationFigure} +
+ {isJapanese ? "世代数:" + generationFigure : "Generation:" + generationFigure}
@@ -329,17 +329,13 @@ accelerate -
+
{isJapanese ? "現在の速度" : "Current speed"}: x{1000 / intervalMs}
- - - -
From 05e627a584d3448b04af3ba1684ccfde16ad06cf Mon Sep 17 00:00:00 2001 From: coelacanth657 <210202793+coelacanth657@users.noreply.github.com> Date: Sat, 15 Nov 2025 15:32:29 +0900 Subject: [PATCH 8/9] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E3=81=A8waitForSync()?= =?UTF-8?q?=E3=81=AE=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lib/components/GlobalToast.svelte | 9 +++-- src/routes/+page.svelte | 51 ++++++++++----------------- 2 files changed, 22 insertions(+), 38 deletions(-) diff --git a/src/lib/components/GlobalToast.svelte b/src/lib/components/GlobalToast.svelte index 8084ebb..e25e48f 100644 --- a/src/lib/components/GlobalToast.svelte +++ b/src/lib/components/GlobalToast.svelte @@ -1,9 +1,8 @@ {#if toast.visible}
-
+
{toast.message}
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 6ff4e1a..3889e80 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -22,7 +22,6 @@ let isJapanese = $state(true); let resetModalOpen = $state(false); let bottomDrawerOpen = $state(false); - let disabledTemplates = $state<{ [key: string]: boolean }>({}); let generationFigure = $state(0); let sizeValue = $state(20); @@ -30,6 +29,16 @@ const boardManager = new BoardManager(); const codeManager = new CodeManager(); + let disabledTemplates: { [key: string]: boolean } = $derived.by(() => { + const newDisabledState: { [key: string]: boolean } = {}; + for (const key in patterns) { + const patternName = key as keyof typeof patterns; + const patternData = patterns[patternName]; + newDisabledState[patternName] = sizeValue < (patternData.minBoardSize || 0); + } + return newDisabledState; + }); + let timer: "running" | "stopped" = $state("stopped"); let intervalMs = $state(1000); $effect(() => { @@ -43,7 +52,6 @@ type OngoingEvent = | "play" | "pause" - | "state_update" | "board_reset" | "board_randomize" | "place_template" @@ -64,9 +72,6 @@ const data = event.data.data as { generationFigure: number; boardSize: number }; generationFigure = data.generationFigure; sizeValue = data.boardSize; - if (resolveSync) { - resolveSync(); - } break; } case "Size shortage": { @@ -113,26 +118,6 @@ editingCode = code; } } - - let resolveSync: (value: void | PromiseLike) => void; - function waitForSync(): Promise { - return new Promise((resolve) => { - resolveSync = resolve; - }); - } - - async function updateTemplateDisability() { - sendEvent("request_sync"); - await waitForSync(); - - const newDisabledState: { [key: string]: boolean } = {}; - for (const key in patterns) { - const patternName = key as keyof typeof patterns; - const patternData = patterns[patternName]; - newDisabledState[patternName] = sizeValue < (patternData.minBoardSize || 0); - } - disabledTemplates = newDisabledState; - }
@@ -185,7 +170,7 @@