danoniplus 40.2.0 → 40.3.1

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2025/03/07
+ * Revised : 2025/03/10
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 40.2.0`;
-const g_revisedDate = `2025/03/07`;
+const g_version = `Ver 40.3.1`;
+const g_revisedDate = `2025/03/10`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -475,19 +475,20 @@ const getIndent = (_level) => ' '.repeat(_level * 4);
  * ストレージ情報の取得
  * @param {string} _name g_storageFuncの実行キー名
  * @param {string} _key g_storageFuncの実行キーの引数
+ * @param {boolean} [_colorFmt=true]
  * @returns {string}
  */
-const viewKeyStorage = (_name, _key = ``) => {
+const viewKeyStorage = (_name, _key = ``, _colorFmt = true) => {
 
 	// キャッシュ設定
 	if (!viewKeyStorage.cache) {
 		viewKeyStorage.cache = new Map();
 	}
-	const cacheKey = _key + _name;
+	const cacheKey = _key + _name + String(_colorFmt);
 	if (viewKeyStorage.cache.has(cacheKey)) {
 		return viewKeyStorage.cache.get(cacheKey);
 	}
-	const result = formatObject(g_storageFunc.get(_name)?.(_key) || setVal(_name, ``, C_TYP_CALC));
+	const result = formatObject(g_storageFunc.get(_name)?.(_key) || setVal(_name, ``, C_TYP_CALC), 0, { colorFmt: _colorFmt });
 	viewKeyStorage.cache.set(cacheKey, result);
 	return result;
 }
@@ -498,11 +499,11 @@ const viewKeyStorage = (_name, _key = ``) => {
  * @param {Number} _indent 
  * @param {boolean} [colorFmt=true] フォーマット加工フラグ
  * @param {string} [rootKey=''] オブジェクトの最上位プロパティ名
- * @param {Object} [_parent=null]
  * @returns {string}
  */
 const formatObject = (_obj, _indent = 0, { colorFmt = true, rootKey = `` } = {}) => {
-	if (_obj === null || typeof _obj !== 'object') {
+	const isObj = _obj => typeof _obj === C_TYP_OBJECT && _obj !== null;
+	if (!isObj(_obj)) {
 		return JSON.stringify(_obj);
 	}
 	const baseIndent = getIndent(_indent);
@@ -541,53 +542,101 @@ const formatObject = (_obj, _indent = 0, { colorFmt = true, rootKey = `` } = {})
 					// keyCtrlXの対応キー表示処理
 					return (g_kCd[_value] && _value !== 0) ? `${_value}|<span style="color:#ffff66">${g_kCd[_value]}</span>` : `----`;
 				}
-			} else if (typeof _value === C_TYP_OBJECT && _value !== null) {
+			} else if (isObj(_value)) {
 				return formatObject(_value, _indent + 1, { colorFmt, rootKey: _rootKey });
 			}
 		}
 		return JSON.stringify(_value);
 	};
 
-	// 二次元配列の整形処理
-	if (Array.isArray(_obj)) {
-		if (_obj.length === 0) {
-			return '[]';
-		}
-		if (colorFmt && _obj.length > 100) {
-			const filteredArray = _obj.reduce((result, value, index) => {
-				if (hasVal(value)) {
-					result.push(`${index}: ${formatValue(value, rootKey)}`);
+	/**
+	 * 配列の装飾処理
+	 * @param {number[]|string[]} _obj 
+	 * @returns {string}
+	 */
+	const formatArrayValue = (_obj) => {
+
+		const formatSetArray = (_list, _numOfSet = 2) => {
+			if (_list.findIndex(val => val === rootKey) >= 0) {
+				let result = `[`;
+				for (let j = 0; j < _obj.length; j += _numOfSet) {
+					result += `<br>${nestedIndent}${_obj[j]}: ${_obj[j + 1]}`;
+					for (let k = 0; k < _numOfSet - 2; k++) {
+						const idx = j + k + 2;
+						if (idx < _obj.length) {
+							result += `, ${formatValue(_obj[idx], rootKey)}`;
+						}
+					}
 				}
+				result += (_obj.length === 0 ? `` : `<br>${baseIndent}`) + `]`;
 				return result;
-			}, []);
-			return `{<br>${baseIndent}[<br>${filteredArray.join(',<br>')}<br>]<br>}`;
-		}
-		const isArrayOfArrays = _obj.every(item => Array.isArray(item));
-		const formattedArray = _obj
-			.map(value => {
-				const isNestedObject = typeof value === 'object' && value !== null;
-				return isArrayOfArrays
-					? `${nestedIndent}${formatValue(value, rootKey)}`
-					: isNestedObject
-						? formatObject(value, _indent + 1, { colorFmt, rootKey })
-						: formatValue(value, rootKey)
-			}).filter(val => !hasVal(val) || val !== `----`).join(isArrayOfArrays ? `,<br>` : `, `);
-
-		return `[${isArrayOfArrays ? `<br>` : ``}${formattedArray}${isArrayOfArrays ? `<br>${baseIndent}` : ''}]`;
-	}
-
-	// オブジェクトのネスト整形処理
-	const formattedEntries = Object.entries(_obj)
-		.map(([key, value]) => {
-			const isNestedObject = typeof value === 'object' && value !== null;
-			const baseKey = rootKey === `` ? key : rootKey;
-			const formattedValue = isNestedObject
-				? formatObject(value, _indent + 1, { colorFmt, rootKey: baseKey }, _obj)
-				: formatValue(value, baseKey);
-			return `<br>${nestedIndent}"${key}": ${formattedValue}`;
-		}).filter(val => !hasVal(val) || val !== `----`).join(`,`);
-
-	let result = `{${formattedEntries}<br>${baseIndent}}`;
+			}
+			return ``;
+		};
+		if (colorFmt) {
+			if (typeof _obj[0] === C_TYP_NUMBER) {
+				let result;
+				Object.keys(g_dataSetObj).forEach(key =>
+					result ||= formatSetArray(g_dataSetObj[key], Number(key)));
+				if (result !== ``) {
+					return result;
+				}
+			}
+			if (_obj.length > 100) {
+				const filteredArray = _obj.reduce((result, value, index) => {
+					if (hasVal(value)) {
+						result.push(`${index}: ${formatValue(value, rootKey)}`);
+					}
+					return result;
+				}, []);
+				return `[<br>${nestedIndent}${filteredArray.join(`,<br>${nestedIndent}`)}<br>${baseIndent}]`;
+			}
+		}
+		return ``;
+	};
+
+	/**
+	 * 配列・オブジェクトのネスト整形処理
+	 * @returns {string}
+	 */
+	const formatCollection = () => {
+		const isArray = Array.isArray(_obj);
+		const isArrayOfArrays = isArray && _obj.every(item => Array.isArray(item));
+		const getNextObject = (_item, _rootKey) => isObj(_item)
+			? formatObject(_item, _indent + 1, { colorFmt, rootKey: _rootKey })
+			: formatValue(_item, _rootKey);
+
+		if (isArray) {
+			let result = formatArrayValue(_obj);
+			if (result !== ``) {
+				return result;
+			}
+		}
+
+		// 配列またはオブジェクトの各要素をフォーマット
+		const formattedEntries = (isArray
+			? _obj.map(item => {
+				const formattedValue = isArrayOfArrays
+					? `<br>${nestedIndent}${formatValue(item, rootKey)}`
+					: getNextObject(item, rootKey);
+				return formattedValue;
+			})
+			: Object.entries(_obj).map(([key, value]) => {
+				const formattedValue = getNextObject(value, rootKey === `` ? key : rootKey);
+				return `<br>${nestedIndent}"${key}": ${formattedValue}`;
+			})).filter(val => !hasVal(val) || val !== `----`);
+
+		// 配列なら[]で囲む、オブジェクトなら{}で囲む
+		if (isArray) {
+			return _obj.length === 0
+				? '[]'
+				: `[${formattedEntries.join(', ')}${isArrayOfArrays ? `<br>${baseIndent}` : ''}]`;
+		} else {
+			return `{${formattedEntries.join(',')}<br>${baseIndent}}`;
+		}
+	};
+
+	let result = formatCollection();
 	if (!colorFmt) {
 		result = result.replaceAll(`<br>`, `\r\n`).replaceAll(`&nbsp;`, ` `);
 	}
@@ -2538,6 +2587,44 @@ const initialControl = async () => {
 			delete g_keyObj[key];
 		}
 	});
+
+	// エディター用のフォーマッター作成
+	const customKeyList = g_headerObj.keyLists.filter(val =>
+		g_keyObj.defaultKeyList.findIndex(key => key === val) < 0);
+
+	customKeyList.forEach(key => {
+		const keyBase = `${key}_0`;
+		const keyCtrlPtn = `${g_keyObj.defaultProp}${keyBase}`;
+		const keyGroup = g_keyObj[`keyGroup${keyBase}`];
+		const keyGroupList = makeDedupliArray(keyGroup.flat());
+		const orgKeyNum = g_keyObj[keyCtrlPtn].length;
+		const baseX = Math.floor(Math.random() * (100 - keyGroupList.length));
+
+		keyGroupList.forEach((keyGroupNo, j) => {
+			const keyN = keyGroupNo === `0` ? key : `${key}_${j + 1}`;
+			const filterCond = (j) => keyGroup[j].findIndex(val => val === keyGroupNo) >= 0;
+			const keyCtrlList = g_keyObj[keyCtrlPtn].filter((val, j) => filterCond(j));
+			const charaList = g_keyObj[`chara${keyBase}`].filter((val, j) => filterCond(j));
+			const colorList = g_keyObj[`color${keyBase}_0`].filter((val, j) => filterCond(j));
+			const keyNum = g_keyObj[keyCtrlPtn].filter((val, j) => filterCond(j)).length;
+
+			g_editorTmp[keyN] = {};
+			g_editorTmp[keyN].id = orgKeyNum * 100 + baseX + j;
+			g_editorTmp[keyN].num = keyNum;
+			g_editorTmp[keyN].chars = keyCtrlList.map(val => g_kCd[val[0]]);
+			g_editorTmp[keyN].keys = keyCtrlList.map(val => g_kCdN[val[0]]).map(val => replaceStr(val, g_escapeStr.editorKey));
+			g_editorTmp[keyN].alternativeKeys = keyCtrlList.map(val => val[1] === 0 ? `` : g_kCdN[val[1]]).map(val => replaceStr(val, g_escapeStr.editorKey));
+			g_editorTmp[keyN].noteNames = charaList.map(val => `${val}_data`);
+			g_editorTmp[keyN].freezeNames = charaList.map(val => {
+				let frzName = replaceStr(val, g_escapeStr.frzName);
+				if (frzName.indexOf(`frz`) === -1 && frzName.indexOf(`foni`) === -1) {
+					frzName = frzName.replaceAll(frzName, `frz${toCapitalize(frzName)}`);
+				}
+				return `${frzName}_data`;
+			});
+			g_editorTmp[keyN].colorGroup = colorList.map(val => val % 3);
+		});
+	});
 };
 
 /**
@@ -5009,10 +5096,12 @@ const dataMgtInit = () => {
 		g_stateObj[`dm_${key}`] = C_FLG_OFF;
 		g_settings.dataMgtNum[key] = 0;
 
+		const keyWidth = Math.min(Math.max(50, getStrWidth(getKeyName(key), g_limitObj.setLblSiz, getBasicFont())), 80);
 		keyListSprite.appendChild(createMgtButton(key, j - 2, 0, {
-			w: Math.max(50, getStrWidth(getKeyName(key) + `    `, g_limitObj.setLblSiz, getBasicFont())),
+			w: keyWidth,
+			siz: getFontSize(getKeyName(key), keyWidth, getBasicFont(), g_limitObj.setLblSiz, 10),
 		}));
-		document.getElementById(`btn${key}`).innerHTML = getKeyName(key);
+		document.getElementById(`btn${toCapitalize(key)}`).innerHTML = getKeyName(key);
 
 		keyListSprite.appendChild(createCss2Button(`btnView${key}`, ``, evt => {
 			keyList.forEach(keyx => {
@@ -5146,6 +5235,11 @@ const preconditionInit = () => {
 				.replace(/[\t\n]/g, ``), 0, 15, g_cssObj.flex_centering),
 
 		createDivCss2Label(`lblPrecondView`, viewKeyStorage(`g_rootObj`), g_lblPosObj.lblPrecondView),
+		createCss2Button(`btnPrecondView`, g_lblNameObj.b_copyStorage, () =>
+			copyTextToClipboard(
+				viewKeyStorage(g_settings.preconditions[g_settings.preconditionNum * numOfPrecs + g_settings.preconditionNumSub], ``, false),
+				g_msgInfoObj.I_0007),
+			g_lblPosObj.btnPrecondView, g_cssObj.button_Default, g_cssObj.button_ON),
 	);
 	setUserSelect($id(`lblPrecondView`), `text`);
 
@@ -5175,6 +5269,7 @@ const preconditionInit = () => {
 			}
 			lblPrecondView.innerHTML = viewKeyStorage(g_settings.preconditions[g_settings.preconditionNum * numOfPrecs + j]);
 			lblPrecondView.scrollTop = 0;
+			g_settings.preconditionNumSub = j;
 			evt.target.classList.replace(g_cssObj.button_Default, g_cssObj.button_Reset);
 		}, {
 			x: g_btnX() + g_btnWidth((j % (numOfPrecs / 2)) / (numOfPrecs / 2 + 1)),

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2025/03/02 (v40.1.0)
+ * Revised : 2025/03/10 (v40.3.1)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -283,6 +283,9 @@ const updateWindowSiz = () => {
         btnKeyStorage: {
             x: g_btnX(1) - 140, y: 100 + g_sHeight / 4 + 10, w: 70, h: 20, siz: 16,
         },
+        btnPrecondView: {
+            x: g_btnX(1) - 90, y: 110, w: 70, h: 20, siz: 16,
+        },
 
         /** 設定画面 */
         btnBack: {
@@ -785,6 +788,18 @@ const g_escapeStr = {
         [`all[]`, `sumData(g_detailObj.arrowCnt[{0}]) + sumData(g_detailObj.frzCnt[{0}])`],
         [`maxlife[]`, `g_headerObj.maxLifeVal`],
     ],
+    editorKey: [
+        [`ArrowLeft`, `KeyU`],
+        [`ArrowDown`, `KeyI`],
+        [`ArrowUp`, `Digit8`],
+        [`ArrowRight`, `KeyO`],
+        [`Space`, `KeyG`],
+        [`KeyB`, `KeyH`],
+        [`Enter`, `BackSlash`],
+        [`ShiftLeft`, `KeyZ`],
+        [`ShiftRight`, `Slash`],
+        [`Tab`, `KeyQ`],
+    ]
 };
 
 /** 設定・オプション画面用共通 */
@@ -1156,8 +1171,9 @@ const g_settings = {
     settingWindowNum: 0,
 
     preconditions: [`g_rootObj`, `g_headerObj`, `g_keyObj`, `g_scoreObj`, `g_workObj`,
-        `g_detailObj`, `g_stateObj`, `g_attrObj`],
+        `g_detailObj`, `g_stateObj`, `g_attrObj`, `g_editorTmp`],
     preconditionNum: 0,
+    preconditionNumSub: 0,
 };
 
 g_settings.volumeNum = g_settings.volumes.length - 1;
@@ -2487,6 +2503,7 @@ const g_keyObj = {
     dfPtnNum: 0,
 
     minKeyCtrlNum: 2,
+    defaultKeyList: [],
 
     // キー別ヘッダー
     // - 譜面データ中に出てくる矢印(ノーツ)の種類と順番(ステップゾーン表示順)を管理する
@@ -3023,6 +3040,11 @@ const g_keyObj = {
 // g_keyObj.defaultProp の上書きを禁止
 Object.defineProperty(g_keyObj, `defaultProp`, { writable: false });
 
+// 既定のキー定義リストを動的に作成
+Object.keys(g_keyObj)
+    .filter(key => key.startsWith(g_keyObj.defaultProp) && key.endsWith(`_0`))
+    .forEach(key => g_keyObj.defaultKeyList.push(key.split(`_`)[0].slice(g_keyObj.defaultProp.length)));
+
 // キーパターンのコピーリスト
 // ・コピー先：コピー元の順に指定する
 // ・上から順に処理する
@@ -3157,6 +3179,8 @@ g_keycons.groups.forEach(type => {
     tmpName.forEach(property => g_keyObj[`${property.slice(0, -2)}`] = g_keyObj[property].concat());
 });
 
+const g_editorTmp = {};
+
 // 特殊キーのコピー種 (simple: 代入、multiple: 配列ごと代入)
 // 後でプロパティ削除に影響するため、先頭文字が全く同じ場合は長い方を先に定義する (例: divMax, div)
 const g_keyCopyLists = {
@@ -3235,6 +3259,17 @@ const g_dataMinObj = {
     style: 1,
 };
 
+/**
+ * データフォーマット管理用
+ * - セット数: 対象の配列名の組で記述
+ */
+const g_dataSetObj = {
+    2: [`speedData`, `boostData`],
+    4: [`colorData`, `arrowCssMotionData`, `frzCssMotionData`,
+        `dummyArrowCssMotionData`, `dummyFrzCssMotionData`],
+    5: [`ncolorData`, `scrollchData`],
+}
+
 const g_dfColorObj = {
 
     // 矢印初期色情報
@@ -3447,6 +3482,7 @@ const g_lang_msgInfoObj = {
         I_0004: `musicUrlが設定されていないため、無音モードで再生します`,
         I_0005: `正規のミラー譜面で無いため、ハイスコアは保存されません`,
         I_0006: `ローカルストレージ情報をクリップボードにコピーしました！`,
+        I_0007: `オブジェクト情報をクリップボードにコピーしました！`,
     },
     En: {
         W_0001: `Your browser is not guaranteed to work.<br>
@@ -3501,6 +3537,7 @@ const g_lang_msgInfoObj = {
         I_0004: `Play in silence mode because "musicUrl" is not set`,
         I_0005: `Highscore is not saved because not a regular mirrored chart.`,
         I_0006: `Local storage information copied to clipboard!`,
+        I_0007: `Object information copied to clipboard!`,
     },
 };
 

package/package.json

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