danoniplus 29.3.5 → 29.4.2

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2023/01/20
+ * Revised : 2023/02/26
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 29.3.5`;
-const g_revisedDate = `2023/01/20`;
+const g_version = `Ver 29.4.2`;
+const g_revisedDate = `2023/02/26`;
 const g_alphaVersion = ``;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
@@ -580,6 +580,17 @@ const openLink = _url => {
 	}
 };
 
+/**
+ * URLのフルパスを取得
+ * @param {string} _url 
+ * @returns 
+ */
+const getFullPath = _url => {
+	const link = document.createElement(`a`);
+	link.href = _url;
+	return link.href;
+};
+
 /**
  * プリロードするファイルの設定
  * @param {string} _as 
@@ -645,7 +656,7 @@ const loadScript2 = (_url, _requiredFlg = true, _charset = `UTF-8`) => {
 		};
 		script.onerror = _err => {
 			if (_requiredFlg) {
-				makeWarningWindow(g_msgInfoObj.E_0041.split(`{0}`).join(_url.split(`?`)[0]));
+				makeWarningWindow(g_msgInfoObj.E_0041.split(`{0}`).join(getFullPath(baseUrl)));
 				reject(_err);
 			} else {
 				resolve(script);
@@ -673,7 +684,7 @@ const importCssFile2 = _href => {
 			resolve(link);
 		};
 		link.onerror = _ => {
-			makeWarningWindow(g_msgInfoObj.E_0041.split(`{0}`).join(baseUrl), { resetFlg: `title` });
+			makeWarningWindow(g_msgInfoObj.E_0041.split(`{0}`).join(getFullPath(baseUrl)), { resetFlg: `title` });
 			resolve(link);
 		};
 		document.head.appendChild(link);
@@ -3564,6 +3575,12 @@ const keysConvert = (_dosObj, { keyExtraList = _dosObj.keyExtraList.split(`,`) }
 					g_keyObj[`divMax${ptnName}`] = setVal(tmpDivPtn[1], -1, C_TYP_FLOAT);
 				}
 			}
+		} else if (g_keyObj[`chara${newKey}_0`] !== undefined) {
+			// 特に指定が無い場合はcharaX_Yの配列長で決定
+			for (let k = 0; k < tmpMinPatterns; k++) {
+				const ptnName = `${newKey}_${k + dfPtnNum}`;
+				g_keyObj[`div${ptnName}`] = g_keyObj[`chara${newKey}_0`].length;
+			}
 		}
 
 		// ステップゾーン位置 (posX_Y)
@@ -3602,6 +3619,14 @@ const keysConvert = (_dosObj, { keyExtraList = _dosObj.keyExtraList.split(`,`) }
 
 		// シャッフルグループ (shuffleX_Y)
 		newKeyTripleParam(newKey, `shuffle`);
+		if (g_keyObj[`shuffle${newKey}_${dfPtnNum}_0`] === undefined) {
+			// 特に指定が無い場合はcolorX_Yの配列長で決定
+			for (let k = 0; k < tmpMinPatterns; k++) {
+				const ptnName = `${newKey}_${k + dfPtnNum}`;
+				g_keyObj[`shuffle${ptnName}_0`] = [...Array(g_keyObj[`color${ptnName}`].length)].fill(0);
+				g_keyObj[`shuffle${ptnName}`] = structuredClone(g_keyObj[`shuffle${ptnName}_0`]);
+			}
+		}
 
 		// スクロールパターン (scrollX_Y)
 		// |scroll(newKey)=Cross::1,1,-1,-1,-1,1,1/Split::1,1,1,-1,-1,-1,-1$...|
@@ -4696,15 +4721,22 @@ const createOptionWindow = _sprite => {
 	}
 
 	const setReverse = _btn => {
-		g_settings.reverseNum = (g_settings.reverseNum + 1) % 2;
-		g_stateObj.reverse = g_settings.reverses[g_settings.reverseNum];
-		setReverseView(_btn);
+		if (!g_settings.scrolls.includes(`Reverse`)) {
+			g_settings.reverseNum = (g_settings.reverseNum + 1) % 2;
+			g_stateObj.reverse = g_settings.reverses[g_settings.reverseNum];
+			setReverseView(_btn);
+		}
 	};
 
 	const setReverseView = _btn => {
 		_btn.classList.replace(g_cssObj[`button_Rev${g_settings.reverses[(g_settings.reverseNum + 1) % 2]}`],
 			g_cssObj[`button_Rev${g_settings.reverses[g_settings.reverseNum]}`]);
-		_btn.textContent = `${g_lblNameObj.Reverse}:${getStgDetailName(g_stateObj.reverse)}`;
+		if (!g_settings.scrolls.includes(`Reverse`)) {
+			_btn.textContent = `${g_lblNameObj.Reverse}:${getStgDetailName(g_stateObj.reverse)}`;
+		} else {
+			_btn.textContent = `X`;
+			setReverseDefault();
+		}
 	};
 
 	// ---------------------------------------------------
@@ -5097,6 +5129,10 @@ const createOptionWindow = _sprite => {
 			spriteList[visibleScr].style.display = C_DIS_INHERIT;
 			spriteList[hiddenScr].style.display = C_DIS_NONE;
 			setSetting(0, visibleScr);
+
+			g_shortcutObj.option.KeyR.id = g_settings.scrolls.includes(`Reverse`) ?
+				g_shortcutObj.option.KeyR.exId : g_shortcutObj.option.KeyR.dfId;
+
 			if (g_settings.scrolls.length > 1) {
 				setReverseView(document.querySelector(`#btnReverse`));
 			}
