danoniplus 52.0.0 → 52.2.0

package/js/lib/settings.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2026/09/13
- * Revised : 2026/11/01 (v52.0.0)
+ * Revised : 2026/11/08 (v52.2.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -625,6 +625,7 @@ const drawDensityGraph = _scoreId => {
 	updateScoreDetailLabel(`Density`, `Arrow`, obj.arrowCnts, 3, g_lblNameObj.s_arrow);
 	updateScoreDetailLabel(`Density`, `Frz`, obj.frzCnts, 4,
 		`${g_lblNameObj.s_frz}${g_headerObj.frzStartjdgUse ? ' <span class="common_bold">(2x)</span>' : ''}`);
+	updateScoreDetailLabel(`Density`, `Ring`, g_detailObj.ringCnt[_scoreId], 5, g_lblNameObj.s_ring);
 };
 
 /**
@@ -734,11 +735,13 @@ const makeDifInfoLabels = _scoreId => {
 			// 縦連
 			`${g_detailObj.toolDif[j].tate}\t` +
 			// 総矢印数
-			`${(obj.arrowCnts + obj.frzCnts)}\t` +
+			`${(obj.arrowCnts + obj.frzCnts + g_detailObj.ringCnt[j])}\t` +
 			// 矢印
 			`${obj.arrowCnts}\t` +
 			// フリーズアロー
 			`${obj.frzCnts}\t` +
+			// リングノート
+			`${g_detailObj.ringCnt[j]}\t` +
 			// APM
 			`${obj.apm}\t` +
 			// 時間(分秒)
@@ -787,9 +790,10 @@ const makeDifInfo = _scoreId => {
 	lblArrowInfo2.innerHTML = g_lblNameObj.s_linecnts.split(`{0}`)
 		.join(`${makeDedupliArray(g_detailObj.toolDif[_scoreId].push3).length} /cnt:${g_detailObj.toolDif[_scoreId].push3cnt}`);
 	dataArrowInfo.innerHTML =
-		`${arrowCnts + frzCnts * (g_headerObj.frzStartjdgUse ? 2 : 1)} ` +
+		`${arrowCnts + frzCnts * (g_headerObj.frzStartjdgUse ? 2 : 1) + g_detailObj.ringCnt[_scoreId]} ` +
 		`<span style="font-size:${wUnit(g_limitObj.difSelectorSiz)};">` +
-		`(${arrowCnts} + ${frzCnts}${g_headerObj.frzStartjdgUse ? ' <span class="common_bold">x 2</span>' : ''})` +
+		`(${arrowCnts} + ${frzCnts}${g_headerObj.frzStartjdgUse ? ' <span class="common_bold">x 2</span>' : ''}` +
+		`${hasRingNotes() ? ` + ${g_detailObj.ringCnt[_scoreId]}` : ''})` +
 		`</span>`;
 
 	const makeArrowCntsView = (_cntlist) => {
@@ -917,25 +921,25 @@ const makeHighScore = _scoreId => {
 			color: g_localStorage.highscores?.[scoreName]?.rankColor ?? `#666666`,
 			fontFamily: getBasicFont(`"Bookman Old Style"`),
 		}),
-		createScoreLabel(`lblHDateTime`, g_localStorage.highscores?.[scoreName]?.dateTime ?? `----/--/-- --:--`, { yPos: 12 }),
-		createScoreLabel(`lblHMarks`,
+		createScoreLabel(`dateTime`, g_localStorage.highscores?.[scoreName]?.dateTime ?? `----/--/-- --:--`, { yPos: 12 }),
+		createScoreLabel(`marks`,
 			`${g_localStorage.highscores?.[scoreName]?.fullCombo ?? '' ? '<span class="result_FullCombo">◆</span>' : ''}` +
 			`${g_localStorage.highscores?.[scoreName]?.perfect ?? '' ? '<span class="result_Perfect">◆</span>' : ''}` +
 			`${g_localStorage.highscores?.[scoreName]?.allPerfect ?? '' ? '<span class="result_AllPerfect">◆</span>' : ''}`,
 			{ xPos: 1, dx: 20, yPos: 12, w: 100, align: C_ALIGN_CENTER }),
-		createScoreLabel(`lblHClearLamps`,
+		createScoreLabel(`clearLamps`,
 			`Cleared: ` + (g_localStorage.highscores?.[scoreName]?.clearLamps?.join(', ') ?? C_FLG_HYPHEN),
 			{ yPos: 13, overflow: C_DIS_AUTO, w: g_sWidth / 2 + 40, h: 37 }),
 
-		createScoreLabel(`lblHShuffle`,
+		createScoreLabel(`shuffleS`,
 			g_stateObj.shuffle.indexOf(`Mirror`) < 0
 				? `` : `Shuffle: <span class="common_shuffle">${g_stateObj.shuffle}</span>`,
 			{ yPos: 11.5, dx: -130 }),
-		createScoreLabel(`lblHAssist`,
+		createScoreLabel(`assistS`,
 			g_autoPlaysBase.includes(g_stateObj.autoPlay)
 				? `` : `Assist: <span class="common_assist">${g_stateObj.autoPlay}</span>`,
 			{ yPos: 12.5, dx: -130 }),
-		createScoreLabel(`lblHAnother`,
+		createScoreLabel(`anotherS`,
 			!hasVal(g_keyObj[`transKey${keyCtrlPtn}`])
 				? `` : `A.Keymode: <span class="common_another">${g_keyObj[`transKey${keyCtrlPtn}`]}</span>`,
 			{ yPos: 13.5, dx: -130 }),
@@ -1031,9 +1035,11 @@ const drawMinimap = (_scoreId, { _initFlg = false, _fadeinFlg = false } = {}) =>
 
 	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);
+	// リング帯の有無で幅が変わるため、キー種 + リング帯有無でキャッシュする
+	const headerKey = params.config.ringBandWidth > 0 ? `${kPtn}_ring` : kPtn;
+	if (!g_detailObj.scoreMinimapHeader[headerKey]) {
+		// ヘッダーはキー種(+リング帯有無)ごとに共通なので、未作成の場合のみ生成してキャッシュ
+		g_detailObj.scoreMinimapHeader[headerKey] = createMinimapHeader(params.config, kPtn, params._keyNum);
 	}
 	if (!savedCanvases) {
 		// 未作成の場合のみミニマップを生成（Lazy Generation）
@@ -1050,7 +1056,7 @@ const drawMinimap = (_scoreId, { _initFlg = false, _fadeinFlg = false } = {}) =>
 	// --- ヘッダー部分 ---
 	const detailMiniMapHeader = createEmptySprite(detailMiniMap, `detailMiniMapHeader`, g_windowObj.detailMiniMapHeader);
 	$id(`detailMiniMapHeader`).top = wUnit(g_stateObj.miniMapRevFlg ? 230 + g_sHeight - 500 : 0);
-	detailMiniMapHeader.appendChild(g_detailObj.scoreMinimapHeader[kPtn]);
+	detailMiniMapHeader.appendChild(g_detailObj.scoreMinimapHeader[headerKey]);
 
 	// --- メイン（譜面）部分 ---
 	const detailMiniMapSub = createEmptySprite(detailMiniMap, `detailMiniMapSub`, g_windowObj.detailMiniMapSub);
@@ -1128,7 +1134,7 @@ const drawMinimap = (_scoreId, { _initFlg = false, _fadeinFlg = false } = {}) =>
  * @return {HTMLCanvasElement} ヘッダー用のキャンバス要素
  */
 const createMinimapHeader = (_config, _keyCtrlPtn, _keyNum) => {
-	const { timeMargin, laneWidth, logicalWidth } = _config;
+	const { timeMargin, laneWidth, logicalWidth, ringBandWidth = 0 } = _config;
 	const headerHeight = 15; // ヘッダーの固定高
 
 	const canvas = createCanvas(null, { w: logicalWidth, h: headerHeight, position: null });
@@ -1143,6 +1149,12 @@ const createMinimapHeader = (_config, _keyCtrlPtn, _keyNum) => {
 		// 視覚的な中央調整で +2px
 		fillCanvasText(ctx, keyText, x, headerHeight / 2 + 2, { siz: 10, color: '#999', align: C_ALIGN_CENTER, baseline: `middle` });
 	}
+	// リングノート帯の見出し
+	if (ringBandWidth > 0) {
+		const bandX = timeMargin + laneWidth * _keyNum + 4;
+		fillCanvasText(ctx, `Ring`, bandX + (ringBandWidth - 4) / 2, headerHeight / 2 + 2,
+			{ siz: 10, color: '#999', align: C_ALIGN_CENTER, baseline: `middle` });
+	}
 
 	return canvas;
 };
@@ -1166,7 +1178,7 @@ const createMinimapHeader = (_config, _keyCtrlPtn, _keyNum) => {
  */
 const generateMinimapData = (_params, _isReverse) => {
 	const { _scoreObj, _keyNum, _playingFrame, _firstArrowFrame, _keyCtrlPtn, config } = _params;
-	const { scale, timeMargin, laneWidth, logicalWidth, mmMarginY } = config;
+	const { scale, timeMargin, laneWidth, logicalWidth, mmMarginY, ringBandWidth = 0 } = config;
 
 	const mmHeightTotal = _playingFrame * scale + mmMarginY * 2;
 	const canvases = createSplitCanvases(logicalWidth, mmHeightTotal);
@@ -1234,6 +1246,46 @@ const generateMinimapData = (_params, _isReverse) => {
 		});
 	}
 
+	// 4. リングノート (レーンを持たないため、右側の専用帯に出現フレームのみ表示)
+	//    座標は使わない。同一フレームに複数ある場合は帯内で横に散らして重なりを避ける
+	if (ringBandWidth > 0 && _scoreObj.ringData !== undefined) {
+		const bandX = timeMargin + laneWidth * _keyNum + 4;
+		const bandW = ringBandWidth - 6;
+		const cols = g_ringObj.cols;
+
+		// 帯の背景
+		distributeDrawing(canvases, 0, mmHeightTotal, g_dpr, (ctx) => {
+			ctx.fillStyle = 'rgba(255, 255, 255, 0.05)';
+			ctx.fillRect(bandX, 0, bandW, mmHeightTotal);
+		});
+
+		// フレーム毎の出現数
+		const frameCnts = new Map();
+		for (let k = 0; k < _scoreObj.ringData.length; k += cols) {
+			const frame = parseFloat(_scoreObj.ringData[k]);
+			if (!isNaN(frame)) {
+				frameCnts.set(frame, (frameCnts.get(frame) ?? 0) + 1);
+			}
+		}
+
+		const seen = new Map();
+		for (let k = 0; k < _scoreObj.ringData.length; k += cols) {
+			const frame = parseFloat(_scoreObj.ringData[k]);
+			if (isNaN(frame)) continue;
+
+			const idx = seen.get(frame) ?? 0;
+			seen.set(frame, idx + 1);
+			const x = bandX + bandW * (idx + 1) / (frameCnts.get(frame) + 1);
+			const y = getY(frame);
+			distributeDrawing(canvases, y - 4, 8, g_dpr, (ctx) => {
+				ctx.fillStyle = 'rgba(255, 170, 60, 0.8)';
+				ctx.beginPath();
+				ctx.arc(x, y, 3, 0, Math.PI * 2);
+				ctx.fill();
+			});
+		}
+	}
+
 	return canvases.map(item => item.canvas);
 };
 
