danoniplus 33.7.0 → 34.0.0

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2023/09/08
+ * Revised : 2023/09/24
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 33.7.0`;
-const g_revisedDate = `2023/09/08`;
+const g_version = `Ver 34.0.0`;
+const g_revisedDate = `2023/09/24`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -294,6 +294,12 @@ const g_convFunc = {
 const setVal = (_checkStr, _default, _type = C_TYP_STRING) =>
 	hasValN(_checkStr) ? g_convFunc[_type](_checkStr, _default) : _default;
 
+/**
+ * ブール値からON/OFFへ変換
+ * @param {boolean} _condition 
+ */
+const boolToSwitch = _condition => _condition ? C_FLG_ON : C_FLG_OFF;
+
 /**
  * ブール値への変換
  * @param {string} _val 
@@ -2299,11 +2305,9 @@ const copySetColor = (_baseObj, _scoreId) => {
  * MusicUrlの基本情報を取得
  * @param {number} _scoreId
  */
-const getMusicUrl = _scoreId => {
-	return g_headerObj.musicUrls !== undefined ?
-		g_headerObj.musicUrls[g_headerObj.musicNos[_scoreId]] ??
-		g_headerObj.musicUrls[0] : `nosound.mp3`;
-};
+const getMusicUrl = _scoreId =>
+	g_headerObj.musicUrls !== undefined ?
+		g_headerObj.musicUrls[g_headerObj.musicNos[_scoreId]] ?? g_headerObj.musicUrls[0] : `nosound.mp3`;
 
 /**
  * 譜面ファイル読込後処理（譜面詳細情報取得用）
@@ -2935,7 +2939,7 @@ const headerConvert = _dosObj => {
 	if (g_presetObj.gaugeList !== undefined) {
 		Object.keys(g_presetObj.gaugeList).forEach(key => {
 			g_gaugeOptionObj.customDefault.push(key);
-			g_gaugeOptionObj.varCustomDefault.push((g_presetObj.gaugeList[key] !== `V` ? C_FLG_OFF : C_FLG_ON));
+			g_gaugeOptionObj.varCustomDefault.push(boolToSwitch(g_presetObj.gaugeList[key] === `V`));
 		});
 		g_gaugeOptionObj.custom = g_gaugeOptionObj.customDefault.concat();
 		g_gaugeOptionObj.varCustom = g_gaugeOptionObj.varCustomDefault.concat();
@@ -3115,8 +3119,8 @@ const headerConvert = _dosObj => {
 
 	// 空押し判定を行うか
 	obj.excessiveJdgUse = setBoolVal(_dosObj.excessiveJdgUse ?? g_presetObj.excessiveJdgUse);
-	g_stateObj.excessive = obj.excessiveJdgUse ? C_FLG_ON : C_FLG_OFF;
-	g_settings.excessiveNum = obj.excessiveJdgUse ? 1 : 0;
+	g_stateObj.excessive = boolToSwitch(obj.excessiveJdgUse);
+	g_settings.excessiveNum = Number(obj.excessiveJdgUse);
 
 	// 譜面名に制作者名を付加するかどうかのフラグ
 	obj.makerView = setBoolVal(_dosObj.makerView);
@@ -3141,7 +3145,7 @@ const headerConvert = _dosObj => {
 		// displayUse -> ボタンの有効/無効, displaySet -> ボタンの初期値(ON/OFF)
 		obj[`${option}Use`] = setBoolVal(displayUse[0], true);
 		obj[`${option}Set`] = setVal(displayUse.length > 1 ? displayUse[1] :
-			(obj[`${option}Use`] ? C_FLG_ON : C_FLG_OFF), ``, C_TYP_SWITCH);
+			boolToSwitch(obj[`${option}Use`]), ``, C_TYP_SWITCH);
 		g_stateObj[`d_${option.toLowerCase()}`] = setVal(obj[`${option}Set`], C_FLG_ON, C_TYP_SWITCH);
 		obj[`${option}ChainOFF`] = (_dosObj[`${option}ChainOFF`] !== undefined ? _dosObj[`${option}ChainOFF`].split(`,`) : []);
 
@@ -3170,7 +3174,7 @@ const headerConvert = _dosObj => {
 	if (g_localStorage.colorType !== undefined) {
 		g_colorType = g_localStorage.colorType;
 		if (obj.colorUse) {
-			g_stateObj.d_color = g_keycons.colorDefTypes.findIndex(val => val === g_colorType) !== -1 ? C_FLG_ON : C_FLG_OFF;
+			g_stateObj.d_color = boolToSwitch(g_keycons.colorDefTypes.findIndex(val => val === g_colorType) !== -1);
 		}
 	}
 
@@ -3515,7 +3519,7 @@ const resetCustomGauge = (_dosObj, { scoreId = 0 } = {}) => {
 			for (let j = 0; j < customGauges.length; j++) {
 				const customGaugeSets = customGauges[j].split(`::`);
 				obj[`custom${scoreId}`][j] = customGaugeSets[0];
-				obj[`varCustom${scoreId}`][j] = (customGaugeSets[1] !== `V` ? C_FLG_OFF : C_FLG_ON);
+				obj[`varCustom${scoreId}`][j] = boolToSwitch(customGaugeSets[1] === `V`);
 			}
 			if (scoreId === 0) {
 				obj.custom = obj.custom0.concat();
@@ -3822,7 +3826,7 @@ const keysConvert = (_dosObj, { keyExtraList = _dosObj.keyExtraList?.split(`,`)
 			if (!hasVal(tmpParam)) {
 				return;
 			}
-			g_keyObj[pairName] = {}
+			g_keyObj[pairName] = {};
 
 			// デフォルト項目がある場合は先に定義
 			if (_defaultName !== ``) {
@@ -4344,8 +4348,10 @@ const setWindowStyle = (_text, _bkColor, _textColor, _align = C_ALIGN_LEFT, { _x
 const commonSettingBtn = _labelName => {
 
 	const switchSave = evt => {
+		const from = boolToSwitch(g_stateObj.dataSaveFlg);
 		g_stateObj.dataSaveFlg = !g_stateObj.dataSaveFlg;
-		const [from, to] = (g_stateObj.dataSaveFlg ? [C_FLG_OFF, C_FLG_ON] : [C_FLG_ON, C_FLG_OFF]);
+
+		const to = boolToSwitch(g_stateObj.dataSaveFlg);
 		evt.target.classList.replace(g_cssObj[`button_${from}`], g_cssObj[`button_${to}`]);
 	};
 
@@ -4386,8 +4392,7 @@ const commonSettingBtn = _labelName => {
  */
 const makePlayButton = _func => createCss2Button(`btnPlay`, g_lblNameObj.b_play, _ => true,
 	Object.assign(g_lblPosObj.btnPlay, {
-		animationName: (g_initialFlg ? `` : `smallToNormalY`),
-		resetFunc: _func,
+		animationName: (g_initialFlg ? `` : `smallToNormalY`), resetFunc: _func,
 	}), g_cssObj.button_Next);
 
 /**
@@ -4436,12 +4441,6 @@ const setSpriteList = _settingList => {
 	return spriteList;
 };
 
-/**
- * 設定ウィンドウの作成
- * @param {string} _sprite 
- */
-const createOptionSprite = _sprite => createEmptySprite(_sprite, `optionsprite`, g_windowObj.optionSprite);
-
 /**
  * スライダー共通処理
  * @param {object} _slider 
@@ -4459,7 +4458,7 @@ const inputSlider = (_slider, _link) => {
 const resetDifWindow = _ => {
 	if (document.querySelector(`#difList`) !== null) {
 		deleteChildspriteAll(`difList`);
