danoniplus 45.5.1 → 45.5.2

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2026/03/06
+ * Revised : 2026/03/10
  *
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 45.5.1`;
-const g_revisedDate = `2026/03/06`;
+const g_version = `Ver 45.5.2`;
+const g_revisedDate = `2026/03/10`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -11763,7 +11763,7 @@ const getArrowSettings = () => {
 	const changeStepRtn = (_name, _angle) =>
 		g_workObj[_name] = g_workObj[_name].map(v => rotateBy(v, _angle));
 
-	if (g_stateObj.playWindow.endsWith(`SideScroll`)) {
+	if (g_stateObj.playWindow === `SideScroll`) {
 		if (g_stateObj.rotateEnabled) {
 			const sign = g_stateObj.playWindowType === `Reverse` ? -1 : 1;
 			changeStepRtn(`stepRtn`, 90 * sign);
@@ -12005,15 +12005,14 @@ const getArrowSettings = () => {
 			const _copiedArray = structuredClone(_array);
 			return _array.map((_val, _i) => _array[_i] = _copiedArray[randArray[_i]]);
 		};
-		if (g_stateObj.camoufrage === `Arrow` || g_stateObj.camoufrage === C_FLG_ALL) {
+		if ([`Arrow`, C_FLG_ALL].includes(g_stateObj.camoufrage)) {
 
 			// 矢印ヒット時に元の矢印がわかるようにするため、あえて g_workObj.stepHitRtn はそのままにする
 			g_workObj.stepRtn = getSwapArray(g_workObj.stepRtn);
 			g_workObj.arrowRtn = getSwapArray(g_workObj.arrowRtn);
 		}
-		eachOrAll.forEach(type => {
-			if (g_stateObj.camoufrage === `Color` || g_stateObj.camoufrage === C_FLG_ALL) {
-
+		if ([`Color`, C_FLG_ALL].includes(g_stateObj.camoufrage)) {
+			eachOrAll.forEach(type => {
 				// ダミー矢印は対象外
 				g_workObj[`arrowColors${type}`] = getSwapArray(g_workObj[`arrowColors${type}`]);
 				g_workObj[`arrowShadowColors${type}`] = getSwapArray(g_workObj[`arrowShadowColors${type}`]);
@@ -12023,23 +12022,19 @@ const getArrowSettings = () => {
 				});
 				g_workObj[`frzNormalShadowColors${type}`] = getSwapArray(g_workObj[`frzNormalShadowColors${type}`]);
 				g_workObj[`frzHitShadowColors${type}`] = getSwapArray(g_workObj[`frzHitShadowColors${type}`]);
-			}
-		});
+			});
 
-		// 位置変更用の配列に従い、個別・全体色変化の位置変更
-		if (g_stateObj.camoufrage === `Color` || g_stateObj.camoufrage === C_FLG_ALL) {
+			// 位置変更用の配列に従い、個別・全体色変化の位置変更
 			const getSwapList = (_array) => {
 				const _copiedArray = structuredClone(_array);
 				return _array.map((_val, _i) => _array[_i] = randArray[_copiedArray[_i]]);
 			};
-			usedColorKeys.forEach(type => {
-				if (g_workObj[type] !== undefined) {
-					for (let j = 0; j < g_workObj[type].length; j++) {
-						if (g_workObj[type][j] === undefined) {
-							continue;
-						}
-						g_workObj[type][j] = getSwapList(g_workObj[type][j]);
+			usedColorKeys.filter(type => g_workObj[type] !== undefined).forEach(type => {
+				for (let j = 0; j < g_workObj[type].length; j++) {
+					if (g_workObj[type][j] === undefined) {
+						continue;
 					}
+					g_workObj[type][j] = getSwapList(g_workObj[type][j]);
 				}
 			});
 		}
@@ -12238,7 +12233,7 @@ const mainInit = () => {
 
 	// Hidden+, Sudden+用のライン、パーセント表示
 	const filterCss = g_stateObj.filterLock === C_FLG_OFF ? g_cssObj.life_Failed : g_cssObj.life_Cleared;
-	const doubleFilterFlg = ![`Default`, `Halfway`].includes(g_stateObj.stepArea);
+	const doubleFilterFlg = getDoubleFilterFlg();
 
 	for (let j = 0; j < g_stateObj.layerNum; j++) {
 		const mainSpriteJ = createEmptySprite(mainSprite, `mainSprite${j}`, mainCommonPos);
@@ -12300,6 +12295,10 @@ const mainInit = () => {
 		}
 	}
 
+	// Appearanceのオプション適用時は一部描画を隠す
+	changeAppearanceBar(g_appearanceRanges.includes(g_stateObj.appearance)
+		? g_hidSudObj.filterPos : g_hidSudObj.filterPosDefault[g_stateObj.appearance], 0);
+
 	// StepArea処理
 	g_stepAreaFunc.get(g_stateObj.stepArea)();
 
@@ -12309,10 +12308,6 @@ const mainInit = () => {
 	// EffectのArrowEffect追加処理
 	g_effectFunc.get(g_stateObj.effect)();
 
-	// Appearanceのオプション適用時は一部描画を隠す
-	changeAppearanceBar(g_appearanceRanges.includes(g_stateObj.appearance)
-		? g_hidSudObj.filterPos : g_hidSudObj.filterPosDefault[g_stateObj.appearance], 0);
-
 	// 現在の矢印・フリーズアローの速度、個別加算速度の初期化 (速度変化時に直す)
 	g_workObj.currentSpeed = 2;
 	g_workObj.boostSpd = 1;
@@ -13645,6 +13640,14 @@ const makeStepZone = (_j, _keyCtrlPtn) => {
 	}
 };
 
+/**
+ * フィルターバーが同一層で複数必要かを確認
+ * @returns {boolean}
+ */
+const getDoubleFilterFlg = () =>
+	g_settings.stepAreaLayers.includes(g_stateObj.stepArea) ||
+	(g_stateObj.stepArea === `Halfway` && g_stateObj.appearance === `Hid&Sud+`);
+
 /**
  * フィルターバーの対象表示変更
  * @param {number} _num 
@@ -13655,7 +13658,7 @@ const changeAppearanceBar = (_num = 10, _dirPlus = 2) => {
 		const step = Math.trunc(_dirPlus / 2) * 2;
 		g_workObj.aprFilterCnt = nextPos(g_workObj.aprFilterCnt, step, g_stateObj.layerNum);
 	}
-	changeAppearanceFilter(_num);
+	const doubleFilterFlg = changeAppearanceFilter(_num);
 
 	// フィルターバーを使用するオプションのみ以下を適用
 	if (g_appearanceRanges.includes(g_stateObj.appearance) && g_stateObj.d_filterline === C_FLG_ON) {
@@ -13669,13 +13672,13 @@ const changeAppearanceBar = (_num = 10, _dirPlus = 2) => {
 				const displayState = (j === g_workObj.aprFilterCnt ? C_DIS_INHERIT : C_DIS_NONE);
 				$id(`filterBar${type}`).display = displayState;
 
-				if (![`Default`, `Halfway`].includes(g_stateObj.stepArea)) {
+				if (doubleFilterFlg) {
 					$id(`filterBar${type}_HS`).display = displayState;
 				}
 			});
 		}
 
-		// スクロールが1種類でHidden+/Sudden+の場合、対面のフィルターバーは不要なため非表示にする
+		// フィルターバーの非表示条件
 		const baseLayer = g_workObj.aprFilterCnt;
 		const dividePosPart = g_workObj.dividePos.filter(v => Math.floor(v / 2) === g_workObj.aprFilterCnt / 2);
 		const currentBarNum = g_hidSudObj.std[g_stateObj.appearance][
@@ -13684,12 +13687,17 @@ const changeAppearanceBar = (_num = 10, _dirPlus = 2) => {
 				: g_stateObj.reverse
 		];
 
-		if (g_stateObj.appearance !== `Hid&Sud+`
-			&& dividePosPart.length > 0
+		if (dividePosPart.length > 0
 			&& dividePosPart.every(v => v % 2 === dividePosPart[0] % 2)) {
-			$id(`filterBar${(currentBarNum + 1) % 2 + baseLayer}`).display = C_DIS_NONE;
-			if (![`Default`, `Halfway`].includes(g_stateObj.stepArea)) {
-				$id(`filterBar${(currentBarNum + 1) % 2 + baseLayer}_HS`).display = C_DIS_NONE;
+			if (g_stateObj.appearance !== `Hid&Sud+` || (g_stateObj.appearance === `Hid&Sud+` && g_stateObj.stepArea === `Halfway`)) {
+				// スクロールが1種類の場合、対面のフィルターバーは不要なため非表示にする
+				$id(`filterBar${(currentBarNum + 1) % 2 + baseLayer}`).display = C_DIS_NONE;
+
+				if (g_settings.stepAreaLayers.includes(g_stateObj.stepArea)) {
+					$id(`filterBar${(currentBarNum + 1) % 2 + baseLayer}_HS`).display = C_DIS_NONE;
+				} else if (g_stateObj.appearance === `Hid&Sud+` && g_stateObj.stepArea === `Halfway`) {
+					$id(`filterBar${(currentBarNum) % 2 + baseLayer}_HS`).display = C_DIS_NONE;
+				}
 			}
 		}
 	}
@@ -13698,6 +13706,7 @@ const changeAppearanceBar = (_num = 10, _dirPlus = 2) => {
 /**
  * アルファマスクの再描画 (Appearance: Hidden+, Sudden+ 用)
  * @param {number} _num 
+ * @returns {boolean} フィルターバーを複数利用するかどうかのフラグ (changeAppearanceBarで利用)
  */
 const changeAppearanceFilter = (_num = 10) => {
 	const MAX_FILTER_POS = 100;
@@ -13716,6 +13725,7 @@ const changeAppearanceFilter = (_num = 10) => {
 	const appearPers = [_num, MAX_FILTER_POS - _num];
 	const topDist = g_posObj.arrowHeight * appearPers[topNum] / MAX_FILTER_POS;
 	const bottomDist = g_posObj.arrowHeight * appearPers[bottomNum] / MAX_FILTER_POS;
+	const doubleFilterFlg = getDoubleFilterFlg();
 
 	for (let j = 0; j < g_stateObj.layerNum; j += 2) {
 		$id(`arrowSprite${topNum + j}`).clipPath = topShape;
@@ -13724,7 +13734,7 @@ const changeAppearanceFilter = (_num = 10) => {
 		addTransform(`filterBar${topNum + j}`, `appearance`, `translateY(${parseFloat($id(`arrowSprite${j}`).top) + topDist}px)`, g_transPriority.layer);
 		addTransform(`filterBar${bottomNum + j}`, `appearance`, `translateY(${parseFloat($id(`arrowSprite${j + 1}`).top) + bottomDist}px)`, g_transPriority.layer);
 
-		if (![`Default`, `Halfway`].includes(g_stateObj.stepArea)) {
+		if (doubleFilterFlg) {
 			addTransform(`filterBar${bottomNum + j}_HS`, `appearance`, `translateY(${parseFloat($id(`arrowSprite${j}`).top) + bottomDist}px)`, g_transPriority.layer);
 			addTransform(`filterBar${topNum + j}_HS`, `appearance`, `translateY(${parseFloat($id(`arrowSprite${j + 1}`).top) + topDist}px)`, g_transPriority.layer);
 		}
@@ -13741,6 +13751,8 @@ const changeAppearanceFilter = (_num = 10) => {
 
 	// ユーザカスタムイベント(アルファマスクの再描画)
 	g_customJsObj.appearanceFilter.forEach(func => func(topNum, bottomNum));
+
+	return doubleFilterFlg;
 };
 
 /**

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2026/03/05 (v45.5.0)
+ * Revised : 2026/03/10 (v45.5.2)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -1738,6 +1738,7 @@ const g_playWindowFunc = new Map([
 const g_arrowGroupSprite = [`stepSprite`, `arrowSprite`, `frzHitSprite`];
 const halfwayOffset = _j => (_j % 2 === 0 ? 1 : -1) * (g_headerObj.playingHeight / 2 - g_posObj.stepY + (g_posObj.stepYR - C_ARW_WIDTH) / 2);
 const getDirFromLayer = _j => (_j % 2 === 0 ? 1 : -1) * (_j < g_stateObj.layerNumDf ? 1 : -1);
+const getDirFromRev = () => g_stateObj.reverse === C_FLG_OFF ? 1 : -1;
 const g_stepAreaFunc = new Map([
     ['Default', () => ``],
     ['Halfway', () => {
@@ -1746,6 +1747,32 @@ const g_stepAreaFunc = new Map([
                 addTransform(`${sprite}${j}`, `stepArea`, `translateY(${halfwayOffset(j)}px)`, g_transPriority.stepArea);
             }
         });
+
+        // Appearanceフィルターの差分適用
+        if (g_appearanceRanges.includes(g_stateObj.appearance)) {
+
+            // Hidden+, Sudden+の場合はレイヤー毎に座標を画面中央から見てフィルターバーを外側へシフト
+            for (let j = 0; j < g_stateObj.layerNumDf; j++) {
+                addTransform(
+                    `filterBar${j}`, `stepArea`,
+                    `translateY(calc(${g_hidSudObj[g_stateObj.appearance] === 0 ? 1 : -1} * ${halfwayOffset(j)}px))`,
+                    g_transPriority.stepArea
+                );
+            }
+
+            // Hid&Sud+の場合は片側に2つのフィルターバーが必要なため、
+            // 追加したフィルターバーを元のフィルターバーに対して反転するようにシフト
+            if (g_stateObj.appearance === `Hid&Sud+`) {
+                for (let j = 0; j < g_stateObj.layerNumDf; j++) {
+                    addTransform(
+                        `filterBar${j}_HS`, `stepArea`,
+                        `translateY(calc(${(-1) * (g_hidSudObj[g_stateObj.appearance] === 0 ? 1 : -1)} * ${halfwayOffset(j)}px))`,
+                        g_transPriority.stepArea
+                    );
+                }
+            }
+            addTransform(`filterView`, `stepArea`, `translateY(${halfwayOffset(Number(g_settings.reverseNum))}px)`, g_transPriority.stepArea);
+        }
     }],
     ['Mismatched', () => {
         for (let j = 0; j < g_stateObj.layerNum; j++) {
@@ -1757,6 +1784,27 @@ const g_stepAreaFunc = new Map([
                     addTransform(`${sprite}${j}`, `stepArea`, `translateY(${halfwayOffset(j)}px)`, g_transPriority.stepArea);
                 }
             });
+
+            // Appearanceフィルターの差分適用
+            if (g_appearanceRanges.includes(g_stateObj.appearance)) {
+                for (let j = 0; j < g_stateObj.layerNumDf; j++) {
+                    if (j % 2 === 0) {
+                        // Hidden+用のフィルターバー補正
+                        addTransform(
+                            `filterBar${j + Number(g_settings.reverseNum)}_HS`, `stepArea`,
+                            `translateY(calc((${getDirFromRev()}) * ${halfwayOffset(j)}px))`,
+                            g_transPriority.stepArea
+                        );
+                    } else {
+                        // Sudden+用のフィルターバー補正
+                        addTransform(
+                            `filterBar${j - Number(g_settings.reverseNum)}`, `stepArea`,
+                            `translateY(calc((${(-1) * getDirFromRev()}) * ${halfwayOffset(j)}px))`,
+                            g_transPriority.stepArea
+                        );
+                    }
+                }
+            }
         }
     }],
     ['R-Mismatched', () => {
@@ -1769,6 +1817,27 @@ const g_stepAreaFunc = new Map([
                     addTransform(`${sprite}${j}`, `stepArea`, `translateY(${halfwayOffset(j)}px)`, g_transPriority.stepArea);
                 }
             });
+
+            // Appearanceフィルターの差分適用
+            if (g_appearanceRanges.includes(g_stateObj.appearance)) {
+                for (let j = 0; j < g_stateObj.layerNumDf; j++) {
+                    if (j % 2 === 0) {
+                        // Hidden+用のフィルターバー補正
+                        addTransform(
+                            `filterBar${j + Number(g_settings.reverseNum)}`, `stepArea`,
+                            `translateY(calc((${getDirFromRev()}) * ${halfwayOffset(j)}px))`,
+                            g_transPriority.stepArea
+                        );
+                    } else {
+                        // Sudden+用のフィルターバー補正
+                        addTransform(
+                            `filterBar${j - Number(g_settings.reverseNum)}_HS`, `stepArea`,
+                            `translateY(calc((${(-1) * getDirFromRev()}) * ${halfwayOffset(j)}px))`,
+                            g_transPriority.stepArea
+                        );
+                    }
+                }
+            }
         }
     }],
     ['2Step', () => {
@@ -1777,6 +1846,27 @@ const g_stepAreaFunc = new Map([
                 addTransform(`${sprite}${j}`, `stepArea`, `translateY(${halfwayOffset(j)}px)`, g_transPriority.stepArea);
             }
         });
+
+        // Appearanceフィルターの差分適用
+        if (g_appearanceRanges.includes(g_stateObj.appearance)) {
+            for (let j = 0; j < g_stateObj.layerNumDf; j++) {
+                addTransform(
+                    `filterBar${j}_HS`, `stepArea`,
+                    `translateY(calc((${g_hidSudObj[g_stateObj.appearance] === 0 ? 1 : -1}) * ${halfwayOffset(j)}px))`,
+                    g_transPriority.stepArea
+                );
+            }
+            if (g_stateObj.appearance === `Hid&Sud+`) {
+                // 2Stepは逆方向スクロールが存在しないため、2つごとに設定
+                for (let j = 0; j < g_stateObj.layerNumDf; j += 2) {
+                    addTransform(
+                        `filterBar${j + Number(g_settings.reverseNum)}_HS`, `stepArea`,
+                        `translateY(calc((${getDirFromRev()}) * ${halfwayOffset(j)}px))`,
+                        g_transPriority.stepArea
+                    );
+                }
+            }
+        }
     }],
     ['X-Flower', () => {
         for (let j = 0; j < g_stateObj.layerNum; j++) {

package/package.json

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