danoniplus 46.0.1 → 46.2.0

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2026/03/14
+ * Revised : 2026/03/19
  *
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 46.0.1`;
-const g_revisedDate = `2026/03/14`;
+const g_version = `Ver 46.2.0`;
+const g_revisedDate = `2026/03/19`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -4682,6 +4682,24 @@ const getKeyName = _key => unEscapeHtml(escapeHtml(g_keyObj[`keyName${_key}`]?.[
  */
 const getKeyUnitName = _key => unEscapeHtml(escapeHtml(g_keyObj[`keyName${_key}`]?.[1] ?? `key`));
 
+/**
+ * シャッフル名の取得
+ * @returns {string}
+ */
+const getShuffleName = () => {
+	const orgShuffleFlg = getOrgShuffleFlg();
+	return `${getStgDetailName(g_stateObj.shuffle)}${!orgShuffleFlg && !g_stateObj.shuffle.endsWith(`+`) ? getStgDetailName('(S)') : ''}`;
+};
+
+/**
+ * シャッフルカスタムフラグの取得
+ * @returns {boolean}
+ */
+const getOrgShuffleFlg = () => {
+	const keyCtrlPtn = `${g_keyObj.currentKey}_${g_keyObj.currentPtn}`;
+	return g_keyObj[`shuffle${keyCtrlPtn}`].filter((shuffleGr, j) => shuffleGr !== g_keyObj[`shuffle${keyCtrlPtn}_0d`][j]).length === 0;
+};
+
 /**
  * 別キーモード時の表示名の取得
  * @param {boolean} _spaceFlg
@@ -6553,10 +6571,8 @@ const visibleSettingSummary = _visible => {
 
 const updateSettingSummary = () => {
 	if (document.getElementById(`settingSumSprite`) === null) return;
-	const keyCtrlPtn = `${g_keyObj.currentKey}_${g_keyObj.currentPtn}`;
-	const orgShuffleFlg = g_keyObj[`shuffle${keyCtrlPtn}`].filter((shuffleGr, j) => shuffleGr !== g_keyObj[`shuffle${keyCtrlPtn}_0d`][j]).length === 0;
-	const shuffleName = `${getStgDetailName(g_stateObj.shuffle)}${!orgShuffleFlg && !g_stateObj.shuffle.endsWith(`+`) ? getStgDetailName('(S)') : ''}`;
-	const settingData = getSelectedSettingList(shuffleName);
+	const orgShuffleFlg = getOrgShuffleFlg();
+	const settingData = getSelectedSettingList(orgShuffleFlg);
 	const estimatedHighscoreCondition = g_stateObj.dataSaveFlg && (g_stateObj.autoPlay !== C_FLG_ALL && g_headerObj.playbackRate === 1 && g_stateObj.fadein < 10 &&
 		(g_stateObj.shuffle === C_FLG_OFF || (g_stateObj.shuffle.endsWith(`Mirror`) && orgShuffleFlg)));
 
@@ -8767,11 +8783,14 @@ const exSettingInit = () => {
  * 拡張設定込みの標準設定
  * @param {any[]} _spriteList
  * @param {string} _name 
- * @param {{ defaultList?: string[], displayName?: string }} [options={}]
+ * @param {{ defaultList?: string[], displayName?: string, func?: function, funcEx?: function }} [options={}]
  * @param {string[]} [options.defaultList=[C_FLG_OFF]] 拡張設定未使用の設定リスト
  * @param {string} [options.displayName='exSetting']
+ * @param {function} [options.func=()=>true] 通常ボタン用追加関数
+ * @param {function} [options.funcEx=()=>true] 拡張ボタン用追加関数
  */
-const createGeneralSettingEx = (_spriteList, _name, { defaultList = [C_FLG_OFF], displayName = `exSetting` } = {}) => {
+const createGeneralSettingEx = (_spriteList, _name, { defaultList = [C_FLG_OFF], displayName = `exSetting`,
+	func = () => true, funcEx = () => true } = {}) => {
 	if (_spriteList?.[_name] === undefined) return;
 
 	/**
@@ -8799,11 +8818,13 @@ const createGeneralSettingEx = (_spriteList, _name, { defaultList = [C_FLG_OFF],
 		createCss2Button(`lnk${toCapitalize(_name)}Type`, getStgDetailName(g_stateObj[`${_name}Type`]),
 			() => {
 				setSetting(1, `${_name}Type`, { maxSiz: g_limitObj.difSelectorSiz });
+				funcEx();
 				createExpandedScView(_name);
 			},
 			Object.assign({
 				cxtFunc: () => {
 					setSetting(-1, `${_name}Type`, { maxSiz: g_limitObj.difSelectorSiz });
+					funcEx();
 					createExpandedScView(_name);
 				},
 				title: g_msgObj[`${_name}Type`] ?? ``,
@@ -8830,6 +8851,7 @@ const createGeneralSettingEx = (_spriteList, _name, { defaultList = [C_FLG_OFF],
 			if (typeEnabled) {
 				setExpandedBtnSiz();
 			}
+			func();
 		},
 	});
 	if (typeEnabled) {
@@ -10246,7 +10268,11 @@ const applyMirror = (_keyNum, _shuffleGroup, _swapFlg = false) => {
 	const mirStyle = structuredClone(style);
 
 	if (_swapFlg) {
-		style.forEach((group, i) => g_settings.swapPattern.forEach(val => swapGroupNums(style, group, i, val)));
+		style.forEach((group, i) => {
+			g_settings.swapPattern.forEach(val => {
+				swapGroupNums(style, group, i, val);
+			});
+		});
 		let swapUseFlg = false;
 		style.forEach((_group, j) => {
 			_group.forEach((val, k) => {
@@ -11785,6 +11811,7 @@ const getArrowSettings = () => {
 	// 各種初期化
 	// g_workObj.frzArrowInitRtnはフリーズアロー(初期表示)としての利用に限定
 	g_workObj.stepX = [];
+	g_workObj.stepX_df = [];
 	g_workObj.scrollDir = [];
 	g_workObj.scrollDirDefault = [];
 	g_workObj.dividePos = [];
@@ -11877,7 +11904,12 @@ const getArrowSettings = () => {
 
 		const posj = g_keyObj[`pos${keyCtrlPtn}`][j];
 		const colorj = g_keyObj[`color${keyCtrlPtn}`][j];
-		const stdPos = posj - ((posj > divideCnt ? posMax : 0) + divideCnt) / 2;
+		let stdPos = posj - ((posj > divideCnt ? posMax : 0) + divideCnt) / 2;
+
+		if (g_stateObj.swapping === `Mirror+`) {
+			g_workObj.stepX_df[j] = g_keyObj.blank * stdPos + (g_headerObj.playingWidth - C_ARW_WIDTH) / 2;
+			stdPos = -stdPos;
+		}
 
 		g_workObj.stepX[j] = g_keyObj.blank * stdPos + (g_headerObj.playingWidth - C_ARW_WIDTH) / 2;
 		const baseLayer = g_keyObj[`layerGroup${keyCtrlPtn}`]?.[j] || 0;
@@ -11999,22 +12031,45 @@ const getArrowSettings = () => {
 	g_workObj.playingX = g_headerObj.playingX + g_workObj.backX;
 
 	// Swapping設定に応じたステップゾーンの入れ替え
-	if (g_stateObj.swapping.includes(`Mirror`)) {
+	// 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`) {
-			_style.map(_group => _group.reverse());
+			_styleTrans.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)));
+			_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座標位置を入れ替える
-		g_workObj.stepX_df = structuredClone(g_workObj.stepX);
-		_style.forEach((_group, _i) => {
+		_styleTrans.forEach((_group, _i) => {
 			_group.forEach((_val, _j) => {
-				g_workObj.stepX[_group[_j]] = g_workObj.stepX_df[g_workObj.shuffleGroupMap[_i][_j]];
+				g_workObj.stepX[_group[_j]] = g_workObj.stepX_df[_styleTransDf[_i][_j]];
 			});
 		});
 	}
@@ -12427,7 +12482,7 @@ const mainInit = () => {
 	const musicTitle = (g_headerObj.musicTitles[g_headerObj.musicNos[g_stateObj.scoreId]] || g_headerObj.musicTitle) + playbackView;
 	const artistName = g_headerObj.artistNames[g_headerObj.musicNos[g_stateObj.scoreId]] || g_headerObj.artistName;
 	const assistFlg = (g_autoPlaysBase.includes(g_stateObj.autoPlay) ? `` : `-${getStgDetailName(g_stateObj.autoPlay)}${getStgDetailName('less')}`);
-	const shuffleName = (g_stateObj.shuffle !== C_FLG_OFF ? `: ${getStgDetailName(g_stateObj.shuffle)}` : ``);
+	const shuffleName = (g_stateObj.shuffle !== C_FLG_OFF ? `: ${getShuffleName()}` : ``);
 
 	// 曲名・アーティスト名、譜面名のサイズ調整
 	const checkMusicSiz = (_text, _siz) => getFontSize2(_text, g_headerObj.playingWidth - g_headerObj.customViewWidth - 125, { maxSiz: _siz });
@@ -13656,7 +13711,8 @@ const makeStepZone = (_j, _keyCtrlPtn) => {
 		// 本体
 		createColorObject2(`step${_j}`, {
 			rotate: g_workObj.stepRtn[_j], styleName: `Step`, display: g_workObj.stepZoneDisp,
-		}, g_cssObj.main_stepDefault),
+		}, g_cssObj[`main_step${g_workObj.stepX[_j] === g_workObj.stepX_df[_j] ? 'Default'
+			: g_stateObj.swapping === 'Mirror+' ? 'Shobon' : 'Matari'}`]),
 
 		// 空押し
 		createColorObject2(`stepDiv${_j}`, {
@@ -14610,11 +14666,10 @@ const resultInit = () => {
 			mTitleForView[j] = g_headerObj.musicTitlesForView[g_headerObj.musicNos[g_stateObj.scoreId]][j] + (j === 1 ? playbackView : ``));
 	}
 
-	const keyCtrlPtn = `${g_keyObj.currentKey}_${g_keyObj.currentPtn}`;
 	const transKeyName = getTransKeyName();
-	const orgShuffleFlg = g_keyObj[`shuffle${keyCtrlPtn}`].filter((shuffleGr, j) => shuffleGr !== g_keyObj[`shuffle${keyCtrlPtn}_0d`][j]).length === 0;
-	const shuffleName = `${getStgDetailName(g_stateObj.shuffle)}${!orgShuffleFlg && !g_stateObj.shuffle.endsWith(`+`) ? getStgDetailName('(S)') : ''}`;
-	const settingData = getSelectedSettingList(shuffleName);
+	const orgShuffleFlg = getOrgShuffleFlg();
+	const shuffleName = getShuffleName();
+	const settingData = getSelectedSettingList(orgShuffleFlg);
 
 	const [lblRX, dataRX] = [20, 60];
 	multiAppend(playDataWindow,
@@ -15297,10 +15352,10 @@ const resultInit = () => {
 
 /**
  * 選択した設定の情報を取得
- * @param {string} _shuffleName 
+ * @param {boolean} _orgShuffleFlg
  * @returns {object}
  */
-const getSelectedSettingList = (_shuffleName) => {
+const getSelectedSettingList = (_orgShuffleFlg) => {
 
 	const transKeyName = getTransKeyName();
 	/**
@@ -15323,7 +15378,7 @@ const getSelectedSettingList = (_shuffleName) => {
 		`${getKeyName(g_headerObj.keyLabels[g_stateObj.scoreId])}${transKeyName} ${keyUnitName} / ${g_headerObj.difLabels[g_stateObj.scoreId]}`,
 		`${withOptions(g_autoPlaysBase.includes(g_stateObj.autoPlay), true, `-${getStgDetailName(g_stateObj.autoPlay)}${getStgDetailName('less')}`)}`,
 		`${withOptions(g_headerObj.makerView, false, `(${g_headerObj.creatorNames[g_stateObj.scoreId]})`)}`,
-		`${withOptions(g_stateObj.shuffle, C_FLG_OFF, `[${_shuffleName}]`)}`
+		`${withOptions(g_stateObj.shuffle, C_FLG_OFF, `[${getShuffleName()}]`)}`
 	];
 	let difData = difDatas.filter(value => value !== ``).join(` `);
 	const difDataForImage = difDatas.filter((value, j) => value !== `` && j !== 2).join(` `);
@@ -15349,7 +15404,8 @@ const getSelectedSettingList = (_shuffleName) => {
 			withOptions(g_stateObj.camoufrageType, C_FLG_HYPHEN,
 				`${g_stateObj.camoufrage !== C_FLG_OFF ? '' : 'Cmf:'}${getStgDetailName(g_stateObj.camoufrageType)}`)
 		].filter(value => value !== ``).join(`+`),
-		withOptions(g_stateObj.swapping, C_FLG_OFF, `Swap:${getStgDetailName(g_stateObj.swapping)}`),
+		withOptions(g_stateObj.swapping, C_FLG_OFF,
+			`Swap:${getStgDetailName(g_stateObj.swapping)}${!_orgShuffleFlg && !g_stateObj.swapping.endsWith(`+`) ? getStgDetailName(`(S)`) : ``}`),
 		withOptions(g_stateObj.judgRange, `Normal`, `Judg:${getStgDetailName(g_stateObj.judgRange)}`),
 	].filter(value => value !== ``).join(`, `);
 

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2026/03/12 (v46.0.0)
+ * Revised : 2026/03/15 (v46.1.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -1367,7 +1367,7 @@ const g_settings = {
     camoufrageTypes: [C_FLG_HYPHEN, `FrzArrow`],
     camoufrageTypeNum: 0,
 
-    swappings: [C_FLG_OFF, `Mirror`, `X-Mirror`],
+    swappings: [C_FLG_OFF, `Mirror`, `X-Mirror`, `Mirror+`],
     swappingNum: 0,
 
     judgRanges: [`Normal`, `Narrow`, `Hard`, `ExHard`],
@@ -4461,6 +4461,7 @@ const g_lblNameObj = {
     'u_Random+': `Random+`,
     'u_S-Random': `S-Random`,
     'u_S-Random+': `S-Random+`,
+    'u_Mirror+': `Mirror+`,
     'u_(S)': `(S)`,
 
     'u_ALL': `ALL`,
@@ -4749,7 +4750,7 @@ const g_lang_msgObj = {
         scroll: `各レーンのスクロール方向をパターンに沿って設定します。\nReverse:ONでスクロール方向を反転します。`,
         shuffle: `譜面を左右反転したり、ランダムにします。\nランダムにした場合は別譜面扱いとなり、ハイスコアは保存されません。`,
         autoPlay: `オートプレイや一部キーを自動で打たせる設定を行います。\nオートプレイ時はハイスコアを保存しません。`,
-        gauge: `クリア条件を設定します。\n[Start] ゲージ初期値, [Border] クリア条件(ハイフン時は0),\n[Recovery] 回復量, [Damage] ダメージ量, [Accuracy] クリアに必要な正確率(オンマウスで許容ミス数表示)`,
+        gauge: `クリア条件を設定します。\n[Start] ゲージ初期値, [Border] クリア条件(ハイフン時は0),\n[Recovery] 回復量, [Damage] ダメージ量, [Accuracy] クリアに必要な正確率、許容ミス数`,
         excessive: `空押し判定を行うか設定します。`,
         adjustment: `曲とのタイミングにズレを感じる場合、\n数値を変えることでフレーム単位のズレを直すことができます。\n外側のボタンは5f刻み、真ん中は1f刻み、内側は0.5f刻みで調整できます。`,
         fadein: `譜面を途中から再生します。\n途中から開始した場合はハイスコアを保存しません。`,
@@ -4789,7 +4790,7 @@ const g_lang_msgObj = {
         effect: `矢印・フリーズアローにエフェクトをかけます。\n[Dizzy/Spin] 矢印が回転します\n[Wave/Storm] 矢印の軌道が左右に揺れます\n[Blinking] 矢印が点滅します\n[Squids] 矢印が伸び縮みします`,
         camoufrage: `ステップの見た目が配置は同じでランダムに変わります。`,
         camoufrageType: `[FrzArrow] フリーズアローの帯部分を初期表示のみ非表示にし、矢印のみで表示します（ヒット/失敗時は帯を再表示）`,
-        swapping: `ステップゾーンの位置をグループ単位で入れ替えます。`,
+        swapping: `ステップゾーンの位置を入れ替える設定です。\n[Mirror] ステップゾーンの位置をグループ単位で入れ替えます。\n[X-Mirror] ステップゾーンの中央部分のみグループ単位で入れ替えます。\n[Mirror+] ステップゾーンの位置をグループに関係なく全体的に反転します。`,
         judgRange: `判定の許容範囲を設定します。\n[Normal] 通常、[Narrow/Hard] 辛判定、[ExHard] 激辛判定`,
         autoRetry: `自動リトライの条件を設定します。\n[Miss] ミス時、[Matari] マターリ時、[Shakin] シャキン時、[FS] Fast/Slow発生時`,
 
@@ -4846,7 +4847,7 @@ const g_lang_msgObj = {
         scroll: `Set the scroll direction for each lane according to the pattern.\nIf "Reverse:ON" sets, reverse the scroll direction.`,
         shuffle: `Flip the chart left and right or make it random.\nIf you make it random, it will be treated as other charts and the high score will not be saved.`,
         autoPlay: `Set to auto play and to hit some keys automatically.\nHigh score is not saved during auto play.`,
-        gauge: `Set the clear condition.\n[Start] initial value, [Border] borderline value (hyphen means zero),\n[Recovery] recovery amount, [Damage] damage amount,\n[Accuracy] accuracy required to clear (mouseover to see the number of allowed mistakes)`,
+        gauge: `Set the clear condition.\n[Start] initial value, [Border] borderline value (hyphen means zero),\n[Recovery] recovery amount, [Damage] damage amount,\n[Accuracy] accuracy required to clear and the number of allowed mistakes`,
         excessive: `Set whether to use excessive miss judgment.`,
         adjustment: `If you feel that the timing is out of sync with the music, \nyou can correct the shift in frame units by changing the value.\nThe outer button can be adjusted in 5 frame increments, the middle in 1 frame increments, \nand the inner button in 0.5 frame increments.`,
         fadein: `Plays the chart from the middle.\nIf you start in the middle, the high score will not be saved.`,
@@ -4887,7 +4888,7 @@ const g_lang_msgObj = {
         effect: `Applies effects to the arrows and freeze arrows.\n[Dizzy/Spin] Arrows rotate.\n[Wave/Storm] Swing from left to right.\n[Blinking] Arrows blink.\n[Squids] Arrows stretch and shrink.`,
         camoufrage: `The appearance of the steps changes randomly with the same placement.`,
         camoufrageType: `[FrzArrow] Initially hides freeze-arrow bars and displays only the arrow portion (bars reappear on hit/failure)`,
-        swapping: `Replaces the position of step zones on a group-by-group basis.`,
+        swapping: `This setting allows you to swap the positions of the step zones.\n[Mirror] Swaps the positions of step zones within each shuffle group. \n[X-Mirror] Swaps only the central portion of step zones within each shuffle group.\n[Mirror+] Flips the position of all step zones, regardless of shuffle groups. `,
         judgRange: `Set the allowable range of judgment.\n[Normal] Normal judgment, [Narrow/Hard] Hard judgment, [ExHard] Very hard judgment`,
         autoRetry: `Set the conditions for automatic retry.\n[Miss] When missed, [Matari] When good, [Shakin] When great, [FS] When Fast/Slow occurs`,
 

package/package.json

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