-		[`difList`, `difCover`, `btnDifU`, `btnDifD`].forEach(obj => optionsprite.removeChild(document.getElementById(obj)));
+		[`difList`, `difCover`, `btnDifU`, `btnDifD`].forEach(obj => document.getElementById(obj).remove());
 		g_currentPage = `option`;
 		setShortcutEvent(g_currentPage, _ => true, { displayFlg: false, dfEvtFlg: true });
 	}
@@ -5068,7 +5067,7 @@ const setDifficulty = (_initFlg) => {
 const createOptionWindow = _sprite => {
 
 	// 各ボタン用のスプライトを作成
-	const optionsprite = createOptionSprite(_sprite);
+	const optionsprite = createEmptySprite(_sprite, `optionsprite`, g_windowObj.optionSprite);
 
 	// 設定毎に個別のスプライトを作成し、その中にラベル・ボタン類を配置
 	const spriteList = setSpriteList(g_settingPos.option);
@@ -5722,8 +5721,8 @@ const setExcessive = _btn => {
  * @param {string} _extraKeyName 特殊キー名(通常キーは省略)
  */
 const getKeyCtrl = (_localStorage, _extraKeyName = ``) => {
-	const baseKeyCtrlPtn = _localStorage[`keyCtrlPtn${_extraKeyName}`];
-	const basePtn = `${g_keyObj.currentKey}_${baseKeyCtrlPtn}`;
+	g_keyObj.storagePtn = _localStorage[`keyCtrlPtn${_extraKeyName}`];
+	const basePtn = `${g_keyObj.currentKey}_${g_keyObj.storagePtn}`;
 	const baseKeyNum = g_keyObj[`${g_keyObj.defaultProp}${basePtn}`].length;
 
 	if (_localStorage[`keyCtrl${_extraKeyName}`] !== undefined && _localStorage[`keyCtrl${_extraKeyName}`][0].length > 0) {
@@ -5923,7 +5922,7 @@ const createSettingsDisplayWindow = _sprite => {
 	};
 
 	// 各ボタン用のスプライトを作成
-	createOptionSprite(_sprite);
+	const optionsprite = createEmptySprite(_sprite, `optionsprite`, g_windowObj.optionSprite);
 
 	// 設定毎に個別のスプライトを作成し、その中にラベル・ボタン類を配置
 	const displaySprite = createEmptySprite(optionsprite, `displaySprite`, g_windowObj.displaySprite);
@@ -5972,13 +5971,11 @@ const createSettingsDisplayWindow = _sprite => {
 	// ---------------------------------------------------
 	// 判定表示系の不透明度 (Opacity)
 	// 縦位置: 9
-	let opacityUse = false;
+	g_headerObj.opacityUse = false;
 	[`judgment`, `fastSlow`, `filterLine`].forEach(display =>
-		opacityUse ||= g_headerObj[`${display}Use`] || g_headerObj[`${display}Set`] === C_FLG_ON);
+		g_headerObj.opacityUse ||= g_headerObj[`${display}Use`] || g_headerObj[`${display}Set`] === C_FLG_ON);
 
-	if (opacityUse) {
-		createGeneralSetting(spriteList.opacity, `opacity`, { unitName: g_lblNameObj.percent });
-	}
+	createGeneralSetting(spriteList.opacity, `opacity`, { unitName: g_lblNameObj.percent });
 
 	// ---------------------------------------------------
 	// タイミング調整 (HitPosition)
@@ -6284,9 +6281,7 @@ const keyConfigInit = (_kcType = g_kcType) => {
 	 */
 	const makeKCButtonHeader = (_id, _name, {
 		x = g_sWidth * 5 / 6 - 30, y = 0, w = g_sWidth / 6, h = 20, siz = 12, align = C_ALIGN_LEFT, ...rest
-	} = {}, ..._classes) => {
-		return createDivCss2Label(_id, g_lblNameObj[_name], { x, y, w, h, siz, align, ...rest }, ..._classes);
-	};
+	} = {}, ..._classes) => createDivCss2Label(_id, g_lblNameObj[_name], { x, y, w, h, siz, align, ...rest }, ..._classes);
 
 	/**
 	 * キーコンフィグ用設定ボタン
@@ -6299,9 +6294,8 @@ const keyConfigInit = (_kcType = g_kcType) => {
 	 * @returns ボタン
 	 */
 	const makeKCButton = (_id, _text, _func, { x = g_sWidth * 5 / 6 - 20, y = 15, w = g_sWidth / 6, h = 18,
-		siz = g_limitObj.jdgCntsSiz, borderStyle = `solid`, cxtFunc, ...rest } = {}, _mainClass = g_cssObj.button_RevOFF, ..._classes) => {
-		return makeSettingLblCssButton(_id, getStgDetailName(_text), 0, _func, { x, y, w, h, siz, cxtFunc, borderStyle, ...rest }, _mainClass, ..._classes);
-	};
+		siz = g_limitObj.jdgCntsSiz, borderStyle = `solid`, cxtFunc, ...rest } = {}, _mainClass = g_cssObj.button_RevOFF, ..._classes) =>
+		makeSettingLblCssButton(_id, getStgDetailName(_text), 0, _func, { x, y, w, h, siz, cxtFunc, borderStyle, ...rest }, _mainClass, ..._classes);
 
 	/**
 	 * キーコンフィグ用ミニボタン
@@ -6310,10 +6304,8 @@ const keyConfigInit = (_kcType = g_kcType) => {
 	 * @param {function} _func 
 	 * @param {*} object (x, y, w, h, siz) 
 	 */
-	const makeMiniKCButton = (_id, _directionFlg, _func, { x = g_sWidth * 5 / 6 - 30, y = 15, w = 15, h = 20, siz = g_limitObj.mainSiz } = {}) => {
-		return createCss2Button(`${_id}${_directionFlg}`, g_settingBtnObj.chara[_directionFlg], _func,
-			{ x, y, w, h, siz }, g_cssObj.button_Mini);
-	};
+	const makeMiniKCButton = (_id, _directionFlg, _func, { x = g_sWidth * 5 / 6 - 30, y = 15, w = 15, h = 20, siz = g_limitObj.mainSiz } = {}) =>
+		createCss2Button(`${_id}${_directionFlg}`, g_settingBtnObj.chara[_directionFlg], _func, { x, y, w, h, siz }, g_cssObj.button_Mini);
 
 	/**
 	 * キーコンフィグ用グループ設定ラベル・ボタンの作成
@@ -6340,7 +6332,8 @@ const keyConfigInit = (_kcType = g_kcType) => {
 	multiAppend(divRoot,
 
 		// ショートカットキーメッセージ
-		createDescDiv(`scMsg`, g_lblNameObj.kcShortcutDesc.split(`{0}`).join(g_isMac ? `Shift+${g_kCd[g_headerObj.keyRetry]}` : g_kCd[g_headerObj.keyTitleBack])
+		createDescDiv(`scMsg`, g_lblNameObj.kcShortcutDesc.split(`{0}`)
+			.join(g_isMac ? `Shift+${g_kCd[g_headerObj.keyRetry]}` : g_kCd[g_headerObj.keyTitleBack])
 			.split(`{1}`).join(g_kCd[g_headerObj.keyRetry]), `scKcMsg`),
 
 		// 別キーモード警告メッセージ
@@ -6386,8 +6379,7 @@ const keyConfigInit = (_kcType = g_kcType) => {
 
 		const nextLeft = (kWidth - C_ARW_WIDTH) / 2 + g_keyObj.blank * stdPos - maxLeftX - 10;
 		cursor.style.left = `${nextLeft}px`;
-		const baseY = C_KYC_HEIGHT * Number(posj > divideCnt) + 57;
-		cursor.style.top = `${baseY + C_KYC_REPHEIGHT * g_currentk}px`;
+		cursor.style.top = `${C_KYC_HEIGHT * Number(posj > divideCnt) + 57 + C_KYC_REPHEIGHT * g_currentk}px`;
 		g_kcType = (g_currentk === 0 ? `Main` : `Replaced`);
 
 		// 次の位置が見えなくなったらkeyconSpriteの位置を調整する
@@ -6424,10 +6416,8 @@ const keyConfigInit = (_kcType = g_kcType) => {
 		keyconSprite.scrollLeft = - maxLeftX;
 	};
 
-	const getNextNum = (_scrollNum, _groupName, _target) => {
-		const typeNum = g_keycons[_groupName].findIndex(value => value === _target);
-		return nextPos(typeNum, _scrollNum, g_keycons[_groupName].length);
-	};
+	const getNextNum = (_scrollNum, _groupName, _target) =>
+		nextPos(g_keycons[_groupName].findIndex(value => value === _target), _scrollNum, g_keycons[_groupName].length);
 
 	/**
 	 * ConfigTypeの制御
@@ -6502,7 +6492,7 @@ const keyConfigInit = (_kcType = g_kcType) => {
 		const nextNum = getNextNum(_scrollNum, `colorTypes`, g_colorType);
 		g_colorType = g_keycons.colorTypes[nextNum];
 		if (g_headerObj.colorUse) {
-			g_stateObj.d_color = g_keycons.colorDefTypes.findIndex(val => val === g_colorType) !== -1 ? C_FLG_ON : C_FLG_OFF;
+			g_stateObj.d_color = boolToSwitch(g_keycons.colorDefTypes.findIndex(val => val === g_colorType) !== -1);
 		}
 		changeSetColor();
 		viewGroupObj.color(`_${g_keycons.colorGroupNum}`);
@@ -6578,8 +6568,7 @@ const keyConfigInit = (_kcType = g_kcType) => {
 	keyconSprite.scrollLeft = - maxLeftX;
 
 	// キーパターン表示
-	const lblTransKey = hasVal(g_keyObj[`transKey${keyCtrlPtn}`]) ?
-		`(${g_keyObj[`transKey${keyCtrlPtn}`] ?? ''})` : ``;
+	const lblTransKey = hasVal(g_keyObj[`transKey${keyCtrlPtn}`]) ? `(${g_keyObj[`transKey${keyCtrlPtn}`] ?? ''})` : ``;
 
 	/**
 	 * キーパターン検索
@@ -6792,8 +6781,7 @@ const getKeyInfo = _ => {
 	const keyGroupList = makeDedupliArray(keyGroupMaps.flat()).sort((a, b) => parseInt(a) - parseInt(b));
 
 	return {
-		keyCtrlPtn: keyCtrlPtn, keyNum: keyNum, posMax: posMax, divideCnt: divideCnt,
-		keyGroupMaps: keyGroupMaps, keyGroupList: keyGroupList,
+		keyCtrlPtn, keyNum, posMax, divideCnt, keyGroupMaps, keyGroupList,
 	};
 };
 
@@ -6840,18 +6828,7 @@ const changeSetColor = _ => {
  * @param {string} _cssName 
  */
 const changeConfigColor = (_obj, _cssName) => {
-	const resetClass = _className => {
-		if (_obj.classList.contains(_className)) {
-			_obj.classList.remove(_className);
-		}
-	};
-
-	// CSSクラスの除去
-	resetClass(g_cssObj.keyconfig_Changekey);
-	resetClass(g_cssObj.keyconfig_Defaultkey);
-	resetClass(g_cssObj.title_base);
-
-	// 指定されたCSSクラスを適用
+	_obj.classList.remove(g_cssObj.keyconfig_Changekey, g_cssObj.keyconfig_Defaultkey, g_cssObj.title_base);
 	_obj.classList.add(_cssName);
 };
 
@@ -7537,7 +7514,10 @@ const scoreConvert = (_dosObj, _scoreId, _preblankFrame, _dummyNo = ``,
 	 */
 	const getRefData = (_header, _dataName) => {
 		const data = _dosObj[`${_header}${_dataName}`];
-		return data?.startsWith(_header) ? _dosObj[data] : data;
+		let dataStr = data;
+		splitLF(data)?.filter(val => val?.startsWith(_header) && _dosObj[val] !== undefined)
+			.forEach(val => dataStr = dataStr.replace(val, _dosObj[val]));
+		return dataStr;
 	}
 
 	/**
@@ -7562,7 +7542,8 @@ const scoreConvert = (_dosObj, _scoreId, _preblankFrame, _dummyNo = ``,
 		}
 
 		const list = [];
-		const anotherKeyFlg = hasVal(g_keyObj[`transKey${_keyCtrlPtn}`]);
+		const ptnName = `${(g_keyObj.currentPtn === -1 ? g_keyObj.storagePtn : g_keyObj.currentPtn) + 1}`;
+		const keyName = setVal(g_keyObj[`transKey${_keyCtrlPtn}`], g_keyObj.currentKey);
 		let type = ``;
 		if (g_stateObj.scroll !== `---`) {
 			type = `Alt`;
@@ -7570,14 +7551,13 @@ const scoreConvert = (_dosObj, _scoreId, _preblankFrame, _dummyNo = ``,
 			type = `Rev`;
 		}
 
-		if (anotherKeyFlg) {
-			list.push(`${g_stateObj.scroll}A`);
-			list.push(`${type}A`);
-			list.push(`A`);
-		}
-		list.push(g_stateObj.scroll);
-		list.push(type);
-		list.push(``);
+		[g_stateObj.scroll, type, ``].forEach(header => {
+			list.push(`${header}[${ptnName}]`, `${header}<${keyName}>`);
+			if (hasVal(g_keyObj[`transKey${_keyCtrlPtn}`])) {
+				list.push(`${header}A`);
+			}
+		});
+		list.push(g_stateObj.scroll, type, ``);
 
 		return makeDedupliArray(list);
 	};
@@ -8066,7 +8046,7 @@ const pushArrows = (_dataObj, _speedOnFrame, _motionOnFrame, _firstArrivalFrame)
 	}
 
 	// 個別加速のタイミング更新
-	const getTimingData = _data => {
+	const calcBoostData = _data => {
 		if (hasArrayList(_data, 2)) {
 			let delIdx = 0;
 			for (let k = _data.length - 2; k >= 0; k -= 2) {
@@ -8086,7 +8066,7 @@ const pushArrows = (_dataObj, _speedOnFrame, _motionOnFrame, _firstArrivalFrame)
 		}
 		return [];
 	};
-	g_workObj.boostData = getTimingData(_dataObj.boostData);
+	g_workObj.boostData = calcBoostData(_dataObj.boostData);
 
 	/**
 	 * 色変化・モーションデータ・スクロール反転データのタイミング更新
@@ -8534,7 +8514,7 @@ const getArrowSettings = _ => {
 	const scrollDirOptions = (g_keyObj[`scrollDir${keyCtrlPtn}`] !== undefined ?
 		g_keyObj[`scrollDir${keyCtrlPtn}`][g_stateObj.scroll] : [...Array(keyNum)].fill(1));
 
-	g_stateObj.autoAll = (g_stateObj.autoPlay === C_FLG_ALL ? C_FLG_ON : C_FLG_OFF);
+	g_stateObj.autoAll = boolToSwitch(g_stateObj.autoPlay === C_FLG_ALL);
 	g_workObj.hitPosition = (g_stateObj.autoAll ? 0 : g_stateObj.hitPosition);
 	changeSetColor();
 
@@ -9267,7 +9247,7 @@ const mainInit = _ => {
 	g_typeLists.arrow.forEach(type =>
 		judgeObjDelete[type] = (_j, _deleteName) => {
 			g_workObj[`judg${toCapitalize(type)}Cnt`][_j]++;
-			arrowSprite[g_attrObj[_deleteName].dividePos].removeChild(document.getElementById(_deleteName));
+			document.getElementById(_deleteName).remove();
 			delete g_attrObj[_deleteName];
 		});
 

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2023/09/07 (v33.6.0)
+ * Revised : 2023/09/24 (v34.0.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -1677,6 +1677,7 @@ const g_keyObj = {
     // - 原則、キー×パターンの数だけ設定が必要
     currentKey: 7,
     currentPtn: 0,
+    storagePtn: 0,
     defaultProp: `keyCtrl`,
 
     prevKey: `Dummy`,

package/package.json

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