danoniplus 31.7.1 → 32.1.0

package/js/danoni_main.js

@@ -4,13 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2023/05/04
+ * Revised : 2023/05/07
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 31.7.1`;
-const g_revisedDate = `2023/05/04`;
-const g_alphaVersion = ``;
+const g_version = `Ver 32.1.0`;
+const g_revisedDate = `2023/05/13`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -121,6 +120,10 @@ const g_presetObj = {
 let g_headerObj = {};
 let g_scoreObj = {};
 let g_attrObj = {};
+
+const g_btnFunc = {
+	base: {}, reset: {}, cxt: {},
+};
 let g_btnAddFunc = {};
 let g_btnDeleteFlg = {};
 let g_cxtAddFunc = {};
@@ -543,7 +546,7 @@ const commonKeyDown = (_evt, _displayName, _func = _code => { }, _dfEvtFlg) => {
 	if (!_dfEvtFlg) {
 		_evt.preventDefault();
 	}
-	const setCode = transCode(_evt.code);
+	const setCode = _evt.code;
 	if (_evt.repeat && (g_unrepeatObj.page.includes(_displayName) || g_unrepeatObj.key.includes(setCode))) {
 		return blockCode(setCode);
 	}
@@ -576,8 +579,9 @@ const commonKeyDown = (_evt, _displayName, _func = _code => { }, _dfEvtFlg) => {
  * @param {object} _evt 
  */
 const commonKeyUp = _evt => {
-	g_inputKeyBuffer[g_kCdNameObj.metaKey] = false;
-	g_inputKeyBuffer[transCode(_evt.code)] = false;
+	g_inputKeyBuffer[g_kCdNameObj.metaLKey] = false;
+	g_inputKeyBuffer[g_kCdNameObj.metaRKey] = false;
+	g_inputKeyBuffer[_evt.code] = false;
 };
 
 /**
@@ -1268,6 +1272,8 @@ const createCss2Button = (_id, _text, _func = _ => true, { x = 0, y = g_sHeight
 			resetFunc(evt);
 		}
 	});
+	g_btnFunc.base[_id] = _func;
+	g_btnFunc.reset[_id] = resetFunc;
 
 	// 右クリック時の処理
 	div.oncontextmenu = evt => {
@@ -1278,6 +1284,8 @@ const createCss2Button = (_id, _text, _func = _ => true, { x = 0, y = g_sHeight
 			if (typeof g_cxtAddFunc[_id] === C_TYP_FUNCTION) {
 				g_cxtAddFunc[_id](evt, cxtFunc);
 			}
+			g_btnFunc.cxt[_id] = cxtFunc;
+
 		} else if (typeof g_cxtAddFunc[_id] === C_TYP_FUNCTION) {
 			g_cxtAddFunc[_id](evt);
 		}
@@ -1335,7 +1343,7 @@ const resetKeyControl = _ => {
 	document.onkeyup = _ => { };
 	document.onkeydown = evt => {
 		evt.preventDefault();
-		return blockCode(transCode(evt.code));
+		return blockCode(evt.code);
 	};
 	g_inputKeyBuffer = {};
 };
@@ -2848,10 +2856,12 @@ const headerConvert = _dosObj => {
 	// 無音のフレーム数
 	obj.blankFrame = 200;
 	obj.blankFrameDef = 200;
+	obj.blankFrameDefs = [];
 	if (isNaN(parseFloat(_dosObj.blankFrame))) {
 	} else {
-		obj.blankFrame = parseInt(_dosObj.blankFrame);
-		obj.blankFrameDef = parseInt(_dosObj.blankFrame);
+		obj.blankFrameDefs = _dosObj.blankFrame.split(`$`).map(val => parseInt(val));
+		obj.blankFrame = obj.blankFrameDefs[0];
+		obj.blankFrameDef = obj.blankFrameDefs[0];
 	}
 
 	// 開始フレーム数（0以外の場合はフェードインスタート）、終了フレーム数
@@ -3578,9 +3588,12 @@ const keysConvert = (_dosObj, { keyExtraList = _dosObj.keyExtraList?.split(`,`)
 				if (existParam(tmpArray[k], `${keyheader}_${k + dfPtn}`)) {
 					continue;
 				}
-				const keyPtn = getKeyPtnName(tmpArray[k]);
-				g_keyObj[`${keyheader}_${k + dfPtn}`] = g_keyObj[`${_name}${keyPtn}`] !== undefined ?
-					structuredClone(g_keyObj[`${_name}${keyPtn}`]) : tmpArray[k].split(`,`).map(n => _convFunc(n));
+				// |keyCtrl9j=Tab,7_0,Enter| -> |keyCtrl9j=Tab,S,D,F,Space,J,K,L,Enter| のように補完
+				g_keyObj[`${keyheader}_${k + dfPtn}`] =
+					tmpArray[k].split(`,`).map(n =>
+						g_keyObj[`${_name}${getKeyPtnName(n)}`] !== undefined ?
+							structuredClone(g_keyObj[`${_name}${getKeyPtnName(n)}`]) : [_convFunc(n)]
+					).flat();
 				if (baseCopyFlg) {
 					g_keyObj[`${keyheader}_${k + dfPtn}d`] = structuredClone(g_keyObj[`${keyheader}_${k + dfPtn}`]);
 				}
@@ -3618,7 +3631,8 @@ const keysConvert = (_dosObj, { keyExtraList = _dosObj.keyExtraList?.split(`,`)
 						g_keyObj[`${keyheader}_${k + dfPtn}_${ptnCnt}`] = [...Array(g_keyObj[`${g_keyObj.defaultProp}${_key}_${k + dfPtn}`].length)].fill(0);
 
 					} else if (g_keyObj[`${_name}${keyPtn}_0`] !== undefined) {
-						// 他のキーパターン (例: |shuffle8i=8_0| ) を指定した場合、該当があれば既存パターンからコピー
+						// 他のキーパターン (例: |shuffle8i=8_0| ) を直接指定した場合、該当があれば既存パターンからコピー
+						// 既存パターンが複数ある場合、全てコピーする
 						let m = 0;
 						while (g_keyObj[`${_name}${keyPtn}_${m}`] !== undefined) {
 							g_keyObj[`${keyheader}_${k + dfPtn}_${ptnCnt}`] = structuredClone(g_keyObj[`${_name}${keyPtn}_${m}`]);
@@ -3627,9 +3641,13 @@ const keysConvert = (_dosObj, { keyExtraList = _dosObj.keyExtraList?.split(`,`)
 						}
 					} else {
 						// 通常の指定方法 (例: |shuffle8i=1,1,1,2,0,0,0,0/1,1,1,1,0,0,0,0| )の場合の取り込み
+						// 部分的にキーパターン指定があった場合は既存パターンを展開 (例: |shuffle9j=2,7_0_0,2|)
 						g_keyObj[`${keyheader}_${k + dfPtn}_${ptnCnt}`] =
-							makeBaseArray(list.split(`,`).map(n => isNaN(parseInt(n)) ? n : parseInt(n, 10)),
-								g_keyObj[`${g_keyObj.defaultProp}${_key}_${k + dfPtn}`].length, 0);
+							makeBaseArray(list.split(`,`).map(n =>
+								g_keyObj[`${_name}${getKeyPtnName(n)}`] !== undefined ?
+									structuredClone(g_keyObj[`${_name}${getKeyPtnName(n)}`]) :
+									[isNaN(parseInt(n)) ? n : parseInt(n, 10)]
+							).flat(), g_keyObj[`${g_keyObj.defaultProp}${_key}_${k + dfPtn}`].length, 0);
 						ptnCnt++;
 					}
 				});
@@ -3651,14 +3669,19 @@ const keysConvert = (_dosObj, { keyExtraList = _dosObj.keyExtraList?.split(`,`)
 	 * @param {string} _key キー数
 	 * @param {string} _name 名前
 	 * @param {string} _type float, number, string, boolean
+	 * @param {string} _defaultVal
 	 */
-	const newKeySingleParam = (_key, _name, _type) => {
+	const newKeySingleParam = (_key, _name, _type, _defaultVal) => {
 		const keyheader = _name + _key;
 		const dfPtn = setIntVal(g_keyObj.dfPtnNum);
 		if (_dosObj[keyheader] !== undefined) {
 			const tmps = _dosObj[keyheader].split(`$`);
 			for (let k = 0; k < tmps.length; k++) {
-				g_keyObj[`${keyheader}_${k + dfPtn}`] = setVal(g_keyObj[`${_name}${tmps[k]}`], setVal(tmps[k], ``, _type));
+				g_keyObj[`${keyheader}_${k + dfPtn}`] = setVal(g_keyObj[`${_name}${getKeyPtnName(tmps[k])}`],
+					tmps[k].indexOf(`_`) !== -1 ? _defaultVal : setVal(tmps[k], ``, _type));
+			}
+			for (let k = tmps.length; k < g_keyObj.minPatterns; k++) {
+				g_keyObj[`${keyheader}_${k + dfPtn}`] = g_keyObj[`${keyheader}_0`];
 			}
 		}
 	};
@@ -3695,11 +3718,15 @@ const keysConvert = (_dosObj, { keyExtraList = _dosObj.keyExtraList?.split(`,`)
 						// 他のキーパターン指定時、該当があればプロパティを全コピー
 						Object.assign(g_keyObj[pairName], g_keyObj[`${_pairName}${keyPtn}`]);
 					} else {
-						// 通常の指定方法（例：|scroll8i=Cross::1,1,1,-1,-1,-1,1,1/Split::1,1,1,1,-1,-1,-1,-1|）から取り込み
+						// 通常の指定方法（例：|scroll8i=Cross::1,1,1,-,-,-,1,1/Split::1,1,1,1,-,-,-,-|）から取り込み
+						// 部分的にキーパターン指定があった場合は既存パターンを展開 (例: |scroll9j=Cross::1,7_0,1|)
 						const tmpParamPair = pairs.split(`::`);
 						g_keyObj[pairName][tmpParamPair[0]] =
-							makeBaseArray(tmpParamPair[1].split(`,`).map(n => parseInt(n, 10)),
-								g_keyObj[`${g_keyObj.defaultProp}${_key}_${k + dfPtn}`].length, _defaultVal);
+							makeBaseArray(tmpParamPair[1].split(`,`).map(n =>
+								g_keyObj[`${_pairName}${getKeyPtnName(n)}`] !== undefined ?
+									structuredClone(g_keyObj[`${_pairName}${getKeyPtnName(n)}`][tmpParamPair[0]]) :
+									[n === `-` ? -1 : parseInt(n, 10)]
+							).flat(), g_keyObj[`${g_keyObj.defaultProp}${_key}_${k + dfPtn}`].length, _defaultVal);
 					}
 				});
 			}
@@ -3770,19 +3797,19 @@ const keysConvert = (_dosObj, { keyExtraList = _dosObj.keyExtraList?.split(`,`)
 		}
 
 		// ステップゾーン間隔 (blankX_Y)
-		newKeySingleParam(newKey, `blank`, C_TYP_FLOAT);
+		newKeySingleParam(newKey, `blank`, C_TYP_FLOAT, g_keyObj.blank_def);
 
 		// 矢印群の倍率 (scaleX_Y)
-		newKeySingleParam(newKey, `scale`, C_TYP_FLOAT);
+		newKeySingleParam(newKey, `scale`, C_TYP_FLOAT, g_keyObj.scale_def);
 
 		// プレイ中ショートカット：リトライ (keyRetryX_Y)
-		newKeySingleParam(newKey, `keyRetry`, C_TYP_STRING);
+		newKeySingleParam(newKey, `keyRetry`, C_TYP_STRING, C_KEY_RETRY);
 
 		// プレイ中ショートカット：タイトルバック (keyTitleBackX_Y)
-		newKeySingleParam(newKey, `keyTitleBack`, C_TYP_STRING);
+		newKeySingleParam(newKey, `keyTitleBack`, C_TYP_STRING, C_KEY_TITLEBACK);
 
 		// 別キーフラグ (transKeyX_Y)
-		newKeySingleParam(newKey, `transKey`, C_TYP_STRING);
+		newKeySingleParam(newKey, `transKey`, C_TYP_STRING, ``);
 
 		// シャッフルグループ (shuffleX_Y)
 		newKeyTripleParam(newKey, `shuffle`);
@@ -3972,7 +3999,7 @@ const titleInit = _ => {
 		customVersion += ` / ${g_localVersion2}`;
 	}
 	const releaseDate = (g_headerObj.releaseDate !== `` ? ` @${g_headerObj.releaseDate}` : ``);
-	const versionName = `&copy; 2018-${g_revisedDate.slice(0, 4)} ティックル, CW ${g_version}${g_alphaVersion}${customVersion}${releaseDate}`;
+	const versionName = `&copy; 2018-${g_revisedDate.slice(0, 4)} ティックル, CW ${g_version}${customVersion}${releaseDate}`;
 
 	let reloadFlg = false;
 	const getLinkSiz = _name => getFontSize(_name, g_sWidth / 2 - 20, getBasicFont(), g_limitObj.lnkSiz, 12);
@@ -6008,7 +6035,7 @@ const keyConfigInit = (_kcType = g_kcType) => {
 					setKeyConfigCursor();
 				}, {
 					x: keyconX, y: 50 + C_KYC_REPHEIGHT * k + keyconY,
-					w: C_ARW_WIDTH, h: C_KYC_REPHEIGHT, siz: g_limitObj.jdgCntsSiz,
+					w: C_ARW_WIDTH, h: C_KYC_REPHEIGHT, siz: g_limitObj.keySetSiz,
 				}, g_cssObj.button_Default_NoColor, g_cssObj.title_base)
 			);
 
@@ -6534,12 +6561,13 @@ const keyConfigInit = (_kcType = g_kcType) => {
 
 		// 全角切替、BackSpace、Deleteキー、Escキーは割り当て禁止
 		// また、直前と同じキーを押した場合(BackSpaceを除く)はキー操作を無効にする
-		const disabledKeys = [229, 240, 242, 243, 244, 91, 29, 28, 27, g_prevKey];
+		const disabledKeys = [229, 240, 242, 243, 244, 91, 29, 28, 27, 259, g_prevKey];
 		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.metaKey) && keyIsDown(g_kCdNameObj.shiftKey))) {
+			((keyIsDown(g_kCdNameObj.metaLKey) || keyIsDown(g_kCdNameObj.metaRKey)) &&
+				(keyIsDown(g_kCdNameObj.shiftLKey) || keyIsDown(g_kCdNameObj.shiftRKey)))) {
 			return;
 		}
 
@@ -6844,6 +6872,7 @@ const loadingScoreInit = async () => {
 	await loadChartFile();
 	const tkObj = getKeyInfo();
 	const [keyCtrlPtn, keyNum] = [tkObj.keyCtrlPtn, tkObj.keyNum];
+	g_headerObj.blankFrameDef = setVal(g_headerObj.blankFrameDefs[g_stateObj.scoreId], g_headerObj.blankFrameDefs[0]);
 	g_headerObj.blankFrame = g_headerObj.blankFrameDef;
 
 	// ユーザカスタムイベント
@@ -8957,7 +8986,7 @@ const mainInit = _ => {
 	// キー操作イベント
 	document.onkeydown = evt => {
 		evt.preventDefault();
-		const setCode = transCode(evt.code);
+		const setCode = evt.code;
 
 		if (evt.repeat && !g_mainRepeatObj.key.includes(setCode)) {
 			return blockCode(setCode);
@@ -8969,7 +8998,7 @@ const mainInit = _ => {
 		// 曲中リトライ、タイトルバック
 		if (setCode === g_kCdN[g_headerObj.keyRetry]) {
 
-			if (g_isMac && keyIsDown(g_kCdNameObj.shiftKey)) {
+			if (g_isMac && (keyIsDown(g_kCdNameObj.shiftLKey) || keyIsDown(g_kCdNameObj.shiftRKey))) {
 				// Mac OS、IPad OSはDeleteキーが無いためShift+BSで代用
 				g_audio.pause();
 				clearTimeout(g_timeoutEvtId);
@@ -8986,7 +9015,7 @@ const mainInit = _ => {
 		} else if (setCode === g_kCdN[g_headerObj.keyTitleBack]) {
 			g_audio.pause();
 			clearTimeout(g_timeoutEvtId);
-			if (keyIsDown(g_kCdNameObj.shiftKey)) {
+			if (keyIsDown(g_kCdNameObj.shiftLKey) || keyIsDown(g_kCdNameObj.shiftRKey)) {
 				if (g_currentArrows !== g_fullArrows || g_stateObj.lifeMode === C_LFE_BORDER && g_workObj.lifeVal < g_workObj.lifeBorder) {
 					g_gameOverFlg = true;
 					g_finishFlg = false;
@@ -9025,7 +9054,7 @@ const mainInit = _ => {
 	};
 
 	document.onkeyup = evt => {
-		const setCode = transCode(evt.code);
+		const setCode = evt.code;
 		g_inputKeyBuffer[setCode] = false;
 		mainKeyUpActFunc[g_stateObj.autoAll]();
 	};

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2023/05/03 (v31.7.0)
+ * Revised : 2023/05/07 (v32.0.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -112,6 +112,7 @@ const g_limitObj = {
     titleSiz: 32,
     mainSiz: 14,
     musicTitleSiz: 13,
+    keySetSiz: 16,
 };
 
 /** 設定項目の位置 */
@@ -638,8 +639,11 @@ const g_escapeStr = {
         [`space`, `frzSpace`], [`iyo`, `frzIyo`], [`gor`, `frzGor`], [`oni`, `foni`],
     ],
     keyCtrlName: [
-        [`Left`, ``], [`Digit`, `D`], [`Numpad`, `N`], [`Semicolon`, `;`],
+        [`ShiftLeft`, `Shift`], [`ControlLeft`, `Control`], [`AltLeft`, `Alt`],
+        [`Digit`, `D`], [`Numpad`, `N`], [`Semicolon`, `;`],
         [`Multiply`, `*`], [`Add`, `+`], [`Subtract`, `-`], [`Decimal`, `.`], [`Divide`, `Div`],
+        [`Quote`, `Ja-Colon`], [`BracketLeft`, `Ja-@`], [`BracketRight`, `Ja-[`],
+        [`Backslash`, `Ja-]`], [`Equal`, `Ja-^`],
     ],
 };
 
@@ -1056,7 +1060,7 @@ let g_prevKey = -1;
 // キーコード
 const g_kCd = [];
 const g_kCdN = [];
-for (let j = 0; j < 255; j++) {
+for (let j = 0; j < 260; j++) {
     g_kCd[j] = ``;
     g_kCdN[j] = ``;
 }
@@ -1068,9 +1072,9 @@ g_kCd[8] = (g_isMac ? `Delete` : `BackSpace`);
 g_kCd[9] = `Tab`;
 g_kCd[12] = `Clear`;
 g_kCd[13] = `Enter`;
-g_kCd[16] = `Shift`;
-g_kCd[17] = `Ctrl`;
-g_kCd[18] = `Alt`;
+g_kCd[16] = `L)Shift`;
+g_kCd[17] = `L)Ctrl`;
+g_kCd[18] = `L)Alt`;
 g_kCd[19] = `Pause`;
 g_kCd[27] = `Esc`;
 g_kCd[28] = `Conv`;
@@ -1174,6 +1178,9 @@ g_kCd[222] = `^ ~`;
 g_kCd[226] = `\\ _`;
 g_kCd[229] = `IME`;
 g_kCd[240] = `CapsLk`;
+g_kCd[256] = `R)Shift`;
+g_kCd[257] = `R)Ctrl`;
+g_kCd[258] = `R)Alt`;
 
 // 従来のキーコードとの変換用
 g_kCdN[0] = `- - -`; // 無効値
@@ -1288,10 +1295,16 @@ g_kCdN[222] = `Equal`;
 g_kCdN[226] = `IntlRo`;
 g_kCdN[229] = `Backquote`;
 g_kCdN[240] = `CapsLock`;
+g_kCdN[256] = `ShiftRight`;
+g_kCdN[257] = `ControlRight`;
+g_kCdN[258] = `AltRight`;
+g_kCdN[259] = `MetaRight`;
 
 const g_kCdNameObj = {
-    shiftKey: `ShiftLeft`,
-    metaKey: `MetaLeft`,
+    shiftLKey: `ShiftLeft`,
+    shiftRKey: `ShiftRight`,
+    metaLKey: `MetaLeft`,
+    metaRKey: `MetaRight`,
 };
 
 // 画面別ショートカット
@@ -1306,47 +1319,79 @@ const g_shortcutObj = {
     },
     option: {
         ShiftLeft_KeyD: { id: `lnkDifficultyL` },
+        ShiftRight_KeyD: { id: `lnkDifficultyL` },
         KeyD: { id: `lnkDifficultyR` },
+
         ShiftLeft_ArrowRight: { id: `lnkSpeedR` },
+        ShiftRight_ArrowRight: { id: `lnkSpeedR` },
         AltLeft_ArrowRight: { id: `lnkSpeedHR` },
+        AltRight_ArrowRight: { id: `lnkSpeedHR` },
         ArrowRight: { id: `lnkSpeedRR` },
         ShiftLeft_ArrowLeft: { id: `lnkSpeedL` },
+        ShiftRight_ArrowLeft: { id: `lnkSpeedL` },
         AltLeft_ArrowLeft: { id: `lnkSpeedHL` },
+        AltRight_ArrowLeft: { id: `lnkSpeedHL` },
         ArrowLeft: { id: `lnkSpeedLL` },
+
         KeyL: { id: `lnkDifficulty` },
 
         ShiftLeft_KeyM: { id: `lnkMotionL` },
+        ShiftRight_KeyM: { id: `lnkMotionL` },
         KeyM: { id: `lnkMotionR` },
         ArrowUp: { id: `lnkScrollL` },
         ArrowDown: { id: `lnkScrollR` },
         KeyR: { id: `lnkReverseR`, dfId: `lnkReverseR`, exId: `btnReverse` },
 
         ShiftLeft_KeyS: { id: `lnkShuffleL` },
+        ShiftRight_KeyS: { id: `lnkShuffleL` },
         KeyS: { id: `lnkShuffleR` },
         ShiftLeft_KeyA: { id: `lnkAutoPlayL` },
+        ShiftRight_KeyA: { id: `lnkAutoPlayL` },
         KeyA: { id: `lnkAutoPlayR` },
         ShiftLeft_KeyG: { id: `lnkGaugeL` },
+        ShiftRight_KeyG: { id: `lnkGaugeL` },
         KeyG: { id: `lnkGaugeR` },
 
         AltLeft_ShiftLeft_Semicolon: { id: `lnkAdjustmentHR` },
+        AltLeft_ShiftRight_Semicolon: { id: `lnkAdjustmentHR` },
+        AltRight_ShiftLeft_Semicolon: { id: `lnkAdjustmentHR` },
+        AltRight_ShiftRight_Semicolon: { id: `lnkAdjustmentHR` },
         ShiftLeft_Semicolon: { id: `lnkAdjustmentR` },
+        ShiftRight_Semicolon: { id: `lnkAdjustmentR` },
         AltLeft_Semicolon: { id: `lnkAdjustmentRRR` },
+        AltRight_Semicolon: { id: `lnkAdjustmentRRR` },
         Semicolon: { id: `lnkAdjustmentRR` },
         AltLeft_ShiftLeft_Minus: { id: `lnkAdjustmentHL` },
+        AltLeft_ShiftRight_Minus: { id: `lnkAdjustmentHL` },
+        AltRight_ShiftLeft_Minus: { id: `lnkAdjustmentHL` },
+        AltRight_ShiftRight_Minus: { id: `lnkAdjustmentHL` },
         ShiftLeft_Minus: { id: `lnkAdjustmentL` },
+        ShiftRight_Minus: { id: `lnkAdjustmentL` },
         AltLeft_Minus: { id: `lnkAdjustmentLLL` },
+        AltRight_Minus: { id: `lnkAdjustmentLLL` },
         Minus: { id: `lnkAdjustmentLL` },
 
         AltLeft_ShiftLeft_NumpadAdd: { id: `lnkAdjustmentHR` },
+        AltLeft_ShiftRight_NumpadAdd: { id: `lnkAdjustmentHR` },
+        AltRight_ShiftLeft_NumpadAdd: { id: `lnkAdjustmentHR` },
+        AltRight_ShiftRight_NumpadAdd: { id: `lnkAdjustmentHR` },
         ShiftLeft_NumpadAdd: { id: `lnkAdjustmentR` },
+        ShiftRight_NumpadAdd: { id: `lnkAdjustmentR` },
         AltLeft_NumpadAdd: { id: `lnkAdjustmentRRR` },
+        AltRight_NumpadAdd: { id: `lnkAdjustmentRRR` },
         NumpadAdd: { id: `lnkAdjustmentRR` },
         AltLeft_ShiftLeft_NumpadSubtract: { id: `lnkAdjustmentHL` },
+        AltLeft_ShiftRight_NumpadSubtract: { id: `lnkAdjustmentHL` },
+        AltRight_ShiftLeft_NumpadSubtract: { id: `lnkAdjustmentHL` },
+        AltRight_ShiftRight_NumpadSubtract: { id: `lnkAdjustmentHL` },
         ShiftLeft_NumpadSubtract: { id: `lnkAdjustmentL` },
+        ShiftRight_NumpadSubtract: { id: `lnkAdjustmentL` },
         AltLeft_NumpadSubtract: { id: `lnkAdjustmentLLL` },
+        ShiftRight_NumpadSubtract: { id: `lnkAdjustmentL` },
         NumpadSubtract: { id: `lnkAdjustmentLL` },
 
         ShiftLeft_KeyV: { id: `lnkVolumeL` },
+        ShiftRight_KeyV: { id: `lnkVolumeL` },
         KeyV: { id: `lnkVolumeR` },
 
         KeyI: { id: `btnGraph` },
@@ -1365,10 +1410,12 @@ const g_shortcutObj = {
         Enter: { id: `btnPlay` },
         NumpadEnter: { id: `btnPlay` },
         ShiftLeft_Tab: { id: `btnBack` },
+        ShiftRight_Tab: { id: `btnBack` },
         Tab: { id: `btnDisplay` },
     },
     difSelector: {
         ShiftLeft_KeyD: { id: `lnkDifficultyL` },
+        ShiftRight_KeyD: { id: `lnkDifficultyL` },
         KeyD: { id: `lnkDifficultyR` },
         KeyR: { id: `difRandom` },
         KeyL: { id: `lnkDifficulty` },
@@ -1390,17 +1437,22 @@ const g_shortcutObj = {
         Enter: { id: `lnkDifficulty` },
         NumpadEnter: { id: `lnkDifficulty` },
         ShiftLeft_Tab: { id: `btnBack` },
+        ShiftRight_Tab: { id: `btnBack` },
         Tab: { id: `btnDisplay` },
     },
     settingsDisplay: {
         ShiftLeft_KeyA: { id: `lnkAppearanceL` },
+        ShiftRight_KeyA: { id: `lnkAppearanceL` },
         KeyA: { id: `lnkAppearanceR` },
         ShiftLeft_KeyO: { id: `lnkOpacityL` },
+        ShiftRight_KeyO: { id: `lnkOpacityL` },
         KeyO: { id: `lnkOpacityR` },
 
         ShiftLeft_KeyB: { id: `lnkHitPositionR` },
+        ShiftRight_KeyB: { id: `lnkHitPositionR` },
         KeyB: { id: `lnkHitPositionRR` },
         ShiftLeft_KeyT: { id: `lnkHitPositionL` },
+        ShiftRight_KeyT: { id: `lnkHitPositionL` },
         KeyT: { id: `lnkHitPositionLL` },
 
         Digit1: { id: `lnkstepZone` },
@@ -1437,6 +1489,7 @@ const g_shortcutObj = {
         Enter: { id: `btnPlay` },
         NumpadEnter: { id: `btnPlay` },
         ShiftLeft_Tab: { id: `btnBack` },
+        ShiftRight_Tab: { id: `btnBack` },
         Tab: { id: `btnSettings` },
     },
     keyConfig: {
@@ -1451,7 +1504,9 @@ const g_shortcutObj = {
     result: {
         Escape: { id: `btnBack` },
         ShiftLeft_Tab: { id: `btnBack` },
+        ShiftRight_Tab: { id: `btnBack` },
         ControlLeft_KeyC: { id: `` },
+        ControlRight_KeyC: { id: `` },
         KeyC: { id: `btnCopy`, reset: true },
         KeyT: { id: `btnTweet`, reset: true },
         KeyG: { id: `btnGitter`, reset: true },

package/package.json

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