danoniplus 35.1.0 → 35.3.0

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2024/02/03
+ * Revised : 2024/02/16
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 35.1.0`;
-const g_revisedDate = `2024/02/03`;
+const g_version = `Ver 35.3.0`;
+const g_revisedDate = `2024/02/16`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -3699,6 +3699,41 @@ const keysConvert = (_dosObj, { keyExtraList = _dosObj.keyExtraList?.split(`,`)
 		makeBaseArray(_str.split(`/`).map(n => getKeyCtrlVal(n)), g_keyObj.minKeyCtrlNum, 0);
 	const toSplitArrayStr = _str => _str.split(`/`).map(n => n);
 
+	// 略記記法を元の文字列に復元後、配列に変換 (1...3,5...7 -> 1,2,3,5,6,7)
+	const toOriginalArray = (_val, _func) => _val?.split(`,`).map(n => _func(n)).join(`,`).split(`,`);
+
+	/**
+	 * 略記記法を元の文字列に変換 (1...5 -> 1,2,3,4,5 / 3...+4 -> 3,4,5,6,7)
+	 * @param {string} _str 
+	 */
+	const toFloatStr = _str => {
+		const nums = _str?.split(`...`);
+		const bottomMark = nums[0].startsWith(`b`) ? `b` : ``;
+		const [startN, endN] = [parseFloat(bottomMark === `b` ? nums[0].slice(1) : nums[0]), parseFloat(nums[1])];
+
+		if (nums.length === 2 && !isNaN(startN) && !isNaN(endN)) {
+			const endN2 = nums[1].startsWith(`+`) ? startN + endN : endN;
+			const arr = [];
+			for (let k = startN; k <= endN2; k++) {
+				arr.push(`${bottomMark}${k}`);
+			}
+			return arr.join(`,`);
+		} else {
+			return _str;
+		}
+	};
+
+	/**
+	 * 略記記法を元の文字列に変換 (1@:5 -> 1,1,1,1,1 / onigiri!giko!c@:2 -> onigiri,giko,c,onigiri,giko,c)
+	 * @param {string} _str
+	 */
+	const toSameValStr = _str => {
+		const nums = _str?.split(`@:`);
+		const groupStr = toFloatStr(nums[0]).split(`!`).join(`,`);
+		return nums.length === 2 && !isNaN(parseInt(nums[1])) ?
+			[...Array(Math.floor(parseInt(nums[1])))].fill(groupStr).join(`,`) : groupStr;
+	};
+
 	/**
 	 * キーパターン（相対パターン）をキーパターン（実際のパターン番号）に変換
 	 * 例) 12_(0) -> 12_4
@@ -3751,8 +3786,9 @@ const keysConvert = (_dosObj, { keyExtraList = _dosObj.keyExtraList?.split(`,`)
 					continue;
 				}
 				// |keyCtrl9j=Tab,7_0,Enter| -> |keyCtrl9j=Tab,S,D,F,Space,J,K,L,Enter| のように補完
+				// |pos9j=0..4,6..9| -> |pos9j=0,1,2,3,4,6,7,8,9|
 				g_keyObj[`${keyheader}_${k + dfPtn}`] =
-					tmpArray[k].split(`,`).map(n =>
+					toOriginalArray(tmpArray[k], toSameValStr).map(n =>
 						structuredClone(g_keyObj[`${_name}${getKeyPtnName(n)}`]) ?? [_convFunc(n)]
 					).flat();
 				if (baseCopyFlg) {
@@ -3803,7 +3839,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| )の場合の取り込み
 						// 部分的にキーパターン指定があった場合は既存パターンを展開 (例: |shuffle9j=2,7_0_0,2|)
 						g_keyObj[`${keyheader}_${k + dfPtn}_${ptnCnt}`] =
-							makeBaseArray(list.split(`,`).map(n =>
+							makeBaseArray(toOriginalArray(list, toSameValStr).map(n =>
 								structuredClone(g_keyObj[`${_name}${getKeyPtnName(n)}`]) ??
 								[isNaN(parseInt(n)) ? n : parseInt(n, 10)]
 							).flat(), g_keyObj[`${g_keyObj.defaultProp}${_key}_${k + dfPtn}`].length, 0);
@@ -3879,7 +3915,7 @@ const keysConvert = (_dosObj, { keyExtraList = _dosObj.keyExtraList?.split(`,`)
 					// 部分的にキーパターン指定があった場合は既存パターンを展開 (例: |scroll9j=Cross::1,7_0,1|)
 					const tmpParamPair = pairs.split(`::`);
 					g_keyObj[pairName][tmpParamPair[0]] =
-						makeBaseArray(tmpParamPair[1]?.split(`,`).map(n =>
+						makeBaseArray(toOriginalArray(tmpParamPair[1], toSameValStr)?.map(n =>
 							structuredClone(g_keyObj[`${_pairName}${getKeyPtnName(n)}`]?.[tmpParamPair[0]]) ??
 							[n === `-` ? -1 : parseInt(n, 10)]
 						).flat(), g_keyObj[`${g_keyObj.defaultProp}${_key}_${k + dfPtn}`].length, _defaultVal);

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2024/01/28 (v35.0.0)
+ * Revised : 2024/02/08 (v35.2.1)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -1793,6 +1793,13 @@ const g_keyObj = {
     chara5_2: [`left`, `down`, `space`, `up`, `right`],
     chara8_2: [`sleft`, `left`, `leftdia`, `down`, `space`, `up`, `rightdia`, `right`],
 
+    // 頻度の高い譜面データ名パターン
+    // 後で chara4A, chara4A_a, chara4A_b, ... に変換する
+    ptchara4A: [`left`, `down`, `up`, `right`],
+    ptchara3S: [`left`, `leftdia`, `down`],
+    ptchara3J: [`up`, `rightdia`, `right`],
+    ptchara7: [`left`, `leftdia`, `down`, `space`, `up`, `rightdia`, `right`],
+
     // ColorGroup - 1
     //  - 同じ数字が同じグループになる
     color5_0_0: [0, 0, 0, 0, 2],
@@ -1930,6 +1937,12 @@ const g_keyObj = {
     // ShapeGroup - 3 (矢印回転、AAキャラクタ)
     stepRtn17_0_2: [45, 45, 0, 0, -45, -45, -90, -90, `onigiri`, 90, 90, 135, 135, 180, 180, 225, 225],
 
+    // 頻度の高い部分ShapeGroupの定義
+    stepRtn4A: [0, -90, 90, 180],
+    stepRtn3S: [0, -45, -90],
+    stepRtn3J: [90, 135, 180],
+    stepRtn3Z: [`giko`, `onigiri`, `iyo`],
+
     // 各キーの区切り位置
     // - 未指定の場合は下段への折り返し無し
     div9i_0: 6,
@@ -2008,6 +2021,17 @@ const g_keyObj = {
 
     keyCtrl8_5: [[`Shift`], [`Z`], [`S`], [`X`, `C`], [`D`, `F`], [`V`], [`G`], [`B`]],
 
+    // 頻度の高い部分キーコンフィグの定義
+    keyCtrl4A: [[`Left`], [`Down`], [`Up`], [`Right`]],
+    keyCtrl4S: [[`S`], [`D`], [`E`, `R`], [`F`]],
+    keyCtrl4J: [[`J`], [`K`], [`I`, `O`], [`L`]],
+    keyCtrl4W: [[`W`], [`E`], [`D3`, `D4`], [`R`]],
+    keyCtrl4U: [[`U`], [`I`], [`D8`, `D9`], [`O`]],
+    keyCtrl3S: [[`S`], [`D`], [`F`]],
+    keyCtrl3J: [[`J`], [`K`], [`L`]],
+    keyCtrl3W: [[`W`], [`E`], [`R`]],
+    keyCtrl3Z: [[`Z`], [`X`], [`C`]],
+
     // 隣接するステップゾーン間の距離
     blank: 55,
     blank_def: 55,
@@ -2368,6 +2392,13 @@ Object.keys(g_copyKeyPtn).forEach(keyPtnTo => {
     }
 });
 
+// 頻度の高い譜面データ名の自動生成 (left -> aleft, bleft, ..., zleft を生成)
+Object.keys(g_keyObj).filter(val => val.startsWith(`ptchara`)).forEach(charaPtn => {
+    g_keyObj[`${charaPtn.slice(2)}`] = g_keyObj[charaPtn].concat();
+    [...Array(26)].map((a, b) => (10 + b).toString(36)).forEach(alphabet =>
+        g_keyObj[`${charaPtn.slice(2)}_${alphabet}`] = g_keyObj[charaPtn].map(str => `${alphabet}${str}`));
+});
+
 // デフォルト配列のコピー (g_keyObj.aaa_X から g_keyObj.aaa_Xd を作成)
 // keyCtrlX_Yについて1キーにつき2キー割り当てできるように配列を補完
 const keyCtrlName = Object.keys(g_keyObj).filter(val => val.startsWith(`keyCtrl`));

package/package.json

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