danoniplus 51.0.3 → 51.1.0

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2026/09/26
+ * Revised : 2026/09/27
  *
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 51.0.3`;
-const g_revisedDate = `2026/09/26`;
+const g_version = `Ver 51.1.0`;
+const g_revisedDate = `2026/09/27`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2026/09/25 (v51.0.2)
+ * Revised : 2026/09/27 (v51.1.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -1340,6 +1340,12 @@ const g_gaugeDefObj = {
     Easy: { Border: 70, Recovery: 4, Damage: 7, Init: 25, Variable: C_FLG_ON, headerOverridable: true, deriveRecoveryFrom: `Normal` },
 };
 
+/**
+ * 譜面ヘッダー由来のゲージ設定をまとめて定義
+ * - 定義方法はg_gaugeSelObjと類似しており、ゲージ名プロパティがない以外はほぼ同じ構造。
+ */
+const g_gaugeHeaderObj = {};
+
 /**
  * カスタムゲージの選択状態・個別上書き値
  * - g_gaugeSelObj[scoreId] = {
@@ -1368,11 +1374,10 @@ const g_gaugeDefObj = {
  */
 const g_gaugeSelObj = {};
 
-/**
- * 譜面ヘッダー由来のゲージ設定をまとめて定義
- * - 定義方法はg_gaugeSelObjと類似しており、ゲージ名プロパティがない以外はほぼ同じ構造。
+/** 
+ * 最終的に適用するゲージ設定値のサマリー
  */
-const g_gaugeHeaderObj = {};
+const g_gaugeResolvedObj = {};
 
 /** どの名前をどの順で選択肢に出すかだけを持つ。詳細値はg_gaugeDefObj、g_gaugeHeaderObj, g_gaugeSelObjを参照 */
 const g_gaugeOptionObj = {
@@ -1537,7 +1542,8 @@ const g_settings = {
     settingWindowNum: 0,
 
     preconditions: [`g_rootObj`, `g_headerObj`, `g_keyObj`, `g_scoreObj`, `g_workObj`,
-        `g_detailObj`, `g_stateObj`, `g_attrObj`, `g_gaugeDefObj`, `g_gaugeHeaderObj`, `g_gaugeSelObj`, `g_editorTmp`, `g_editorTmp2`],
+        `g_detailObj`, `g_stateObj`, `g_attrObj`,
+        `g_gaugeDefObj`, `g_gaugeHeaderObj`, `g_gaugeSelObj`, `g_gaugeResolvedObj`, `g_editorTmp`, `g_editorTmp2`],
     preconditionNum: 0,
     preconditionNumSub: 0,
 };

package/js/lib/dosConverter.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2026/09/13
- * Revised : 2026/09/26 (v51.0.3)
+ * Revised : 2026/09/27 (v51.1.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -262,6 +262,10 @@ const initialControl = async () => {
 				getGaugeSetting(g_rootObj, gaugePtn, { scoreId: j }));
 		}
 	}
+	// g_loadObj.mainがfalseで上のブロックが丸ごとスキップされた場合でも、
+	// setGaugeが必ずg_gaugeResolvedObjを引けるよう毎回解決し直す
+	resolveGaugeValuesAll();
+
 	safeExecuteCustomHooks(`g_customJsObj.preTitle`, g_customJsObj.preTitle);
 	const queryMusicId = getQueryParamVal(`musicId`);
 	g_settings.musicIdxNum = queryMusicId !== null ? Number(queryMusicId) :
@@ -2068,7 +2072,7 @@ const resetCustomGauge = (_dosObj, { scoreId = 0 } = {}) => {
 
 	const scoreIdHeader = (scoreId === 0 && hasVal(_dosObj[`customGauge1`]))
 		? 1 : setScoreIdHeader(scoreId, g_stateObj.scoreLockFlg, false);
-	const dosCustomGauge = _dosObj[`customGauge${scoreIdHeader}`];
+	const dosCustomGauge = _dosObj[`customGauge${scoreIdHeader}`] ?? _dosObj.customGauge;
 	if (!hasVal(dosCustomGauge)) return;
 
 	g_gaugeSelObj[scoreId] = structuredClone(g_gaugeSelObj.default ?? { __order: [] });
@@ -2126,6 +2130,70 @@ const getGaugeSetting = (_dosObj, _name, { scoreId = 0 } = {}) => {
 	g_gaugeSelObj[scoreId][_name] = { ...g_gaugeSelObj[scoreId][_name], Border: border, Recovery: recovery, Damage: damage, Init: init };
 };
 
+/**
+ * 全ゲージ名の最終値（Border/Recovery/Damage/Init/Variable）を決定する関数
+ */
+const resolveGaugeValuesAll = () => {
+	for (let j = 0; j < g_headerObj.difLabels.length; j++) {
+		resolveGaugeValues(j);
+	}
+}
+
+/**
+ * (scoreId)単位で、その譜面の全ゲージ名の最終値（Border/Recovery/Damage/Init/Variable）を
+ * 事前に解決し、g_gaugeResolvedObj[scoreId]として保持する。
+ * カーソル位置には依存しない、譜面が決まれば決まる値なので、getGaugeSetting(j)の直後に1回だけ呼ぶ
+ * @param {number} _scoreId
+ */
+const resolveGaugeValues = (_scoreId) => {
+	const getGaugeCalc = (_val, _defaultVal) => setVal(convertStrToVal(
+		replaceStr(_val, g_escapeStr.gaugeParamName)?.split(`{0}`).join(_scoreId)
+	), _defaultVal, C_TYP_CALC);
+	const resolveBorder = (_border, _defaultVal) => (_border === `x` ? `x` : getGaugeCalc(_border, _defaultVal));
+
+	const currentGaugeSel = g_gaugeSelObj[_scoreId] || g_gaugeSelObj[0] || g_gaugeSelObj.default;
+	const header = g_gaugeHeaderObj[_scoreId];
+	const isCustom = currentGaugeSel?.__order?.length > 0;
+	const order = isCustom
+		? currentGaugeSel.__order
+		: g_gaugeOptionObj[header.Border === `x` ? `survival` : `border`];
+
+	// __order内で最初に出てくるheaderOverridable「系統」だけにdifDataを適用する（Light/EasyはOriginal/Normalの系統扱い）
+	const getGaugeRoot = _name => g_gaugeDefObj[_name]?.deriveRecoveryFrom ?? _name;
+	const firstOverridableRoot = getGaugeRoot(order.find(name => g_gaugeDefObj[name]?.headerOverridable));
+
+	const resolved = { __order: order.concat(), __custom: isCustom };
+	order.forEach(name => {
+		const def = g_gaugeDefObj[name] ?? {};
+
+		// Step1：基本設定（g_gaugeDefObj）をまず適用
+		const value = { Border: def.Border, Recovery: def.Recovery, Damage: def.Damage, Init: def.Init };
+
+		// Step2：譜面ヘッダー（headerOverridable、系統一致のみ）
+		if (def.headerOverridable && (!isCustom || getGaugeRoot(name) === firstOverridableRoot)) {
+			value.Border = resolveBorder(header.Border, value.Border);
+			value.Recovery = getGaugeCalc(header.Recovery, value.Recovery) * (hasVal(def.deriveRecoveryFrom) ? 2 : 1);
+			value.Damage = getGaugeCalc(header.Damage, value.Damage);
+			value.Init = getGaugeCalc(header.Init, value.Init);
+		}
+
+		// Step3：ゲージ個別設定（最優先）
+		const override = currentGaugeSel?.[name];
+		if (override?.Recovery !== undefined) {
+			if (hasVal(override.Border)) {
+				value.Border = resolveBorder(override.Border, value.Border);
+			}
+			value.Recovery = getGaugeCalc(override.Recovery, value.Recovery);
+			value.Damage = getGaugeCalc(override.Damage, value.Damage);
+			value.Init = getGaugeCalc(override.Init, value.Init);
+		}
+
+		value.Variable = override?.Variable ?? def.Variable ?? C_FLG_OFF;
+		resolved[name] = value;
+	});
+	g_gaugeResolvedObj[_scoreId] = resolved;
+};
+
 /**
  * 【参照用】g_gaugeOptionObjの旧プロパティを参照できるようにする関数
  * （initXXX/rcvXXX/dmgXXX/clearXXX/typeXXX/varXXX）
@@ -2162,11 +2230,21 @@ const restoreLegacyGaugeHeaderReference = () => {
 	})
 };
 
+/**
+ * 【反映用】カスタムスクリプトが旧形式で作った個別ゲージ設定の適用
+ * - g_gaugeOptionObj[`gauge${name}s`]（旧形式）で用意した各ゲージ名の個別設定を
+ * まとめてg_gaugeSelObjへ反映し、影響する全譜面分のg_gaugeResolvedObjを再計算する。
+ * - カスタムJS側はこの1関数を呼ぶだけでよく、applyLegacyGaugeOverride単体での呼び出しは不要
+ */
+const applyLegacyGaugeOverrides = () => {
+	Object.keys(g_gaugeOptionObj.customFulls).forEach(name => applyLegacyGaugeOverride(name));
+	resolveGaugeValuesAll();
+};
+
 /**
  * 【反映用】カスタムスクリプトが旧形式で作った個別ゲージ設定
  * - g_gaugeOptionObj[`gauge${_name}s`] = { lifeBorders, lifeRecoverys, lifeDamages, lifeInits }
  * （それぞれscoreId順の配列）を、新プロパティ g_gaugeSelObj[scoreId][_name] へ変換して反映する
- * - 本体からの呼び出しは無いため、カスタムスクリプト側で呼び出しする想定
  * @param {string} _name ゲージ名
  */
 const applyLegacyGaugeOverride = (_name) => {

package/js/lib/settings.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2026/09/13
- * Revised : 2026/09/25 (v51.0.2)
+ * Revised : 2026/09/27 (v51.1.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -2175,110 +2175,25 @@ const setReverseView = _btn => {
  * ゲージ設定メイン
  * @param {number} _scrollNum
  */
-const setGauge = (() => {
-
-	const getGaugeCalc = (_val, _defaultVal) => setVal(convertStrToVal(
-		replaceStr(_val, g_escapeStr.gaugeParamName)?.split(`{0}`).join(g_stateObj.scoreId)
-	), _defaultVal, C_TYP_CALC);
-
-	/** Border値からライフ制／ノルマ制を切り替える */
-	const applyLifeModeSwitch = (_border) => {
-		if (_border === `x`) {
-			g_stateObj.lifeBorder = 0;
-			g_stateObj.lifeMode = C_LFE_SURVIVAL;
-		} else {
-			g_stateObj.lifeBorder = getGaugeCalc(_border, g_stateObj.lifeBorder);
-			g_stateObj.lifeMode = C_LFE_BORDER;
-		}
-	};
-
-	let currentGaugeSel = null;
-
-	const resolveCustomGaugeSel = () => {
-		currentGaugeSel = g_gaugeSelObj[g_stateObj.scoreId] || g_gaugeSelObj[0] || g_gaugeSelObj.default;
-	};
-
-	/**
-	 * 【Step1】ゲージ種別(g_gaugeType)を確定し、ゲージ配列とカーソル位置を入れ替える
-	 * @param {number} _scrollNum
-	 * @param {boolean} _gaugeInitFlg true時は前回選択していたゲージ名を引き継がず、配列の先頭を強制的に使う
-	 */
-	const resolveGaugeType = (_scrollNum, _gaugeInitFlg) => {
-		applyLifeModeSwitch(g_gaugeHeaderObj[g_stateObj.scoreId].Border);
-		g_gaugeType = (currentGaugeSel?.__order?.length > 0 ? C_LFE_CUSTOM : g_stateObj.lifeMode);
-
-		g_settings.gauges = structuredClone(g_gaugeType === C_LFE_CUSTOM
-			? currentGaugeSel.__order
-			: g_gaugeOptionObj[g_gaugeType.toLowerCase()]);
-		g_settings.gaugeNum = (_gaugeInitFlg ? 0 : getCurrentNo(g_settings.gauges, g_stateObj.gauge));
-		g_stateObj.gauge = g_settings.gauges[g_settings.gaugeNum];
-
-		setSetting(_scrollNum, `gauge`);
-		g_stateObj.lifeVariable = currentGaugeSel?.[g_stateObj.gauge]?.Variable
-			?? g_gaugeDefObj[g_stateObj.gauge]?.Variable
-			?? C_FLG_OFF;
-	};
-
-	/** 【Step2：基本設定】g_gaugeDefObjのカーソル位置に対応する初期設定を適用 */
-	const applyBaseGaugeSettings = () => {
-		const def = g_gaugeDefObj[g_stateObj.gauge];
-		if (!hasVal(def)) return;
-		g_stateObj.lifeMode = (def.Border === `x` ? C_LFE_SURVIVAL : C_LFE_BORDER);
-		g_stateObj.lifeBorder = (def.Border === `x` ? 0 : def.Border);
-		g_stateObj.lifeInit = def.Init;
-		g_stateObj.lifeRcv = def.Recovery;
-		g_stateObj.lifeDmg = def.Damage;
-	};
-
-	/** 【Step3：譜面ヘッダー】headerOverridable指定ゲージのみ、difData由来の値で上書き */
-	const applyHeaderGaugeSettings = () => {
-		const def = g_gaugeDefObj[g_stateObj.gauge];
-		if (!def?.headerOverridable) return;
-		if (g_gaugeType === C_LFE_CUSTOM) {
-			// カスタム選択でOriginal/Normal等headerOverridable対象が複数混在する場合、
-			// difDataは1つしか値を持たないため、選択順で最初に出てきた「系統」だけに適用する。
-			// Light/EasyはOriginal/Normalの系統として扱う（deriveRecoveryFromで判定）
-			const getGaugeRoot = _name => g_gaugeDefObj[_name]?.deriveRecoveryFrom ?? _name;
-			const firstOverridableRoot = getGaugeRoot(
-				g_settings.gauges.find(name => g_gaugeDefObj[name]?.headerOverridable)
-			);
-			if (getGaugeRoot(g_stateObj.gauge) !== firstOverridableRoot) return;
-		}
-		const header = g_gaugeHeaderObj[g_stateObj.scoreId];
-		applyLifeModeSwitch(header.Border);
-		g_stateObj.lifeInit = getGaugeCalc(header.Init, g_stateObj.lifeInit);
-		g_stateObj.lifeRcv = getGaugeCalc(header.Recovery, g_stateObj.lifeRcv)
-			* (hasVal(def.deriveRecoveryFrom) ? 2 : 1);
-		g_stateObj.lifeDmg = getGaugeCalc(header.Damage, g_stateObj.lifeDmg);
-	};
-
-	/**
-	 * 【Step4：ゲージ個別設定（最優先）】gaugeXXXで明示的に設定された値があれば上書き。
-	 * g_gaugeSelObj[scoreId][name]は既に単一譜面分の値なので、g_headerObj用の
-	 * applyLifeModeSwitch/applyLifeCategory（配列アクセス版）は使わず直接適用する
-	 */
-	const applyIndividualGaugeSettings = () => {
-		const override = currentGaugeSel?.[g_stateObj.gauge];
-		if (override?.Recovery === undefined) return; // gaugeXXXヘッダー由来の上書きが無い（overrideが無い/Variableのみの場合を含む）
-		if (hasVal(override.Border)) {
-			applyLifeModeSwitch(override.Border);
-		}
-		g_stateObj.lifeInit = getGaugeCalc(override.Init, g_stateObj.lifeInit);
-		g_stateObj.lifeRcv = getGaugeCalc(override.Recovery, g_stateObj.lifeRcv);
-		g_stateObj.lifeDmg = getGaugeCalc(override.Damage, g_stateObj.lifeDmg);
-	};
-
-	return (_scrollNum, _gaugeInitFlg = false) => {
-		resolveCustomGaugeSel();
-		resolveGaugeType(_scrollNum, _gaugeInitFlg);
-		applyBaseGaugeSettings();
-		applyHeaderGaugeSettings();
-		applyIndividualGaugeSettings();
-
-		lblGauge2.innerHTML = gaugeFormat(g_stateObj.lifeMode,
-			g_stateObj.lifeBorder, g_stateObj.lifeRcv, g_stateObj.lifeDmg, g_stateObj.lifeInit, g_stateObj.lifeVariable);
-	};
-})();
+const setGauge = (_scrollNum, _gaugeInitFlg = false) => {
+	const resolved = g_gaugeResolvedObj[g_stateObj.scoreId];
+
+	g_settings.gauges = structuredClone(resolved.__order);
+	g_settings.gaugeNum = (_gaugeInitFlg ? 0 : getCurrentNo(g_settings.gauges, g_stateObj.gauge));
+	g_stateObj.gauge = g_settings.gauges[g_settings.gaugeNum];
+	setSetting(_scrollNum, `gauge`);
+
+	const value = resolved[g_stateObj.gauge];
+	g_stateObj.lifeMode = (value.Border === `x` ? C_LFE_SURVIVAL : C_LFE_BORDER);
+	g_stateObj.lifeBorder = (value.Border === `x` ? 0 : value.Border);
+	g_stateObj.lifeInit = value.Init;
+	g_stateObj.lifeRcv = value.Recovery;
+	g_stateObj.lifeDmg = value.Damage;
+	g_stateObj.lifeVariable = value.Variable;
+
+	lblGauge2.innerHTML = gaugeFormat(g_stateObj.lifeMode,
+		g_stateObj.lifeBorder, g_stateObj.lifeRcv, g_stateObj.lifeDmg, g_stateObj.lifeInit, g_stateObj.lifeVariable);
+};
 
 /**
  * ゲージ設定の詳細表示を整形

package/package.json

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