Merge pull request #211 from EndoHizumi/copilot/implement-missing-functionality

Implement auto mode, skip mode toggle, and expose Store as public API

Author: EndoHizumi

src/core/defaultUIHandler.ts

@@ -64,6 +64,8 @@ export class DefaultUIHandler {
         const styleTags = Array.from(document.head.getElementsByTagName('style'))
         styleTags.forEach((tag) => document.head.removeChild(tag))
 
+        gameContainer.tabIndex = 0
+        gameContainer.style.outline = 'none'
         // HTMLコンテンツを注入する
         gameContainer.innerHTML = mainDiv.innerHTML
 
@@ -76,6 +78,8 @@ export class DefaultUIHandler {
           styleEl.textContent = styleContent
           document.head.appendChild(styleEl)
         }
+
+        gameContainer.focus()
       } else {
         // 古いダイアログ用スタイルシートを削除する
         document.head
@@ -221,14 +225,16 @@ export class DefaultUIHandler {
       if (inputAbortController) inputAbortController.abort()
       inputAbortController = new AbortController()
       const { signal } = inputAbortController
-      const { onNext, setSkip } = data
+      const { onNext, setSkip, toggleAuto, toggleSkip } = data
       gameContainer.addEventListener(
         'keydown',
         (e: KeyboardEvent) => {
           if (e.key === 'Enter') {
             onNext()
           } else if (e.key === 'Control') {
-            setSkip(true, true)
+            toggleSkip()
+          } else if (e.key.toLowerCase() === 'a' && toggleAuto) {
+            toggleAuto()
           }
         },
         { signal },
@@ -237,12 +243,19 @@ export class DefaultUIHandler {
         'keyup',
         (e: KeyboardEvent) => {
           if (e.key === 'Control') {
-            setSkip(true, false)
+            toggleSkip()
           }
         },
         { signal },
       )
-      gameContainer.addEventListener('click', () => onNext(), { signal })
+      gameContainer.addEventListener(
+        'click',
+        () => {
+          gameContainer.focus()
+          onNext()
+        },
+        { signal },
+      )
     })
   }
 }

src/core/index.js

@@ -80,6 +80,8 @@ export class Core {
         this.drawer.isSkip = drawerSkip
         this.isNext = coreNext
       },
+      toggleAuto: () => { this.isAuto = !this.isAuto },
+      toggleSkip: () => { this.isSkip = !this.isSkip },
     })
 
       await this.textHandler('タップでスタート')
@@ -225,7 +227,7 @@ export class Core {
     await this.eventBus.emit('text:show', {
       name: scenarioObject.name || '',
       content: scenarioObject.content,
-      speed: scenarioObject.speed || 25,
+      speed: this.isSkip ? 1 : scenarioObject.speed || 25,
       expandVariable: this.expandVariable.bind(this),
       waitFn: this.waitHandler.bind(this),
     })
@@ -254,15 +256,26 @@ export class Core {
     if (typeof line.wait === 'string' && !isNaN(Number(line.wait))) {
       line.wait = Number(line.wait)
     }
+
+    // スキップモードが有効な場合は全ての待機をスキップする
+    if (this.isSkip) {
+      return
+    }
+
     if (typeof line.wait === 'number') {
       if (line.wait > 0 || this.isAuto) {
         const waitTime = line.wait || 1500
         // 指定された時間だけ待機
         await sleep(waitTime)
       }
     } else {
-      // 改行ごとに入力待ち
-      await this.clickWait()
+      if (this.isAuto) {
+        // オートモードが有効な場合はデフォルト時間後に自動進行する
+        await sleep(1500)
+      } else {
+        // 改行ごとに入力待ち
+        await this.clickWait()
+      }
     }
   }
 
@@ -271,7 +284,7 @@ export class Core {
     this.drawer.setVisibility('#waitCircle', true)
     return new Promise((resolve) => {
       const intervalId = setInterval(() => {
-        if (this.isNext) {
+        if (this.isNext || this.isAuto || this.isSkip) {
           this.drawer.setVisibility('#waitCircle', false)
           clearInterval(intervalId)
           this.isNext = false
@@ -750,6 +763,15 @@ export class Core {
         getSaveList: () => this.getSaveList(),
         deleteSave: (slot) => this.deleteSave(slot),
       },
+      store: this.store,
+      playback: {
+        toggleAuto: () => { this.isAuto = !this.isAuto },
+        setAuto: (value) => { this.isAuto = value },
+        getAuto: () => this.isAuto,
+        toggleSkip: () => { this.isSkip = !this.isSkip },
+        setSkip: (value) => { this.isSkip = value },
+        getSkip: () => this.isSkip,
+      },
       sandbox: {
         execute: this.executeScenario.bind(this),
       },
@@ -803,7 +825,7 @@ export class Core {
   async loadHandler(line) {
     const slot = line.slot || 'auto'
 
-    const saveDataRaw = this.store.get ? this.store.get(`save_${slot}`) : this.store[`save_${slot}`]
+    const saveDataRaw = this.store.get(`save_${slot}`)
     if (!saveDataRaw) {
       throw new Error(`セーブデータが見つかりません: スロット${slot}`)
     }
@@ -882,6 +904,6 @@ export class Core {
   }
 
   deleteSave(slot) {
-    delete this.store[`save_${slot}`]
+    this.store.remove(`save_${slot}`)
   }
 }

src/utils/store.ts

@@ -6,6 +6,8 @@ interface StoreData {
 
 export interface Store extends StoreData {
   set(key: string, value: any): void;
+  get(key: string): any;
+  remove(key: string): void;
 }
 
 export const generateStore = (): Store => {
@@ -16,7 +18,14 @@ export const generateStore = (): Store => {
     set(key: string, value: any): void {
       storejs.set(key, value);
       this[key] = value;
-    }
+    },
+    get(key: string): any {
+      return storejs.get(key);
+    },
+    remove(key: string): void {
+      storejs.remove(key);
+      delete (this as StoreData)[key];
+    },
   };
 
   return store;