danoniplus 47.3.2 → 47.4.1

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2026/04/25
+ * Revised : 2026/04/29
  *
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 47.3.2`;
-const g_revisedDate = `2026/04/25`;
+const g_version = `Ver 47.4.1`;
+const g_revisedDate = `2026/04/29`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -3385,17 +3385,15 @@ const storeBaseData = (_scoreId, _scoreObj, _keyCtrlPtn) => {
 			mmWidthBase: (g_sWidth - 500) / 2 + 290,
 			mmMarginY: 2,
 			get laneWidth() {
-				return Math.min(Math.floor((this.mmWidthBase - this.timeMargin) / keyNum), 40);
+				return Math.min((this.mmWidthBase - this.timeMargin) / keyNum, 40);
 			},
 			get logicalWidth() {
-				return this.timeMargin + (this.laneWidth * keyNum);
+				const logicalWidth = this.timeMargin + (this.laneWidth * keyNum);
+				return Math.ceil(logicalWidth * this.dpr) / this.dpr;
 			}
 		},
 	};
 
-	// ヘッダー生成
-	g_detailObj.scoreMinimapHeader[_scoreId] = createMinimapHeader(g_detailObj.miniMapParams[_scoreId].config, _keyCtrlPtn, keyNum);
-
 	// Canvas保存用配列を空で初期化
 	g_detailObj.scoreMinimap[_scoreId] = null;
 	g_detailObj.scoreMinimapReverse[_scoreId] = null;
@@ -3510,7 +3508,7 @@ const createMinimapHeader = (_config, _keyCtrlPtn, _keyNum) => {
 	for (let j = 0; j < _keyNum; j++) {
 		// config.laneWidth を使って中央座標を計算
 		const x = timeMargin + j * laneWidth + laneWidth / 2;
-		const keyText = g_kCd[g_keyObj[`keyCtrl${_keyCtrlPtn}`][j][0]];
+		const keyText = g_kCd[g_keyObj[`keyCtrl${_keyCtrlPtn}`][j][0]].split(` `).join(``);
 
 		ctx.fillText(keyText, x, headerHeight / 2 + 2); // 視覚的な中央調整で +2px
 	}
@@ -7290,7 +7288,6 @@ const drawSpeedGraph = _scoreId => {
 		speed: { frame: [0], speed: [1], cnt: 0, strokeColor: g_graphColorObj.speed },
 		boost: { frame: [0], speed: [1], cnt: 0, strokeColor: g_graphColorObj.boost }
 	};
-	const dpr = window.devicePixelRatio || 1;
 
 	const tmpSpeedPoint = [0];
 	Object.keys(speedObj).forEach(speedType => {
@@ -7509,7 +7506,7 @@ const updateScoreDetailLabel = (_name, _label, _value, _pos = 0, _labelname = _l
 	const baseLabel = (_bLabel, _bLabelname, _bAlign) =>
 		document.getElementById(`detail${_name}`).appendChild(
 			createDivCss2Label(_bLabel, _bLabelname, {
-				x: 10, y: 110 + _pos * 20, w: 100, h: 20, siz: g_limitObj.difSelectorSiz, align: _bAlign,
+				x: 10, y: 130 + _pos * 16, w: 100, h: 16, siz: g_limitObj.difSelectorSiz, align: _bAlign,
 			})
 		);
 	if (document.getElementById(`data${_label}`) === null) {
@@ -7880,9 +7877,14 @@ const drawMinimap = (_scoreId, { _initFlg = false, _fadeinFlg = false } = {}) =>
 		? g_detailObj.scoreMinimapReverse[_scoreId]
 		: g_detailObj.scoreMinimap[_scoreId];
 
+	const params = g_detailObj.miniMapParams[_scoreId];
+	const kPtn = params._keyCtrlPtn;
+	if (!g_detailObj.scoreMinimapHeader[kPtn]) {
+		// ヘッダーはキー種ごとに共通なので、未作成の場合のみ生成してキャッシュ
+		g_detailObj.scoreMinimapHeader[kPtn] = createMinimapHeader(params.config, kPtn, params._keyNum);
+	}
 	if (!savedCanvases) {
 		// 未作成の場合のみミニマップを生成（Lazy Generation）
-		const params = g_detailObj.miniMapParams[_scoreId];
 		savedCanvases = generateMinimapData(params, isRev);
 
 		// 生成したものをキャッシュに保存
@@ -7896,7 +7898,7 @@ const drawMinimap = (_scoreId, { _initFlg = false, _fadeinFlg = false } = {}) =>
 	// --- ヘッダー部分 ---
 	const detailMiniMapHeader = createEmptySprite(detailMiniMap, `detailMiniMapHeader`, g_windowObj.detailMiniMapHeader);
 	$id(`detailMiniMapHeader`).top = (g_stateObj.miniMapRevFlg ? 230 + g_sHeight - 500 : 0) + `px`;
-	detailMiniMapHeader.appendChild(g_detailObj.scoreMinimapHeader[_scoreId]);
+	detailMiniMapHeader.appendChild(g_detailObj.scoreMinimapHeader[kPtn]);
 
 	// --- メイン（譜面）部分 ---
 	const detailMiniMapSub = createEmptySprite(detailMiniMap, `detailMiniMapSub`, g_windowObj.detailMiniMapSub);
@@ -8243,7 +8245,6 @@ const createOptionWindow = _sprite => {
 				graphObj.style.top = wUnit(0);
 				graphObj.style.position = `absolute`;
 				graphObj.style.background = j === 0 ? bkColor : `#ffffff00`;
