danoniplus 45.1.0 → 45.2.0

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2026/02/26
+ * Revised : 2026/02/27
  *
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 45.1.0`;
-const g_revisedDate = `2026/02/26`;
+const g_version = `Ver 45.2.0`;
+const g_revisedDate = `2026/02/27`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -1692,7 +1692,7 @@ const createMultipleSprite = (_baseName, _num, { x = 0, priority = g_transPriori
 	for (let j = 0; j <= _num; j++) {
 		createEmptySprite(sprite, `${_baseName}${j}`);
 	}
-	addX(_baseName, `root`, x, { priority });
+	addTransform(_baseName, `root`, `translateX(${x}px)`, priority);
 	return sprite;
 };
 
@@ -5010,6 +5010,12 @@ const keysConvert = (_dosObj, { keyExtraList = _dosObj.keyExtraList?.split(`,`)
 		// キーの最小横幅 (minWidthX)
 		g_keyObj[`minWidth${newKey}`] = _dosObj[`minWidth${newKey}`] ?? g_keyObj[`minWidth${newKey}`] ?? g_keyObj.minWidthDefault;
 
+		// 移動ロック (movLockX)
+		g_keyObj[`movLock${newKey}`] = setBoolVal(_dosObj[`movLock${newKey}`] ?? g_keyObj[`movLock${newKey}`], false);
+
+		// 位置マニュアル化 (initManualX)
+		g_keyObj[`initManual${newKey}`] = setBoolVal(_dosObj[`initManual${newKey}`] ?? g_keyObj[`initManual${newKey}`], false);
+
 		// キーコンフィグ (keyCtrlX_Y)
 		g_keyObj.minPatterns = newKeyMultiParam(newKey, `keyCtrl`, toKeyCtrlArray, {
 			errCd: `E_0104`, baseCopyFlg: true,
@@ -11954,6 +11960,13 @@ const getArrowSettings = () => {
 	// AppearanceFilterの可視範囲設定
 	g_workObj.aprFilterCnt = 0;
 
+	// 位置をマニュアルで設定する際は矢印の初期位置をゼロにする
+	if (g_keyObj[`initManual${g_keyObj.currentKey}`] !== undefined && g_keyObj[`initManual${g_keyObj.currentKey}`]) {
+		g_workObj.stepX = fillArray(g_workObj.stepX.length, 0);
+	}
+	g_workObj.movLockEnabled = g_keyObj[`movLock${g_keyObj.currentKey}`] === true ? `movLock` : `default`;
+	g_workObj.initManualEnabled = g_keyObj[`initManual${g_keyObj.currentKey}`] === true ? `manual` : `auto`;
+
 	if (g_stateObj.dataSaveFlg) {
 		// ローカルストレージへAdjustment, HitPosition, Volume設定を保存
 		// 変更が確定した時点で表示用のキャッシュを解放
@@ -12085,15 +12098,15 @@ const mainInit = () => {
 	}
 
 	addTransform(`mainSprite`, `root`, `scale(${g_workObj.scale})`, g_transPriority.scale);
-	addXY(`mainSprite`, `root`, g_workObj.playingX, g_posObj.stepY - C_STEP_Y + g_headerObj.playingY, { priority: g_transPriority.base });
+	addTransform(`mainSprite`, `main`, `translateX(${g_workObj.playingX}px) translateY(${g_posObj.stepY - C_STEP_Y + g_headerObj.playingY}px)`, g_transPriority.base);
 
 	// 曲情報・判定カウント用スプライトを作成（メインスプライトより上位）
 	const infoSprite = createEmptySprite(divRoot, `infoSprite`, mainCommonPos);
-	addXY(`infoSprite`, `root`, g_workObj.playingX, g_headerObj.playingY, { priority: g_transPriority.base });
+	addTransform(`infoSprite`, `main`, `translateX(${g_workObj.playingX}px) translateY(${g_headerObj.playingY}px)`, g_transPriority.base);
 
 	// 判定系スプライトを作成（メインスプライトより上位）
 	const judgeSprite = createEmptySprite(divRoot, `judgeSprite`, mainCommonPos);
-	addXY(`judgeSprite`, `root`, g_workObj.playingX, g_headerObj.playingY, { priority: g_transPriority.base });
+	addTransform(`judgeSprite`, `main`, `translateX(${g_workObj.playingX}px) translateY(${g_headerObj.playingY}px)`, g_transPriority.base);
 	const tkObj = getKeyInfo();
 	const [keyCtrlPtn, keyNum] = [tkObj.keyCtrlPtn, tkObj.keyNum];
 
@@ -12208,11 +12221,6 @@ const mainInit = () => {
 	changeAppearanceBar(g_appearanceRanges.includes(g_stateObj.appearance)
 		? g_hidSudObj.filterPos : g_hidSudObj.filterPosDefault[g_stateObj.appearance], 0);
 
-	// Shaking初期化
-	if (g_stateObj.shaking !== C_FLG_OFF) {
-		addXY(`mainSprite`, `shaking`, 0, 0, { priority: g_transPriority.shaking });
-	}
-
 	// 現在の矢印・フリーズアローの速度、個別加算速度の初期化 (速度変化時に直す)
 	g_workObj.currentSpeed = 2;
 	g_workObj.boostSpd = 1;
@@ -12886,9 +12894,9 @@ const mainInit = () => {
 		const colorPos = g_keyObj[`color${keyCtrlPtn}`][_j];
 
 		const arrowName = `${_name}${_j}_${_arrowCnt}`;
-		const firstPosY = C_STEP_Y + g_posObj.reverseStepY * dividePos +
-			(_attrs.initY * g_workObj.boostSpd +
-				_attrs.initBoostY * g_workObj.boostDir) * g_workObj.scrollDir[_j];
+		const stepY = C_STEP_Y + g_posObj.reverseStepY * dividePos;
+		const firstPosY = stepY + (_attrs.initY * g_workObj.boostSpd +
+			_attrs.initBoostY * g_workObj.boostDir) * g_workObj.scrollDir[_j];
 
 		const arrowRoot = createEmptySprite(arrowSprite[g_workObj.dividePos[_j]], arrowName, {
 			x: g_workObj.stepX[_j], y: 0, w: C_ARW_WIDTH, h: C_ARW_WIDTH,
@@ -12914,7 +12922,7 @@ const mainInit = () => {
 			// 現フレーム時の位置
 			y: firstPosY,
 		};
-		addTransform(arrowName, `root`, `translateY(${wUnit(firstPosY)})`);
+		setArrowY.get(`${g_workObj.movLockEnabled}_${g_workObj.initManualEnabled}`)(arrowName, firstPosY, stepY);
 
 		// 矢印色の設定
 		// - 枠/塗りつぶし色: g_attrObj[arrowName].Arrow / ArrowShadow
@@ -12970,7 +12978,7 @@ const mainInit = () => {
 			currentArrow.prevY = currentArrow.y;
 			currentArrow.y -= (g_workObj.currentSpeed * currentArrow.boostSpd +
 				(g_workObj.motionOnFrames[boostCnt] || 0) * currentArrow.boostDir) * currentArrow.dir;
-			addTransform(arrowName, `root`, `translateY(${wUnit(currentArrow.y)})`);
+			movArrowY.get(g_workObj.movLockEnabled)(arrowName, currentArrow.y);
 			g_motionAlphaFunc.get(g_stateObj.motion)(arrowName, currentArrow);
 			currentArrow.boostCnt--;
 		}
@@ -12994,9 +13002,9 @@ const mainInit = () => {
 		const dividePos = g_workObj.dividePos[_j] % 2;
 		const frzNo = `${_j}_${_arrowCnt}`;
 		const frzName = `${_name}${frzNo}`;
-		const firstPosY = C_STEP_Y + g_posObj.reverseStepY * dividePos +
-			(_attrs.initY * g_workObj.boostSpd +
-				_attrs.initBoostY * g_workObj.boostDir) * g_workObj.scrollDir[_j];
+		const stepY = C_STEP_Y + g_posObj.reverseStepY * dividePos;
+		const firstPosY = stepY + (_attrs.initY * g_workObj.boostSpd +
+			_attrs.initBoostY * g_workObj.boostDir) * g_workObj.scrollDir[_j];
 		const firstBarLength = g_workObj[`mk${toCapitalize(_name)}Length`][_j][(_arrowCnt - 1) * 2] * g_workObj.boostSpd;
 
 		const frzRoot = createEmptySprite(arrowSprite[g_workObj.dividePos[_j]], frzName, {
@@ -13033,7 +13041,7 @@ const mainInit = () => {
 			// フリーズアロー(対矢印)の相対位置
 			btmY: firstBarLength * g_workObj.scrollDir[_j],
 		};
-		addTransform(frzName, `root`, `translateY(${wUnit(firstPosY)})`);
+		setArrowY.get(`${g_workObj.movLockEnabled}_${g_workObj.initManualEnabled}`)(frzName, firstPosY, stepY);
 
 		// フリーズアロー色の設定
 		// - 通常時 (矢印枠/矢印塗りつぶし/帯): g_attrObj[frzName].Normal / NormalShadow / NormalBar
@@ -13127,7 +13135,7 @@ const mainInit = () => {
 				if (g_workObj.currentSpeed !== 0) {
 					currentFrz.prevY = currentFrz.y;
 					currentFrz.y -= movY + (g_workObj.motionOnFrames[currentFrz.boostCnt] || 0) * currentFrz.dir * currentFrz.boostDir;
-					addTransform(frzName, `root`, `translateY(${wUnit(currentFrz.y)})`);
+					movArrowY.get(g_workObj.movLockEnabled)(frzName, currentFrz.y);
 					g_motionAlphaFunc.get(g_stateObj.motion)(frzName, currentFrz);
 					currentFrz.boostCnt--;
 				}
@@ -13167,7 +13175,7 @@ const mainInit = () => {
 			currentFrz.frzBarLength -= movY * currentFrz.dir;
 			if (currentFrz.frzBarLength > 0) {
 				currentFrz.y -= movY;
-				addTransform(frzName, `root`, `translateY(${wUnit(currentFrz.y)})`);
+				movArrowY.get(g_workObj.movLockEnabled)(frzName, currentFrz.y);
 			} else {
 				judgeObjDelete[_name](_j, frzName);
 			}
@@ -13432,6 +13440,28 @@ const mainInit = () => {
 	g_timeoutEvtId = setTimeout(flowTimeline, 1000 / g_fps);
 };
 
+/**
+ * 矢印・フリーズアローの初期位置
+ * - movLock_manual: スクロールなし/初期位置マニュアル
+ * - movLock_auto:   スクロールなし/初期位置自動
+ * - default_manual: スクロールあり/初期位置マニュアル（設定上ありえないがdefault_autoと同じにしておく）
+ * - default_auto:   スクロールあり/初期位置自動
+ */
+const setArrowY = new Map([
+	[`movLock_manual`, (_name, _startY, _stepY) => { }],
+	[`movLock_auto`, (_name, _startY, _stepY) => addTransform(_name, `root`, `translateY(${wUnit(_stepY)})`)],
+	[`default_manual`, (_name, _startY, _stepY) => addTransform(_name, `root`, `translateY(${wUnit(_startY)})`)],
+	[`default_auto`, (_name, _startY, _stepY) => addTransform(_name, `root`, `translateY(${wUnit(_startY)})`)],
+]);
+
+/**
+ * 矢印・フリーズアローの移動処理
+ */
+const movArrowY = new Map([
+	[`movLock`, (_name, _y) => { }],
+	[`default`, (_name, _y) => addTransform(_name, `root`, `translateY(${wUnit(_y)})`)],
+]);
+
 /**
  * ステップゾーン、フリーズアローヒット部分の生成
  * @param {number} _j 
@@ -13580,20 +13610,20 @@ const changeAppearanceFilter = (_num = 10) => {
 		$id(`arrowSprite${topNum + j}`).clipPath = topShape;
 		$id(`arrowSprite${bottomNum + j}`).clipPath = bottomShape;
 
-		addY(`filterBar${topNum + j}`, `appearance`, parseFloat($id(`arrowSprite${j}`).top) + topDist, { priority: g_transPriority.layer });
-		addY(`filterBar${bottomNum + j}`, `appearance`, parseFloat($id(`arrowSprite${j + 1}`).top) + bottomDist, { priority: g_transPriority.layer });
+		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)) {
-			addY(`filterBar${bottomNum + j}_HS`, `appearance`, parseFloat($id(`arrowSprite${j}`).top) + bottomDist, { priority: g_transPriority.layer });
-			addY(`filterBar${topNum + j}_HS`, `appearance`, parseFloat($id(`arrowSprite${j + 1}`).top) + topDist, { priority: g_transPriority.layer });
+			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);
 		}
 	}
 
 	// フィルターバーのパーセント表示（フィルターバーが複数表示されるなど複雑なため、最初の階層グループの位置に追従）
 	if (g_appearanceRanges.includes(g_stateObj.appearance)) {
 		const currentBarNum = g_hidSudObj.std[g_stateObj.appearance][g_stateObj.reverse];
-		addY(`filterView`, `appearance`, parseFloat($id(`arrowSprite${currentBarNum % 2}`).top) +
-			(currentBarNum % 2 === 0 ? bottomDist : topDist), { priority: g_transPriority.layer });
+		addTransform(`filterView`, `appearance`, `translateY(${parseFloat($id(`arrowSprite${currentBarNum % 2}`).top) +
+			(currentBarNum % 2 === 0 ? bottomDist : topDist)}px)`, g_transPriority.layer);
 		filterView.textContent = `${_num}%`;
 		g_hidSudObj.filterPos = _num;
 	}
@@ -13848,7 +13878,7 @@ const changeHitFrz = (_j, _k, _name, _difFrame = 0) => {
 	currentFrz.btmY -= delFrzLength + delFrzMotionLength + hitPos;
 	currentFrz.y += delFrzLength;
 	currentFrz.isMoving = false;
-	addTransform(frzName, `root`, `translateY(${wUnit(currentFrz.y)})`);
+	movArrowY.get(g_workObj.movLockEnabled)(frzName, currentFrz.y);
 
 	/**
 	 * フリーズアロー(ヒット時)の色変更

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2026/02/26 (v45.1.0)
+ * Revised : 2026/02/27 (v45.1.1)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -1727,7 +1727,7 @@ const g_stepAreaFunc = new Map([
     ['Halfway', () => {
         g_arrowGroupSprite.forEach(sprite => {
             for (let j = 0; j < g_stateObj.layerNum; j++) {
-                addY(`${sprite}${j}`, `stepArea`, halfwayOffset(j));
+                addTransform(`${sprite}${j}`, `stepArea`, `translateY(${halfwayOffset(j)}px)`, g_transPriority.stepArea);
             }
         });
     }],
@@ -1738,7 +1738,7 @@ const g_stepAreaFunc = new Map([
         if (g_workObj.orgFlatFlg) {
             g_arrowGroupSprite.forEach(sprite => {
                 for (let j = g_stateObj.layerNumDf; j < g_stateObj.layerNum; j++) {
-                    addY(`${sprite}${j}`, `stepArea`, halfwayOffset(j));
+                    addTransform(`${sprite}${j}`, `stepArea`, `translateY(${halfwayOffset(j)}px)`, g_transPriority.stepArea);
                 }
             });
         }
@@ -1750,7 +1750,7 @@ const g_stepAreaFunc = new Map([
         if (g_workObj.orgFlatFlg) {
             g_arrowGroupSprite.forEach(sprite => {
                 for (let j = 0; j < g_stateObj.layerNumDf; j++) {
-                    addY(`${sprite}${j}`, `stepArea`, halfwayOffset(j));
+                    addTransform(`${sprite}${j}`, `stepArea`, `translateY(${halfwayOffset(j)}px)`, g_transPriority.stepArea);
                 }
             });
         }
@@ -1758,7 +1758,7 @@ const g_stepAreaFunc = new Map([
     ['2Step', () => {
         g_arrowGroupSprite.forEach(sprite => {
             for (let j = g_stateObj.layerNumDf; j < g_stateObj.layerNum; j++) {
-                addY(`${sprite}${j}`, `stepArea`, halfwayOffset(j));
+                addTransform(`${sprite}${j}`, `stepArea`, `translateY(${halfwayOffset(j)}px)`, g_transPriority.stepArea);
             }
         });
     }],
@@ -1781,36 +1781,37 @@ const g_stepAreaFunc = new Map([
 const getShakingDist = () => (Math.abs((g_scoreObj.baseFrame / 2) % 100 - 50) - 25);
 const g_shakingFunc = new Map([
     ['OFF', () => true],
-    ['Horizontal', () => addX(`mainSprite`, `shaking`, getShakingDist())],
-    ['Vertical', () => addY(`mainSprite`, `shaking`, getShakingDist() / 2)],
+    ['Horizontal', () => addTransform(`mainSprite`, `shakingX`, `translateX(${getShakingDist()}px)`, g_transPriority.shaking)],
+    ['Vertical', () => addTransform(`mainSprite`, `shakingY`, `translateY(${getShakingDist() / 2}px)`, g_transPriority.shaking)],
     ['X-Horizontal', () => {
         for (let j = 0; j < g_stateObj.layerNum; j++) {
-            addX(`mainSprite${j}`, `shaking`, getDirFromLayer(j) * (4 / 3) * getShakingDist());
+            addTransform(`mainSprite${j}`, `shakingX`, `translateX(${getDirFromLayer(j) * (4 / 3) * getShakingDist()}px)`, g_transPriority.shaking);
         }
     }],
     ['X-Vertical', () => {
         for (let j = 0; j < g_stateObj.layerNum; j++) {
-            addY(`mainSprite${j}`, `shaking`, getDirFromLayer(j) * getShakingDist());
+            addTransform(`mainSprite${j}`, `shakingY`, `translateY(${getDirFromLayer(j) * getShakingDist()}px)`, g_transPriority.shaking);
         }
     }],
     ['Drunk', () => {
-        const shakeX = g_posXs.mainSprite?.get(`shaking`) ?? 0;
-        const shakeY = g_posYs.mainSprite?.get(`shaking`) ?? 0;
+        // Drunkは揺れの軸が途中で変わるため、基準位置取得のためにmainSpriteのみaddX, addYを使用
+        const shakeX = g_posXs.mainSprite?.get(`shakingX`) ?? 0;
+        const shakeY = g_posYs.mainSprite?.get(`shakingY`) ?? 0;
         if (shakeX === 0 && shakeY === 0) {
             g_workObj.drunkXFlg = Math.random() < 0.5;
             g_workObj.drunkYFlg = Math.random() < 0.5;
         }
         if (g_workObj.drunkXFlg) {
             const deltaX = getShakingDist();
-            addX(`mainSprite`, `shaking`, deltaX);
-            addX(`infoSprite`, `shaking`, deltaX);
-            addX(`judgeSprite`, `shaking`, deltaX);
+            addX(`mainSprite`, `shakingX`, deltaX, { priority: g_transPriority.shaking });
+            addTransform(`infoSprite`, `shakingX`, `translateX(${deltaX}px)`, g_transPriority.shaking);
+            addTransform(`judgeSprite`, `shakingX`, `translateX(${deltaX}px)`, g_transPriority.shaking);
         }
         if (g_workObj.drunkYFlg) {
             const deltaY = getShakingDist() / 2;
-            addY(`mainSprite`, `shaking`, deltaY);
-            addY(`infoSprite`, `shaking`, deltaY);
-            addY(`judgeSprite`, `shaking`, deltaY);
+            addY(`mainSprite`, `shakingY`, deltaY, { priority: g_transPriority.shaking });
+            addTransform(`infoSprite`, `shakingY`, `translateY(${deltaY}px)`, g_transPriority.shaking);
+            addTransform(`judgeSprite`, `shakingY`, `translateY(${deltaY}px)`, g_transPriority.shaking);
         }
     }],
     ['S-Drunk', () => {

package/package.json

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