danoniplus 51.0.1 → 51.0.3

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2026/09/23
+ * Revised : 2026/09/26
  *
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 51.0.1`;
-const g_revisedDate = `2026/09/23`;
+const g_version = `Ver 51.0.3`;
+const g_revisedDate = `2026/09/26`;
 
 // カスタム用バージョン (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/23 (v51.0.0)
+ * Revised : 2026/09/25 (v51.0.2)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -1368,7 +1368,13 @@ const g_gaugeDefObj = {
  */
 const g_gaugeSelObj = {};
 
-/** どの名前をどの順で選択肢に出すかだけを持つ。詳細値はg_gaugeDefObjやg_gaugeSelObjを参照 */
+/**
+ * 譜面ヘッダー由来のゲージ設定をまとめて定義
+ * - 定義方法はg_gaugeSelObjと類似しており、ゲージ名プロパティがない以外はほぼ同じ構造。
+ */
+const g_gaugeHeaderObj = {};
+
+/** どの名前をどの順で選択肢に出すかだけを持つ。詳細値はg_gaugeDefObj、g_gaugeHeaderObj, g_gaugeSelObjを参照 */
 const g_gaugeOptionObj = {
     survival: [`Original`, `Heavy`, `NoRecovery`, `SuddenDeath`, `Practice`, `Light`],
     border: [`Normal`, `Hard`, `SuddenDeath`, `Easy`],
@@ -1531,7 +1537,7 @@ 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_gaugeSelObj`, `g_editorTmp`, `g_editorTmp2`],
+        `g_detailObj`, `g_stateObj`, `g_attrObj`, `g_gaugeDefObj`, `g_gaugeHeaderObj`, `g_gaugeSelObj`, `g_editorTmp`, `g_editorTmp2`],
     preconditionNum: 0,
     preconditionNumSub: 0,
 };
@@ -5328,6 +5334,7 @@ const g_root = {
     get g_judgObj() { return g_judgObj },
     get g_judgRanges() { return g_judgRanges },
     get g_gaugeDefObj() { return g_gaugeDefObj },
+    get g_gaugeHeaderObj() { return g_gaugeHeaderObj },
     get g_gaugeSelObj() { return g_gaugeSelObj },
 };
 const getPathVal = _path => _path.split(`.`).reduce((o, k) => o?.[k], g_root);

