danoniplus 50.5.2 → 51.0.0

package/js/danoni_main.js

@@ -8,7 +8,7 @@
  *
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 50.5.2`;
+const g_version = `Ver 51.0.0`;
 const g_revisedDate = `2026/09/23`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
@@ -16,7 +16,8 @@ let g_localVersion = ``;
 let g_localVersion2 = ``;
 
 // ショートカット用文字列(↓の文字列を検索することで対象箇所へジャンプできます)
-//  共通:water 初期化:peach タイトル:melon データ管理:pear 前提条件表示:mango 設定:lime ディスプレイ:lemon 拡張設定:apple キーコンフィグ:orange 譜面読込:strawberry メイン:banana 結果:grape
+//  共通:water 初期化:peach タイトル:melon データ管理:pear 前提条件表示:mango 
+//  設定:lime ディスプレイ:lemon 拡張設定:apple キーコンフィグ:orange 譜面読込:strawberry メイン:banana 結果:grape
 //  シーンジャンプ:Scene
 
 /**
@@ -2140,7 +2141,9 @@ const fillCanvasText = (_ctx, _text, _x, _y, { siz = 15, font, color, align = C_
  */
 const createImg = (_id, _imgPath, _x, _y, _width, _height) => {
 	const div = createDiv(_id, _x, _y, _width, _height);
-	div.innerHTML = `<img id="${_id}img" src="${_imgPath}" style="width:${wUnit(_width)};height:${wUnit(_height)}"${g_isFile ? `` : ` crossOrigin="anonimous"`}>`;
+	div.innerHTML =
+		`<img id="${_id}img" src="${_imgPath}" style="width:${wUnit(_width)};height:${wUnit(_height)}"` +
+		`${g_isFile ? `` : ` crossOrigin="anonimous"`}>`;
 
 	return div;
 };
@@ -2562,7 +2565,9 @@ const makeWarningWindow = (_text = ``, { resetFlg = false, backBtnUse = false }
  * @param {number} [object._y=0]
  * @param {number} [object._w=g_btnWidth()]
  */
-const makeInfoWindow = (_text, _animationName = ``, { _backColor = `#ccccff`, _textColor = `#000066`, _pointerEvents = C_DIS_NONE, _x = g_btnX(), _y = 0, _w = g_btnWidth() } = {}) => {
+const makeInfoWindow = (_text, _animationName = ``, {
+	_backColor = `#ccccff`, _textColor = `#000066`, _pointerEvents = C_DIS_NONE, _x = g_btnX(), _y = 0, _w = g_btnWidth()
+} = {}) => {
 	const lblWarning = setWindowStyle(`<p>${_text}</p>`, _backColor, _textColor, C_ALIGN_CENTER, { _x, _y, _w });
 	lblWarning.style.pointerEvents = _pointerEvents;
 

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2026/09/13 (v50.5.0)
+ * Revised : 2026/09/23 (v51.0.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -1322,32 +1322,57 @@ const C_LFE_CUSTOM = `Custom`;
 const C_LFE_MAXLIFE = `maxLife`;
 
 /**
- * ゲージ初期設定
+ * 汎用ゲージの定義（g_presetObj.gauge/gaugeCustomと同じBorder/Recovery/Damage/Initに
+ * Variable（回復・ダメージ量が矢印数等で変動:ON／固定:OFF）を加えた5項目のみ）
+ * headerOverridable: 譜面ヘッダー(difData)による上書き対象（Step3）かどうか
+ * deriveRecoveryFrom: difDataしか参照値が無い場合のみ、参照元ゲージの回復量を2倍にして使う
  */
+const g_gaugeDefObj = {
+    Original: { Border: `x`, Recovery: 6, Damage: 40, Init: 25, Variable: C_FLG_OFF, headerOverridable: true },
+    Heavy: { Border: `x`, Recovery: 2, Damage: 50, Init: 50, Variable: C_FLG_OFF },
+    NoRecovery: { Border: `x`, Recovery: 0, Damage: 50, Init: 100, Variable: C_FLG_OFF },
+    SuddenDeath: { Border: `x`, Recovery: 0, Damage: C_LFE_MAXLIFE, Init: 100, Variable: C_FLG_OFF },
+    Practice: { Border: `x`, Recovery: 0, Damage: 0, Init: 50, Variable: C_FLG_OFF },
+    Light: { Border: `x`, Recovery: 12, Damage: 40, Init: 25, Variable: C_FLG_OFF, headerOverridable: true, deriveRecoveryFrom: `Original` },
+
+    Normal: { Border: 70, Recovery: 2, Damage: 7, Init: 25, Variable: C_FLG_ON, headerOverridable: true },
+    Hard: { Border: 0, Recovery: 1, Damage: 50, Init: 100, Variable: C_FLG_ON },
+    Easy: { Border: 70, Recovery: 4, Damage: 7, Init: 25, Variable: C_FLG_ON, headerOverridable: true, deriveRecoveryFrom: `Normal` },
+};
+
+/**
+ * カスタムゲージの選択状態・個別上書き値
+ * - g_gaugeSelObj[scoreId] = {
+ *   __order: [名前, ...],         // customGauge指定時のみ存在。並び順がそのままカーソル移動の順序
+ *   名前: { 上書きプロパティ },    // customGaugeのインライン指定なら{Variable}のみ、
+ *                                  // gaugeXXXヘッダー由来なら{Border,Recovery,Damage,Init}を含む
+ * }
+ * - 'default'キー：g_presetObj.gaugeList由来の、譜面指定が無い場合の共通デフォルト（同じ形）
+ *   上書きプロパティは常にg_gaugeDefObj[名前]とマージして使う（Border等が無ければg_gaugeDefObjの値を使う）
+ *
+ * - 例：
+ * g_gaugeSelObj = {
+ *   default: { 
+ *     __order: [`Original`, `Normal`],
+ *     Original: { Variable: C_FLG_OFF },
+ *   },
+ *   0: {
+ *     __order: [],  // カスタムゲージ未定義 (difDataの定義もしくはデフォルト値を使用)
+ *   },
+ *   1: {
+ *     __order: [`Escape`, `Normal`],
+ *     Escape: { Variable: C_FLG_ON,  Border: 0,  Recovery: 1, Damage: 100, Init: 100 }, // |customGauge2=Escape::V|gaugeEscape2=0,1,100,100|
+ *     Normal: { Variable: C_FLG_OFF, Border: 75, Recovery: 3, Damage: 7, Init: 25 },    // |customGauge2=Normal::F|gaugeNormal2=75,3,7,25|
+ *   },
+ * };
+ */
+const g_gaugeSelObj = {};
+
+/** どの名前をどの順で選択肢に出すかだけを持つ。詳細値はg_gaugeDefObjやg_gaugeSelObjを参照 */
 const g_gaugeOptionObj = {
     survival: [`Original`, `Heavy`, `NoRecovery`, `SuddenDeath`, `Practice`, `Light`],
     border: [`Normal`, `Hard`, `SuddenDeath`, `Easy`],
-    custom: [],
-    customDefault: [],
     customFulls: {},
-
-    initSurvival: [25, 50, 100, 100, 50, 25],
-    rcvSurvival: [6, 2, 0, 0, 0, 12],
-    dmgSurvival: [40, 50, 50, C_LFE_MAXLIFE, 0, 40],
-    typeSurvival: [C_LFE_SURVIVAL, C_LFE_SURVIVAL, C_LFE_SURVIVAL, C_LFE_SURVIVAL, C_LFE_SURVIVAL, C_LFE_SURVIVAL],
-    varSurvival: [C_FLG_OFF, C_FLG_OFF, C_FLG_OFF, C_FLG_OFF, C_FLG_OFF, C_FLG_OFF],
-    clearSurvival: [0, 0, 0, 0, 0, 0],
-
-    initBorder: [25, 100, 100, 25],
-    rcvBorder: [2, 1, 0, 4],
-    dmgBorder: [7, 50, C_LFE_MAXLIFE, 7],
-    typeBorder: [C_LFE_BORDER, C_LFE_BORDER, C_LFE_SURVIVAL, C_LFE_BORDER],
-    varBorder: [C_FLG_ON, C_FLG_ON, C_FLG_OFF, C_FLG_ON],
-    clearBorder: [70, 0, 0, 70],
-
-    varCustom: [],
-    varCustomDefault: [],
-    defaultList: [`survival`, `border`],
     defaultPlusList: [`survival`, `border`, `customDefault`],
 };
 let g_gaugeType;
@@ -1506,7 +1531,7 @@ const g_settings = {
     settingWindowNum: 0,
 
     preconditions: [`g_rootObj`, `g_headerObj`, `g_keyObj`, `g_scoreObj`, `g_workObj`,
-        `g_detailObj`, `g_stateObj`, `g_attrObj`, `g_editorTmp`, `g_editorTmp2`],
+        `g_detailObj`, `g_stateObj`, `g_attrObj`, `g_gaugeDefObj`, `g_gaugeSelObj`, `g_editorTmp`, `g_editorTmp2`],
     preconditionNum: 0,
     preconditionNumSub: 0,
 };
@@ -5302,6 +5327,8 @@ const g_root = {
     get g_imgObj() { return g_imgObj },
     get g_judgObj() { return g_judgObj },
     get g_judgRanges() { return g_judgRanges },
+    get g_gaugeDefObj() { return g_gaugeDefObj },
+    get g_gaugeSelObj() { return g_gaugeSelObj },
 };
 const getPathVal = _path => _path.split(`.`).reduce((o, k) => o?.[k], g_root);
 const setPathVal = (_path, _value) => {

package/js/lib/dataLoader.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2026/09/13
- * Revised : 
+ * Revised : 2026/09/23 (v51.0.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -171,7 +171,8 @@ const fetchMusicBlobUrl = (_url, _lblLoading) => new Promise((resolve, reject) =
 			_lblLoading.textContent = g_lblNameObj.pleaseWait;
 			resolve(blobUrl);
 		} else {
-			makeWarningWindow(`${g_msgInfoObj.E_0041.split('{0}').join(getFullPath(_url))}<br>(${request.status} ${request.statusText})`, { backBtnUse: true });
+			makeWarningWindow(`${g_msgInfoObj.E_0041.split('{0}').join(getFullPath(_url))}<br>(${request.status} ${request.statusText})`,
+				{ backBtnUse: true });
 			reject(new Error(`HTTP ${request.status}`));
 		}
 	});
@@ -663,11 +664,14 @@ const applySRandom = (_keyNum, _shuffleGroup, _arrowHeader, _frzHeader) => {
 			const getFreeSpaces = ({ scatterFrame = 0, frzFlg = false, prevFlg = false } = {}) =>
 				_group.filter(_key =>
 					// 通常矢印と重ならない
-					tmpArrowData[_key].find(_other => _arrow >= _other - scatterFrame && _arrow <= _other + scatterFrame) === undefined
+					tmpArrowData[_key].find(_other =>
+						_arrow >= _other - scatterFrame && _arrow <= _other + scatterFrame) === undefined
 					// フリーズと重ならない
-					&& (!frzFlg || tmpFrzData[_key].find(_freeze => _arrow >= _freeze.begin - scatterFrame && _arrow <= _freeze.end + scatterFrame) === undefined)
+					&& (!frzFlg || tmpFrzData[_key].find(_freeze =>
+						_arrow >= _freeze.begin - scatterFrame && _arrow <= _freeze.end + scatterFrame) === undefined)
 					// 直前の矢印と重ならない
-					&& (!prevFlg || tmpArrowData[_key].find(_other => prev2Num === _other) === undefined)
+					&& (!prevFlg || tmpArrowData[_key].find(_other =>
+						prev2Num === _other) === undefined)
 				);
 
 			// 置ける場所を検索
@@ -2266,7 +2270,9 @@ const getArrowSettings = () => {
 
 		g_workObj.stepX[j] = g_keyObj.blank * stdPos + (g_headerObj.playingWidth - C_ARW_WIDTH) / 2;
 		const baseLayer = g_keyObj[`layerGroup${keyCtrlPtn}`]?.[j] || 0;
-		g_workObj.dividePos[j] = baseLayer * 2 + ((posj <= divideCnt ? 0 : 1) + (scrollDirOptions[j] === 1 ? 0 : 1) + (g_stateObj.reverse === C_FLG_OFF ? 0 : 1)) % 2;
+		g_workObj.dividePos[j] = baseLayer * 2 + (
+			(posj <= divideCnt ? 0 : 1) + (scrollDirOptions[j] === 1 ? 0 : 1) + (g_stateObj.reverse === C_FLG_OFF ? 0 : 1)
+		) % 2;
 		g_workObj.scrollDir[j] = (posj <= divideCnt ? 1 : -1) * scrollDirOptions[j] * (g_stateObj.reverse === C_FLG_OFF ? 1 : -1);
 
 		// 個別色設定
@@ -2428,7 +2434,9 @@ const getArrowSettings = () => {
 	g_workObj.arrowReturnVal = 0;
 	g_gameOverFlg = false;
 	g_finishFlg = true;
-	g_workObj.nonDefaultSc = g_headerObj.keyRetry !== C_KEY_RETRY || g_headerObj.keyTitleBack !== C_KEY_TITLEBACK || g_headerObj.keyPause !== C_KEY_PAUSE;
+	g_workObj.nonDefaultSc = g_headerObj.keyRetry !== C_KEY_RETRY ||
+		g_headerObj.keyTitleBack !== C_KEY_TITLEBACK ||
+		g_headerObj.keyPause !== C_KEY_PAUSE;
 	if (g_headerObj.scAreaWidth === 0 && (
 		g_headerObj.keyRetry !== g_headerObj.keyRetryDef2 ||
 		g_headerObj.keyTitleBack !== g_headerObj.keyTitleBackDef2 ||

package/js/lib/dosConverter.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2026/09/13
- * Revised : 
+ * Revised : 2026/09/23 (v51.0.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -206,20 +206,65 @@ const initialControl = async () => {
 		g_stateObj.dosDivideFlg = setBoolVal(document.getElementById(`externalDosDivide`)?.value ?? getQueryParamVal(`dosDivide`));
 		g_stateObj.scoreLockFlg = setBoolVal(document.getElementById(`externalDosLock`)?.value ?? getQueryParamVal(`dosLock`));
 
-		// 非分割時は resetGaugeSetting が全難易度を一括構築するため、初回のみで十分
+		// カスタムゲージ設定（共通設定ファイル）
+		addGaugeFulls(g_gaugeOptionObj.survival);
+		addGaugeFulls(g_gaugeOptionObj.border);
+
+		if (g_presetObj.gaugeCustom !== undefined) {
+			g_gaugeSelObj.default ??= { __order: [] };
+			Object.entries(g_presetObj.gaugeCustom).forEach(([name, def]) =>
+				g_gaugeSelObj.default[name] = { ...g_gaugeSelObj.default[name], ...def });
+		}
+		if (g_presetObj.gaugeList !== undefined) {
+			g_gaugeSelObj.default ??= { __order: [] };
+			g_gaugeSelObj.default.__order ??= [];
+			Object.keys(g_presetObj.gaugeList).forEach(name => {
+				g_gaugeSelObj.default.__order.push(name);
+				g_gaugeSelObj.default[name] = { ...g_gaugeSelObj.default[name], Variable: boolToSwitch(g_presetObj.gaugeList[name] === `V`) };
+			});
+			addGaugeFulls(g_gaugeSelObj.default.__order);
+		}
+
+		// 初期色設定（譜面ヘッダー）の初期設定
+		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.keyLabels.length; j++) {
+		for (let j = 0; j < g_headerObj.difLabels.length; j++) {
 
 			// 譜面ファイルが分割されている場合、譜面詳細情報取得のために譜面をロード
 			if (g_stateObj.dosDivideFlg) {
 				await loadChartFile(j);
-				resetColorSetting(j);
+
+				if (g_stateObj.scoreLockFlg) {
+					Object.assign(g_rootObj, copySetColor(g_rootObj, j));
+
+					// 分割先のファイルで初期色が未定義の場合はデフォルト値を適用
+					[``, `Shadow`].forEach(pattern =>
+						[`set`, `frz`].forEach(arrow => {
+							// frzShadowColorStrのみ、空で構成された初期配列があるためその条件を追加して除外条件とする
+							if (!hasVal(g_rootObj[`${arrow}${pattern}Color${j + 1}`])
+								&& g_headerObj[`${arrow}${pattern}ColorStr`]?.flat()?.some(val => hasVal(val))) {
+								g_rootObj[`${arrow}${pattern}Color`] = g_headerObj[`${arrow}${pattern}ColorStr`].join(`,`);
+							}
+						})
+					);
+				}
 			}
-			getScoreDetailData(j);
+			// 初期色設定（譜面ヘッダー）の譜面別設定
+			Object.assign(g_headerObj, resetBaseColorList(g_headerObj, g_rootObj, { scoreId: j, scoreLockFlg: false }));
+
+			// 譜面詳細データの格納
+			const keyCtrlPtnDef = `${g_headerObj.keyLabels[j]}_0`;
+			storeBaseData(j, scoreConvert(g_rootObj, j, 0, ``, keyCtrlPtnDef, true), keyCtrlPtnDef);
+
+			// カスタムゲージの設定（譜面ヘッダー側）
+			resetCustomGauge(g_rootObj, { scoreId: j });
 			if (j < loopCount) {
-				// 分割時は各譜面ごとに上書き・補完、非分割時は初回のみ実行
-				resetGaugeSetting(j);
+				// ゲージ設定：分割時は各譜面ごとに上書き・補完、非分割時は初回のみ実行
+				Object.keys(g_gaugeOptionObj.customFulls).forEach(gaugePtn =>
+					getGaugeSetting(g_rootObj, gaugePtn, g_headerObj.difLabels.length, { scoreId: j }));
 			}
 		}
 	}
@@ -295,8 +340,10 @@ const initialControl = async () => {
 			g_editorTmp[keyN].id = orgKeyNum * 100 + baseX + j;
 			g_editorTmp[keyN].num = keyNum;
 			g_editorTmp[keyN].chars = keyCtrlList.map(val => g_kCd[val[0]]);
-			g_editorTmp[keyN].keys = keyCtrlList.map(val => g_kCdN[val[0]]).map(val => replaceStr(val, g_escapeStr.editorKey));
-			g_editorTmp[keyN].alternativeKeys = keyCtrlList.map(val => val[1] === 0 ? `` : g_kCdN[val[1]]).map(val => replaceStr(val, g_escapeStr.editorKey));
+			g_editorTmp[keyN].keys = keyCtrlList.map(val => g_kCdN[val[0]])
+				.map(val => replaceStr(val, g_escapeStr.editorKey));
+			g_editorTmp[keyN].alternativeKeys = keyCtrlList.map(val => val[1] === 0 ? `` : g_kCdN[val[1]])
+				.map(val => replaceStr(val, g_escapeStr.editorKey));
 			g_editorTmp[keyN].noteNames = charaList.map(val => `${val}_data`);
 			g_editorTmp[keyN].freezeNames = charaList.map(val => {
 				let frzName = replaceStr(val, g_escapeStr.frzName);
@@ -496,7 +543,6 @@ const dosConvert = (_dos = ``) => {
 const loadChartFile = async (_scoreId = g_stateObj.scoreId) => {
 
 	const dosInput = document.getElementById(`dos`);
-	const divRoot = document.getElementById(`divRoot`);
 	const queryDos = getQueryParamVal(`dos`) !== null ?
 		`dos/${getQueryParamVal('dos')}.txt` : encodeURI(document.getElementById(`externalDos`)?.value ?? ``);
 
@@ -541,39 +587,6 @@ const loadChartFile = async (_scoreId = g_stateObj.scoreId) => {
 	}
 };
 
-/**
- * 譜面をファイルで分割している場合に初期色を追加取得
- * @param {string} _scoreId 
- */
-const resetColorSetting = _scoreId => {
-	// 初期矢印・フリーズアロー色の再定義
-	if (g_stateObj.scoreLockFlg) {
-		Object.assign(g_rootObj, copySetColor(g_rootObj, _scoreId));
-
-		// 分割先のファイルで初期色が未定義の場合はデフォルト値を適用
-		[``, `Shadow`].forEach(pattern =>
-			[`set`, `frz`].forEach(arrow => {
-				// frzShadowColorStrのみ、空で構成された初期配列があるためその条件を追加して除外条件とする
-				if (!hasVal(g_rootObj[`${arrow}${pattern}Color${_scoreId + 1}`])
-					&& g_headerObj[`${arrow}${pattern}ColorStr`]?.flat()?.some(val => hasVal(val))) {
-					g_rootObj[`${arrow}${pattern}Color`] = g_headerObj[`${arrow}${pattern}ColorStr`].join(`,`);
-				}
-			})
-		);
-	}
-	Object.assign(g_headerObj, resetBaseColorList(g_headerObj, g_rootObj, { scoreId: _scoreId, scoreLockFlg: false }));
-};
-
-/**
- * 譜面をファイルで分割している場合にゲージ情報を追加取得
- * @param {string} _scoreId 
- */
-const resetGaugeSetting = _scoreId => {
-	// ライフ設定のカスタム部分再取得（譜面ヘッダー加味）
-	Object.assign(g_gaugeOptionObj, resetCustomGauge(g_rootObj, { scoreId: _scoreId }));
-	Object.keys(g_gaugeOptionObj.customFulls).forEach(gaugePtn => getGaugeSetting(g_rootObj, gaugePtn, g_headerObj.difLabels.length, { scoreId: _scoreId }));
-};
-
 /**
  * 譜面番号固定かつ譜面ファイル分割時に初期色情報を他譜面へコピー
  * @param {object} _baseObj 
@@ -625,15 +638,6 @@ const getFullMusicUrl = (_musicUrl = ``) => {
 	return `${musicPath}${musicFile}`;
 };
 
-/**
- * 譜面ファイル読込後処理（譜面詳細情報取得用）
- * @param {number} _scoreId 
- */
-const getScoreDetailData = _scoreId => {
-	const keyCtrlPtn = `${g_headerObj.keyLabels[_scoreId]}_0`;
-	storeBaseData(_scoreId, scoreConvert(g_rootObj, _scoreId, 0, ``, keyCtrlPtn, true), keyCtrlPtn);
-};
-
 /**
  * 譜面詳細データの格納
  * @param {number} _scoreId 
@@ -1248,14 +1252,14 @@ const headerConvert = _dosObj => {
 
 		difs.forEach(dif => {
 			const difDetails = dif.split(`,`);
-			const lifeData = (_type, _default) =>
-				difDetails[difpos[_type]] || g_presetObj.gauge?.[_type] || _default;
+			const lifeData = (_type) =>
+				difDetails[difpos[_type]] || g_presetObj.gauge?.[_type] || g_gaugeDefObj.Original[_type];
 
 			// ライフ：ノルマ、回復量、ダメージ量、初期値の設定
-			obj.lifeBorders.push(lifeData(`Border`, `x`));
-			obj.lifeRecoverys.push(lifeData(`Recovery`, 6));
-			obj.lifeDamages.push(lifeData(`Damage`, 40));
-			obj.lifeInits.push(lifeData(`Init`, 25));
+			obj.lifeBorders.push(lifeData(`Border`));
+			obj.lifeRecoverys.push(lifeData(`Recovery`));
+			obj.lifeDamages.push(lifeData(`Damage`));
+			obj.lifeInits.push(lifeData(`Init`));
 
 			// キー数
 			const keyLabel = difDetails[difpos.Key] || g_keyObj.initKeyLabel;
@@ -1386,10 +1390,9 @@ const headerConvert = _dosObj => {
 	}
 
 	// ゲージ初期設定（最大ライフ反映）
-	g_gaugeOptionObj.defaultList.forEach(type => {
-		const pos = g_gaugeOptionObj[`dmg${toCapitalize(type)}`].findIndex(val => val === C_LFE_MAXLIFE);
-		g_gaugeOptionObj[`dmg${toCapitalize(type)}`][pos] = obj.maxLifeVal;
-	});
+	Object.values(g_gaugeDefObj)
+		.filter(def => def.Damage === C_LFE_MAXLIFE)
+		.forEach(def => def.Damage = obj.maxLifeVal);
 
 	// フリーズアローのデフォルト色セットの利用有無 (true: 使用, false: 矢印色を優先してセット)
 	obj.defaultFrzColorUse = setBoolVal(_dosObj.defaultFrzColorUse ?? g_presetObj.frzColors, true);
@@ -1423,27 +1426,6 @@ const headerConvert = _dosObj => {
 		'Type0': [!obj.defaultColorgrd[0], obj.defaultColorgrd[1]],
 	};
 
-	// カスタムゲージ設定（共通設定ファイル）
-	addGaugeFulls(g_gaugeOptionObj.survival);
-	addGaugeFulls(g_gaugeOptionObj.border);
-
-	if (g_presetObj.gaugeList !== undefined) {
-		Object.keys(g_presetObj.gaugeList).forEach(key => {
-			g_gaugeOptionObj.customDefault.push(key);
-			g_gaugeOptionObj.varCustomDefault.push(boolToSwitch(g_presetObj.gaugeList[key] === `V`));
-		});
-		g_gaugeOptionObj.custom = g_gaugeOptionObj.customDefault.concat();
-		g_gaugeOptionObj.varCustom = g_gaugeOptionObj.varCustomDefault.concat();
-		addGaugeFulls(g_gaugeOptionObj.customDefault);
-	}
-
-	// カスタムゲージ設定、初期色設定（譜面ヘッダー）の譜面別設定
-	Object.assign(obj, resetBaseColorList(obj, _dosObj));
-	for (let j = 0; j < obj.difLabels.length; j++) {
-		Object.assign(g_gaugeOptionObj, resetCustomGauge(_dosObj, { scoreId: j }));
-		Object.assign(obj, resetBaseColorList(obj, _dosObj, { scoreId: j }));
-	}
-
 	// ダミー譜面の設定
 	if (hasVal(_dosObj.dummyId)) {
 		obj.dummyScoreNos = _dosObj.dummyId.split(`$`);
@@ -2088,45 +2070,40 @@ const setColorList = (_data, _colorInit, _colorInitLength,
 /**
  * 複合カスタムゲージの定義設定
  * |customGauge=_Original::F::Original,_Normal::V::Normal,Escape::V|
+ * 
+ * g_gaugeSelObj[scoreId]に「名前→上書きプロパティ」を書き込む。
+ * g_gaugeSelObj[scoreId].__order（選択順）と、名前ごとの上書き(Variable)を書き込む
  * @param {object} _dosObj 
  * @param {string} [object.scoreId=0]
- * @returns {object} ※Object.assign(obj, resetCustomGauge(...))の形で呼び出しが必要
+ * @returns {void} g_gaugeSelObj[scoreId]を直接更新する
  */
 const resetCustomGauge = (_dosObj, { scoreId = 0 } = {}) => {
 
-	const obj = {};
-	const scoreIdHeader = setScoreIdHeader(scoreId, g_stateObj.scoreLockFlg, false);
+	const scoreIdHeader = (scoreId === 0 && hasVal(_dosObj[`customGauge1`]))
+		? 1 : setScoreIdHeader(scoreId, g_stateObj.scoreLockFlg, false);
 	const dosCustomGauge = _dosObj[`customGauge${scoreIdHeader}`];
-	if (hasVal(dosCustomGauge)) {
-		if (g_gaugeOptionObj.defaultPlusList.includes(dosCustomGauge)) {
-			obj[`custom${scoreId}`] = g_gaugeOptionObj[dosCustomGauge].concat();
-			obj[`varCustom${scoreId}`] = g_gaugeOptionObj[`var${toCapitalize(dosCustomGauge)}`].concat();
-			if (g_gaugeOptionObj.defaultList.includes(dosCustomGauge)) {
-				obj[`defaultGauge${scoreId}`] = dosCustomGauge;
-				obj[`typeCustom${scoreId}`] = g_gaugeOptionObj[`type${toCapitalize(dosCustomGauge)}`].concat();
-			}
-		} else {
-			const customGauges = dosCustomGauge.split(`,`);
-
-			obj[`custom${scoreId}`] = [];
-			obj[`varCustom${scoreId}`] = [];
-
-			for (let j = 0; j < customGauges.length; j++) {
-				const customGaugeSets = customGauges[j].split(`::`);
-				obj[`custom${scoreId}`][j] = customGaugeSets[0];
-				obj[`varCustom${scoreId}`][j] = boolToSwitch(customGaugeSets[1] === `V`);
-				if (hasVal(customGaugeSets[2])) {
-					g_lblNameObj[`u_${customGaugeSets[0]}`] = customGaugeSets[2];
-				}
-			}
-			if (scoreId === 0) {
-				obj.custom = obj.custom0.concat();
-				obj.varCustom = obj.varCustom0.concat();
-			}
-			addGaugeFulls(obj[`custom${scoreId}`]);
+	if (!hasVal(dosCustomGauge)) return;
+
+	g_gaugeSelObj[scoreId] = structuredClone(g_gaugeSelObj.default ?? { __order: [] });
+	if (g_gaugeOptionObj.defaultPlusList.includes(dosCustomGauge)) {
+		// customDefault: cloneした時点でdefaultの並び・上書きがそのまま入っているので何もしない
+		// survival/border: 選択順(名前)だけをsurvival/border配列に差し替える（値上書きはdefault由来のまま）
+		if (dosCustomGauge !== `customDefault`) {
+			g_gaugeSelObj[scoreId].__order = g_gaugeOptionObj[dosCustomGauge].concat();
 		}
+		return;
 	}
-	return obj;
+	// インライン指定（例: customGauge=Escape::V::エスケープ,Normal::F）
+	g_gaugeSelObj[scoreId].__order = [];
+	dosCustomGauge.split(`,`).forEach(gaugeSet => {
+		const [name, variableFlag, dispName] = gaugeSet.split(`::`);
+		g_gaugeSelObj[scoreId].__order.push(name);
+		g_gaugeSelObj[scoreId][name] = { ...g_gaugeSelObj[scoreId][name], Variable: boolToSwitch(variableFlag === `V`) };
+		if (hasVal(dispName)) {
+			g_lblNameObj[`u_${name}`] = dispName;
+		}
+	});
+	addGaugeFulls(g_gaugeSelObj[scoreId].__order);
 };
 
 /**
@@ -2138,39 +2115,16 @@ const resetCustomGauge = (_dosObj, { scoreId = 0 } = {}) => {
  */
 const getGaugeSetting = (_dosObj, _name, _difLength, { scoreId = 0 } = {}) => {
 
-	const obj = {
-		lifeBorders: [],
-		lifeRecoverys: [],
-		lifeDamages: [],
-		lifeInits: []
-	};
-	/** ゲージ設定再作成フラグ */
-	let gaugeCreateFlg = false;
-
 	/** ゲージ設定上書きフラグ */
 	const gaugeUpdateFlg = g_stateObj.scoreLockFlg && scoreId > 0;
-
-	/**
-	 * ゲージ別個別配列への値格納
-	 * この時点では各種ゲージ設定は文字列のまま。setGauge関数にて数式に変換される
-	 * @param {number} _scoreId 
-	 * @param {string[]} _gaugeDetails
-	 * @returns {boolean}
-	 */
-	const setGaugeDetails = (_scoreId, _gaugeDetails) => {
-
-		obj.lifeBorders[_scoreId] = _gaugeDetails[0] === `x` ? `x` : _gaugeDetails[0];
-		obj.lifeRecoverys[_scoreId] = _gaugeDetails[1];
-		obj.lifeDamages[_scoreId] = _gaugeDetails[2];
-		obj.lifeInits[_scoreId] = _gaugeDetails[3];
-
-		if (gaugeUpdateFlg && hasVal(g_gaugeOptionObj[`gauge${_name}s`])) {
-			// ゲージ上書き時は_gaugeDetails(obj)の値を優先し、デフォルト値で穴埋めする
-			Object.keys(obj).forEach(key => g_gaugeOptionObj[`gauge${_name}s`][key] =
-				fillMissingArrayElem(g_gaugeOptionObj[`gauge${_name}s`][key] || [], obj[key]));
-			return false;
-		}
-		return true;
+	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 };
 	};
 
 	/**
@@ -2179,47 +2133,70 @@ const getGaugeSetting = (_dosObj, _name, _difLength, { scoreId = 0 } = {}) => {
 	 * @param {number[]} _defaultGaugeList
 	 * @returns {number[]}
 	 */
-	const getGaugeDetailList = (_scoreId, _defaultGaugeList) => {
-		if (_scoreId > 0) {
-			const idHeader = setScoreIdHeader(_scoreId, g_stateObj.scoreLockFlg, false);
+	const getGaugeDetailList = (_scoreId) => {
+		const idHeader = (_scoreId === 0) ? 1 : setScoreIdHeader(_scoreId, g_stateObj.scoreLockFlg, false);
+		if (hasVal(idHeader)) {
 			const dosId = (idHeader || 0) - 1;
 			const headerName = `gauge${_name}${idHeader}`;
 			if (hasVal(_dosObj[headerName])) {
-				const gauges = splitLF2(_dosObj[headerName]);
-				return (gauges[dosId] || gauges[0])?.split(`,`);
+				const detailGauges = splitLF2(_dosObj[headerName]);
+				return (detailGauges[dosId] || detailGauges[0])?.split(`,`);
 			}
 		}
-		return _defaultGaugeList;
+		return (gauges[_scoreId] || gauges[0])?.split(`,`);
 	};
 
-	if (hasVal(_dosObj[`gauge${_name}`])) {
-
-		const gauges = splitLF2(_dosObj[`gauge${_name}`]);
-		if (gaugeUpdateFlg) {
-			gaugeCreateFlg = setGaugeDetails(scoreId, (gauges[scoreId] || gauges[0])?.split(`,`));
-		} else {
-			for (let j = 0; j < _difLength; j++) {
-				gaugeCreateFlg = setGaugeDetails(j, getGaugeDetailList(j, (gauges[j] || gauges[0]).split(`,`)));
-			}
+	if (gaugeUpdateFlg) {
+		registerGaugeDetails(scoreId);
+	} else {
+		for (let j = 0; j < _difLength; j++) {
+			registerGaugeDetails(j);
 		}
+	}
+};
 
-	} else if (g_presetObj.gaugeCustom?.[_name] !== undefined) {
+/**
+ * 【参照用】g_gaugeOptionObjの旧プロパティを参照できるようにする関数
+ * （initXXX/rcvXXX/dmgXXX/clearXXX、typeXXX/varXXXも参考として）に展開する。
+ * - カスタムスクリプト側で既存ゲージの既定値を参照するための補助関数。本体からの呼び出しはない。
+ */
+const restoreLegacyGaugeReference = () => {
+	[`survival`, `border`].forEach(type => {
+		const cap = toCapitalize(type);
+		const names = g_gaugeOptionObj[type];
+		g_gaugeOptionObj[`init${cap}`] = names.map(name => g_gaugeDefObj[name]?.Init);
+		g_gaugeOptionObj[`rcv${cap}`] = names.map(name => g_gaugeDefObj[name]?.Recovery);
+		g_gaugeOptionObj[`dmg${cap}`] = names.map(name => g_gaugeDefObj[name]?.Damage);
+		g_gaugeOptionObj[`clear${cap}`] = names.map(name =>
+			(g_gaugeDefObj[name]?.Border === `x` ? 0 : g_gaugeDefObj[name]?.Border));
+		g_gaugeOptionObj[`var${cap}`] = names.map(name => g_gaugeDefObj[name]?.Variable);
+		g_gaugeOptionObj[`type${cap}`] = names.map(name =>
+			(g_gaugeDefObj[name]?.Border === `x` ? C_LFE_SURVIVAL : C_LFE_BORDER));
+	});
+};
 
-		const gaugeDetails = [
-			g_presetObj.gaugeCustom[_name].Border, g_presetObj.gaugeCustom[_name].Recovery,
-			g_presetObj.gaugeCustom[_name].Damage, g_presetObj.gaugeCustom[_name].Init,
-		];
-		if (gaugeUpdateFlg) {
-			gaugeCreateFlg = setGaugeDetails(scoreId, gaugeDetails);
-		} else {
-			for (let j = 0; j < _difLength; j++) {
-				gaugeCreateFlg = setGaugeDetails(j, getGaugeDetailList(j, gaugeDetails));
-			}
-		}
-	}
-	if (gaugeCreateFlg) {
-		g_gaugeOptionObj[`gauge${_name}s`] = obj;
-	}
+/**
+ * 【反映用】カスタムスクリプトが旧形式で作った個別ゲージ設定
+ * - g_gaugeOptionObj[`gauge${_name}s`] = { lifeBorders, lifeRecoverys, lifeDamages, lifeInits }
+ * （それぞれscoreId順の配列）を、新プロパティ g_gaugeSelObj[scoreId][_name] へ変換して反映する
+ * - 本体からの呼び出しは無いため、カスタムスクリプト側で呼び出しする想定
+ * @param {string} _name ゲージ名
+ */
+const applyLegacyGaugeOverride = (_name) => {
+	const legacyObj = g_gaugeOptionObj[`gauge${_name}s`];
+	if (!hasVal(legacyObj)) return;
+	legacyObj.lifeRecoverys.forEach((recovery, scoreId) => {
+		if (!hasVal(recovery)) return;
+		g_gaugeSelObj[scoreId] ??= structuredClone(g_gaugeSelObj.default ?? { __order: [] });
+		g_gaugeSelObj[scoreId][_name] = {
+			...g_gaugeSelObj[scoreId][_name],
+			Border: legacyObj.lifeBorders[scoreId],
+			Recovery: recovery,
+			Damage: legacyObj.lifeDamages[scoreId],
+			Init: legacyObj.lifeInits[scoreId],
+		};
+	});
+	delete g_gaugeOptionObj[`gauge${_name}s`]; // 反映済みの旧データは残さない
 };
 
 /**
@@ -2692,7 +2669,8 @@ const keysConvert = (_dosObj, { keyExtraList = _dosObj.keyExtraList?.split(`,`)
 				_dosObj[`layerTrans${newKey}`] = _dosObj[`layerTrans${newKey}`]?.replaceAll(`,`, `___`);
 				newKeyMultiParam(newKey, `layerTrans`, toSplitArrayStr, {
 					loopFunc: (k, keyheader) => {
-						g_keyObj[`${keyheader}_${k + dfPtnNum}`][0] = g_keyObj[`${keyheader}_${k + dfPtnNum}`]?.[0]?.map(val => val.replaceAll(`___`, `,`));
+						g_keyObj[`${keyheader}_${k + dfPtnNum}`][0] =
+							g_keyObj[`${keyheader}_${k + dfPtnNum}`]?.[0]?.map(val => val.replaceAll(`___`, `,`));
 					},
 				});
 			}