danoniplus 35.2.1 → 35.4.1

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2024/02/08
+ * Revised : 2024/02/23
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 35.2.1`;
-const g_revisedDate = `2024/02/08`;
+const g_version = `Ver 35.4.1`;
+const g_revisedDate = `2024/02/23`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -3729,9 +3729,9 @@ const keysConvert = (_dosObj, { keyExtraList = _dosObj.keyExtraList?.split(`,`)
 	 */
 	const toSameValStr = _str => {
 		const nums = _str?.split(`@:`);
-		const groupStr = nums[0].split(`!`).join(`,`);
+		const groupStr = toFloatStr(nums[0]).split(`!`).join(`,`);
 		return nums.length === 2 && !isNaN(parseInt(nums[1])) ?
-			[...Array(Math.floor(parseInt(nums[1])))].fill(groupStr).join(`,`) : _str;
+			[...Array(Math.floor(parseInt(nums[1])))].fill(groupStr).join(`,`) : groupStr;
 	};
 
 	/**
@@ -3765,6 +3765,24 @@ const keysConvert = (_dosObj, { keyExtraList = _dosObj.keyExtraList?.split(`,`)
 		return _num.startsWith(`b`) ? parseFloat(_num.slice(1)) + _divNum : parseFloat(_num);
 	}
 
+	/**
+	 * キーパターンの略名から実際のデータへ展開
+	 * @param {string} _str 
+	 * @param {string} _name 
+	 * @param {function} _convFunc
+	 */
+	const expandKeyPtn = (_str, _name, _convFunc) => {
+		const pos = _str.indexOf(`>`);
+		const expandData = _ptnstr => structuredClone(g_keyObj[`${_name}${getKeyPtnName(_ptnstr)}`]) ?? [_convFunc(_ptnstr)];
+
+		if (pos > 0 && _name === `chara`) {
+			const [header, ptn] = [_str.substring(0, pos), _str.substring(pos + 1)];
+			return expandData(ptn)?.map(n => `${header}${n}`);
+		} else {
+			return expandData(_str);
+		}
+	};
+
 	/**
 	 * 新キー用複合パラメータ
 	 * @param {string} _key キー数
@@ -3788,9 +3806,7 @@ const keysConvert = (_dosObj, { keyExtraList = _dosObj.keyExtraList?.split(`,`)
 				// |keyCtrl9j=Tab,7_0,Enter| -> |keyCtrl9j=Tab,S,D,F,Space,J,K,L,Enter| のように補完
 				// |pos9j=0..4,6..9| -> |pos9j=0,1,2,3,4,6,7,8,9|
 				g_keyObj[`${keyheader}_${k + dfPtn}`] =
-					toOriginalArray(tmpArray[k], toFloatStr).map(n =>
-						structuredClone(g_keyObj[`${_name}${getKeyPtnName(n)}`]) ?? [_convFunc(n)]
-					).flat();
+					toOriginalArray(tmpArray[k], toSameValStr).map(n => expandKeyPtn(n, _name, _convFunc)).flat();
 				if (baseCopyFlg) {
 					g_keyObj[`${keyheader}_${k + dfPtn}d`] = structuredClone(g_keyObj[`${keyheader}_${k + dfPtn}`]);
 				}
@@ -3840,8 +3856,7 @@ const keysConvert = (_dosObj, { keyExtraList = _dosObj.keyExtraList?.split(`,`)
 						// 部分的にキーパターン指定があった場合は既存パターンを展開 (例: |shuffle9j=2,7_0_0,2|)
 						g_keyObj[`${keyheader}_${k + dfPtn}_${ptnCnt}`] =
 							makeBaseArray(toOriginalArray(list, toSameValStr).map(n =>
-								structuredClone(g_keyObj[`${_name}${getKeyPtnName(n)}`]) ??
-								[isNaN(parseInt(n)) ? n : parseInt(n, 10)]
+								expandKeyPtn(n, _name, _str => isNaN(parseInt(_str)) ? _str : parseInt(_str, 10))
 							).flat(), g_keyObj[`${g_keyObj.defaultProp}${_key}_${k + dfPtn}`].length, 0);
 						ptnCnt++;
 					}
@@ -3915,7 +3930,7 @@ const keysConvert = (_dosObj, { keyExtraList = _dosObj.keyExtraList?.split(`,`)
 					// 部分的にキーパターン指定があった場合は既存パターンを展開 (例: |scroll9j=Cross::1,7_0,1|)
 					const tmpParamPair = pairs.split(`::`);
 					g_keyObj[pairName][tmpParamPair[0]] =
-						makeBaseArray(tmpParamPair[1]?.split(`,`).map(n =>
+						makeBaseArray(toOriginalArray(tmpParamPair[1], toSameValStr)?.map(n =>
 							structuredClone(g_keyObj[`${_pairName}${getKeyPtnName(n)}`]?.[tmpParamPair[0]]) ??
 							[n === `-` ? -1 : parseInt(n, 10)]
 						).flat(), g_keyObj[`${g_keyObj.defaultProp}${_key}_${k + dfPtn}`].length, _defaultVal);
@@ -4007,6 +4022,9 @@ const keysConvert = (_dosObj, { keyExtraList = _dosObj.keyExtraList?.split(`,`)
 		// 別キーフラグ (transKeyX_Y)
 		newKeySingleParam(newKey, `transKey`, C_TYP_STRING, ``);
 
+		// フラットモード (flatModeX_Y)
+		newKeySingleParam(newKey, `flatMode`, C_TYP_BOOLEAN, false);
+
 		// シャッフルグループ (shuffleX_Y)
 		newKeyTripleParam(newKey, `shuffle`);
 
@@ -6002,28 +6020,63 @@ const createSettingsDisplayWindow = _sprite => {
 	const makeDisplayButton = (_name, _heightPos, _widthPos) => {
 
 		const flg = g_stateObj[`d_${_name.toLowerCase()}`];
-		const list = [C_FLG_OFF, C_FLG_ON];
 		const linkId = `lnk${_name}`;
 
 		if (g_headerObj[`${_name}Use`]) {
-			const switchDisplay = evt => {
-				const displayFlg = g_stateObj[`d_${_name.toLowerCase()}`];
-				const displayNum = list.findIndex(flg => flg === displayFlg);
-				const nextDisplayFlg = list[(displayNum + 1) % list.length];
-				g_stateObj[`d_${_name.toLowerCase()}`] = nextDisplayFlg;
-				evt.target.classList.replace(g_cssObj[`button_${displayFlg}`], g_cssObj[`button_${nextDisplayFlg}`]);
 
-				interlockingButton(g_headerObj, _name, nextDisplayFlg, displayFlg, true);
-			}
+			// 設定名、CSS名(2種)、表示名
+			const list = [C_FLG_OFF, C_FLG_ON].concat(g_settings[`d_${_name}s`] || []);
+			const cssBarList = [C_FLG_OFF, C_FLG_ON].concat(Array(g_settings[`d_${_name}s`]?.length).fill(g_settings.d_cssBarExName) || []);
+			const cssBgList = [g_settings.d_cssBgName, g_settings.d_cssBgName].concat(Array(g_settings[`d_${_name}s`]?.length).fill(g_settings.d_cssBgExName) || []);
+			const lbls = [toCapitalize(_name), toCapitalize(_name)].concat(g_settings[`d_${_name}s`] || []);
+
+			const dispView = _ => [C_FLG_OFF, C_FLG_ON].includes(g_stateObj[`d_${_name.toLowerCase()}`]) ?
+				g_lblNameObj[`d_${toCapitalize(_name)}`] : getStgDetailName(lbls[g_settings.displayNum[_name]]);
+
+			const withShortCutDesc = _ => createScText(document.getElementById(linkId), `${toCapitalize(_name)}`,
+				{ displayName: g_currentPage, targetLabel: linkId, x: -5 });
+
+			/**
+			 * Displayボタン処理
+			 * @param {number} _scrollNum 
+			 * @param {boolean} _filterFlg 
+			 */
+			const switchDisplay = (_scrollNum = 1, _filterFlg = true) => {
+				const prevDisp = g_settings.displayNum[_name];
+				const [prevBarColor, prevBgColor] = [cssBarList[prevDisp], cssBgList[prevDisp]];
+
+				g_settings.displayNum[_name] = (prevDisp + _scrollNum) % (_filterFlg ? 2 : list.length);
+				const nextDisp = g_settings.displayNum[_name];
+				const [nextBarColor, nextBgColor] = [cssBarList[nextDisp], cssBgList[nextDisp]];
+
+				g_stateObj[`d_${_name.toLowerCase()}`] = list[g_settings.displayNum[_name]];
+				document.getElementById(linkId).innerHTML = dispView();
+				document.getElementById(linkId).classList.replace(g_cssObj[`button_${prevBarColor}`], g_cssObj[`button_${nextBarColor}`]);
+				document.getElementById(linkId).classList.replace(g_cssObj[`button_${prevBgColor}`], g_cssObj[`button_${nextBgColor}`]);
+
+				withShortCutDesc();
+				interlockingButton(g_headerObj, _name, nextBarColor, prevBarColor, true);
+			};
+
+			// Displayボタン初期化
+			g_settings.displayNum[_name] = list.findIndex(flg => flg === g_stateObj[`d_${_name.toLowerCase()}`]);
 			displaySprite.appendChild(
-				makeSettingLblCssButton(linkId, g_lblNameObj[`d_${toCapitalize(_name)}`], _heightPos, evt => switchDisplay(evt), {
+				makeSettingLblCssButton(linkId, dispView(), _heightPos, _ => switchDisplay(), {
 					x: 30 + 180 * _widthPos, w: 170,
 					title: g_msgObj[`d_${_name.toLowerCase()}`], borderStyle: `solid`,
-					cxtFunc: evt => switchDisplay(evt),
-				}, `button_${flg}`)
+					cxtFunc: _ => switchDisplay(-1),
+				}, `button_${cssBgList[g_settings.displayNum[_name]]}`, `button_${cssBarList[g_settings.displayNum[_name]]}`)
 			);
-			createScText(document.getElementById(linkId), `${toCapitalize(_name)}`,
-				{ displayName: g_currentPage, targetLabel: linkId, x: -5 });
+			withShortCutDesc();
+
+			// Display切替ボタン（ON/OFF以外用）
+			if (g_settings[`d_${_name}s`] !== undefined) {
+				displaySprite.appendChild(
+					makeSettingLblCssButton(`${linkId}R`, `>`, _heightPos, _ => switchDisplay(1, false), {
+						x: 175 + 180 * _widthPos, w: 25,
+					}, g_cssObj.button_Mini)
+				);
+			}
 		} else {
 			displaySprite.appendChild(
 				createDivCss2Label(linkId, g_lblNameObj[`d_${toCapitalize(_name)}`] + `:${g_headerObj[`${_name}Set`]}`, {
@@ -8819,7 +8872,8 @@ const mainInit = _ => {
 	let speedCnts = 0;
 	let boostCnts = 0;
 	let keychCnts = 0;
-	const stepZoneDisp = (g_stateObj.d_stepzone === C_FLG_OFF || g_settings.scrollFlat.includes(g_stateObj.scroll)) ? C_DIS_NONE : C_DIS_INHERIT;
+	const flatMode = g_stateObj.d_stepzone === `FlatBar` || g_stateObj.scroll.endsWith(`Flat`) || g_keyObj[`flatMode${keyCtrlPtn}`];
+	const stepZoneDisp = (g_stateObj.d_stepzone === C_FLG_OFF || flatMode) ? C_DIS_NONE : C_DIS_INHERIT;
 
 	for (let j = 0; j < keyNum; j++) {
 		const colorPos = g_keyObj[`color${keyCtrlPtn}`][j];
@@ -8862,17 +8916,22 @@ const mainInit = _ => {
 
 		);
 	}
-	if (g_settings.scrollFlat.includes(g_stateObj.scroll) && g_stateObj.d_stepzone === C_FLG_ON) {
+	if (flatMode && g_stateObj.d_stepzone !== C_FLG_OFF) {
 
 		// スクロール名に`R-`が含まれていればリバースと見做す
 		const reverseFlg = g_stateObj.reverse === C_FLG_ON || g_stateObj.scroll.startsWith(`R-`);
 
 		// ステップゾーンの代わり
 		const lineY = [(C_ARW_WIDTH - g_stateObj.flatStepHeight) / 2, (C_ARW_WIDTH + g_stateObj.flatStepHeight) / 2];
+		const reverses = [reverseFlg, reverseFlg];
+		if (makeDedupliArray(g_workObj.scrollDir).length > 1) {
+			lineY.push(lineY[0], lineY[1]);
+			reverses.push(!reverses[0], !reverses[1]);
+		}
 		lineY.forEach((y, j) => {
 			mainSprite.appendChild(
 				createColorObject2(`stepBar${j}`, {
-					x: 0, y: C_STEP_Y + g_posObj.reverseStepY * Number(reverseFlg) + y,
+					x: 0, y: C_STEP_Y + g_posObj.reverseStepY * Number(reverses[j]) + y,
 					w: g_headerObj.playingWidth - 50, h: 1, styleName: `lifeBar`,
 				}, g_cssObj.life_Failed)
 			);
@@ -10701,7 +10760,8 @@ const resultInit = _ => {
 	].filter(value => value !== ``).join(`, `);
 
 	let displayData = [
-		withOptions(g_stateObj.d_stepzone, C_FLG_ON, g_lblNameObj.rd_StepZone),
+		withOptions(g_stateObj.d_stepzone, C_FLG_ON, g_lblNameObj.rd_StepZone +
+			`${g_stateObj.d_stepzone === C_FLG_OFF ? `` : ` : ${g_stateObj.d_stepzone}`}`),
 		withOptions(g_stateObj.d_judgment, C_FLG_ON, g_lblNameObj.rd_Judgment),
 		withOptions(g_stateObj.d_fastslow, C_FLG_ON, g_lblNameObj.rd_FastSlow),
 		withOptions(g_stateObj.d_lifegauge, C_FLG_ON, g_lblNameObj.rd_LifeGauge),
@@ -10712,7 +10772,10 @@ const resultInit = _ => {
 	if (displayData === ``) {
 		displayData = `All Visible`;
 	} else {
-		displayData += ` : OFF`;
+		if (!displayData.includes(`,`) && g_stateObj.d_stepzone !== C_FLG_OFF) {
+		} else {
+			displayData += ` : OFF`;
+		}
 	}
 
 	let display2Data = [

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2024/02/08 (v35.2.1)
+ * Revised : 2024/02/23 (v35.4.1)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -906,7 +906,6 @@ const g_settings = {
 
     scrolls: [],
     scrollNum: 0,
-    scrollFlat: [`Flat`, `R-Flat`],
 
     shuffles: [C_FLG_OFF, `Mirror`, `X-Mirror`, `Turning`, `Random`, `Random+`, `S-Random`, `S-Random+`],
     shuffleNum: 0,
@@ -944,6 +943,29 @@ const g_settings = {
     scoreDetailCursors: [],
 
     scoreDetailTrans: [[`Velocity`, `Speed`], [`DifLevel`, `ToolDif`]],
+
+    // Display設定の拡張用デザイン
+    d_cssBarExName: `RevON`,
+    d_cssBgName: `Default`,
+    d_cssBgExName: `Setting`,
+
+    // Display設定の拡張リスト
+    d_stepZones: [`FlatBar`],
+
+    displayNum: {
+        stepZone: 0,
+        judgment: 0,
+        fastSlow: 0,
+        lifeGauge: 0,
+        score: 0,
+        musicInfo: 0,
+        speed: 0,
+        color: 0,
+        lyrics: 0,
+        background: 0,
+        arrowEffect: 0,
+        special: 0,
+    },
 };
 
 g_settings.volumeNum = g_settings.volumes.length - 1;
@@ -1542,6 +1564,33 @@ const g_shortcutObj = {
         ShiftRight_KeyT: { id: `lnkHitPositionL` },
         KeyT: { id: `lnkHitPositionLL` },
 
+        ShiftLeft_Digit1: { id: `lnkstepZoneR` },
+        ShiftRight_Digit1: { id: `lnkstepZoneR` },
+        ShiftLeft_Digit2: { id: `lnkjudgmentR` },
+        ShiftRight_Digit2: { id: `lnkjudgmentR` },
+        ShiftLeft_Digit3: { id: `lnkfastSlowR` },
+        ShiftRight_Digit3: { id: `lnkfastSlowR` },
+        ShiftLeft_Digit4: { id: `lnklifeGaugeR` },
+        ShiftRight_Digit4: { id: `lnklifeGaugeR` },
+        ShiftLeft_Digit5: { id: `lnkscoreR` },
+        ShiftRight_Digit5: { id: `lnkscoreR` },
+        ShiftLeft_Digit6: { id: `lnkmusicInfoR` },
+        ShiftRight_Digit6: { id: `lnkmusicInfoR` },
+        ShiftLeft_Digit7: { id: `lnkfilterLineR` },
+        ShiftRight_Digit7: { id: `lnkfilterLineR` },
+        ShiftLeft_Digit8: { id: `lnkspeedR` },
+        ShiftRight_Digit8: { id: `lnkspeedR` },
+        ShiftLeft_Digit9: { id: `lnkcolorR` },
+        ShiftRight_Digit9: { id: `lnkcolorR` },
+        ShiftLeft_Digit0: { id: `lnklyricsR` },
+        ShiftRight_Digit0: { id: `lnklyricsR` },
+        ShiftLeft_Semicolon: { id: `lnkbackgroundR` },
+        ShiftRight_Semicolon: { id: `lnkbackgroundR` },
+        ShiftLeft_Minus: { id: `lnkarrowEffectR` },
+        ShiftRight_Minus: { id: `lnkarrowEffectR` },
+        ShiftLeft_Slash: { id: `lnkspecialR` },
+        ShiftRight_Slash: { id: `lnkspecialR` },
+
         Digit1: { id: `lnkstepZone` },
         Digit2: { id: `lnkjudgment` },
         Digit3: { id: `lnkfastSlow` },
@@ -1556,6 +1605,33 @@ const g_shortcutObj = {
         Minus: { id: `lnkarrowEffect` },
         Slash: { id: `lnkspecial` },
 
+        ShiftLeft_Numpad1: { id: `lnkstepZoneR` },
+        ShiftRight_Numpad1: { id: `lnkstepZoneR` },
+        ShiftLeft_Numpad2: { id: `lnkjudgmentR` },
+        ShiftRight_Numpad2: { id: `lnkjudgmentR` },
+        ShiftLeft_Numpad3: { id: `lnkfastSlowR` },
+        ShiftRight_Numpad3: { id: `lnkfastSlowR` },
+        ShiftLeft_Numpad4: { id: `lnklifeGaugeR` },
+        ShiftRight_Numpad4: { id: `lnklifeGaugeR` },
+        ShiftLeft_Numpad5: { id: `lnkscoreR` },
+        ShiftRight_Numpad5: { id: `lnkscoreR` },
+        ShiftLeft_Numpad6: { id: `lnkmusicInfoR` },
+        ShiftRight_Numpad6: { id: `lnkmusicInfoR` },
+        ShiftLeft_Numpad7: { id: `lnkfilterLineR` },
+        ShiftRight_Numpad7: { id: `lnkfilterLineR` },
+        ShiftLeft_Numpad8: { id: `lnkspeedR` },
+        ShiftRight_Numpad8: { id: `lnkspeedR` },
+        ShiftLeft_Numpad9: { id: `lnkcolorR` },
+        ShiftRight_Numpad9: { id: `lnkcolorR` },
+        ShiftLeft_Numpad0: { id: `lnklyricsR` },
+        ShiftRight_Numpad0: { id: `lnklyricsR` },
+        ShiftLeft_NumpadAdd: { id: `lnkbackgroundR` },
+        ShiftRight_NumpadAdd: { id: `lnkbackgroundR` },
+        ShiftLeft_NumpadSubtract: { id: `lnkarrowEffectR` },
+        ShiftRight_NumpadSubtract: { id: `lnkarrowEffectR` },
+        ShiftLeft_NumpadDivide: { id: `lnkspecialR` },
+        ShiftRight_NumpadDivide: { id: `lnkspecialR` },
+
         Numpad1: { id: `lnkstepZone` },
         Numpad2: { id: `lnkjudgment` },
         Numpad3: { id: `lnkfastSlow` },
@@ -2801,7 +2877,7 @@ const g_lblNameObj = {
     d_Score: `Score`,
     d_MusicInfo: `MusicInfo`,
     d_FilterLine: `FilterLine`,
-    d_Speed: `Speed`,
+    d_Speed: `Velocity`,
     d_Color: `Color`,
     d_Lyrics: `Lyrics`,
     d_Background: `Background`,
@@ -2857,6 +2933,8 @@ const g_lblNameObj = {
     'u_Hard': `Hard`,
     'u_Easy': `Easy`,
 
+    'u_FlatBar': `FlatBar`,
+
     'u_Visible': `Visible`,
     'u_Hidden': `Hidden`,
     'u_Hidden+': `Hidden+`,

package/package.json

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