package/js/lib/dosConverter.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2026/09/13
- * Revised : 2026/09/23 (v51.0.0)
+ * Revised : 2026/09/26 (v51.0.3)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -228,9 +228,6 @@ const initialControl = async () => {
 		// 初期色設定（譜面ヘッダー）の初期設定
 		Object.assign(g_headerObj, resetBaseColorList(g_headerObj, g_rootObj));
 
-		// 非分割時は getGaugeSetting が全難易度を一括構築するため、初回のみで十分
-		const loopCount = g_stateObj.dosDivideFlg ? g_headerObj.keyLabels.length : 1;
-
 		for (let j = 0; j < g_headerObj.difLabels.length; j++) {
 
 			// 譜面ファイルが分割されている場合、譜面詳細情報取得のために譜面をロード
@@ -261,11 +258,8 @@ const initialControl = async () => {
 
 			// カスタムゲージの設定（譜面ヘッダー側）
 			resetCustomGauge(g_rootObj, { scoreId: j });
-			if (j < loopCount) {
-				// ゲージ設定：分割時は各譜面ごとに上書き・補完、非分割時は初回のみ実行
-				Object.keys(g_gaugeOptionObj.customFulls).forEach(gaugePtn =>
-					getGaugeSetting(g_rootObj, gaugePtn, g_headerObj.difLabels.length, { scoreId: j }));
-			}
+			Object.keys(g_gaugeOptionObj.customFulls).forEach(gaugePtn =>
+				getGaugeSetting(g_rootObj, gaugePtn, { scoreId: j }));
 		}
 	}
 	safeExecuteCustomHooks(`g_customJsObj.preTitle`, g_customJsObj.preTitle);
@@ -1242,24 +1236,20 @@ const headerConvert = _dosObj => {
 		obj.keyLabels = [];
 		obj.difLabels = [];
 		obj.initSpeeds = [];
-		obj.lifeBorders = [];
-		obj.lifeRecoverys = [];
-		obj.lifeDamages = [];
-		obj.lifeInits = [];
 		obj.creatorNames = [];
 		obj.difficulties = [];
 		g_stateObj.scoreId = (g_stateObj.scoreId < difs.length ? g_stateObj.scoreId : 0);
 
-		difs.forEach(dif => {
+		difs.forEach((dif, scoreId) => {
 			const difDetails = dif.split(`,`);
 			const lifeData = (_type) =>
 				difDetails[difpos[_type]] || g_presetObj.gauge?.[_type] || g_gaugeDefObj.Original[_type];
 
 			// ライフ：ノルマ、回復量、ダメージ量、初期値の設定
-			obj.lifeBorders.push(lifeData(`Border`));
-			obj.lifeRecoverys.push(lifeData(`Recovery`));
-			obj.lifeDamages.push(lifeData(`Damage`));
-			obj.lifeInits.push(lifeData(`Init`));
+			g_gaugeHeaderObj[scoreId] = {
+				Border: lifeData(`Border`), Recovery: lifeData(`Recovery`),
+				Damage: lifeData(`Damage`), Init: lifeData(`Init`),
+			};
 
 			// キー数
 			const keyLabel = difDetails[difpos.Key] || g_keyObj.initKeyLabel;
@@ -1285,10 +1275,7 @@ const headerConvert = _dosObj => {
 		obj.keyLabels = [g_keyObj.initKeyLabel];
 		obj.difLabels = [`Normal`];
 		obj.initSpeeds = [3.5];
-		obj.lifeBorders = [`x`];
-		obj.lifeRecoverys = [6];
-		obj.lifeDamages = [40];
-		obj.lifeInits = [25];
+		g_gaugeHeaderObj[0] = { ...g_gaugeDefObj.Original };
 		obj.creatorNames = [obj.tuning];
 		obj.difficulties = [0];
 	}
@@ -2110,31 +2097,17 @@ const resetCustomGauge = (_dosObj, { scoreId = 0 } = {}) => {
  * ゲージ別個別設定の取得
  * @param {object} _dosObj 
  * @param {string} _name 
- * @param {number} _difLength
  * @param {string} [object.scoreId=0]
  */
-const getGaugeSetting = (_dosObj, _name, _difLength, { scoreId = 0 } = {}) => {
-
-	/** ゲージ設定上書きフラグ */
-	const gaugeUpdateFlg = g_stateObj.scoreLockFlg && scoreId > 0;
+const getGaugeSetting = (_dosObj, _name, { scoreId = 0 } = {}) => {
 	const gauges = hasVal(_dosObj[`gauge${_name}`]) ? splitLF2(_dosObj[`gauge${_name}`]) : [];
 
-	const registerGaugeDetails = (_scoreId) => {
-		const gaugeDetails = getGaugeDetailList(_scoreId);
-		if (!hasVal(gaugeDetails)) return; // baseも譜面別ヘッダーもどちらも無ければ何もしない
-		const [border, recovery, damage, init] = gaugeDetails;
-		g_gaugeSelObj[_scoreId] ??= structuredClone(g_gaugeSelObj.default ?? { __order: [] });
-		g_gaugeSelObj[_scoreId][_name] = { ...g_gaugeSelObj[_scoreId][_name], Border: border, Recovery: recovery, Damage: damage, Init: init };
-	};
-
 	/**
 	 * gaugeNormal2, gaugeEasy2などの個別設定があった場合にその値から配列を作成
-	 * @param {number} _scoreId 
-	 * @param {number[]} _defaultGaugeList
 	 * @returns {number[]}
 	 */
-	const getGaugeDetailList = (_scoreId) => {
-		const idHeader = (_scoreId === 0) ? 1 : setScoreIdHeader(_scoreId, g_stateObj.scoreLockFlg, false);
+	const getGaugeDetailList = () => {
+		const idHeader = (scoreId === 0) ? 1 : setScoreIdHeader(scoreId, g_stateObj.scoreLockFlg, false);
 		if (hasVal(idHeader)) {
 			const dosId = (idHeader || 0) - 1;
 			const headerName = `gauge${_name}${idHeader}`;
@@ -2143,21 +2116,19 @@ const getGaugeSetting = (_dosObj, _name, _difLength, { scoreId = 0 } = {}) => {
 				return (detailGauges[dosId] || detailGauges[0])?.split(`,`);
 			}
 		}
-		return (gauges[_scoreId] || gauges[0])?.split(`,`);
+		return (gauges[scoreId] || gauges[0])?.split(`,`);
 	};
 
-	if (gaugeUpdateFlg) {
-		registerGaugeDetails(scoreId);
-	} else {
-		for (let j = 0; j < _difLength; j++) {
-			registerGaugeDetails(j);
-		}
-	}
+	const gaugeDetails = getGaugeDetailList();
+	if (!hasVal(gaugeDetails)) return;
+	const [border, recovery, damage, init] = gaugeDetails;
+	g_gaugeSelObj[scoreId] ??= structuredClone(g_gaugeSelObj.default ?? { __order: [] });
+	g_gaugeSelObj[scoreId][_name] = { ...g_gaugeSelObj[scoreId][_name], Border: border, Recovery: recovery, Damage: damage, Init: init };
 };
 
 /**
  * 【参照用】g_gaugeOptionObjの旧プロパティを参照できるようにする関数
- * （initXXX/rcvXXX/dmgXXX/clearXXX、typeXXX/varXXXも参考として）に展開する。
+ * （initXXX/rcvXXX/dmgXXX/clearXXX/typeXXX/varXXX）
  * - カスタムスクリプト側で既存ゲージの既定値を参照するための補助関数。本体からの呼び出しはない。
  */
 const restoreLegacyGaugeReference = () => {
@@ -2175,6 +2146,22 @@ const restoreLegacyGaugeReference = () => {
 	});
 };
 
+/**
+ * 【参照用】g_headerObjの旧プロパティを参照可能にする関数
+ * （lifeBorders/lifeRecoverys/lifeDamages/lifeInits）
+ * - カスタムスクリプト側で既存ゲージの既定値を参照するための補助関数。本体からの呼び出しはない。
+ */
+const restoreLegacyGaugeHeaderReference = () => {
+	[`Border`, `Recovery`, `Damage`, `Init`].forEach(type => {
+		const legacyType = `life${type}s`;
+		g_headerObj[legacyType] = [];
+
+		for (let j = 0; j < g_headerObj.difLabels.length; j++) {
+			g_headerObj[legacyType].push(g_gaugeHeaderObj[j][type]);
+		}
+	})
+};
+
 /**
  * 【反映用】カスタムスクリプトが旧形式で作った個別ゲージ設定
  * - g_gaugeOptionObj[`gauge${_name}s`] = { lifeBorders, lifeRecoverys, lifeDamages, lifeInits }

package/js/lib/settings.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2026/09/13
- * Revised : 2026/09/23 (v51.0.0)
+ * Revised : 2026/09/25 (v51.0.2)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -1422,7 +1422,7 @@ const setDifficulty = (_chartChangeFlg) => {
 	);
 
 	// ゲージ設定及びカーソル位置調整
-	setGauge(0, !g_canLoadDifInfoFlg);
+	setGauge(0, !g_initialFlg);
 
 	// 速度、スクロール、アシスト設定のカーソル位置調整
 	if (_chartChangeFlg) {
@@ -2204,7 +2204,7 @@ const setGauge = (() => {
 	 * @param {boolean} _gaugeInitFlg true時は前回選択していたゲージ名を引き継がず、配列の先頭を強制的に使う
 	 */
 	const resolveGaugeType = (_scrollNum, _gaugeInitFlg) => {
-		applyLifeModeSwitch(g_headerObj.lifeBorders[g_stateObj.scoreId]);
+		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
@@ -2244,10 +2244,12 @@ const setGauge = (() => {
 			);
 			if (getGaugeRoot(g_stateObj.gauge) !== firstOverridableRoot) return;
 		}
-		g_stateObj.lifeInit = getGaugeCalc(g_headerObj.lifeInits[g_stateObj.scoreId], g_stateObj.lifeInit);
-		g_stateObj.lifeRcv = getGaugeCalc(g_headerObj.lifeRecoverys[g_stateObj.scoreId], g_stateObj.lifeRcv)
+		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(g_headerObj.lifeDamages[g_stateObj.scoreId], g_stateObj.lifeDmg);
+		g_stateObj.lifeDmg = getGaugeCalc(header.Damage, g_stateObj.lifeDmg);
 	};
 
 	/**

package/package.json

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