danoniplus 43.6.3 → 44.0.0

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2026/01/26
+ * Revised : 2026/02/07
  *
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 43.6.3`;
-const g_revisedDate = `2026/01/26`;
+const g_version = `Ver 44.0.0`;
+const g_revisedDate = `2026/02/07`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -3969,6 +3969,12 @@ const headerConvert = _dosObj => {
 		}
 	});
 
+	// 縦伸縮率の設定
+	const stretchYRate = [];
+	_dosObj.stretchYRate?.split(`$`).forEach((val, j) => {
+		stretchYRate[j] = hasVal(val) ? setVal(val, 1, C_TYP_FLOAT) : 1;
+	});
+	obj.stretchYRate = makeBaseArray(stretchYRate, obj.difLabels.length, 1);
 	// 最終演出表示有無（noneで無効化）
 	obj.finishView = _dosObj.finishView ?? ``;
 
@@ -5760,7 +5766,7 @@ const playBGM = async (_num, _currentLoopNum = g_settings.musicLoopNum) => {
 
 	/**
 	 * BGMのループ処理 (base64エンコード時用)
-	 * - base64エンコード時はtimeupdateイベントが発火しないため、setIntervalで時間を取得する
+	 * - base64エンコード時はtimeupdateイベントが発火しないため、監視しながらループ処理を行う
 	 */
 	const repeatBGM = () => {
 		const numAtStart = g_settings.musicIdxNum;
@@ -5789,22 +5795,36 @@ const playBGM = async (_num, _currentLoopNum = g_settings.musicLoopNum) => {
 		);
 	};
 
+	/**
+	 * 既存のAudio/AudioPlayerをクローズ
+	 */
+	const closeExistingAudio = () => {
+		if (g_stateObj.bgmTimeupdateEvtId !== null && g_stateObj.bgmTimeupdateEvtId !== undefined) {
+			g_handler.removeListener(g_stateObj.bgmTimeupdateEvtId);
+			g_stateObj.bgmTimeupdateEvtId = null;
+		}
+		if (g_audioForMS instanceof AudioPlayer) {
+			g_musicdata = ``;
+			g_audioForMS.close();
+		}
+	};
+
 	if (encodeFlg) {
 		try {
 			// base64エンコードは読込に時間が掛かるため、曲変更時のみ読込
 			if (!hasVal(g_musicdata) || Math.abs(_num) % g_headerObj.musicIdxList.length !== 0) {
-				if (g_audioForMS instanceof AudioPlayer) {
-					g_audioForMS.close();
-				}
+				closeExistingAudio();
 				await loadScript2(url);
 				musicInit();
 				if (!isTitle()) {
+					g_musicdata = ``;
 					return;
 				}
 				const tmpAudio = new AudioPlayer();
 				const array = Uint8Array.from(atob(g_musicdata), v => v.charCodeAt(0));
 				await tmpAudio.init(array.buffer);
 				if (!isTitle()) {
+					g_musicdata = ``;
 					tmpAudio.close();
 					return;
 				}
@@ -5823,13 +5843,7 @@ const playBGM = async (_num, _currentLoopNum = g_settings.musicLoopNum) => {
 
 	} else {
 		// 既存の監視を解除し、AudioPlayer を確実にクローズ
-		if (g_stateObj.bgmTimeupdateEvtId) {
-			g_handler.removeListener(g_stateObj.bgmTimeupdateEvtId);
-			g_stateObj.bgmTimeupdateEvtId = null;
-		}
-		if (g_audioForMS instanceof AudioPlayer) {
-			g_audioForMS.close();
-		}
+		closeExistingAudio();
 		g_audioForMS = new Audio();
 		g_audioForMS.src = url;
 		g_audioForMS.autoplay = false;
@@ -9768,6 +9782,28 @@ const loadingScoreInit = async () => {
 	}
 	g_scoreObj = scoreConvert(g_rootObj, g_stateObj.scoreId, 0, dummyIdHeader);
 
+	// Motionオプション適用時の矢印別の速度を取得（配列形式）
+	g_workObj.motionOnFrames = setMotionOnFrame();
+	g_workObj.motionReverseFlg = g_workObj.motionOnFrames.filter(val => g_stateObj.speed + val < 0).length > 0;
+
+	// 矢印描画時間の引き伸ばし設定（個別加速がある場合かつ逆走を伴うモーションは初期倍速によりさらに引き伸ばしを行う）
+	// ただし、速度による引き伸ばし(boostFactor)の上限は描画の関係で2倍までとする
+	let maxBoost = 1;
+	for (let j = 0; j < g_scoreObj.boostData.length; j += 2) {
+		maxBoost = Math.max(maxBoost, g_scoreObj.boostData[j + 1]);
+	}
+	const boostFactor = 1 + (
+		(g_settings.motionDistRates[g_settings.motionNum] === 1 || !g_workObj.motionReverseFlg)
+			? 0
+			: (
+				g_stateObj.speed * g_headerObj.baseSpeed - g_settings.motionBoostFactorMinSpd > 0 && maxBoost > 1
+					? Math.min(maxBoost / 4, 1) : 0
+			)
+	);
+	g_scoreObj.distY = Math.max(
+		g_headerObj.stretchYRate[g_stateObj.scoreId], g_settings.motionDistRates[g_settings.motionNum] * boostFactor
+	) * g_posObj.distY;
+
 	// 最終フレーム数の取得
 	let lastFrame = getLastFrame(g_scoreObj) + g_headerObj.blankFrame;
 
@@ -9780,9 +9816,6 @@ const loadingScoreInit = async () => {
 	// フレームごとの速度を取得（配列形式）
 	let speedOnFrame = setSpeedOnFrame(g_scoreObj.speedData, lastFrame);
 
-	// Motionオプション適用時の矢印別の速度を取得（配列形式）
-	g_workObj.motionOnFrames = setMotionOnFrame();
-
 	// 最初のフレームで出現する矢印が、ステップゾーンに到達するまでのフレーム数を取得
 	const firstFrame = (g_scoreObj.frameNum === 0 ? 0 : g_scoreObj.frameNum + g_headerObj.blankFrame);
 	let arrivalFrame = getFirstArrivalFrame(firstFrame, speedOnFrame);
@@ -10830,7 +10863,7 @@ const getFountainTrace = (_frms, _spd) => {
 		_frms[j] = Math.floor((10 - (j - C_MOTION_STD_POS - 1) * diff) * factor);
 	}
 	return _frms;
-}
+};
 
 /**
  * 最初のフレームで出現する矢印が、ステップゾーンに到達するまでのフレーム数を取得
@@ -10842,7 +10875,7 @@ const getFirstArrivalFrame = (_startFrame, _speedOnFrame) => {
 	let startY = 0;
 	let frm = _startFrame;
 
-	while (g_posObj.distY - startY > 0) {
+	while (g_scoreObj.distY - startY > 0) {
 		startY += _speedOnFrame[frm];
 		frm++;
 	}
@@ -11190,7 +11223,7 @@ const getArrowStartFrame = (_frame, _speedOnFrame) => {
 		motionFrm: C_MOTION_STD_POS
 	};
 
-	while (g_posObj.distY - obj.startY > 0) {
+	while (g_scoreObj.distY - obj.startY > 0) {
 		obj.startY += _speedOnFrame[obj.frm - 1];
 
 		if (_speedOnFrame[obj.frm - 1] !== 0) {
@@ -12782,6 +12815,7 @@ const mainInit = () => {
 			currentArrow.y -= (g_workObj.currentSpeed * currentArrow.boostSpd +
 				(g_workObj.motionOnFrames[boostCnt] || 0) * currentArrow.boostDir) * currentArrow.dir;
 			$id(arrowName).top = wUnit(currentArrow.y);
+			g_motionAlphaFunc.get(g_stateObj.motion)(arrowName, currentArrow);
 			currentArrow.boostCnt--;
 		}
 		judgeMotionFunc[`${_name}${g_stateObj.autoAll}`](_j, arrowName, --currentArrow.cnt);
@@ -12932,8 +12966,10 @@ const mainInit = () => {
 
 				// 移動
 				if (g_workObj.currentSpeed !== 0) {
+					currentFrz.prevY = currentFrz.y;
 					currentFrz.y -= movY + (g_workObj.motionOnFrames[currentFrz.boostCnt] || 0) * currentFrz.dir * currentFrz.boostDir;
 					$id(frzName).top = wUnit(currentFrz.y);
+					g_motionAlphaFunc.get(g_stateObj.motion)(frzName, currentFrz);
 					currentFrz.boostCnt--;
 				}
 				currentFrz.cnt--;

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2026/01/23 (v43.6.0)
+ * Revised : 2026/02/07 (v44.0.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -1218,9 +1218,16 @@ const g_settings = {
     speedNum: 0,
     speedTerms: [20, 5, 1],
 
-    motions: [C_FLG_OFF, `Boost`, `Hi-Boost`, `Brake`, `Compress`, `Fountain`],
+    motions: [C_FLG_OFF, `Boost`, `Hi-Boost`, `Brake`, `Compress`, `Fountain`, `Magnet`],
     motionNum: 0,
 
+    // 移動距離倍率 (Compress, Fountain, Magnetのみ倍率を変更)
+    motionDistRates: [1, 1, 1, 1, 1.25, 3, 1.5],
+    // 速度が逆転するときのアルファ値 (g_motionAlphaFuncで使用)
+    motionAlpha: 0.625,
+    // 移動距離倍率の補正を行う最小の初期倍速
+    motionBoostFactorMinSpd: 5,
+
     reverses: [C_FLG_OFF, C_FLG_ON],
     reverseNum: 0,
 
@@ -1563,9 +1570,34 @@ const g_motionFunc = new Map([
     ['Hi-Boost', _frms => getBoostTrace(_frms, g_stateObj.speed * 2)],
     ['Brake', _frms => getBrakeTrace(_frms)],
     ['Compress', _frms => getBoostTrace(_frms, g_stateObj.speed * 5 / 8, -1)],
-    ['Fountain', _frms => getFountainTrace(_frms, g_stateObj.speed * 2)],
+    ['Fountain', _frms => getFountainTrace(_frms, g_stateObj.speed)],
+    ['Magnet', _frms => getFountainTrace(_frms, g_stateObj.speed * 2)],
+]);
+
+/**
+ * モーション適用中のアルファ値制御関数
+ * @param {object} _obj 対象オブジェクト
+ * @param {object} _property 対象オブジェクトのプロパティ情報 (g_attrObj[オブジェクト名])
+ */
+const g_motionAlphaFunc = new Map([
+    ['OFF', () => ``],
+    ['Boost', () => ``],
+    ['Hi-Boost', () => ``],
+    ['Brake', () => ``],
+    ['Compress', () => ``],
+    ['Fountain', (_obj, _property) => motionAlphaToggle(_obj, _property)],
+    ['Magnet', (_obj, _property) => motionAlphaToggle(_obj, _property)],
 ]);
 
+const motionAlphaToggle = (_obj, _property) => {
+    const dir = (_property.y - _property.prevY) * _property.dir;
+    if (($id(_obj).opacity === ``) && dir > 0) {
+        $id(_obj).opacity = g_settings.motionAlpha;
+    } else if (Number($id(_obj).opacity) === g_settings.motionAlpha && dir < 0) {
+        $id(_obj).opacity = ``;
+    }
+};
+
 /**
  * PlayWindow適用関数
  */

package/package.json

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