@@ -1828,7 +1880,7 @@ const createOptionWindow = _sprite => {
 
 	// ---------------------------------------------------
 	// タイミング調整 (Adjustment)
-	// 縦位置: 10.5  短縮ショートカットあり
+	// 縦位置: 10.6  短縮ショートカットあり
 	createGeneralSetting(spriteList.adjustment, `adjustment`, {
 		skipTerms: g_settings.adjustmentTerms, hiddenBtn: true, scLabel: g_lblNameObj.sc_adjustment, roundNum: 5,
 		unitName: g_lblNameObj.frame, addRFunc: () => viewAdjustment(),
@@ -1857,7 +1909,7 @@ const createOptionWindow = _sprite => {
 
 	// ---------------------------------------------------
 	// フェードイン (Fadein)
-	// 縦位置: 11.5 スライダーあり
+	// 縦位置: 11.6 スライダーあり
 	spriteList.fadein.appendChild(createLblSetting(`Fadein`));
 
 	const lnkFadein = createDivCss2Label(`lnkFadein`, `${g_stateObj.fadein}${g_lblNameObj.percent}`,
@@ -1893,7 +1945,7 @@ const createOptionWindow = _sprite => {
 
 	// ---------------------------------------------------
 	// ボリューム (Volume) 
-	// 縦位置: 12.5
+	// 縦位置: 12.6
 	createGeneralSetting(spriteList.volume, `volume`, { unitName: g_lblNameObj.percent });
 
 	// 譜面番号の再取得
@@ -2051,9 +2103,15 @@ const openHelpOverlay = (_title, _msg, _stateKey) => {
 	if (![`option`, `exSetting`, `settingsDisplay`].includes(g_currentPage)) return;
 
 	// 現在値は、g_currentPage を切り替える前に取得する(getStgDetailName が画面名を参照するため)
-	const currentVal = g_stateObj[_stateKey];
-	const currentNames = [currentVal, getStgDetailName(currentVal)];
-	const optNames = new Map((g_settings[`${_stateKey}s`] ?? []).map(val => [val, [val, getStgDetailName(val)]]));
+	const sub = g_helpPreviewDefs[_stateKey]?.sub || (_stateKey + `Type`);
+	const subList = sub !== undefined ? (g_settings[`${sub}s`] ?? []) : [];
+	const currentVals = [g_stateObj[_stateKey], ...(subList.length > 0 ? [g_stateObj[sub]] : [])];
+	const currentNames = currentVals.flatMap(val => [val, getStgDetailName(val)]);
+	const optNames = new Map([...(g_settings[`${_stateKey}s`] ?? []), ...subList]
+		.map(val => [val, [val, getStgDetailName(val)]]));
+
+	// Typeがある設定は、本体の説明文の後にTypeの説明文を続ける
+	const helpMsg = [_msg, ...(subList.length > 0 ? [g_msgObj[sub]] : [])].filter(hasVal).join(`\n\n`);
 	const rowElms = [];
 	const bright = g_headerObj.baseBrightFlg;
 
@@ -2080,7 +2138,7 @@ const openHelpOverlay = (_title, _msg, _stateKey) => {
 	});
 	g_handler.addListener(body, `click`, evt => evt.stopPropagation());
 
-	parseHelpLines(_msg).forEach(line => {
+	parseHelpLines(helpMsg).forEach(line => {
 		const row = document.createElement(`div`);
 		Object.assign(row.style, {
 			fontFamily: getBasicFont(), fontSize: wUnit(14), lineHeight: `1.1`, textAlign: `left`,
@@ -2109,12 +2167,13 @@ const openHelpOverlay = (_title, _msg, _stateKey) => {
 	});
 
 	// 説明文の選択行 (背景) をプレビューのカーソルに追従させる
-	const markHelpRows = _val => {
-		const names = optNames.get(_val) ?? [_val];
+	const markHelpRows = (_vals, _focus = 0) => {
+		const names = _vals.flatMap(val => optNames.get(val) ?? [val]);
+		const focusNames = optNames.get(_vals[_focus]) ?? [_vals[_focus]];
 		rowElms.forEach(({ nameList, row }) => {
 			const on = nameList.some(name => names.includes(name));
 			row.style.background = on ? `rgba(80,140,255,0.25)` : ``;
-			if (on) {
+			if (nameList.some(name => focusNames.includes(name))) {
 				// 本文がスクロールする場合は、選択行が見える位置へ寄せる
 				const [top, bottom] = [row.offsetTop, row.offsetTop + row.offsetHeight];
 				if (top < body.scrollTop) {
@@ -2125,7 +2184,7 @@ const openHelpOverlay = (_title, _msg, _stateKey) => {
 			}
 		});
 	};
-	markHelpRows(currentVal);
+	markHelpRows(currentVals);
 	g_helpSelectHook = markHelpRows;
 
 	// 上下キー: プレビューの選択肢移動、または本文のスクロール
@@ -2150,10 +2209,25 @@ const openHelpOverlay = (_title, _msg, _stateKey) => {
 		createCss2Button(`btnHelpNext`, ``, () => true, {
 			x: 0, y: 0, w: 0, h: 0, opacity: 0, resetFunc: () => moveHelp(1),
 		}, g_cssObj.button_Mini),
+
+		// 操作対象の列の切り替え (本体 / Type)
+		createCss2Button(`btnHelpLeft`, ``, () => true, {
+			x: 0, y: 0, w: 0, h: 0, opacity: 0, resetFunc: () => g_helpPreviewColumn(-1),
+		}, g_cssObj.button_Mini),
+		createCss2Button(`btnHelpRight`, ``, () => true, {
+			x: 0, y: 0, w: 0, h: 0, opacity: 0, resetFunc: () => g_helpPreviewColumn(1),
+		}, g_cssObj.button_Mini),
 	);
 	createScText(btnHelpClose, `HelpClose`, { displayName: `helpOverlay`, targetLabel: `btnHelpClose`, x: -5 });
 	if (previewH > 0) {
-		makeHelpPreview(overlay, _stateKey, g_sHeight - 30 - previewH, previewH);
+		const def = g_helpPreviewDefs[_stateKey];
+		let func;
+		if (def?.ring) {
+			func = makeRingHelpPreview;
+		} else {
+			func = makeHelpPreview;
+		}
+		func(overlay, _stateKey, g_sHeight - 30 - previewH, previewH);
 	}
 	// ユーザカスタムイベント(ヘルプ表示)
 	safeExecuteCustomHooks(`g_customJsObj.helpOverlay`, g_customJsObj.helpOverlay);
@@ -2202,17 +2276,21 @@ const isLongHelp = _msg =>
  * - currentKey: サンプルキーではなく実際のキーに合わせてマッピングする
  *               (StepArea, Swappingは実際のキーには非対応)
  * - frzUse    : サンプルでフリーズアローを使用するかどうか
+ * - sub       : 派生する設定 (Typeなど)。選択肢の列を2列目に追加する
+ * - ring      : リングのプレビューを出す
  */
 const g_helpPreviewDefs = {
 	motion: {},
 	scroll: { currentKey: true },
 	appearance: { splitLayer: true },
-	playWindow: {},
+	playWindow: { sub: `playWindowType` },
 	stepArea: {},
 	shaking: { splitLayer: true },
-	frzReturn: {},
-	effect: { currentKey: true, frzUse: true },
+	frzReturn: { sub: `frzReturnType` },
+	effect: { frzUse: true, splitLayer: true },
 	swapping: { frzUse: true },
+	ringSpeed: { ring: true },
+	ringGuide: { ring: true },
 };
 
 /**
@@ -2246,6 +2324,9 @@ let g_helpPreviewStop = () => true;
 /** プレビューの選択肢を前後へ動かす処理 (プレビュー表示中のみ差し替わる) */
 let g_helpPreviewMove = _dir => true;
 
+/** プレビューの操作対象の列を切り替える処理 (-1: 本体、1: Type。プレビュー表示中のみ差し替わる) */
+let g_helpPreviewColumn = _dir => true;
+
 /**
  * 詳細ヘルプ内プレビューの作成
  * @param {HTMLDivElement} _parent オーバーレイ
@@ -2260,7 +2341,10 @@ const makeHelpPreview = (_parent, _key, _top, _height) => {
 		return;
 	}
 	const playH = g_headerObj.playingHeight || g_sHeight;
-	const chipW = 120;
+	const subList = def.sub !== undefined ? g_settings[`${def.sub}s`] : undefined;
+	const subUse = subList !== undefined;
+	const colW = subUse ? 90 : 120;
+	const chipW = subUse ? colW * 2 + 6 : colW;   // 選択肢ボタン列の全体幅 (Typeがある場合は2列) 	
 	const areaW = g_sWidth - 60;
 
 	// レーン定義: Scrollのみ現在選択中のキー・パターンの定義を使用 (他は4レーン固定)
@@ -2432,6 +2516,8 @@ const makeHelpPreview = (_parent, _key, _top, _height) => {
 	let stride = Math.max(Math.round(visibleLanes.length * 0.6), 1);
 	while (gcd(stride, visibleLanes.length) !== 1) stride++;
 	let selected = ``;
+	let subSelected = subUse ? (subList.includes(g_stateObj[def.sub]) ? g_stateObj[def.sub] : subList[0]) : ``;
+	let activeCol = 0;   // 上下キーの対象列 (0: 本体、1: Type)
 	let frameCnt = 0;
 	let noteCnt = 0;
 	let autoCnt = 0;   // 自動切替までの経過フレーム数
@@ -2443,7 +2529,7 @@ const makeHelpPreview = (_parent, _key, _top, _height) => {
 	let filterElms = [];   // Appearanceのフィルターバー・ラベル
 	const frzLen = 90;   // Effectプレビュー用フリーズアローの長さ(px)
 	const work = { drunkXFlg: true, drunkYFlg: true, drunkAxisFlg: false, drunkRotateFlg: false };
-	const frz = { seq: null, axes: [], start: 0, next: 0 };
+	const frz = { seq: null, seqNo: 0, axes: [], start: 0, next: 0 };
 
 	/** 付与したtransformの初期化 */
 	const resetTransforms = () => spriteIds.forEach(id => {
@@ -2598,6 +2684,18 @@ const makeHelpPreview = (_parent, _key, _top, _height) => {
 		});
 	};
 
+	/** Typeの選択値を、ゲーム側の関数が参照する g_stateObj へ一時的に差し替えて実行 (g_playWindowDir など) */
+	const withSub = func => {
+		if (!subUse) return func();
+		const org = g_stateObj[def.sub];
+		g_stateObj[def.sub] = subSelected;
+		try {
+			return func();
+		} finally {
+			g_stateObj[def.sub] = org;
+		}
+	};
+
 	/**
 	 * 選択肢の適用
 	 * - Motion: 「配列の15がステップゾーン上」として、ステップゾーンからの距離を逆算する
@@ -2611,9 +2709,10 @@ const makeHelpPreview = (_parent, _key, _top, _height) => {
 
 		assignSwapping(_key === `swapping` ? opt : null);
 		// レーンのレイヤー配置 (StepAreaは選択肢ごと、Shakingは右半分を逆スクロール側へ)
-		assignLanes((_key === `stepArea` ? g_helpStepAreaLayouts[opt] : null)
-			?? (g_helpPreviewDefs[_key]?.currentKey ? getScrollLayout(opt) : null)
-			?? (def.splitLayer ? [0, 0, 1, 1] : [0, 0, 0, 0]));
+		assignLanes((g_helpPreviewDefs[_key]?.currentKey ? getScrollLayout(opt) : null)
+			?? (_key === `stepArea` ? g_helpStepAreaLayouts[opt] : null)
+			?? (def.splitLayer ? [0, 0, 1, 1] : [0, 0, 0, 0])
+				.map(val => g_stateObj.reverse === C_FLG_OFF ? val : val ^ 1));
 		applyFlat(opt);
 		if (_key === `stepArea`) {
 			runStepArea(opt);
@@ -2624,7 +2723,7 @@ const makeHelpPreview = (_parent, _key, _top, _height) => {
 
 		// SideScrollのみ矢印を90度回転 (ゲーム側の changeStepRtn と同じ符号)
 		rtnOffset = (_key === `playWindow` && opt === `SideScroll` && g_stateObj.rotateEnabled)
-			? 90 * (g_stateObj.playWindowType === C_FLG_REVERSE2 ? -1 : 1) : 0;
+			? 90 * (subSelected === C_FLG_REVERSE2 ? -1 : 1) : 0;
 		if (g_stateObj.rotateEnabled) {
 			laneInfo.forEach((lane, j) => {
 				if (typeof getRtn(j) === `number`) {
@@ -2651,13 +2750,14 @@ const makeHelpPreview = (_parent, _key, _top, _height) => {
 			dist[b] = dist[b - 1] + frameSpd + (trace[b] || 0);
 		}
 		if (_key === `playWindow`) {
-			addTransform(`mainSprite`, `playWindow`, g_playWindowFunc.get(opt)(), g_transPriority.playWindow);
+			addTransform(`mainSprite`, `playWindow`, withSub(() => g_playWindowFunc.get(opt)()), g_transPriority.playWindow);
 		}
 		if (_key === `shaking`) {
 			Object.assign(work, { drunkXFlg: true, drunkYFlg: true, drunkAxisFlg: false, drunkRotateFlg: false });
 		}
 		if (_key === `frzReturn`) {
 			frz.seq = null;
+			frz.seqNo = 0;
 			frz.next = frameCnt + 30;
 		}
 	};
@@ -2737,8 +2837,8 @@ const makeHelpPreview = (_parent, _key, _top, _height) => {
 		if (selected === C_FLG_OFF) return;
 		if (frz.seq === null) {
 			if (frameCnt < frz.next) return;
-			const seqs = (g_frzReturnSeqFunc.get(g_stateObj.frzReturnType) ?? g_frzReturnSeqFunc.get(`360deg`))();
-			frz.seq = seqs[Math.floor(Math.random() * seqs.length)];
+			const seqs = (g_frzReturnSeqFunc.get(subSelected) ?? g_frzReturnSeqFunc.get(`360deg`))();
+			frz.seq = seqs[frz.seqNo++ % seqs.length];
 			frz.axes = [...g_frzReturnFunc.get(selected)()].filter(Boolean);
 			frz.start = frameCnt;
 		}
@@ -2813,38 +2913,83 @@ const makeHelpPreview = (_parent, _key, _top, _height) => {
 		spriteIds.forEach(id => delete g_transforms[id]);
 		g_helpPreviewStop = () => true;
 		g_helpPreviewMove = _dir => true;
+		g_helpPreviewColumn = _dir => true;
 	};
 	g_helpPreviewStop = stop;
 
 	// ---------------------------------------------------
-	// 選択肢ボタン (g_settings の一覧から作成)
-	const chipH = Math.min(20, Math.floor(_height / optList.length));
+	// 選択肢ボタン (本体の列と、Typeがある設定のみTypeの列)
+	const chipX = baseX + viewW + 15;
+	const colMain = createEmptySprite(area, `pvColMain`, { x: chipX, y: 0, w: colW, h: _height });
+	const colSub = subUse ? createEmptySprite(area, `pvColSub`, { x: chipX + colW + 6, y: 0, w: colW, h: _height }) : null;
+
+	const makeChips = (_list, _prefix, _onSelect, _title = ``) => {
+		const chipH = Math.min(20, Math.floor(_height / _list.length));
+		return _list.map((opt, i) =>
+			createCss2Button(`${_prefix}${i}`, getStgDetailName(opt), () => _onSelect(opt), {
+				x: 0, y: i * chipH, w: colW, h: chipH - 2, siz: 12, title: _title,
+			}, g_cssObj.button_Default));
+	};
+	const chips = makeChips(optList, `pvChip`, opt => selectMain(opt));
+	const subChips = subUse ? makeChips(subList, `pvSubChip`, opt => selectSub(opt), g_msgObj[def.sub] ?? ``) : [];
+	multiAppend(colMain, ...chips);
+	if (subUse) {
+		multiAppend(colSub, ...subChips);
+	}
+
 	const markChips = () => {
-		chips.forEach((chip, i) => {
+		const mark = (_list, _chips, _current) => _chips.forEach((chip, i) => {
 			chip.classList.remove(g_cssObj.button_Default, g_cssObj.button_Setting);
-			chip.classList.add(optList[i] === selected ? g_cssObj.button_Setting : g_cssObj.button_Default);
+			chip.classList.add(_list[i] === _current ? g_cssObj.button_Setting : g_cssObj.button_Default);
 		});
-		g_helpSelectHook(selected);
+		mark(optList, chips, selected);
+		if (subUse) {
+			mark(subList, subChips, subSelected);
+			colSub.style.opacity = activeCol === 1 ? 1 : 0.5;   // 操作対象でない列は薄く表示
+		}
+		colMain.style.opacity = subUse && activeCol !== 0 ? 0.5 : 1;
+		g_helpSelectHook(subUse ? [selected, subSelected] : [selected], activeCol);
 		safeExecuteCustomHooks(`g_customJsObj.helpPreview`, g_customJsObj.helpPreview, _key, selected,
-			{ pvFrame, mainSprite, stepSprites, arrowSprites, playW, playH });
+			{ pvFrame, mainSprite, stepSprites, arrowSprites, playW, playH, sub: subSelected });
+	};
+
+	// 本体の選択（選択時は自動移動時間を2倍にする）
+	const selectMain = opt => {
+		autoCnt = -g_limitObj.helpPreviewAutoFrames;
+		activeCol = 0;
+		applyOption(opt);
+		markChips();
+	};
+
+	// Typeの選択 (本体がOFF/Defaultのときは、効果が見える基準の選択肢へ切り替える)
+	const selectSub = opt => {
+		autoCnt = -g_limitObj.helpPreviewAutoFrames;
+		activeCol = 1;
+		subSelected = opt;
+		const base = optList[1];
+		applyOption(selected === optList[0] && optList.includes(base) ? base : selected);
+		markChips();
 	};
-	const chips = optList.map((opt, i) =>
-		createCss2Button(`pvChip${i}`, getStgDetailName(opt), () => {
-			autoCnt = -g_limitObj.helpPreviewAutoFrames;
-			applyOption(opt);
-			markChips();
-		}, { x: baseX + viewW + 15, y: i * chipH, w: chipW, h: chipH - 2, siz: 12 }, g_cssObj.button_Default)
-	);
-	multiAppend(area, ...chips);
 
+	// 上下キー: 操作対象の列の選択肢を前後に動かす (端では反対側へ循環)
 	const moveOption = _dir => {
 		applyOption(optList[nextPos(optList.indexOf(selected), _dir, optList.length)]);
 		markChips();
 	};
-	// 上下キー: 選択肢を前後に動かす (端では反対側へ循環)
 	g_helpPreviewMove = _dir => {
-		autoCnt = -g_limitObj.helpPreviewAutoFrames;
-		moveOption(_dir);
+		if (subUse && activeCol === 1) {
+			selectSub(subList[nextPos(subList.indexOf(subSelected), _dir, subList.length)]);
+		} else {
+			autoCnt = -g_limitObj.helpPreviewAutoFrames;
+			moveOption(_dir);
+		}
+	};
+
+	// 左右キー: 操作対象の列を切り替える (←: 本体、→: Type)
+	g_helpPreviewColumn = _dir => {
+		if (!subUse) return;
+		activeCol = _dir > 0 ? 1 : 0;
+		markChips();
 	};
 
 	// 初期表示: 現在値 (OFF/Default の場合は最初の非OFFの選択肢)
@@ -2854,6 +2999,227 @@ const makeHelpPreview = (_parent, _key, _top, _height) => {
 	timerId = g_timerHandler.setTimeout(tick, 1000 / g_fps);
 };
 
+/**
+ * リングノート設定 (RingSpeed / RingGuide) 用の詳細ヘルプ内プレビュー
+ * - ゲーム側 makeRing/updateRings と同じ構成 (ガイド円 + 収束する本体円) を縮小表示する
+ * - 判定はオートプレイ相当 (到達フレームで判定済み扱い)。ポインタ判定は再現しない
+ * - RingSpeed: 現在の倍率での出現～到達フレーム数で収束させる
+ * - RingGuide: ガイドの違いが分かるよう、複数のリングが同時に出る固定の速さで表示する
+ * @param {HTMLDivElement} _parent オーバーレイ
+ * @param {string} _key ringSpeed / ringGuide
+ * @param {number} _top 配置Y座標
+ * @param {number} _height 領域の高さ
+ */
+const makeRingHelpPreview = (_parent, _key, _top, _height) => {
+	if (document.getElementById(`pvRingFrame`) !== null) {
+		return;
+	}
+	const isSpeed = _key === `ringSpeed`;
+	const optList = g_settings[`${_key}s`];
+	const round2 = _val => Math.round(_val * 100) / 100;
+	const sameVal = (_a, _b) => (isSpeed ? round2(_a) === round2(_b) : _a === _b);
+
+	// チップに出す選択肢 (RingSpeedは数が多いため 0.5x 刻みの代表値のみ)
+	const chipList = isSpeed ? optList.filter(val => Math.round(val * 100) % 50 === 0) : optList;
+
+	const playW = g_headerObj.playingWidth || g_sWidth;
+	const playH = g_headerObj.playingHeight || g_sHeight;
+	const chipW = 100;
+	const areaW = g_sWidth - 60;
+	const rate = Math.min(g_limitObj.helpPreviewMaxRate, _height / playH, (areaW - chipW - 15) / playW);
+	const viewW = Math.round(playW * rate);
+	const baseX = Math.max(Math.round((areaW - viewW - chipW - 15) / 2), 0);
+
+	// 領域内のクリックでオーバーレイが閉じないようにする
+	const area = createEmptySprite(_parent, `helpPreview`, {
+		x: 30, y: _top, w: areaW, h: _height, pointerEvents: C_DIS_AUTO,
+	});
+	g_handler.addListener(area, `click`, evt => evt.stopPropagation());
+
+	// ---------------------------------------------------
+	// ミニプレイ画面 (縮小表示)
+	const scaler = createEmptySprite(area, `pvRingScale`, {
+		x: baseX, y: 0, w: playW, h: playH, transform: `scale(${rate})`, transformOrigin: `top left`,
+	});
+	const pvFrame = createEmptySprite(scaler, `pvRingFrame`, {
+		w: playW, h: playH, background: g_headerObj.baseBrightFlg ? `#eeeeee` : `#111111`,
+		border: `1px solid #444444`, boxSizing: `border-box`, overflow: `hidden`,
+	});
+	const ringSprite = createEmptySprite(pvFrame, `pvRingSprite`, { w: playW, h: playH });
+
+	// ---------------------------------------------------
+	// プレビュー状態
+	const radius = g_ringObj.radius;
+	const ringColor = g_headerObj.baseBrightFlg ? g_ringObj.colorLight : g_ringObj.color;
+	const spots = [[0.3, 0.3], [0.65, 0.4], [0.45, 0.62], [0.75, 0.72], [0.25, 0.68], [0.55, 0.25]];
+	const holdFrames = 6;                           // 到達後に残すフレーム数 (判定の瞬間を見せる)
+	const guideDuration = 90, guideInterval = 28;   // RingGuide用 (同時に3個前後出る)
+	const speedInterval = 45;                       // RingSpeed用
+
+	let selected = isSpeed
+		? (optList.find(val => sameVal(val, g_stateObj.ringSpeed)) ?? optList[0])
+		: (optList.includes(g_stateObj.ringGuide) ? g_stateObj.ringGuide : optList[0]);
+	let rings = [];
+	let frameCnt = 0;
+	let noteCnt = 0;
+	let autoCnt = 0;
+	let timerId = null;
+
+	// ゲーム側 getRingDuration (ringSpeedData なし) と同じ式
+	const getTotal = () => isSpeed ? Math.max(Math.round(g_ringObj.baseFrame / selected), 1) : guideDuration;
+	const getInterval = () => isSpeed ? speedInterval : guideInterval;
+	const guideMode = () => isSpeed ? `ALL` : selected;
+
+	const clearRings = () => {
+		rings.forEach(ring => {
+			ring.guide.remove();
+			ring.body.remove();
+		});
+		rings = [];
+	};
+
+	const spawn = () => {
+		const [rx, ry] = spots[noteCnt % spots.length];
+		const no = ++noteCnt;
+		const base = {
+			x: Math.round(playW * rx) - radius, y: Math.round(playH * ry) - radius,
+			w: radius * 2, h: radius * 2, borderRadius: `50%`, boxSizing: `border-box`,
+		};
+		const guide = createEmptySprite(ringSprite, `pvRingGuide${no}`, {
+			...base, border: `solid ${g_ringObj.lineWidth}px ${g_ringObj.guideColor}`,
+			visibility: guideMode() === `Hidden` ? `hidden` : `visible`,
+		});
+		const body = createEmptySprite(ringSprite, `pvRingBody${no}`, {
+			...base, border: `solid ${g_ringObj.lineWidth}px ${ringColor}`,
+			transform: `scale(${g_ringObj.startRate})`,
+		});
+		const total = getTotal();
+		rings.push({ guide, body, total, cnt: total + 1, guideVisible: guideMode() !== `Hidden` });
+	};
+
+	const updateRings = () => {
+		rings = rings.filter(ring => {
+			ring.cnt--;
+			if (ring.cnt < -holdFrames) {
+				ring.guide.remove();
+				ring.body.remove();
+				return false;
+			}
+			// 本体の大きさ (cnt === 0 でガイドと一致)
+			const t = Math.min(Math.max(1 - ring.cnt / ring.total, 0), 1);
+			ring.body.style.transform = `scale(${g_ringObj.startRate + (1 - g_ringObj.startRate) * t})`;
+			ring.body.style.opacity = ring.cnt > 0 ? 1 : Math.max((holdFrames + ring.cnt) / holdFrames, 0);
+			return true;
+		});
+
+		// ガイド表示 (ゲーム側 updateRings と同じ条件。Next: 到達済み or 次に判定するリングのみ)
+		const mode = guideMode();
+		const nextRing = rings.find(ring => ring.cnt > 0);
+		rings.forEach(ring => {
+			const visible = mode === `Hidden` ? false
+				: mode === `Next` ? (ring.cnt <= 0 || ring === nextRing) : true;
+			if (ring.guideVisible !== visible) {
+				ring.guide.style.visibility = visible ? `visible` : `hidden`;
+				ring.guideVisible = visible;
+			}
+		});
+	};
+
+	// ---------------------------------------------------
+	// 選択肢ボタン
+	const colMain = createEmptySprite(area, `pvColMain`, { x: baseX + viewW + 15, y: 0, w: chipW, h: _height });
+	const chipH = Math.min(20, Math.floor(_height / (chipList.length + 2)));
+	const getChipName = opt => isSpeed ? `${opt} ${g_lblNameObj.multi}` : getStgDetailName(opt);
+	const chips = chipList.map((opt, i) =>
+		createCss2Button(`pvRingChip${i}`, getChipName(opt), () => selectOption(opt), {
+			x: 0, y: i * chipH, w: chipW, h: chipH - 2, siz: 12,
+		}, g_cssObj.button_Default));
+	multiAppend(colMain, ...chips);
+
+	// RingSpeed: 現在の倍率と出現～到達フレーム数
+	const lblInfo = createDivCss2Label(`pvRingInfo`, ``, {
+		x: 0, y: chipList.length * chipH + 4, w: chipW, h: 32, siz: 12, align: C_ALIGN_LEFT,
+	});
+	colMain.appendChild(lblInfo);
+
+	const markChips = () => {
+		chips.forEach((chip, i) => {
+			chip.classList.remove(g_cssObj.button_Default, g_cssObj.button_Setting);
+			chip.classList.add(sameVal(chipList[i], selected) ? g_cssObj.button_Setting : g_cssObj.button_Default);
+		});
+		lblInfo.textContent = isSpeed ? `${round2(selected)} ${g_lblNameObj.multi} (${getTotal()}f)` : ``;
+		g_helpSelectHook([selected], 0);
+		safeExecuteCustomHooks(`g_customJsObj.helpPreview`, g_customJsObj.helpPreview, _key, selected,
+			{ pvFrame, ringSprite, playW, playH });
+	};
+
+	const applyOption = opt => {
+		selected = opt;
+		clearRings();
+		frameCnt = 0;
+		spawn();
+	};
+	const selectOption = opt => {
+		autoCnt = -g_limitObj.helpPreviewAutoFrames;
+		applyOption(opt);
+		markChips();
+	};
+
+	// 上下キー: RingSpeedは内側ボタンと同じ5つ刻み (0.25x)、RingGuideは1つずつ
+	const moveOption = _step => {
+		const idx = Math.max(optList.findIndex(val => sameVal(val, selected)), 0);
+		applyOption(optList[nextPos(idx, _step, optList.length)]);
+		markChips();
+	};
+	// 自動切替: RingSpeedは代表値 (チップ) を順に巡回
+	const autoOption = () => {
+		if (!isSpeed) {
+			moveOption(1);
+			return;
+		}
+		const next = chipList.find(val => round2(val) > round2(selected));
+		applyOption(next ?? chipList[0]);
+		markChips();
+	};
+
+	const stop = () => {
+		if (timerId !== null) {
+			g_timerHandler.clearTimeout(timerId);
+		}
+		timerId = null;
+		g_helpPreviewStop = () => true;
+		g_helpPreviewMove = _dir => true;
+		g_helpPreviewColumn = _dir => true;
+	};
+	g_helpPreviewStop = stop;
+	g_helpPreviewMove = _dir => {
+		autoCnt = -g_limitObj.helpPreviewAutoFrames;
+		moveOption(_dir * (isSpeed ? g_settings.ringSpeedTerms[1] : 1));
+	};
+
+	const tick = () => {
+		if (document.getElementById(`pvRingFrame`) === null) {
+			stop();
+			return;
+		}
+		frameCnt++;
+		if (g_limitObj.helpPreviewAutoFrames > 0 && ++autoCnt >= g_limitObj.helpPreviewAutoFrames) {
+			autoCnt = 0;
+			autoOption();
+		}
+		if (frameCnt % getInterval() === 0) {
+			spawn();
+		}
+		updateRings();
+		timerId = g_timerHandler.setTimeout(tick, 1000 / g_fps);
+	};
+
+	// 初期表示: 現在の設定値
+	applyOption(selected);
+	markChips();
+	timerId = g_timerHandler.setTimeout(tick, 1000 / g_fps);
+};
+
 /**
  * 設定名の置き換え処理（未指定時は原則g_lblNameObjの値を使用、明示的な指定がある場合のみ元の名前を返却）
  * @param {string} _name 
@@ -3005,7 +3371,8 @@ const gaugeFormat = (_mode, _border, _rcv, _dmg, _init, _lifeValFlg) => {
 	let rcvText = round2(_rcv), dmgText = round2(_dmg);
 	let realRcv = _rcv, realDmg = _dmg;
 	const allCnt = sumData(g_detailObj.arrowCnt[g_stateObj.scoreId]) +
-		(g_headerObj.frzStartjdgUse ? 2 : 1) * sumData(g_detailObj.frzCnt[g_stateObj.scoreId]);
+		(g_headerObj.frzStartjdgUse ? 2 : 1) * sumData(g_detailObj.frzCnt[g_stateObj.scoreId]) +
+		g_detailObj.ringCnt[g_stateObj.scoreId];
 
 	// ゲージ設定が矢印数依存の場合、実際の値に変換して表示する
 	// 表示上、計算した値は小数第二位までの表示とする（それ以外はそのまま）
@@ -3985,8 +4352,30 @@ const createSettingsDisplayWindow = _sprite => {
 		unitName: g_lblNameObj.pixel,
 		addRFunc: () => updatePreviewHitPositionLine(g_stateObj.hitPosition),
 	});
+
+	if (hasRingNotes()) {
+		// ---------------------------------------------------
+		// リングノートの速度 (RingSpeed)
+		// 縦位置: 9.8
+		g_settings.ringSpeedNum = Math.max(g_settings.ringSpeeds.indexOf(g_stateObj.ringSpeed), 0);
+		g_stateObj.ringSpeed = g_settings.ringSpeeds[g_settings.ringSpeedNum];
+		createGeneralSetting(spriteList.ringSpeed, `ringSpeed`, { skipTerms: g_settings.ringSpeedTerms, unitName: ` ${g_lblNameObj.multi}` });
+
+		// ---------------------------------------------------
+		// リングノートのガイド表示 (RingGuide)
+		// 縦位置: 10.8
+		g_settings.ringGuideNum = Math.max(g_settings.ringGuides.indexOf(g_stateObj.ringGuide), 0);
+		g_stateObj.ringGuide = g_settings.ringGuides[g_settings.ringGuideNum];
+		createGeneralSetting(spriteList.ringGuide, `ringGuide`);
+	}
 };
 
+/**
+ * 選択中の譜面にリングノートが含まれるかをチェック
+ * @returns {boolean}
+ */
+const hasRingNotes = () => (g_detailObj.ringCnt[g_stateObj.scoreId] ?? 0) > 0;
+
 /**
  * Displayボタンを切り替えたときに連動して切り替えるボタンの設定
  * @param {object} _headerObj 
@@ -4155,7 +4544,10 @@ const createGeneralSettingEx = (_spriteList, _name, { defaultList = [C_FLG_OFF],
 					funcEx();
 					createExpandedScView(_name);
 				},
-				title: g_msgObj[`${_name}Type`] ?? ``,
+				// 拡張ボタンの説明文表示は「拡張元」設定のヘルプが長い場合、詳細ヘルプ表示側で表示するため省略する
+				title: isLongHelp(g_msgObj[`${_name}`] ?? ``) || g_helpPreviewDefs[_name] !== undefined
+					? ``
+					: (g_msgObj[`${_name}Type`] ?? ``),
 			}, g_cssObj.button_Default, g_cssObj.button_RevON);
 
 	/**