-				graphObj.style.border = `dotted ${wUnit(2)}`;
 				const ctx = graphObj.getContext(`2d`);
 				ctx.scale(dpr, dpr);
 
@@ -11784,6 +11785,24 @@ const pushArrows = (_dataObj, _speedOnFrame, _firstArrivalFrame) => {
 	/** Motionの適用フレーム数 */
 	g_workObj.motionFrame = [];
 
+	const boostData = [];
+	if (hasArrayList(_dataObj.boostData, 2)) {
+		const _data = _dataObj.boostData.concat();
+		for (let k = 0; k < _data.length; k += 2) {
+			boostData.push({ frame: _data[k], spd: getSpeedFactor(_data[k + 1]) });
+		}
+		if (boostData.length > 0 && boostData[0].frame > 0) {
+			boostData.unshift({ frame: 0, spd: 1 });
+		}
+	}
+	const getSpdByFrame = _targetFrame => {
+		// targetFrame 以下の frame を持つ要素の中で、最後（最新）のものを見つける
+		const result = boostData.findLast((item) => _targetFrame >= item.frame);
+
+		// 該当するものがない場合（frame: 0 未満など）のフォールバック
+		return result ? result.spd : 1;
+	};
+
 	/**
 	 * 矢印・フリーズアローのデータ格納処理
 	 * @param {number} _j 
@@ -11797,9 +11816,14 @@ const pushArrows = (_dataObj, _speedOnFrame, _firstArrivalFrame) => {
 	 * @param {number} object.arrivalFrame
 	 * @param {number} object.motionFrame 
 	 */
-	const setNotes = (_j, _k, _data, _startPoint, _header, _frzFlg = false, { initY, initBoostY, arrivalFrame, motionFrame } = {}) => {
+	const setNotes = (_j, _k, _data, _startPoint, _header, _frzFlg = false, { initY, initBoostY, arrivalFrame, motionFrame, boostSpd } = {}) => {
 		if (_startPoint >= 0) {
-			const arrowAttrs = { pos: _j, initY, initBoostY, arrivalFrame, motionFrame };
+			const arrowAttrs = {
+				pos: _j, initY, initBoostY, arrivalFrame, motionFrame, boostSpd,
+				get boostDir() {
+					return Math.sign(this.boostSpd);
+				}
+			};
 			if (g_workObj[`mk${_header}Arrow`][_startPoint] === undefined) {
 				g_workObj[`mk${_header}Arrow`][_startPoint] = [arrowAttrs];
 			} else {
@@ -11863,8 +11887,10 @@ const pushArrows = (_dataObj, _speedOnFrame, _firstArrivalFrame) => {
 		if (_frzFlg) {
 			g_workObj[`mk${camelHeader}Length`][_j] = [];
 		}
-		setNotes(_j, lastk, _data, startPoint[lastk], camelHeader, _frzFlg,
-			{ initY: tmpObj.startY, initBoostY: g_workObj.initBoostY[frmPrev], arrivalFrame: tmpObj.arrivalFrm, motionFrame: tmpObj.motionFrm });
+		setNotes(_j, lastk, _data, startPoint[lastk], camelHeader, _frzFlg, {
+			initY: tmpObj.startY, initBoostY: g_workObj.initBoostY[frmPrev],
+			arrivalFrame: tmpObj.arrivalFrm, motionFrame: tmpObj.motionFrm, boostSpd: getSpdByFrame(arrowArrivalFrm)
+		});
 
 		// 矢印は1つずつ、フリーズアローは2つで1セット
 		for (let k = lastk - setcnt; k >= 0; k -= setcnt) {
@@ -11943,9 +11969,10 @@ const pushArrows = (_dataObj, _speedOnFrame, _firstArrivalFrame) => {
 			}
 
 			// 出現タイミングを保存
-			setNotes(_j, k, _data, startPoint[k], camelHeader, _frzFlg,
-				{ initY: tmpObj.startY, initBoostY: g_workObj.initBoostY[frmPrev], arrivalFrame: tmpObj.arrivalFrm, motionFrame: tmpObj.motionFrm }
-			);
+			setNotes(_j, k, _data, startPoint[k], camelHeader, _frzFlg, {
+				initY: tmpObj.startY, initBoostY: g_workObj.initBoostY[frmPrev],
+				arrivalFrame: tmpObj.arrivalFrm, motionFrame: tmpObj.motionFrm, boostSpd: getSpdByFrame(arrowArrivalFrm)
+			});
 		}
 	};
 
@@ -11960,30 +11987,6 @@ const pushArrows = (_dataObj, _speedOnFrame, _firstArrivalFrame) => {
 		calcNotes(j, _dataObj.dummyFrzData[j], `dummyFrz`, true);
 	}
 
-	// 個別加速のタイミング更新
-	const calcBoostData = _data => {
-		if (hasArrayList(_data, 2)) {
-			let delIdx = 0;
-			for (let k = _data.length - 2; k >= 0; k -= 2) {
-				const tmpObj = getArrowStartFrame(_data[k], _speedOnFrame);
-				if (tmpObj.frm < g_scoreObj.frameNum) {
-					_data[k] = g_scoreObj.frameNum;
-					delIdx = k;
-					break;
-				} else {
-					_data[k] = tmpObj.frm;
-				}
-				_data[k + 1] = getSpeedFactor(_data[k + 1]);
-			}
-			for (let k = 0; k < delIdx; k++) {
-				_data.shift();
-			}
-			return _data;
-		}
-		return [];
-	};
-	g_workObj.boostData = calcBoostData(_dataObj.boostData);
-
 	/**
 	 * 色変化・モーションデータ・スクロール反転データのタイミング更新
 	 * - この関数を使用する場合、配列グループの先頭2つが「フレーム数、矢印番号」となっていないと動作しない
@@ -12954,7 +12957,6 @@ const mainInit = () => {
 	const dummyArrowCnts = fillArray(keyNum);
 	const dummyFrzCnts = fillArray(keyNum);
 	let speedCnts = 0;
-	let boostCnts = 0;
 	let keychCnts = 0;
 
 	g_workObj.flatMode = g_stateObj.d_stepzone === `FlatBar` ||
@@ -13044,10 +13046,8 @@ const mainInit = () => {
 	// EffectのArrowEffect追加処理
 	g_effectFunc.get(g_stateObj.effect)();
 
-	// 現在の矢印・フリーズアローの速度、個別加算速度の初期化 (速度変化時に直す)
+	// 現在の矢印・フリーズアローの速度の初期化 (速度変化時に直す)
 	g_workObj.currentSpeed = 2;
-	g_workObj.boostSpd = 1;
-	g_workObj.boostDir = 1;
 
 	// 開始位置、楽曲再生位置の設定
 	const firstFrame = g_scoreObj.frameNum;
@@ -13557,6 +13557,10 @@ const mainInit = () => {
 			}
 		},
 
+		get dummyArrowON() {
+			return this.dummyArrowOFF;
+		},
+
 		// フリーズアロー(成功時)
 		frzOK: (_j, _k, _frzName, _cnt) => {
 			judgeKita(_cnt);
@@ -13600,10 +13604,11 @@ const mainInit = () => {
 
 		// ダミーフリーズアロー(キーを離したときの処理)
 		// ※処理上通ることはないが、統一のために定義
-		dummyFrzKeyUp: (_j, _k, _frzName, _cnt) => { },
+		get dummyFrzKeyUp() {
+			return this.dummyFrzNG;
+		}
 
 	};
-	judgeMotionFunc.dummyArrowON = (_j, _arrowName, _cnt) => judgeMotionFunc.dummyArrowOFF(_j, _arrowName, _cnt);
 
 	/**
 	 * 次矢印・フリーズアローへ判定を移すかチェック
@@ -13641,8 +13646,12 @@ const mainInit = () => {
 		},
 
 		arrowON: (_j, _k, _cnt) => true,
-		dummyArrowOFF: (_j, _k, _cnt) => true,
-		dummyArrowON: (_j, _k, _cnt) => true,
+		get dummyArrowOFF() {
+			return this.arrowON;
+		},
+		get dummyArrowON() {
+			return this.arrowON;
+		},
 
 		frzOFF: (_j, _k, _cnt) => {
 
@@ -13682,10 +13691,8 @@ const mainInit = () => {
 				changeHitFrz(_j, _k, `dummyFrz`);
 			}
 		},
-		dummyFrzON: (_j, _k, _cnt) => {
-			if (_cnt === 0) {
-				changeHitFrz(_j, _k, `dummyFrz`);
-			}
+		get dummyFrzON() {
+			return this.dummyFrzOFF;
 		},
 	};
 
@@ -13718,8 +13725,8 @@ const mainInit = () => {
 
 		const arrowName = `${_name}${_j}_${_arrowCnt}`;
 		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 firstPosY = stepY + (_attrs.initY * _attrs.boostSpd +
+			_attrs.initBoostY * _attrs.boostDir) * g_workObj.scrollDir[_j];
 
 		const arrowRoot = createEmptySprite(arrowSprite[g_workObj.dividePos[_j]], arrowName, {
 			x: 0, y: 0, w: C_ARW_WIDTH, h: C_ARW_WIDTH,
@@ -13733,13 +13740,13 @@ const mainInit = () => {
 			// 生存フレーム数 (ストップ分除去、個別加速/Motionオプション用)
 			boostCnt: _attrs.motionFrame,
 			// 個別加速量
-			boostSpd: g_workObj.boostSpd,
+			boostSpd: _attrs.boostSpd,
 			// ステップゾーン位置 (0: デフォルト, 1: リバース)
 			dividePos: dividePos,
 			// スクロール方向 (1: デフォルト, -1: リバース)
 			dir: g_workObj.scrollDir[_j],
 			// 個別加速方向 (1: 順方向加速, -1: 逆方向加速)
-			boostDir: g_workObj.boostDir,
+			boostDir: _attrs.boostDir,
 			// 前フレーム時の位置 (判定で使用)
 			prevY: firstPosY,
 			// 現フレーム時の位置
@@ -13834,9 +13841,9 @@ const mainInit = () => {
 		const frzNo = `${_j}_${_arrowCnt}`;
 		const frzName = `${_name}${frzNo}`;
 		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 firstPosY = stepY + (_attrs.initY * _attrs.boostSpd +
+			_attrs.initBoostY * _attrs.boostDir) * g_workObj.scrollDir[_j];
+		const firstBarLength = g_workObj[`mk${toCapitalize(_name)}Length`][_j][(_arrowCnt - 1) * 2] * _attrs.boostSpd;
 
 		const frzRoot = createEmptySprite(arrowSprite[g_workObj.dividePos[_j]], frzName, {
 			x: 0, y: 0, w: C_ARW_WIDTH, h: C_ARW_WIDTH + firstBarLength,
@@ -13864,13 +13871,13 @@ const mainInit = () => {
 			// キーを離していたフレーム数 (基準値超えでNG判定)
 			keyUpFrame: 0,
 			// 個別加速量
-			boostSpd: g_workObj.boostSpd,
+			boostSpd: _attrs.boostSpd,
 			// ステップゾーン位置 (0: デフォルト, 1: リバース)
 			dividePos: dividePos,
 			// スクロール方向 (1: デフォルト, -1: リバース)
 			dir: g_workObj.scrollDir[_j],
 			// 個別加速方向 (1: 順方向加速, -1: 逆方向加速)
-			boostDir: g_workObj.boostDir,
+			boostDir: _attrs.boostDir,
 			// 現フレーム時のフリーズアロー本体の位置
 			y: firstPosY,
 			// フリーズアロー(帯)の相対位置
@@ -14082,11 +14089,6 @@ const mainInit = () => {
 			g_workObj.currentSpeed = g_workObj.speedData[speedCnts + 1];
 			speedCnts += 2;
 		}
-		while (currentFrame >= g_workObj.boostData?.[boostCnts]) {
-			g_workObj.boostSpd = g_workObj.boostData[boostCnts + 1];
-			g_workObj.boostDir = (g_workObj.boostSpd > 0 ? 1 : -1);
-			boostCnts += 2;
-		}
 
 		objList.forEach(header => {
 			const headerU = toCapitalize(header);

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2026/04/25 (v47.3.2)
+ * Revised : 2026/04/29 (v47.4.1)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -489,31 +489,31 @@ const updateWindowSiz = () => {
             x: 290, y: 145, w: 120, h: 20, siz: 50, align: C_ALIGN_CENTER,
         },
         lblSpdHeader: {
-            x: 5, y: 180, w: 100, h: 20, siz: g_limitObj.difSelectorSiz, align: C_ALIGN_LEFT,
+            x: 5, y: 190, w: 100, h: 20, siz: g_limitObj.difSelectorSiz, align: C_ALIGN_LEFT,
         },
         lblSpdBase: {
-            x: 0, y: 200, w: 40, h: 20, siz: 11.5, fontWeight: `bold`,
+            x: 0, y: 210, w: 40, h: 20, siz: 11.5, fontWeight: `bold`,
         },
         lblSpdOverall: {
-            x: 40, y: 200, w: 40, h: 20, siz: 11.5,
+            x: 40, y: 210, w: 40, h: 20, siz: 11.5,
             color: g_graphColorObj.speedChara, fontWeight: `bold`,
         },
         lblSpdBoost: {
-            x: 80, y: 200, w: 40, h: 20, siz: 11.5,
+            x: 80, y: 210, w: 40, h: 20, siz: 11.5,
             color: g_graphColorObj.boostChara, fontWeight: `bold`,
         },
         lblSpdTotal: {
-            x: 5, y: 215, w: 100, h: 20, siz: g_limitObj.difSelectorSiz,
+            x: 5, y: 225, w: 100, h: 20, siz: g_limitObj.difSelectorSiz,
             align: C_ALIGN_LEFT, fontWeight: `bold`,
         },
         lblSpdFrame: {
-            x: 70, y: 218, w: 50, h: 20, siz: 12, fontWeight: `bold`,
+            x: 70, y: 228, w: 50, h: 20, siz: 12, fontWeight: `bold`,
         },
         btnSpdCursorL: {
-            x: 85, y: 180, w: 15, h: 20, siz: 12,
+            x: 85, y: 190, w: 15, h: 20, siz: 12,
         },
         btnSpdCursorR: {
-            x: 100, y: 180, w: 15, h: 20, siz: 12,
+            x: 100, y: 190, w: 15, h: 20, siz: 12,
         },
         lnkMiniMapRev: {
             w: g_limitObj.difCoverWidth, h: 20, borderStyle: `solid`,
@@ -4844,6 +4844,7 @@ const g_lang_msgObj = {
         lnkDensityG: `譜面の密度状況を表示`,
         lnkToolDifG: `譜面の難易度、矢印・フリーズアローの分布状況を表示`,
         lnkHighScoreG: `譜面のハイスコアを表示`,
+        lnkMiniMapG: `譜面内容をミニマップで表示`,
         lnkDifInfo: `譜面の難易度、矢印・フリーズアローの分布状況をクリップボードへコピー`,
         lnkResetHighScore: `譜面のハイスコア情報を消去`,
         lnkHighScore: `譜面のハイスコアをクリップボードへコピー`,
@@ -4944,6 +4945,7 @@ const g_lang_msgObj = {
         lnkDensityG: `Displays the density status of the chart.`,
         lnkToolDifG: `Displays the difficulty level of the chart and the distribution of arrows and freeze arrows.`,
         lnkHighScoreG: `Displays the high score of the chart.`,
+        lnkMiniMapG: `Display chart on the minimap.`,
         lnkDifInfo: `Copy the difficulty of the chart and the distribution of arrows and freeze arrows to the clipboard.`,
         lnkResetHighScore: `Erase the high score information in the chart.`,
         lnkHighScore: `Copies the high score of the chart to the clipboard.`,

package/package.json

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