danoniplus 45.5.6 → 45.5.8

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2026/03/20
+ * Revised : 2026/03/31
  *
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 45.5.6`;
-const g_revisedDate = `2026/03/20`;
+const g_version = `Ver 45.5.8`;
+const g_revisedDate = `2026/03/31`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -8843,7 +8843,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),
 	);
 
 	// キーの一覧を表示
@@ -9629,12 +9631,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]();
@@ -9649,14 +9656,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;
 		}
 
@@ -11766,7 +11766,7 @@ const getArrowSettings = () => {
 
 	if (g_stateObj.playWindow === `SideScroll`) {
 		if (g_stateObj.rotateEnabled) {
-			const sign = g_stateObj.playWindowType === `Reverse` ? -1 : 1;
+			const sign = g_stateObj.playWindowType === `Rev` ? -1 : 1;
 			changeStepRtn(`stepRtn`, 90 * sign);
 			changeStepRtn(`stepHitRtn`, 90 * sign);
 			changeStepRtn(`arrowRtn`, 90 * sign);
@@ -15305,7 +15305,7 @@ const getSelectedSettingList = (_shuffleName) => {
 		((g_appearanceRanges.includes(g_stateObj.appearance) && g_stateObj.filterLock === C_FLG_ON) ? `(${g_hidSudObj.filterPos}%)` : ``),
 		withOptions(g_stateObj.gauge, g_settings.gauges[0]),
 		withOptions(g_stateObj.playWindow, `Default`,
-			`${getStgDetailName(g_stateObj.playWindowType === `Reverse` ? `R-` : ``)}${getStgDetailName(g_stateObj.playWindow)}`),
+			`${getStgDetailName(g_stateObj.playWindowType === `Rev` ? `R-` : ``)}${getStgDetailName(g_stateObj.playWindow)}`),
 		withOptions(g_stateObj.stepArea, `Default`),
 		withOptions(g_stateObj.frzReturn, C_FLG_OFF,
 			`FR:${getStgDetailName(g_stateObj.frzReturn)}(${getStgDetailName(g_stateObj.frzReturnType)})`),

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2026/03/15 (v45.5.5)
+ * Revised : 2026/03/31 (v45.5.8)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -1338,7 +1338,7 @@ const g_settings = {
     playWindows: [`Default`, `Stairs`, `Slope`, `Distorted`, `SideScroll`],
     playWindowNum: 0,
 
-    playWindowTypes: [`---`, `Reverse`],
+    playWindowTypes: [`---`, `Rev`],
     playWindowTypeNum: 0,
 
     stepAreas: [`Default`, `Halfway`, `2Step`, `Mismatched`, `R-Mismatched`, `X-Flower`, `Alt-Crossing`],
@@ -1719,7 +1719,7 @@ const motionAlphaToggle = (_obj, _property) => {
  * PlayWindow適用関数
  * - 対応するキー名: g_settings.playWindows
  */
-const g_playWindowDir = () => g_stateObj.playWindowType === `Reverse` ? 1 : -1;
+const g_playWindowDir = () => g_stateObj.playWindowType === `Rev` ? 1 : -1;
 const g_changeStairs = (_rad) => `rotate(${_rad * g_playWindowDir()}deg)`;
 const g_changeSkew = (_rad) => `Skew(${_rad * g_playWindowDir()}deg, ${_rad * g_playWindowDir()}deg) scaleY(0.9)`;
 
@@ -4445,6 +4445,7 @@ const g_lblNameObj = {
     'u_R-': `R-`,
     'u_---': `---`,
     'u_Reverse': `Reverse`,
+    'u_Rev': `Reverse`,
 
     'u_Mirror': `Mirror`,
     'u_X-Mirror': `X-Mirror`,

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "danoniplus",
-  "version": "45.5.6",
+  "version": "45.5.8",
   "description": "Dancing☆Onigiri (CW Edition) - Web-based Rhythm Game",
   "main": "./js/danoni_main.js",
+  "jsdelivr": "./js/danoni_main.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },