danoniplus 38.2.0 → 38.3.0

package/README.md

@@ -1,7 +1,5 @@
 # Dancing☆Onigiri (CW Edition)
 
-[![CodeFactor](https://www.codefactor.io/repository/github/cwtickle/danoniplus/badge)](https://www.codefactor.io/repository/github/cwtickle/danoniplus)
-[![Codacy Badge](https://app.codacy.com/project/badge/Grade/1213a18348c34328ac4f10c9e8a2b987)](https://app.codacy.com/gh/cwtickle/danoniplus/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
 [![CodeQL](https://github.com/cwtickle/danoniplus/workflows/CodeQL/badge.svg)](https://github.com/cwtickle/danoniplus/actions?query=workflow%3ACodeQL)
 [![Discord](https://img.shields.io/discord/698460971231870977?style=flat&logo=discord&logoColor=%23ffffff&label=Discord&labelColor=%236666ff&color=%23000066)](https://discord.gg/YVWUdUGyMy)  
 [![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/cwtickle/danoniplus?sort=semver)](https://github.com/cwtickle/danoniplus/security/policy)

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2024/12/14
+ * Revised : 2025/01/08
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 38.2.0`;
-const g_revisedDate = `2024/12/14`;
+const g_version = `Ver 38.3.0`;
+const g_revisedDate = `2025/01/08`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -1107,6 +1107,7 @@ const getFontSize = (_str, _maxWidth, _font = getBasicFont(), _maxFontsize = 64,
 const createDescDiv = (_id, _str, { altId = _id, siz = g_limitObj.mainSiz } = {}) =>
 	createDivCss2Label(_id, _str, Object.assign(g_lblPosObj[altId], {
 		siz: getFontSize(_str, g_lblPosObj[altId]?.w || g_sWidth, getBasicFont(), siz),
+		pointerEvents: C_DIS_NONE,
 	}));
 
 /*-----------------------------------------------------------*/
@@ -2988,8 +2989,10 @@ const headerConvert = _dosObj => {
 	// プレイ中のショートカットキー
 	obj.keyRetry = setIntVal(getKeyCtrlVal(_dosObj.keyRetry), C_KEY_RETRY);
 	obj.keyRetryDef = obj.keyRetry;
+	obj.keyRetryDef2 = obj.keyRetry;
 	obj.keyTitleBack = setIntVal(getKeyCtrlVal(_dosObj.keyTitleBack), C_KEY_TITLEBACK);
 	obj.keyTitleBackDef = obj.keyTitleBack;
+	obj.keyTitleBackDef2 = obj.keyTitleBack;
 
 	// フリーズアローの許容フレーム数設定
 	obj.frzAttempt = setIntVal(_dosObj.frzAttempt, C_FRM_FRZATTEMPT);
@@ -6680,6 +6683,7 @@ const keyConfigInit = (_kcType = g_kcType) => {
 	const divRoot = document.getElementById(`divRoot`);
 	g_kcType = _kcType;
 	g_currentPage = `keyConfig`;
+	let selectedKc = `Default`;
 
 	// 譜面初期情報ロード許可フラグ
 	g_canLoadDifInfoFlg = false;
@@ -6845,6 +6849,7 @@ const keyConfigInit = (_kcType = g_kcType) => {
 					g_currentj = j;
 					g_currentk = k;
 					g_prevKey = -1;
+					selectedKc = `Default`;
 					g_keycons.cursorNum = g_keycons.cursorNumList.findIndex(val => val === g_currentj);
 					setKeyConfigCursor();
 				}, {
@@ -7000,12 +7005,32 @@ const keyConfigInit = (_kcType = g_kcType) => {
 		viewGroup(_type);
 	};
 
+	const kcSubX = parseFloat(keyconSprite.style.width) * ((1 - g_keyObj.scale) / 4);
+	const kcSubY = parseFloat(keyconSprite.style.height) / ((1 + g_keyObj.scale) / 2) - parseFloat(keyconSprite.style.height);
 	multiAppend(divRoot,
 
 		// ショートカットキーメッセージ
-		createDescDiv(`scMsg`, g_lblNameObj.kcShortcutDesc.split(`{0}`)
-			.join(g_isMac ? `Shift+${g_kCd[g_headerObj.keyRetry]}` : g_kCd[g_headerObj.keyTitleBack])
-			.split(`{1}`).join(g_kCd[g_headerObj.keyRetry]), { altId: `scKcMsg` }),
+		createDescDiv(`scMsg`, g_lblNameObj.kcShortcutDesc, { altId: `scKcMsg` }),
+
+		// タイトルバックのショートカットキー変更
+		createCss2Button(`scTitleBack`, getScMsg.TitleBack(), () => {
+			if (!g_isMac) {
+				cursor.style.left = wUnit(g_btnX(1 / 4) - kcSubX);
+				cursor.style.top = wUnit(g_sHeight - 160 + kcSubY);
+				selectedKc = `TitleBack`;
+			}
+		}, g_lblPosObj.scTitleBack, g_cssObj.button_Default_NoColor,
+			g_headerObj.keyTitleBack === g_headerObj.keyTitleBackDef2 ?
+				g_cssObj.title_base : g_cssObj.keyconfig_Changekey),
+
+		// リトライのショートカットキー変更
+		createCss2Button(`scRetry`, getScMsg.Retry(), () => {
+			cursor.style.left = wUnit(g_btnX(5 / 8) + kcSubX);
+			cursor.style.top = wUnit(g_sHeight - 160 + kcSubY);
+			selectedKc = `Retry`;
+		}, g_lblPosObj.scRetry, g_cssObj.button_Default_NoColor,
+			g_headerObj.keyRetry === g_headerObj.keyRetryDef2 ?
+				g_cssObj.title_base : g_cssObj.keyconfig_Changekey),
 
 		// 別キーモード警告メッセージ
 		createDivCss2Label(
@@ -7452,6 +7477,27 @@ const keyConfigInit = (_kcType = g_kcType) => {
 		// 全角切替、BackSpace、Deleteキー、Escキーは割り当て禁止
 		// また、直前と同じキーを押した場合(BackSpaceを除く)はキー操作を無効にする
 		const disabledKeys = [240, 242, 243, 244, 91, 29, 28, 27, 259, g_prevKey];
+
+		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]();
+			document.getElementById(`sc${selectedKc}`).style.fontSize = `${getFontSize(getScMsg[selectedKc](), g_btnWidth(5 / 12) - 40, getBasicFont(), 13)}px`;
+			if (g_isMac) {
+				scTitleBack.textContent = getScMsg.TitleBack();
+				scTitleBack.style.fontSize = `${getFontSize(getScMsg.TitleBack(), g_btnWidth(5 / 12) - 40, getBasicFont(), 13)}px`;
+			}
+			changeConfigColor(document.getElementById(`sc${selectedKc}`),
+				g_headerObj[`key${selectedKc}`] === g_headerObj[`key${selectedKc}Def2`] ?
+					g_cssObj.title_base : g_cssObj.keyconfig_Changekey);
+			return;
+		}
+
 		if (g_localeObj.val === `Ja`) {
 			disabledKeys.unshift(229);
 		}
@@ -8274,22 +8320,14 @@ const scoreConvert = (_dosObj, _scoreId, _preblankFrame, _dummyNo = ``,
 				// 矢印番号の組み立て
 				const colorVals = [];
 				replaceStr(patternStr[0], g_escapeStr.targetPatternName)?.split(`/`)?.forEach(val => {
-					if (val.startsWith('g')) {
-						// g付きの場合は矢印グループから対象の矢印番号を検索
-						const groupVal = setIntVal(val.slice(1));
-						for (let j = 0; j < keyNum; j++) {
-							if (g_keyObj[`color${_keyCtrlPtn}`][j] === groupVal) {
-								colorVals.push(j);
-							}
-						}
-					} else if (val.indexOf(`...`) > 0) {
+					if (val.indexOf(`...`) > 0) {
 						// 範囲指定表記の補完 例. 0...3 -> 0/1/2/3
 						const [valMin, valMax] = [val.split(`...`)[0], val.split(`...`)[1]].map(val => setIntVal(val));
 						for (let k = valMin; k <= valMax; k++) {
-							colorVals.push(setIntVal(k));
+							colorVals.push(String(k));
 						}
 					} else {
-						colorVals.push(setIntVal(val));
+						colorVals.push(val);
 					}
 				});
 
@@ -9207,6 +9245,9 @@ const getFrzLength = (_speedOnFrame, _startFrame, _endFrame) => {
 
 /**
  * キーパターン(デフォルト)に対応する矢印番号を格納
+ * - 色変化、矢印・フリーズアローモーション、スクロール変化で
+ *   矢印レーンの番号を実際のキーパターンに対応する番号に置き換える際に使用
+ * - 例: [0, 1, 2, 3, 4] -> [4, 0, 1, 2, 3]
  */
 const convertReplaceNums = () => {
 	const tkObj = getKeyInfo();
@@ -9284,7 +9325,17 @@ const pushColors = (_header, _frame, _val, _colorCd, _allFlg, _pattern = ``) =>
 			allUseTypes.push(`Frz`);
 		}
 		// 色変化情報の格納
-		baseHeaders.forEach(baseHeader => pushColor(baseHeader, g_workObj.replaceNums[_val] + addAll));
+		if (_val.startsWith('g')) {
+			// g付きの場合は矢印グループから対象の矢印番号を検索
+			const groupVal = setIntVal(_val.slice(1));
+			for (let j = 0; j < tkObj.keyNum; j++) {
+				if (g_keyObj[`color${tkObj.keyCtrlPtn}`][j] === groupVal) {
+					baseHeaders.forEach(baseHeader => pushColor(baseHeader, j + addAll));
+				}
+			}
+		} else {
+			baseHeaders.forEach(baseHeader => pushColor(baseHeader, g_workObj.replaceNums[setIntVal(_val)] + addAll));
+		}
 	};
 
 	/**
@@ -9526,6 +9577,10 @@ const getArrowSettings = () => {
 	g_gameOverFlg = false;
 	g_finishFlg = true;
 	g_workObj.nonDefaultSc = g_headerObj.keyRetry !== C_KEY_RETRY || g_headerObj.keyTitleBack !== C_KEY_TITLEBACK;
+	if (g_headerObj.scAreaWidth === 0 && (g_headerObj.keyRetry !== g_headerObj.keyRetryDef2 || g_headerObj.keyTitleBack !== g_headerObj.keyTitleBackDef2)) {
+		g_workObj.nonDefaultSc = false;
+	}
+
 	g_workObj.backX = (g_workObj.nonDefaultSc && g_headerObj.playingLayout ? g_headerObj.scAreaWidth : 0);
 	g_workObj.playingX = g_headerObj.playingX + g_workObj.backX;
 

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2024/12/02 (v38.1.0)
+ * Revised : 2025/01/08 (v38.3.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -159,6 +159,10 @@ const g_windowObj = {
 };
 
 const g_lblPosObj = {};
+const getScMsg = {
+    TitleBack: () => g_lblNameObj.kcShortcutDesc1.split(`{0}`).join(g_isMac ? `Shift+${g_kCd[g_headerObj.keyRetry]}` : g_kCd[g_headerObj.keyTitleBack]),
+    Retry: () => g_lblNameObj.kcShortcutDesc2.split(`{1}`).join(g_kCd[g_headerObj.keyRetry]),
+};
 
 /**
  * 可変部分のウィンドウサイズを更新
@@ -321,7 +325,7 @@ const updateWindowSiz = () => {
 
         /** キーコンフィグ画面 */
         scKcMsg: {
-            x: g_btnX(), y: g_sHeight - 50, w: g_btnWidth(), h: 20,
+            x: g_btnX(), y: g_sHeight - 50, w: g_btnWidth(1 / 4), h: 20,
         },
         kcMsg: {
             x: g_btnX(), y: g_sHeight - 33, w: g_btnWidth(), h: 20, siz: g_limitObj.mainSiz,
@@ -380,6 +384,14 @@ const updateWindowSiz = () => {
             w: g_btnWidth(1 / 3), h: g_limitObj.btnHeight / 2, siz: g_limitObj.btnSiz * 2 / 3,
             title: g_msgObj.kcReset,
         },
+        scTitleBack: {
+            x: g_btnX(1 / 4) + 20, y: g_sHeight - 50, align: C_ALIGN_LEFT,
+            w: g_btnWidth(5 / 12) - 40, h: C_KYC_REPHEIGHT, siz: getFontSize(getScMsg.TitleBack(), g_btnWidth(5 / 12) - 40, getBasicFont(), 13),
+        },
+        scRetry: {
+            x: g_btnX(5 / 8) + 20, y: g_sHeight - 50, align: C_ALIGN_LEFT,
+            w: g_btnWidth(5 / 12) - 40, h: C_KYC_REPHEIGHT, siz: getFontSize(getScMsg.Retry(), g_btnWidth(5 / 12) - 40, getBasicFont(), 13),
+        },
 
         /** メイン画面 */
         stepHit: {
@@ -3158,7 +3170,9 @@ const g_lang_lblNameObj = {
         kcShuffleDesc: `番号をクリックでシャッフルグループ、矢印をクリックでカラーグループを変更`,
         kcNoShuffleDesc: `矢印をクリックでカラーグループを変更`,
         sdDesc: `[クリックでON/OFFを切替、灰色でOFF]`,
-        kcShortcutDesc: `プレイ中ショートカット：「{0}」タイトルバック / 「{1}」リトライ`,
+        kcShortcutDesc: `プレイ中ショートカット：`,
+        kcShortcutDesc1: `タイトルバック: {0}`,
+        kcShortcutDesc2: `リトライ: {1}`,
         transKeyDesc: `別キーモードではキーコンフィグ、ColorType等は保存されません`,
         sdShortcutDesc: `Hid+/Sud+時ショートカット：「pageUp」カバーを上へ / 「pageDown」下へ`,
         resultImageDesc: `画像を右クリックしてコピーできます`,
@@ -3197,7 +3211,9 @@ const g_lang_lblNameObj = {
         kcShuffleDesc: `Click the number to change the shuffle group, and click the arrow to change the color.`,
         kcNoShuffleDesc: `Click the arrow to change the color group.`,
         sdDesc: `[Click to switch, gray to OFF]`,
-        kcShortcutDesc: `Shortcut during play: "{0}" Return to title / "{1}" Retry the game`,
+        kcShortcutDesc: `Shortcut during play:`,
+        kcShortcutDesc1: `Return to title: {0}`,
+        kcShortcutDesc2: `Retry the game: {1}`,
         transKeyDesc: `Key config, Color type, etc. are not saved in another key mode`,
         sdShortcutDesc: `When "Hidden+" or "Sudden+" select, "pageUp" cover up / "pageDown" cover down`,
         resultImageDesc: `You can copy the image by right-clicking on it.`,

package/package.json

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