danoniplus 29.4.9 → 29.4.11

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2023/09/02
+ * Revised : 2024/03/17
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 29.4.9`;
-const g_revisedDate = `2023/09/02`;
+const g_version = `Ver 29.4.11`;
+const g_revisedDate = `2024/03/17`;
 const g_alphaVersion = ``;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
@@ -442,11 +442,14 @@ const nextPos = (_basePos, _num, _length) => (_basePos + _length + _num) % _leng
  * 特定キーコードを置換する処理
  * @param {string} _setCode 
  */
-const transCode = _setCode => {
-	if ([`Control`, `Shift`, `Alt`].includes(_setCode.slice(0, -5))) {
-		return _setCode.replaceAll(`Right`, `Left`);
+const transCode = _evt => {
+	const evtCode = _evt.code;
+	if ([`Control`, `Shift`, `Alt`].includes(evtCode.slice(0, -5))) {
+		return evtCode.replaceAll(`Right`, `Left`);
+	} else if (evtCode === `` && _evt.key === `Shift`) {
+		return `ShiftLeft`;
 	}
-	return _setCode;
+	return evtCode;
 };
 
 /**
@@ -471,7 +474,7 @@ const commonKeyDown = (_evt, _displayName, _func = _code => { }, _dfEvtFlg) => {
 	if (!_dfEvtFlg) {
 		_evt.preventDefault();
 	}
-	const setCode = transCode(_evt.code);
+	const setCode = transCode(_evt);
 	if (_evt.repeat && (g_unrepeatObj.page.includes(_displayName) || g_unrepeatObj.key.includes(setCode))) {
 		return blockCode(setCode);
 	}
@@ -505,7 +508,7 @@ const commonKeyDown = (_evt, _displayName, _func = _code => { }, _dfEvtFlg) => {
  */
 const commonKeyUp = _evt => {
 	g_inputKeyBuffer[g_kCdNameObj.metaKey] = false;
-	g_inputKeyBuffer[transCode(_evt.code)] = false;
+	g_inputKeyBuffer[transCode(_evt)] = false;
 };
 
 /**
@@ -1263,7 +1266,7 @@ const resetKeyControl = _ => {
 	document.onkeyup = _ => { };
 	document.onkeydown = evt => {
 		evt.preventDefault();
-		return blockCode(transCode(evt.code));
+		return blockCode(transCode(evt));
 	};
 	g_inputKeyBuffer = {};
 };
@@ -8568,7 +8571,7 @@ const mainInit = _ => {
 	// キー操作イベント
 	document.onkeydown = evt => {
 		evt.preventDefault();
-		const setCode = transCode(evt.code);
+		const setCode = transCode(evt);
 
 		if (evt.repeat && !g_mainRepeatObj.key.includes(setCode)) {
 			return blockCode(setCode);
@@ -8636,7 +8639,7 @@ const mainInit = _ => {
 	};
 
 	document.onkeyup = evt => {
-		const setCode = transCode(evt.code);
+		const setCode = transCode(evt);
 		g_inputKeyBuffer[setCode] = false;
 		mainKeyUpActFunc[g_stateObj.autoAll]();
 	};
@@ -8856,19 +8859,22 @@ const mainInit = _ => {
 
 		frzOFF: (_j, _k, _cnt) => {
 
-			if (g_workObj.judgFrzCnt[_j] === _k - 1) {
+			// 判定対象が自身より前のフリーズアローで、自身の判定範囲がキター(O.K.)の範囲内のとき
+			if (g_workObj.judgFrzCnt[_j] === _k - 1 && _cnt <= g_judgObj.frzJ[g_judgPosObj.sfsf]) {
 				const prevFrzName = `frz${_j}_${g_workObj.judgFrzCnt[_j]}`;
 				const prevFrz = g_attrObj[prevFrzName];
 
-				if (prevFrz.isMoving && !prevFrz.judgEndFlg && prevFrz.cnt < (-1) * g_judgObj.frzJ[g_judgPosObj.kita]) {
+				// 自身より前のフリーズアローが移動中かつキター(O.K.)の領域外のとき
+				if (prevFrz.isMoving && prevFrz.cnt < (-1) * g_judgObj.frzJ[g_judgPosObj.kita]) {
 
-					// 自身より前のフリーズアローが未判定の場合、強制的に枠外判定を行いフリーズアローを削除
-					if (prevFrz.cnt >= (-1) * g_judgObj.frzJ[g_judgPosObj.iknai]) {
+					// 自身より前のフリーズアローが未判定の場合、強制的に枠外判定を行う
+					if (prevFrz.cnt >= (-1) * g_judgObj.frzJ[g_judgPosObj.iknai] && !prevFrz.judgEndFlg) {
 						judgeIknai(prevFrz.cnt);
 						if (g_headerObj.frzStartjdgUse) {
 							judgeUwan(prevFrz.cnt);
 						}
 					}
+					// 自身より前のフリーズアローを削除して判定対象を自身に変更 (g_workObj.judgFrzCnt[_j]をカウントアップ)
 					judgeObjDelete.frz(_j, prevFrzName);
 				}
 			}

package/package.json

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