danoniplus 46.2.0 → 46.2.1

package/README.md

@@ -1,8 +1,9 @@
 # Dancing☆Onigiri (CW Edition)
 
 [![CodeQL](https://github.com/cwtickle/danoniplus/workflows/CodeQL/badge.svg)](https://github.com/cwtickle/danoniplus/actions?query=workflow%3ACodeQL)
-![CodeRabbit Pull Request Reviews](https://img.shields.io/coderabbit/prs/github/cwtickle/danoniplus?utm_source=oss&utm_medium=github&utm_campaign=cwtickle%2Fdanoniplus&labelColor=171717&color=FF570A&link=https%3A%2F%2Fcoderabbit.ai&label=CodeRabbit+Reviews)
-[![Discord](https://img.shields.io/discord/698460971231870977?style=flat&logo=discord&logoColor=%23ffffff&label=Discord&labelColor=%236666ff&color=%23000066)](https://discord.gg/YVWUdUGyMy)  
+![CodeRabbit Pull Request Reviews](https://img.shields.io/coderabbit/prs/github/cwtickle/danoniplus?utm_source=oss&utm_medium=github&utm_campaign=cwtickle%2Fdanoniplus&labelColor=171717&color=FF570A&link=https%3A%2F%2Fcoderabbit.ai&label=CodeRabbit+Reviews&logo=coderabbit)
+[![Discord](https://img.shields.io/discord/698460971231870977?style=flat&logo=discord&logoColor=%23ffffff&label=Discord&labelColor=%236666ff&color=%23000066)](https://discord.gg/YVWUdUGyMy)
+[![DeepWiki](https://img.shields.io/badge/DeepWiki-cwtickle%2Fdanoniplus-blue.svg?logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAyCAYAAAAnWDnqAAAAAXNSR0IArs4c6QAAA05JREFUaEPtmUtyEzEQhtWTQyQLHNak2AB7ZnyXZMEjXMGeK/AIi+QuHrMnbChYY7MIh8g01fJoopFb0uhhEqqcbWTp06/uv1saEDv4O3n3dV60RfP947Mm9/SQc0ICFQgzfc4CYZoTPAswgSJCCUJUnAAoRHOAUOcATwbmVLWdGoH//PB8mnKqScAhsD0kYP3j/Yt5LPQe2KvcXmGvRHcDnpxfL2zOYJ1mFwrryWTz0advv1Ut4CJgf5uhDuDj5eUcAUoahrdY/56ebRWeraTjMt/00Sh3UDtjgHtQNHwcRGOC98BJEAEymycmYcWwOprTgcB6VZ5JK5TAJ+fXGLBm3FDAmn6oPPjR4rKCAoJCal2eAiQp2x0vxTPB3ALO2CRkwmDy5WohzBDwSEFKRwPbknEggCPB/imwrycgxX2NzoMCHhPkDwqYMr9tRcP5qNrMZHkVnOjRMWwLCcr8ohBVb1OMjxLwGCvjTikrsBOiA6fNyCrm8V1rP93iVPpwaE+gO0SsWmPiXB+jikdf6SizrT5qKasx5j8ABbHpFTx+vFXp9EnYQmLx02h1QTTrl6eDqxLnGjporxl3NL3agEvXdT0WmEost648sQOYAeJS9Q7bfUVoMGnjo4AZdUMQku50McDcMWcBPvr0SzbTAFDfvJqwLzgxwATnCgnp4wDl6Aa+Ax283gghmj+vj7feE2KBBRMW3FzOpLOADl0Isb5587h/U4gGvkt5v60Z1VLG8BhYjbzRwyQZemwAd6cCR5/XFWLYZRIMpX39AR0tjaGGiGzLVyhse5C9RKC6ai42ppWPKiBagOvaYk8lO7DajerabOZP46Lby5wKjw1HCRx7p9sVMOWGzb/vA1hwiWc6jm3MvQDTogQkiqIhJV0nBQBTU+3okKCFDy9WwferkHjtxib7t3xIUQtHxnIwtx4mpg26/HfwVNVDb4oI9RHmx5WGelRVlrtiw43zboCLaxv46AZeB3IlTkwouebTr1y2NjSpHz68WNFjHvupy3q8TFn3Hos2IAk4Ju5dCo8B3wP7VPr/FGaKiG+T+v+TQqIrOqMTL1VdWV1DdmcbO8KXBz6esmYWYKPwDL5b5FA1a0hwapHiom0r/cKaoqr+27/XcrS5UwSMbQAAAABJRU5ErkJggg==)](https://deepwiki.com/cwtickle/danoniplus)  
 [![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/cwtickle/danoniplus?sort=semver)](https://github.com/cwtickle/danoniplus/security/policy)
 [![GitHub All Releases](https://img.shields.io/github/downloads/cwtickle/danoniplus/total?color=%23ff3399&label=downloads%20%28recently%29)](https://github.com/cwtickle/danoniplus/releases)
 [![GitHub](https://img.shields.io/github/license/cwtickle/danoniplus)](https://github.com/cwtickle/danoniplus/blob/develop/LICENSE)  

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2026/03/19
+ * Revised : 2026/03/20
  *
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 46.2.0`;
-const g_revisedDate = `2026/03/19`;
+const g_version = `Ver 46.2.1`;
+const g_revisedDate = `2026/03/20`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -11947,6 +11947,56 @@ const getArrowSettings = () => {
 	g_workObj.orgFlatFlg = g_workObj.dividePos.every(v => v % 2 === g_workObj.dividePos[0] % 2);
 	g_stateObj.layerNumDf = Math.max(g_stateObj.layerNumDf, Math.ceil((Math.max(...g_workObj.dividePos) + 1) / 2) * 2);
 
+	// Swapping設定に応じたステップゾーンの入れ替え
+	// Mirror+のみ事前にオリジナルの位置を設定済みのためスキップする
+	if (g_workObj.stepX_df.length === 0) {
+		g_workObj.stepX_df = structuredClone(g_workObj.stepX);
+	}
+	if (g_stateObj.swapping.endsWith(`Mirror`)) {
+
+		// Swappingにおけるグループ単位での入れ替えでは、上下でステップゾーンが分かれている場合は分離してシャッフルする
+		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);
+				});
+			});
+		}
+		// オリジナルと同一の場合、設定をOFFに戻す
+		if (JSON.stringify(_styleTransDf) === JSON.stringify(_styleTrans)) {
+			g_stateObj.swapping = C_FLG_OFF;
+			g_settings.swappingNum = 0;
+		}
+
+		// 入れ替えた結果に合わせてX座標位置を入れ替える
+		_styleTrans.forEach((_group, _i) => {
+			_group.forEach((_val, _j) => {
+				g_workObj.stepX[_group[_j]] = g_workObj.stepX_df[_styleTransDf[_i][_j]];
+			});
+		});
+	}
+
 	// StepArea(Default, Halfway以外)によるレイヤー移動
 	// ずらした位置に表示するため、レイヤーを倍化して倍化した先に割り当てる
 	const assignLayer = _func => {
@@ -12030,50 +12080,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設定に応じたステップゾーンの入れ替え
-	// Mirror+のみ事前にオリジナルの位置を設定済みのためスキップする
-	if (g_workObj.stepX_df.length === 0) {
-		g_workObj.stepX_df = structuredClone(g_workObj.stepX);
-	}
-	if (g_stateObj.swapping.endsWith(`Mirror`)) {
-
-		// Swappingにおけるグループ単位での入れ替えでは、上下でステップゾーンが分かれている場合は分離してシャッフルする
-		let _style = structuredClone(Object.values(g_workObj.shuffleGroupMap));
-		const _styleTrans = _style.flatMap(arr => {
-			const small = arr.filter(n => g_keyObj[`pos${keyCtrlPtn}`][n] < g_keyObj[`div${keyCtrlPtn}`]);
-			const large = arr.filter(n => g_keyObj[`pos${keyCtrlPtn}`][n] >= g_keyObj[`div${keyCtrlPtn}`]);
-			return [
-				...(small.length ? [small] : []),
-				...(large.length ? [large] : [])
-			];
-		});
-		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);
-				});
-			});
-		}
-		// オリジナルと同一の場合、設定をOFFに戻す
-		if (JSON.stringify(_styleTransDf) === JSON.stringify(_styleTrans)) {
-			g_stateObj.swapping = C_FLG_OFF;
-			g_settings.swappingNum = 0;
-		}
-
-		// 入れ替えた結果に合わせてX座標位置を入れ替える
-		_styleTrans.forEach((_group, _i) => {
-			_group.forEach((_val, _j) => {
-				g_workObj.stepX[_group[_j]] = g_workObj.stepX_df[_styleTransDf[_i][_j]];
-			});
-		});
-	}
-
 	// FrzReturnの初期化
 	g_workObj.frzReturnFlg = false;
 	g_workObj.frzReturnSeq = g_frzReturnSeqFunc.get(g_stateObj.frzReturnType)();

package/package.json

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