sa2kit 1.6.0 → 1.6.1

package/dist/mmd/index.mjs

@@ -2827,6 +2827,7 @@ var MMDVisualNovel = forwardRef(
     const [pendingNodeIndex, setPendingNodeIndex] = useState(null);
     const [showChoices, setShowChoices] = useState(false);
     const [isCameraManual, setIsCameraManual] = useState(false);
+    const [variables, setVariables] = useState({});
     const playerRef = useRef(null);
     const containerRef = useRef(null);
     const autoTimerRef = useRef(null);
@@ -2848,32 +2849,6 @@ var MMDVisualNovel = forwardRef(
         }
       ]);
     }, []);
-    const goToNextDialogue = useCallback(() => {
-      if (!currentNode) return;
-      if (autoTimerRef.current) {
-        clearTimeout(autoTimerRef.current);
-        autoTimerRef.current = null;
-      }
-      const nextDialogueIndex = currentDialogueIndex + 1;
-      if (nextDialogueIndex < currentNode.dialogues.length && currentNode?.dialogues[nextDialogueIndex] !== void 0) {
-        const nextDialogue = currentNode.dialogues[nextDialogueIndex];
-        setCurrentDialogueIndex(nextDialogueIndex);
-        addToHistory(nextDialogue, currentNodeIndex, nextDialogueIndex);
-        onDialogueChange?.(nextDialogue, nextDialogueIndex, currentNodeIndex);
-        typingCompleteRef.current = false;
-      } else if (currentNode.choices && currentNode.choices.length > 0) {
-        setShowChoices(true);
-      } else {
-        const nextNodeIndex = currentNodeIndex + 1;
-        if (nextNodeIndex < nodes.length) {
-          goToNode(nextNodeIndex);
-        } else if (loop) {
-          goToNode(0);
-        } else {
-          onScriptComplete?.();
-        }
-      }
-    }, [currentNode, currentDialogueIndex, currentNodeIndex, nodes.length, loop, addToHistory, onDialogueChange, onScriptComplete]);
     const goToNode = useCallback(
       (nodeIndex, force = false) => {
         if (nodeIndex < 0 || nodeIndex >= nodes.length) return;
@@ -2912,8 +2887,52 @@ var MMDVisualNovel = forwardRef(
           }, 100);
         }, 300);
       },
-      [nodes, isTransitioning, addToHistory, onNodeChange, onDialogueChange, currentNodeIndex, isVmdFinished]
+      [nodes, isTransitioning, addToHistory, onNodeChange, onDialogueChange, currentNodeIndex]
     );
