danoniplus 37.8.1 → 38.0.0

package/js/danoni_main.js

@@ -8,7 +8,7 @@
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 37.8.1`;
+const g_version = `Ver 38.0.0`;
 const g_revisedDate = `2024/11/04`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
@@ -233,6 +233,7 @@ const getNumAttr = (_baseObj, _attrkey) => parseFloat(_baseObj.getAttribute(_att
  * @returns {string} 埋め込み後の変数
  */
 const convertStrToVal = _str => {
+	if (!hasVal(_str)) return _str;
 	const strs = _str.split(`}`).join(`{`).split(`{`);
 	let convStrs = ``;
 	for (let j = 0; j < strs.length; j += 2) {
@@ -516,7 +517,7 @@ const fuzzyListMatching = (_str, _headerList, _footerList) =>
  */
 const replaceStr = (_str, _pairs) => {
 	let tmpStr = _str;
-	_pairs.forEach(pair => tmpStr = tmpStr?.split(pair[0]).join(pair[1]));
+	_pairs.forEach(pair => tmpStr = String(tmpStr)?.split(pair[0]).join(pair[1]));
 	return tmpStr;
 };
 
@@ -2290,10 +2291,14 @@ const initialControl = async () => {
 			// 譜面ファイルが分割されている場合、譜面詳細情報取得のために譜面をロード
 			if (g_stateObj.dosDivideFlg) {
 				await loadChartFile(j);
-				resetColorAndGauge(j);
+				resetColorSetting(j);
 			}
 			getScoreDetailData(j);
 		}
+		const loopCount = g_stateObj.dosDivideFlg ? g_headerObj.keyLabels.length : 1;
+		for (let j = 0; j < loopCount; j++) {
+			resetGaugeSetting(j);
+		}
 	}
 	g_customJsObj.preTitle.forEach(func => func());
 	titleInit();
@@ -2441,16 +2446,22 @@ const loadChartFile = async (_scoreId = g_stateObj.scoreId) => {
 };
 
 /**
- * 譜面をファイルで分割している場合に初期色やゲージ情報を追加取得
+ * 譜面をファイルで分割している場合に初期色を追加取得
  * @param {string} _scoreId 
  */
-const resetColorAndGauge = _scoreId => {
+const resetColorSetting = _scoreId => {
 	// 初期矢印・フリーズアロー色の再定義
 	if (g_stateObj.scoreLockFlg) {
 		Object.assign(g_rootObj, copySetColor(g_rootObj, _scoreId));
 	}
 	Object.assign(g_headerObj, resetBaseColorList(g_headerObj, g_rootObj, { scoreId: _scoreId }));
+};
 
+/**
+ * 譜面をファイルで分割している場合にゲージ情報を追加取得
+ * @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 }));
@@ -3023,7 +3034,7 @@ const headerConvert = _dosObj => {
 		difs.forEach(dif => {
 			const difDetails = dif.split(`,`);
 			const lifeData = (_type, _default) =>
-				setVal(difDetails[difpos[_type]] || g_presetObj.gauge?.[_type], _default, C_TYP_FLOAT);
+				difDetails[difpos[_type]] || g_presetObj.gauge?.[_type] || _default;
 
 			// ライフ：ノルマ、回復量、ダメージ量、初期値の設定
 			obj.lifeBorders.push(lifeData(`Border`, `x`));
@@ -3153,9 +3164,6 @@ const headerConvert = _dosObj => {
 		Object.assign(obj, resetBaseColorList(obj, _dosObj, { scoreId: j }));
 	}
 
-	// ライフ設定のカスタム部分取得（譜面ヘッダー加味）
-	Object.keys(g_gaugeOptionObj.customFulls).forEach(gaugePtn => getGaugeSetting(_dosObj, gaugePtn, obj.difLabels.length));
-
 	// ダミー譜面の設定
 	if (hasVal(_dosObj.dummyId)) {
 		obj.dummyScoreNos = _dosObj.dummyId.split(`$`);
@@ -3778,19 +3786,17 @@ const getGaugeSetting = (_dosObj, _name, _difLength, { scoreId = 0 } = {}) => {
 
 	/**
 	 * ゲージ別個別配列への値格納
+	 * この時点では各種ゲージ設定は文字列のまま。setGauge関数にて数式に変換される
 	 * @param {number} _scoreId 
 	 * @param {string[]} _gaugeDetails
 	 * @returns {boolean}
 	 */
 	const setGaugeDetails = (_scoreId, _gaugeDetails) => {
-		if (_gaugeDetails[0] === `x`) {
-			obj.lifeBorders[_scoreId] = `x`;
-		} else {
-			obj.lifeBorders[_scoreId] = setVal(_gaugeDetails[0], ``, C_TYP_FLOAT);
-		}
-		obj.lifeRecoverys[_scoreId] = setVal(_gaugeDetails[1], ``, C_TYP_FLOAT);
-		obj.lifeDamages[_scoreId] = setVal(_gaugeDetails[2], ``, C_TYP_FLOAT);
-		obj.lifeInits[_scoreId] = setVal(_gaugeDetails[3], ``, C_TYP_FLOAT);
+
+		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`])) {
 			Object.keys(obj).forEach(key => Object.assign(g_gaugeOptionObj[`gauge${_name}s`][key] || [], obj[key]));
@@ -6092,6 +6098,18 @@ const setReverseView = _btn => {
  */
 const setGauge = (_scrollNum, _gaugeInitFlg = false) => {
 
+	/**
+	 * 数式からゲージ値に変換
+	 * arrow[] -> 矢印数, frz[] -> フリーズアロー数, all[] -> 矢印＋フリーズアロー数に置換する
+	 * @param {string} _val 
+	 * @param {string} _defaultVal
+	 * @returns {number}
+	 */
+	const getGaugeCalc = (_val, _defaultVal) => {
+		return setVal(convertStrToVal(
+			replaceStr(_val, g_escapeStr.gaugeParamName)?.split(`{0}`).join(g_stateObj.scoreId)
+		), _defaultVal, C_TYP_CALC);
+	};
 	/**
 	 * ゲージ詳細一括変更
 	 * @param {object} _baseObj 
@@ -6100,15 +6118,9 @@ const setGauge = (_scrollNum, _gaugeInitFlg = false) => {
 	 * @param {number} object.magDmg
 	 */
 	const setLifeCategory = (_baseObj, { _magInit = 1, _magRcv = 1, _magDmg = 1 } = {}) => {
-		if (hasVal(_baseObj.lifeInits[g_stateObj.scoreId])) {
-			g_stateObj.lifeInit = _baseObj.lifeInits[g_stateObj.scoreId] * _magInit;
-		}
-		if (hasVal(_baseObj.lifeRecoverys[g_stateObj.scoreId])) {
-			g_stateObj.lifeRcv = _baseObj.lifeRecoverys[g_stateObj.scoreId] * _magRcv;
-		}
-		if (hasVal(_baseObj.lifeDamages[g_stateObj.scoreId])) {
-			g_stateObj.lifeDmg = _baseObj.lifeDamages[g_stateObj.scoreId] * _magDmg;
-		}
+		g_stateObj.lifeInit = getGaugeCalc(_baseObj.lifeInits[g_stateObj.scoreId], g_stateObj.lifeInit) * _magInit;
+		g_stateObj.lifeRcv = getGaugeCalc(_baseObj.lifeRecoverys[g_stateObj.scoreId], g_stateObj.lifeRcv) * _magRcv;
+		g_stateObj.lifeDmg = getGaugeCalc(_baseObj.lifeDamages[g_stateObj.scoreId], g_stateObj.lifeDmg) * _magDmg;
 	};
 
 	/**
@@ -6120,7 +6132,7 @@ const setGauge = (_scrollNum, _gaugeInitFlg = false) => {
 			g_stateObj.lifeBorder = 0;
 			g_stateObj.lifeMode = C_LFE_SURVIVAL;
 		} else {
-			g_stateObj.lifeBorder = _baseObj.lifeBorders[g_stateObj.scoreId];
+			g_stateObj.lifeBorder = getGaugeCalc(_baseObj.lifeBorders[g_stateObj.scoreId], g_stateObj.lifeBorder);
 			g_stateObj.lifeMode = C_LFE_BORDER;
 		}
 	};
@@ -11592,7 +11604,7 @@ const resultInit = () => {
 		rankMark = g_rankObj.rankMarkF;
 		rankColor = g_rankObj.rankColorF;
 		g_resultObj.spState = `failed`;
-	} else if (playingArrows === g_fullArrows && g_stateObj.autoAll === C_FLG_OFF && !(g_headerObj.excessiveJdgUse && g_stateObj.excessive === C_FLG_OFF)) {
+	} else if (allArrowsPlayed && g_stateObj.autoAll === C_FLG_OFF && !(g_headerObj.excessiveJdgUse && g_stateObj.excessive === C_FLG_OFF)) {
 		if (g_resultObj.spState === ``) {
 			g_resultObj.spState = `cleared`;
 		}
@@ -11616,6 +11628,7 @@ const resultInit = () => {
 			mTitleForView[j] = g_headerObj.musicTitlesForView[g_headerObj.musicNos[g_stateObj.scoreId]][j] + (j === 1 ? playbackView : ``));
 	}
 
+	const allArrowsPlayed = playingArrows === g_fullArrows;
 	const keyCtrlPtn = `${g_keyObj.currentKey}_${g_keyObj.currentPtn}`;
 	const transKeyName = (hasVal(g_keyObj[`transKey${keyCtrlPtn}`]) ? `(${g_keyObj[`transKey${keyCtrlPtn}`]})` : ``);
 	const orgShuffleFlg = g_keyObj[`shuffle${keyCtrlPtn}`].filter((shuffleGr, j) => shuffleGr !== g_keyObj[`shuffle${keyCtrlPtn}_0d`][j]).length === 0;
@@ -11766,7 +11779,7 @@ const resultInit = () => {
 	divRoot.appendChild(lblResultPre);
 
 	divRoot.appendChild(createDivCss2Label(`lblResultPre2`,
-		resultViewText(g_gameOverFlg ? `failed` : (playingArrows === g_fullArrows ? g_resultObj.spState : ``)),
+		resultViewText(g_gameOverFlg ? `failed` : (allArrowsPlayed ? g_resultObj.spState : ``)),
 		g_lblPosObj.lblResultPre2, g_cssObj.result_Cleared));
 
 	// プレイデータは Cleared & Failed に合わせて表示
@@ -11864,7 +11877,9 @@ const resultInit = () => {
 			if (![``, `failed`, `cleared`].includes(g_resultObj.spState)) {
 				g_localStorage.highscores[scoreName][g_resultObj.spState] = true;
 			}
-			if (!g_gameOverFlg && g_finishFlg && g_workObj.requiredAccuracy !== `----` && playingArrows === g_fullArrows) {
+			const isGameCompleted = !g_gameOverFlg && g_finishFlg;
+			const hasValidAccuracy = g_workObj.requiredAccuracy !== `----`;
+			if (isGameCompleted && hasValidAccuracy && allArrowsPlayed) {
 				if (g_localStorage.highscores[scoreName].clearLamps === undefined) {
 					g_localStorage.highscores[scoreName].clearLamps = [];
 				}

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2024/11/04 (v37.8.1)
+ * Revised : 2024/11/04 (v38.0.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -654,16 +654,17 @@ const C_BLOCK_KEYS = [
  * (置き換え元、置き換え先の組で二次元配列として定義。主にreplaceStr関数で使用)
  * - 先に合致したものを置換するため、複雑なパターンは先に配置する必要がある
  * 
- * @property {array} escape 特殊文字 -> エスケープ文字列
- * @property {array} escapeTag CW Edition定義の特殊文字列 -> エスケープ文字列
- * @property {array} unEscapeTag エスケープ文字列 -> 特殊文字
- * @property {array} escapeCode 使用禁止文字の無効化
- * @property {array} musicNameSimple 曲名中の改行タグ -> 空白化
- * @property {array} musicNameMultiLine 曲名中の特殊改行タグ -> 通常タグ化
- * @property {array} frzName 矢印データ名 -> フリーズアローデータ名
- * @property {array} keyCtrlName キー割当正式名 -> 略名
- * @property {array} colorPatternName 色変化指定先略名 -> 正式名
- * @property {array} targetPatternName 色変化指定先略名(all) -> 正式適用先(g0～g49)
+ * @property {string[][]} escape 特殊文字 -> エスケープ文字列
+ * @property {string[][]} escapeTag CW Edition定義の特殊文字列 -> エスケープ文字列
+ * @property {string[][]} unEscapeTag エスケープ文字列 -> 特殊文字
+ * @property {string[][]} escapeCode 使用禁止文字の無効化
+ * @property {string[][]} musicNameSimple 曲名中の改行タグ -> 空白化
+ * @property {string[][]} musicNameMultiLine 曲名中の特殊改行タグ -> 通常タグ化
+ * @property {string[][]} frzName 矢印データ名 -> フリーズアローデータ名
+ * @property {string[][]} keyCtrlName キー割当正式名 -> 略名
+ * @property {string[][]} colorPatternName 色変化指定先略名 -> 正式名
+ * @property {string[][]} targetPatternName 色変化指定先略名(all) -> 正式適用先(g0～g49)
+ * @property {string[][]} gaugeParamName ゲージ数式用略名 -> 計算式 ({0}にはscoreIdが入る)
  */
 const g_escapeStr = {
     escape: [[`&`, `&amp;`], [`<`, `&lt;`], [`>`, `&gt;`], [`"`, `&quot;`]],
@@ -709,7 +710,13 @@ const g_escapeStr = {
     ],
     targetPatternName: [
         [`all`, [...Array(50).keys()].map(i => `g${i}`).join(`/`)],
-    ]
+    ],
+    gaugeParamName: [
+        [`arrow[]`, `sumData(g_detailObj.arrowCnt[{0}])`],
+        [`frz[]`, `sumData(g_detailObj.frzCnt[{0}])`],
+        [`all[]`, `sumData(g_detailObj.arrowCnt[{0}]) + sumData(g_detailObj.frzCnt[{0}])`],
+        [`maxlife[]`, `g_headerObj.maxLifeVal`],
+    ],
 };
 
 /** 設定・オプション画面用共通 */
@@ -3442,17 +3449,6 @@ const g_skinJsObj = {
     result: [],
 };
 
-/** @deprecated */
-const convertreplaceNums = () => {
-    console.warn('convertreplaceNums is deprecated. Use convertReplaceNums instead.');
-    convertReplaceNums();
-};
-/** @deprecated */
-const MainInit = () => {
-    console.warn('MainInit is deprecated. Use mainInit instead.');
-    mainInit();
-};
-
 /**
  * 従来のカスタム関数をg_customJsObj, g_skinJsObjへ追加
  * - customjsファイルを読み込んだ直後にこの関数を呼び出している

package/js/lib/legacy_functions.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2024/10/29 
- * Revised : 2024/11/01 (v37.8.0)
+ * Revised : ----/--/--
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -93,6 +93,16 @@ const checkArrayVal = (_checkArray, _type, _minLength) => {
 /** @deprecated */
 const paddingLeft = (_str, _length, _chr) => String(_str)?.padStart(_length, _chr);
 
+/** @deprecated */
+const convertreplaceNums = () => {
+    console.warn('convertreplaceNums is deprecated. Use convertReplaceNums instead.');
+    convertReplaceNums();
+};
+/** @deprecated */
+const MainInit = () => {
+    console.warn('MainInit is deprecated. Use mainInit instead.');
+    mainInit();
+};
 /** @deprecated */
 let C_CLR_DEFAULT = `#333333`;
 /** @deprecated */

package/js/template/danoni_setting.js

@@ -98,7 +98,7 @@ g_presetObj.gaugeCustom = {
 	SuddenDeath: {
 		Border: `x`,
 		Recovery: 0,
-		Damage: setVal(g_rootObj.maxLifeVal, C_VAL_MAXLIFE, C_TYP_FLOAT),
+		Damage: `{maxlife[]}`,
 		Init: 100,
 	},
 	Practice: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "danoniplus",
-  "version": "37.8.1",
+  "version": "38.0.0",
   "description": "Dancing☆Onigiri (CW Edition) - Web-based Rhythm Game",
   "main": "index.js",
   "scripts": {