danoniplus 30.3.0 → 30.3.1

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2023/03/01
+ * Revised : 2023/03/04
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 30.3.0`;
-const g_revisedDate = `2023/03/01`;
+const g_version = `Ver 30.3.1`;
+const g_revisedDate = `2023/03/04`;
 const g_alphaVersion = ``;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
@@ -3511,7 +3511,7 @@ const keysConvert = (_dosObj, { keyExtraList = _dosObj.keyExtraList.split(`,`) }
 					// 通常の指定方法 (例: |shuffle8i=1,1,1,2,0,0,0,0/1,1,1,1,0,0,0,0| )の場合の取り込み
 					tmpArray[k].split(`/`).forEach((list, m) =>
 						g_keyObj[`${keyheader}_${k + dfPtn}_${m}`] = (list === `` ?
-							[...Array(g_keyObj[`color${_key}_${k + dfPtn}`].length)].fill(0) : list.split(`,`).map(n => parseInt(n, 10))));
+							[...Array(g_keyObj[`chara${_key}_${k + dfPtn}`].length)].fill(0) : list.split(`,`).map(n => parseInt(n, 10))));
 				}
 				g_keyObj[`${keyheader}_${k + dfPtn}`] = structuredClone(g_keyObj[`${keyheader}_${k + dfPtn}_0`]);
 			}
@@ -3563,7 +3563,7 @@ const keysConvert = (_dosObj, { keyExtraList = _dosObj.keyExtraList.split(`,`) }
 					Object.assign(g_keyObj[pairName], g_keyObj[`${_pairName}${tmpParams[k]}`]);
 				} else {
 					if (_defaultName !== ``) {
-						g_keyObj[pairName][_defaultName] = [...Array(g_keyObj[`color${_key}_${k + dfPtn}`].length)].fill(_defaultVal);
+						g_keyObj[pairName][_defaultName] = [...Array(g_keyObj[`chara${_key}_${k + dfPtn}`].length)].fill(_defaultVal);
 					}
 					tmpParams[k].split(`/`).forEach(pairs => {
 						const tmpParamPair = pairs.split(`::`);
@@ -3582,7 +3582,7 @@ const keysConvert = (_dosObj, { keyExtraList = _dosObj.keyExtraList.split(`,`) }
 		// キーパターンの追記 (appendX)
 		if (setBoolVal(_dosObj[`append${newKey}`])) {
 			for (let j = 0; ; j++) {
-				if (g_keyObj[`color${newKey}_${j}`] === undefined) {
+				if (g_keyObj[`chara${newKey}_${j}`] === undefined) {
 					break;
 				}
 				g_keyObj.dfPtnNum++;
@@ -3610,14 +3610,6 @@ const keysConvert = (_dosObj, { keyExtraList = _dosObj.keyExtraList.split(`,`) }
 
 		// ステップゾーン位置 (posX_Y)
 		newKeyMultiParam(newKey, `pos`, toFloat);
-		if (_dosObj[`pos${newKey}`] === undefined) {
-			for (let k = 0; k < tmpMinPatterns; k++) {
-				const ptnName = `${newKey}_${k + dfPtnNum}`;
-				if (g_keyObj[`color${ptnName}`] !== undefined) {
-					g_keyObj[`pos${ptnName}`] = [...Array(g_keyObj[`color${ptnName}`].length).keys()].map(i => i);
-				}
-			}
-		}
 
 		// 各キーの区切り位置 (divX_Y)
 		if (_dosObj[`div${newKey}`] !== undefined) {
@@ -3629,7 +3621,7 @@ const keysConvert = (_dosObj, { keyExtraList = _dosObj.keyExtraList.split(`,`) }
 				if (g_keyObj[`div${tmpDivPtn[0]}`] !== undefined) {
 					// 既定キーパターンが指定された場合、存在すればその値を適用
 					g_keyObj[`div${ptnName}`] = g_keyObj[`div${tmpDivPtn[0]}`];
-					g_keyObj[`divMax${ptnName}`] = setVal(g_keyObj[`divMax${tmpDivPtn[0]}`], Math.max(...g_keyObj[`pos${ptnName}`]) + 1, C_TYP_FLOAT);
+					g_keyObj[`divMax${ptnName}`] = setVal(g_keyObj[`divMax${tmpDivPtn[0]}`], undefined, C_TYP_FLOAT);
 				} else if (!hasVal(tmpDivPtn[0]) && setIntVal(g_keyObj[`div${ptnName}`], -1) !== -1) {
 					// カスタムキー側のdivXが未定義だが、すでに初期設定で定義済みの場合はスキップ
 					continue;
@@ -3640,13 +3632,9 @@ const keysConvert = (_dosObj, { keyExtraList = _dosObj.keyExtraList.split(`,`) }
 				}
 			}
 		}
-		// divX_Yが未指定の場合はposX_Yを元に適用
+		// posX_Y, divX_Y, divMaxX_Yが未指定の場合はcharaX_Yを元に適用
 		for (let k = 0; k < tmpMinPatterns; k++) {
-			const ptnName = `${newKey}_${k + dfPtnNum}`;
-			if (g_keyObj[`div${ptnName}`] === undefined) {
-				g_keyObj[`div${ptnName}`] = Math.max(...g_keyObj[`pos${ptnName}`]) + 1;
-				g_keyObj[`divMax${ptnName}`] = g_keyObj[`div${ptnName}`];
-			}
+			setKeyDfVal(`${newKey}_${k + dfPtnNum}`);
 		}
 
 		// ステップゾーン間隔 (blankX_Y)
@@ -3670,7 +3658,7 @@ const keysConvert = (_dosObj, { keyExtraList = _dosObj.keyExtraList.split(`,`) }
 			// 特に指定が無い場合はcolorX_Yの配列長で決定
 			for (let k = 0; k < tmpMinPatterns; k++) {
 				const ptnName = `${newKey}_${k + dfPtnNum}`;
-				g_keyObj[`shuffle${ptnName}_0`] = [...Array(g_keyObj[`color${ptnName}`].length)].fill(0);
+				g_keyObj[`shuffle${ptnName}_0`] = [...Array(g_keyObj[`chara${ptnName}`].length)].fill(0);
 				g_keyObj[`shuffle${ptnName}`] = structuredClone(g_keyObj[`shuffle${ptnName}_0`]);
 			}
 		}
@@ -3690,6 +3678,22 @@ const keysConvert = (_dosObj, { keyExtraList = _dosObj.keyExtraList.split(`,`) }
 	return keyExtraList;
 };
 
+/**
+ * キーパターンのデフォルト値設定
+ * @param {string} _ptnName 
+ */
+const setKeyDfVal = _ptnName => {
+	if (g_keyObj[`pos${_ptnName}`] === undefined) {
+		g_keyObj[`pos${_ptnName}`] = [...Array(g_keyObj[`chara${_ptnName}`].length).keys()].map(i => i);
+	}
+	if (g_keyObj[`div${_ptnName}`] === undefined) {
+		g_keyObj[`div${_ptnName}`] = Math.max(...g_keyObj[`pos${_ptnName}`]) + 1;
+	}
+	if (g_keyObj[`divMax${_ptnName}`] === undefined) {
+		g_keyObj[`divMax${_ptnName}`] = Math.max(...g_keyObj[`pos${_ptnName}`]) + 1;
+	}
+};
+
 /*-----------------------------------------------------------*/
 /* Scene : TITLE [melon] */
 /*-----------------------------------------------------------*/

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2023/03/01 (v30.3.0)
+ * Revised : 2023/03/04 (v30.3.1)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -1583,7 +1583,6 @@ const g_keyObj = {
 
     // シャッフルグループ(パターン3)
     shuffle15A_0_2: [0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 3, 2, 2, 2],
-    shuffle15B_0_2: [0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 3, 2, 2, 2],
 
     // 基本パターン (矢印回転、AAキャラクタ)
     // - AAキャラクタの場合、キャラクタ名を指定
@@ -1622,63 +1621,32 @@ const g_keyObj = {
     stepRtn8_2: [`onigiri`, 0, 30, 60, 90, 120, 150, 180],
 
     // 各キーの区切り位置
-    div5_0: 5,
-    div7_0: 7,
-    div7i_0: 7,
-    div8_0: 8,
-    div9A_0: 9,
-    div9B_0: 9,
     div9i_0: 6,
     div11_0: 6,
     div11L_0: 6,
     div11W_0: 6,
-    div11i_0: 11,
     div12_0: 5,
     div13_0: 8,
     div14_0: 7,
     div14i_0: 8,
     div15A_0: 8,
     div16i_0: 8,
-    div17_0: 17,
     div23_0: 12,
 
-    div5_1: 5,
-    div8_1: 8,
-    div9i_1: 9,
     div17_1: 9,
 
-    div5_2: 5,
-    div8_2: 8,
-
     // 各キーの位置関係
-    pos5_0: [0, 1, 2, 3, 4],
-    pos7_0: [0, 1, 2, 3, 4, 5, 6],
-    pos7i_0: [0, 1, 2, 3, 4, 5, 6],
-    pos8_0: [0, 1, 2, 3, 4, 5, 6, 7],
-    pos9A_0: [0, 1, 2, 3, 4, 5, 6, 7, 8],
-    pos9B_0: [0, 1, 2, 3, 4, 5, 6, 7, 8],
     pos9i_0: [2, 3, 4, 5, 6, 7, 8, 9, 10],
     pos11_0: [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
     pos11L_0: [0, 1, 2, 3, 6, 7, 8, 9, 10, 11, 12],
     pos11W_0: [0, 2, 3, 5, 6, 7, 8, 9, 10, 11, 12],
-    pos11i_0: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
     pos12_0: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
     pos13_0: [4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16],
     pos14_0: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14],
-    pos14i_0: [0, 1, 2, 3, 4, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15],
-    pos15A_0: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14],
+    pos14i_0: [0, 1, 2, 3, 4, 5, 6, 8, 9, 10, 11, 12, 13, 14],
     pos16i_0: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16],
-    pos17_0: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16],
     pos23_0: [0, 1, 2, 3, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26],
 
-    pos5_1: [0, 1, 2, 3, 4],
-    pos8_1: [0, 1, 2, 3, 4, 5, 6, 7],
-    pos9i_1: [0, 1, 2, 3, 4, 5, 6, 7, 8],
-    pos17_1: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16],
-
-    pos5_2: [0, 1, 2, 3, 4],
-    pos8_2: [0, 1, 2, 3, 4, 5, 6, 7],
-
     // 基本パターン (キーコンフィグ)
     // - 順番はchara, stepRtnと対応している。
     // - 多次元配列内はステップに対応するキーコードを示す。カンマ区切りで複数指定できる。
@@ -1968,6 +1936,11 @@ const g_keyObj = {
 
 };
 
+// posX_Y, divX_Y, divMaxX_Yが未定義のときに0からの連番で補完する処理 (charaX_Yが定義されていることが前提)
+Object.keys(g_keyObj).filter(val => val.startsWith(`chara`)).forEach(charaPtn => {
+    setKeyDfVal(charaPtn.slice(`chara`.length));
+});
+
 // キーパターンのコピーリスト
 // ・コピー先：コピー元の順に指定する
 // ・上から順に処理する
@@ -2049,6 +2022,7 @@ Object.keys(g_copyKeyPtn).forEach(keyPtnTo => {
     copyKeyPtn(`assistPos`);
 
     copyKeyPtnVal(`div`);
+    copyKeyPtnVal(`divMax`);
     copyKeyPtnVal(`blank`);
     copyKeyPtnVal(`scale`);
     copyKeyPtnVal(`keyRetry`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "danoniplus",
-  "version": "30.3.0",
+  "version": "30.3.1",
   "description": "Dancing☆Onigiri (CW Edition) - Web-based Rhythm Game",
   "main": "index.js",
   "scripts": {