+    const triggerNodeTransition = useCallback(() => {
+      if (!currentNode) return;
+      let nextNodeIndex = currentNodeIndex + 1;
+      if (currentNode.nextCondition) {
+        const { key, map, defaultIndex } = currentNode.nextCondition;
+        const val = variables[key];
+        if (val !== void 0 && map[val] !== void 0) {
+          nextNodeIndex = map[val];
+          console.log(`[MMDVisualNovel] Branching: ${key}=${val} -> node ${nextNodeIndex}`);
+        } else {
+          nextNodeIndex = defaultIndex;
+        }
+      }
+      if (nextNodeIndex < nodes.length && nextNodeIndex >= 0) {
+        goToNode(nextNodeIndex);
+      } else if (loop) {
+        goToNode(0);
+      } else {
+        onScriptComplete?.();
+      }
+    }, [currentNode, currentNodeIndex, nodes.length, loop, variables, goToNode, onScriptComplete]);
+    const goToNextDialogue = useCallback(() => {
+      if (!currentNode) return;
+      if (currentDialogue?.choices && currentDialogue.choices.length > 0 && !showChoices) {
+        setShowChoices(true);
+        return;
+      }
+      if (autoTimerRef.current) {
+        clearTimeout(autoTimerRef.current);
+        autoTimerRef.current = null;
+      }
+      const nextDialogueIndex = currentDialogueIndex + 1;
+      if (nextDialogueIndex < currentNode.dialogues.length && currentNode?.dialogues[nextDialogueIndex] !== void 0) {
+        const nextDialogue = currentNode.dialogues[nextDialogueIndex];
+        setCurrentDialogueIndex(nextDialogueIndex);
+        addToHistory(nextDialogue, currentNodeIndex, nextDialogueIndex);
+        onDialogueChange?.(nextDialogue, nextDialogueIndex, currentNodeIndex);
+        typingCompleteRef.current = false;
+      } else if (currentNode.choices && currentNode.choices.length > 0) {
+        setShowChoices(true);
+      } else {
+        triggerNodeTransition();
+      }
+    }, [currentNode, currentDialogue, currentDialogueIndex, currentNodeIndex, nodes.length, loop, addToHistory, onDialogueChange, onScriptComplete, showChoices, variables, goToNode, triggerNodeTransition]);
     const goToDialogue = useCallback(
       (dialogueIndex) => {
         if (!currentNode) return;
@@ -2992,6 +3011,10 @@ var MMDVisualNovel = forwardRef(
         getCurrentNodeIndex: () => currentNodeIndex,
         getCurrentDialogueIndex: () => currentDialogueIndex,
         getHistory: () => history,
+        getVariables: () => variables,
+        setVariable: (key, value) => {
+          setVariables((prev) => ({ ...prev, [key]: value }));
+        },
         setAutoMode: setIsAutoMode,
         skipTyping: () => {
           typingCompleteRef.current = true;
@@ -3152,18 +3175,38 @@ var MMDVisualNovel = forwardRef(
           }
         }
       ),
-      showChoices && currentNode.choices && /* @__PURE__ */ React6.createElement(
+      showChoices && (currentDialogue?.choices || currentNode.choices) && /* @__PURE__ */ React6.createElement(
         ChoiceMenu,
         {
-          choices: currentNode.choices,
+          choices: currentDialogue?.choices || currentNode.choices,
           theme: dialogueTheme,
           onSelect: (choice) => {
+            if (choice.setVariable) {
+              const { key, value } = choice.setVariable;
+              setVariables((prev) => ({ ...prev, [key]: value }));
+              console.log(`[MMDVisualNovel] Variable set: ${key} = ${value}`);
+            }
             choice.onSelect?.();
-            if (choice.nextNodeIndex === currentNodeIndex) {
-              goToDialogue(choice.nextDialogueIndex || 0);
-              setShowChoices(false);
-            } else {
-              goToNode(choice.nextNodeIndex, true);
+            setShowChoices(false);
+            if (choice.nextNodeIndex !== void 0) {
+              if (choice.nextNodeIndex === currentNodeIndex) {
+                goToDialogue(choice.nextDialogueIndex || 0);
+              } else {
+                goToNode(choice.nextNodeIndex, true);
+              }
+            } else if (currentDialogue?.choices) {
+              const nextIdx = currentDialogueIndex + 1;
+              if (currentNode && nextIdx < currentNode.dialogues.length) {
+                const nextDialogue = currentNode.dialogues[nextIdx];
+                if (nextDialogue) {
+                  setCurrentDialogueIndex(nextIdx);
+                  addToHistory(nextDialogue, currentNodeIndex, nextIdx);
+                  onDialogueChange?.(nextDialogue, nextIdx, currentNodeIndex);
+                  typingCompleteRef.current = false;
+                }
+              } else {
+                triggerNodeTransition();
+              }
             }
           }
         }
@@ -3582,6 +3625,6 @@ var MMDMusicPlayer = forwardRef(
 );
 MMDMusicPlayer.displayName = "MMDMusicPlayer";
 
-export { DialogueBox, HistoryPanel, LoadingOverlay, LoadingScreen, MMDMusicPlayer, MMDPlayerBase, MMDPlayerEnhanced, MMDPlayerEnhancedDebugInfo, MMDPlaylist, MMDPlaylistDebugInfo, MMDVisualNovel, MusicControls, PlaylistPanel, StartScreen, TrackInfo, loadAmmo };
+export { ChoiceMenu, DialogueBox, HistoryPanel, LoadingOverlay, LoadingScreen, MMDMusicPlayer, MMDPlayerBase, MMDPlayerEnhanced, MMDPlayerEnhancedDebugInfo, MMDPlaylist, MMDPlaylistDebugInfo, MMDVisualNovel, MusicControls, PlaylistPanel, StartScreen, TrackInfo, loadAmmo };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map