danoniplus 40.6.0 → 40.7.0-a2

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2025/03/16
+ * Revised : 2025/03/22
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 40.6.0`;
-const g_revisedDate = `2025/03/16`;
+const g_version = `Ver 40.7.0`;
+const g_revisedDate = `2025/03/22`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -78,6 +78,7 @@ const g_isDebug = g_isLocal ||
 const isLocalMusicFile = _scoreId => g_isFile && !listMatching(getMusicUrl(_scoreId), [`.js`, `.txt`], { suffix: `$` });
 
 window.onload = async () => {
+	await new Promise(resolve => setTimeout(resolve, 500));
 	g_loadObj.main = true;
 	g_currentPage = `initial`;
 	const links = document.querySelectorAll(`link`);
@@ -2605,6 +2606,19 @@ const initialControl = async () => {
 	const customKeyList = g_headerObj.keyLists.filter(val =>
 		g_keyObj.defaultKeyList.findIndex(key => key === val) < 0);
 
+	if (customKeyList.length === 0) {
+		g_settings.preconditions = g_settings.preconditions.filter(val => !val.includes(`g_editorTmp`));
+	}
+
+	const addNewOrderGroup = (_orgList, _sortRule) => {
+		// インデックスを保持した配列を作成、ルールに従ってソート
+		const indexedList = _orgList.map((value, idx) => ({ value, idx }));
+		const sortedList = [...indexedList].sort(_sortRule);
+		// ソート後の配列のインデックスに基づいて、元のインデックスを取得
+		const newIdxs = sortedList.map(({ idx }) => indexedList.findIndex(({ idx: originalIdx }) => originalIdx === idx));
+		return !newIdxs.every((val, j) => val === j) ? newIdxs : undefined;
+	};
+
 	customKeyList.forEach(key => {
 		const keyBase = `${key}_0`;
 		const keyCtrlPtn = `${g_keyObj.defaultProp}${keyBase}`;
@@ -2613,14 +2627,21 @@ const initialControl = async () => {
 		const orgKeyNum = g_keyObj[keyCtrlPtn].length;
 		const baseX = Math.floor(Math.random() * (100 - keyGroupList.length));
 
+		const divPos = g_keyObj[`div${keyBase}`];
+		const divMaxPos = g_keyObj[`divMax${keyBase}`] ?? Math.max(...g_keyObj[`pos${keyBase}`]) + 1;
+		const stdPos = Math.max(divPos, divMaxPos - divPos);
+		const [deltaXAbove, deltaXBelow] = [(divPos - stdPos) / 2, (divMaxPos - divPos - stdPos) / 2];
+
 		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 stepRtnList = g_keyObj[`stepRtn${keyBase}_0`].filter((val, j) => filterCond(j));
 			const keyNum = g_keyObj[keyCtrlPtn].filter((val, j) => filterCond(j)).length;
 
+			// ---- Dancing☆Onigiri (CW Edition対応)のフォーマット
 			g_editorTmp[keyN] = {};
 			g_editorTmp[keyN].id = orgKeyNum * 100 + baseX + j;
 			g_editorTmp[keyN].num = keyNum;
@@ -2636,6 +2657,77 @@ const initialControl = async () => {
 				return `${frzName}_data`;
 			});
 			g_editorTmp[keyN].colorGroup = colorList.map(val => val % 3);
+
+			// orderGroupsのカスタマイズ
+			if (divMaxPos > divPos) {
+
+				// posXの実際の相対位置を計算
+				const orgPosList = g_keyObj[`pos${keyBase}`].filter((val, j) => filterCond(j));
+				const posList = orgPosList.map(val => val < divPos ? val - deltaXAbove : val - divPos - deltaXBelow);
+
+				g_editorTmp[keyN].orderGroups = [];
+
+				// パターン1: 上下グループ分けして各グループ内で位置順にソート（上下反転）
+				const upDownIdxs = addNewOrderGroup(orgPosList, (a, b) => {
+					const aAbove = a.value < divPos;
+					const bAbove = b.value < divPos;
+					if (aAbove !== bAbove) return Number(aAbove) - Number(bAbove);
+					return a.value - b.value;
+				});
+				if (upDownIdxs !== undefined) {
+					g_editorTmp[keyN].orderGroups.push(upDownIdxs);
+				}
+
+				// パターン2: 単純にステップゾーンのX座標が小さい順にソート
+				const sortedIdxs = addNewOrderGroup(posList, (a, b) => a.value - b.value);
+				if (sortedIdxs !== undefined) {
+					g_editorTmp[keyN].orderGroups.push(sortedIdxs);
+				}
+				if (g_editorTmp[keyN].orderGroups.length === 0) {
+					delete g_editorTmp[keyN].orderGroups;
+				}
+			}
+
+			// ---- ダンおに譜面作成エディタ ver3フォーマット
+
+			// 既存のシャッフルグループからミラー配列を自動生成
+			let k = 0, n = 0, convTxt = ``;
+			let prevMirrorList = [];
+			while (g_keyObj[`shuffle${keyBase}_${k}`] !== undefined) {
+
+				const orgTmpList = []
+				const mirrorTmpList = [];
+				const mirrorList = [];
+				g_keyObj[`shuffle${keyBase}_${k}`].filter((val, m) => filterCond(m))
+					.forEach((_val, _i) => orgTmpList[_val]?.push(_i) || (orgTmpList[_val] = [_i]));
+				orgTmpList.forEach((list, idx) => mirrorTmpList[idx] = list.toReversed());
+				orgTmpList?.forEach((list, a) => list?.forEach((val, b) => mirrorList[orgTmpList[a][b]] = mirrorTmpList[a][b]));
+				if (!mirrorList.every((val, p) => val === prevMirrorList[p])) {
+					convTxt += `\$conv${n + 1}=Mirror${n + 1},${mirrorList.join(',')}<br>`;
+					prevMirrorList = mirrorList.concat();
+					n++;
+				}
+				k++;
+			}
+
+			// 矢印・フリーズアローのヘッダー情報を定義
+			let noteTxt = ``, freezeTxt = ``;
+			g_editorTmp[keyN].noteNames.forEach((val, j) =>
+				noteTxt += `|${val.slice(0, -(`_data`.length))}[i]_data=[a${String(j).padStart(2, `0`)}]|[E]<br>`);
+
+			g_editorTmp[keyN].freezeNames.forEach((val, j) =>
+				freezeTxt += `|${val.slice(0, -(`_data`.length))}[i]_data=[f${String(j).padStart(2, `0`)}]|[E]<br>`);
+
+			g_editorTmp2 += g_editorTmp2Template
+				.replace(`[__KEY__]`, keyN)
+				.replace(`[__MAP__]`, colorList.map(val => val < 3 ? (val + 1) % 3 : val % 7).join(','))
+				.replace(`[__POS__]`, fillArray(keyNum).map((val, j) =>
+					isNaN(parseFloat(stepRtnList[j])) ? 28 : 24).join(`,`))
+				.replace(`[__TXT__]`, g_editorTmp[keyN].chars.map(val => val.replace(`, `, ``)).join(`,`))
+				.replace(`[__CONV__]`, convTxt)
+				.replace(`[__NOTE__]`, noteTxt)
+				.replace(`[__FREEZE__]`, freezeTxt)
+				.replaceAll(`\n`, ``);
 		});
 	});
 };
@@ -5275,9 +5367,14 @@ const preconditionInit = () => {
 
 		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),
+			copyTextToClipboard((() => {
+				const key = g_settings.preconditions[g_settings.preconditionNum * numOfPrecs + g_settings.preconditionNumSub];
+				if (key === `g_editorTmp2`) {
+					return g_editorTmp2.replaceAll(`<br>`, `\r\n`).replaceAll(`&nbsp;`, ` `);
+				} else {
+					return viewKeyStorage(key, ``, false);
+				}
+			})(), g_msgInfoObj.I_0007),
 			g_lblPosObj.btnPrecondView, g_cssObj.button_Default, g_cssObj.button_ON),
 	);
 	setUserSelect($id(`lblPrecondView`), `text`);

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2025/03/12 (v40.5.2)
+ * Revised : 2025/03/22 (v40.7.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -1179,7 +1179,7 @@ const g_settings = {
     settingWindowNum: 0,
 
     preconditions: [`g_rootObj`, `g_headerObj`, `g_keyObj`, `g_scoreObj`, `g_workObj`,
-        `g_detailObj`, `g_stateObj`, `g_attrObj`, `g_editorTmp`],
+        `g_detailObj`, `g_stateObj`, `g_attrObj`, `g_editorTmp`, `g_editorTmp2`],
     preconditionNum: 0,
     preconditionNumSub: 0,
 };
@@ -3187,7 +3187,42 @@ g_keycons.groups.forEach(type => {
     tmpName.forEach(property => g_keyObj[`${property.slice(0, -2)}`] = g_keyObj[property].concat());
 });
 
+// 外部エディター用テンプレート
+// g_editorTmp: Dancing☆Onigiriエディター (CW Edition対応)
+// g_editorTmp2: ダンおに譜面作成エディタ ver3.x
 const g_editorTmp = {};
+let g_editorTmp2 = ``;
+
+const g_editorTmp2Template = `
+<br>
+\$key=[__KEY__]<br>
+\$map=[__MAP__]<br>
+\$pos=[__POS__]<br>
+\$txt=[__TXT__]<br>
+[__CONV__]
+<br>
+\$dosformat=<br>function externalDosInit() {[E]<br>
+[E]<br>
+&nbsp;&nbsp;g_externalDos = \`[E]<br>
+[E]<br>
+[header][E]<br>
+[E]<br>
+[notestart]<br>
+[__NOTE__]
+<br>
+[__FREEZE__]
+<br>
+|speed[i]_data=[speed]|[E]<br>
+|boost[i]_data=[boost]|[E]<br>
+[datatext][E]<br>
+|edit[i]_info=[edit]|[E][E]<br>
+[noteend]<br>
+<br>
+[footer]<br>
+&nbsp;&nbsp;\`;[E]<br>
+}<br>
+<br>
+`;
 
 // 特殊キーのコピー種 (simple: 代入、multiple: 配列ごと代入)
 // 後でプロパティ削除に影響するため、先頭文字が全く同じ場合は長い方を先に定義する (例: divMax, div)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "danoniplus",
-  "version": "40.6.0",
+  "version": "40.7.0-a2",
   "description": "Dancing☆Onigiri (CW Edition) - Web-based Rhythm Game",
   "main": "./js/danoni_main.js",
   "scripts": {