danoniplus 39.8.19 → 39.8.21

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2026/03/12
+ * Revised : 2026/03/26
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 39.8.19`;
-const g_revisedDate = `2026/03/12`;
+const g_version = `Ver 39.8.21`;
+const g_revisedDate = `2026/03/26`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -7163,7 +7163,9 @@ const keyConfigInit = (_kcType = g_kcType) => {
 		createDescDiv(`kcDesc`, g_lblNameObj.kcDesc.split(`{0}`).join(g_kCd[C_KEY_RETRY])
 			.split(`{1}:`).join(g_isMac ? `` : `Delete:`)),
 
-		createDescDiv(`kcShuffleDesc`, g_headerObj.shuffleUse ? g_lblNameObj.kcShuffleDesc : g_lblNameObj.kcNoShuffleDesc),
+		createDescDiv(`kcShuffleDesc`,
+			g_headerObj.shuffleUse && g_settings.shuffles.filter(val => val.endsWith(`+`)).length > 0
+				? g_lblNameObj.kcShuffleDesc : g_lblNameObj.kcNoShuffleDesc),
 	);
 
 	// キーの一覧を表示
@@ -7947,12 +7949,17 @@ const keyConfigInit = (_kcType = g_kcType) => {
 		// また、直前と同じキーを押した場合(BackSpaceを除く)はキー操作を無効にする
 		const disabledKeys = [240, 242, 243, 244, 91, 29, 28, 27, 259, g_prevKey];
 
+		if (g_localeObj.val === `Ja`) {
+			disabledKeys.unshift(229);
+		}
+		if (disabledKeys.includes(setKey) || g_kCdN[setKey] === undefined) {
+			makeInfoWindow(g_msgInfoObj.I_0002, `fadeOut0`);
+			return;
+		} else if ((keyIsDown(g_kCdNameObj.metaLKey) || keyIsDown(g_kCdNameObj.metaRKey)) && keyIsShift()) {
+			return;
+		}
 		if (selectedKc === `TitleBack` || selectedKc === `Retry`) {
 			// プレイ中ショートカットキー変更
-			if (disabledKeys.includes(setKey) || g_kCdN[setKey] === undefined) {
-				makeInfoWindow(g_msgInfoObj.I_0002, `fadeOut0`);
-				return;
-			}
 			g_headerObj[`key${selectedKc}`] = setKey;
 			g_headerObj[`key${selectedKc}Def`] = setKey;
 			document.getElementById(`sc${selectedKc}`).textContent = getScMsg[selectedKc]();
@@ -7967,14 +7974,7 @@ const keyConfigInit = (_kcType = g_kcType) => {
 			return;
 		}
 
-		if (g_localeObj.val === `Ja`) {
-			disabledKeys.unshift(229);
-		}
-		if (disabledKeys.includes(setKey) || g_kCdN[setKey] === undefined) {
-			makeInfoWindow(g_msgInfoObj.I_0002, `fadeOut0`);
-			return;
-		} else if ((setKey === C_KEY_TITLEBACK && g_currentk === 0) ||
-			((keyIsDown(g_kCdNameObj.metaLKey) || keyIsDown(g_kCdNameObj.metaRKey)) && keyIsShift())) {
+		if (setKey === C_KEY_TITLEBACK && g_currentk === 0) {
 			return;
 		}
 
@@ -10089,6 +10089,47 @@ const getArrowSettings = () => {
 		g_workObj.frzHitShadowColorsAll[j] = ``;
 
 	}
+
+	// Swapping設定に応じたステップゾーンの入れ替え
+	if (g_stateObj.swapping.includes(`Mirror`)) {
+
+		let _style = structuredClone(Object.values(g_workObj.shuffleGroupMap));
+		const _styleTrans = _style.flatMap(arr => {
+			// g_workObj.devidePosの値ごとにグループ化する
+			const groups = {};
+
+			arr.forEach(n => {
+				const div = g_workObj.dividePos[n];
+				if (!groups[div]) groups[div] = [];
+				groups[div].push(n);
+			});
+
+			// groups は {0:[...], 1:[...], 2:[...]} のような形になるので
+			// これを配列に変換して返す
+			return Object.values(groups);
+		});
+		const _styleTransDf = structuredClone(Object.values(_styleTrans));
+		if (g_stateObj.swapping === `Mirror`) {
+			_styleTrans.map(_group => _group.reverse());
+
+		} else if (g_stateObj.swapping === `X-Mirror`) {
+			// X-Mirrorの場合、グループの内側だけ入れ替える
+			_styleTrans.forEach((group, i) => {
+				g_settings.swapPattern.forEach(val => {
+					swapGroupNums(_styleTrans, group, i, val);
+				});
+			});
+		}
+
+		// 入れ替えた結果に合わせてX座標位置を入れ替える
+		g_workObj.stepX_df = structuredClone(g_workObj.stepX);
+		_styleTrans.forEach((_group, _i) => {
+			_group.forEach((_val, _j) => {
+				g_workObj.stepX[_group[_j]] = g_workObj.stepX_df[_styleTransDf[_i][_j]];
+			});
+		});
+	}
+
 	g_workObj.orgFlatFlg = g_workObj.dividePos.every(v => v === g_workObj.dividePos[0]);
 	if (g_stateObj.stepArea === `X-Flower` || (g_stateObj.stepArea.includes(`Mismatched`) && g_workObj.orgFlatFlg)) {
 		for (let j = 0; j < keyNum; j++) {
@@ -10130,27 +10171,6 @@ const getArrowSettings = () => {
 	g_workObj.backX = (g_workObj.nonDefaultSc && g_headerObj.playingLayout ? g_headerObj.scAreaWidth : 0);
 	g_workObj.playingX = g_headerObj.playingX + g_workObj.backX;
 
-	// Swapping設定に応じたステップゾーンの入れ替え
-	if (g_stateObj.swapping.includes(`Mirror`)) {
-
-		let _style = structuredClone(Object.values(g_workObj.shuffleGroupMap));
-		if (g_stateObj.swapping === `Mirror`) {
-			_style.map(_group => _group.reverse());
-
-		} else if (g_stateObj.swapping === `X-Mirror`) {
-			// X-Mirrorの場合、グループの内側だけ入れ替える
-			_style.forEach((group, i) => g_settings.swapPattern.forEach(val => swapGroupNums(_style, group, i, val)));
-		}
-
-		// 入れ替えた結果に合わせてX座標位置を入れ替える
-		g_workObj.stepX_df = structuredClone(g_workObj.stepX);
-		_style.forEach((_group, _i) => {
-			_group.forEach((_val, _j) => {
-				g_workObj.stepX[_group[_j]] = g_workObj.stepX_df[g_workObj.shuffleGroupMap[_i][_j]];
-			});
-		});
-	}
-
 	// FrzReturnの初期化
 	g_workObj.frzReturnFlg = false;
 

package/package.json

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