@@ -5280,11 +5316,18 @@ const getKeyReverse = (_localStorage, _extraKeyName = ``) => {
 		g_stateObj.reverse = _localStorage[`reverse${_extraKeyName}`] ?? C_FLG_OFF;
 		g_settings.reverseNum = roundZero(g_settings.reverses.findIndex(reverse => reverse === g_stateObj.reverse));
 	} else {
-		g_stateObj.reverse = C_FLG_OFF;
-		g_settings.reverseNum = 0;
+		setReverseDefault();
 	}
 };
 
+/**
+ * リバースのデフォルト化処理
+ */
+const setReverseDefault = _ => {
+	g_stateObj.reverse = C_FLG_OFF;
+	g_settings.reverseNum = 0;
+};
+
 /**
  * 保存済みキーコンフィグ取得処理
  * @param {object} _localStorage 保存先のローカルストレージ名
@@ -6433,7 +6476,7 @@ const loadMusic = _ => {
 			lblLoading.textContent = g_lblNameObj.pleaseWait;
 			setAudio(blobUrl);
 		} else {
-			makeWarningWindow(`${g_msgInfoObj.E_0032}<br>(${request.status} ${request.statusText})`, { backBtnUse: true });
+			makeWarningWindow(`${g_msgInfoObj.E_0041.split('{0}').join(getFullPath(musicUrl))}<br>(${request.status} ${request.statusText})`, { backBtnUse: true });
 		}
 	});
 

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2023/01/20 (v29.3.5)
+ * Revised : 2023/01/28 (v29.4.1)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -1182,7 +1182,7 @@ const g_shortcutObj = {
         KeyM: { id: `lnkMotionR` },
         ArrowUp: { id: `lnkScrollL` },
         ArrowDown: { id: `lnkScrollR` },
-        KeyR: { id: `lnkReverseR` },
+        KeyR: { id: `lnkReverseR`, dfId: `lnkReverseR`, exId: `btnReverse` },
 
         ShiftLeft_KeyS: { id: `lnkShuffleL` },
         KeyS: { id: `lnkShuffleR` },

package/package.json

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