danoniplus 38.3.1 → 38.3.3

package/README.md

@@ -2,7 +2,7 @@
 
 [![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)
+[![GitHub release](https://img.shields.io/github/package-json/v/cwtickle/danoniplus/support%2Fv38)](https://github.com/cwtickle/danoniplus/security/policy)
 [![GitHub All Releases](https://img.shields.io/github/downloads/cwtickle/danoniplus/total?color=%23ff3399&label=downloads%20%28recently%29)](https://github.com/cwtickle/danoniplus/releases)
 [![GitHub](https://img.shields.io/github/license/cwtickle/danoniplus)](https://github.com/cwtickle/danoniplus/blob/develop/LICENSE)  
 ![AboutDanOni](http://cw7.sakura.ne.jp/danoni/wiki/danonitop.png)

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2025/01/28
+ * Revised : 2025/02/17
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 38.3.1`;
-const g_revisedDate = `2025/01/28`;
+const g_version = `Ver 38.3.3`;
+const g_revisedDate = `2025/02/17`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -5513,14 +5513,8 @@ const setDifficulty = (_initFlg) => {
 			});
 
 		}
-
-		const keyCtrlPtn = `${g_keyObj.currentKey}_${g_keyObj.currentPtn}`;
-		if (g_headerObj.keyRetryDef === C_KEY_RETRY) {
-			g_headerObj.keyRetry = setIntVal(getKeyCtrlVal(g_keyObj[`keyRetry${keyCtrlPtn}`]), g_headerObj.keyRetryDef);
-		}
-		if (g_headerObj.keyTitleBackDef === C_KEY_TITLEBACK) {
-			g_headerObj.keyTitleBack = setIntVal(getKeyCtrlVal(g_keyObj[`keyTitleBack${keyCtrlPtn}`]), g_headerObj.keyTitleBackDef);
-		}
+		// 曲中ショートカットキーの切り替え
+		setPlayingShortcut();
 	}
 
 	// スクロール設定用の配列を入れ替え
@@ -7386,6 +7380,9 @@ const keyConfigInit = (_kcType = g_kcType) => {
 		// カラーグループ、シャッフルグループの再設定
 		g_keycons.groups.forEach(type => resetGroupList(type, `${g_keyObj.currentKey}_${g_keyObj.currentPtn}`));
 
+		// 曲中ショートカットキーの切り替え
+		setPlayingShortcut();
+
 		// キーコンフィグ画面を再呼び出し
 		keyConfigInit();
 
@@ -7571,6 +7568,20 @@ const getKeyInfo = () => {
 	};
 };
 
+/**
+ * デフォルトの曲中ショートカットをキー数・キーパターンにより切り替え
+ * - キーコンフィグ画面で個別に変えていた場合は変更しない
+ */
+const setPlayingShortcut = () => {
+	const keyCtrlPtn = `${g_keyObj.currentKey}_${g_keyObj.currentPtn}`;
+	if (g_headerObj.keyRetryDef === C_KEY_RETRY) {
+		g_headerObj.keyRetry = setIntVal(getKeyCtrlVal(g_keyObj[`keyRetry${keyCtrlPtn}`]), g_headerObj.keyRetryDef);
+	}
+	if (g_headerObj.keyTitleBackDef === C_KEY_TITLEBACK) {
+		g_headerObj.keyTitleBack = setIntVal(getKeyCtrlVal(g_keyObj[`keyTitleBack${keyCtrlPtn}`]), g_headerObj.keyTitleBackDef);
+	}
+};
+
 /**
  * ステップゾーン間隔、大きさの更新
  * @param {string} _header 
@@ -9810,8 +9821,8 @@ const mainInit = () => {
 	const filterCss = g_stateObj.filterLock === C_FLG_OFF ? g_cssObj.life_Failed : g_cssObj.life_Cleared;
 	[`filterBar0`, `filterBar1`, `borderBar0`, `borderBar1`].forEach(obj =>
 		mainSprite.appendChild(createColorObject2(obj, g_lblPosObj.filterBar, filterCss)));
-	borderBar0.style.top = wUnit(g_posObj.stepDiffY + g_stateObj.hitPosition);
-	borderBar1.style.top = wUnit(g_posObj.stepDiffY + g_posObj.arrowHeight - g_stateObj.hitPosition);
+	borderBar0.style.top = wUnit(g_posObj.stepDiffY + g_workObj.hitPosition);
+	borderBar1.style.top = wUnit(g_posObj.stepDiffY + g_posObj.arrowHeight - g_workObj.hitPosition);
 
 	if (g_appearanceRanges.includes(g_stateObj.appearance)) {
 		mainSprite.appendChild(createDivCss2Label(`filterView`, ``, g_lblPosObj.filterView));
@@ -11054,8 +11065,8 @@ const changeAppearanceFilter = (_num = 10) => {
 	$id(`arrowSprite${topNum}`).clipPath = topShape;
 	$id(`arrowSprite${bottomNum}`).clipPath = bottomShape;
 
-	$id(`filterBar0`).top = wUnit(g_posObj.arrowHeight * _num / MAX_FILTER_POS + g_stateObj.hitPosition);
-	$id(`filterBar1`).top = wUnit(g_posObj.arrowHeight * (MAX_FILTER_POS - _num) / MAX_FILTER_POS - g_stateObj.hitPosition);
+	$id(`filterBar0`).top = wUnit(g_posObj.arrowHeight * _num / MAX_FILTER_POS - g_stateObj.hitPosition);
+	$id(`filterBar1`).top = wUnit(g_posObj.arrowHeight * (MAX_FILTER_POS - _num) / MAX_FILTER_POS + g_stateObj.hitPosition);
 
 	if (g_appearanceRanges.includes(g_stateObj.appearance)) {
 		$id(`filterView`).top =

package/package.json

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