danoniplus 36.5.0 → 37.0.0

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2024/06/01
+ * Revised : 2024/06/15
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 36.5.0`;
-const g_revisedDate = `2024/06/05`;
+const g_version = `Ver 37.0.0`;
+const g_revisedDate = `2024/06/15`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -55,7 +55,6 @@ window.onload = async () => {
 	// ロード直後に定数・初期化ファイル、旧バージョン定義関数を読込
 	await loadScript2(`${g_rootPath}../js/lib/danoni_localbinary.js?${g_randTime}`, false);
 	await loadScript2(`${g_rootPath}../js/lib/danoni_constants.js?${g_randTime}`);
-	await loadScript2(`${g_rootPath}../js/lib/danoni_legacy_function.js?${g_randTime}`, false);
 	initialControl();
 };
 
@@ -6453,7 +6452,7 @@ const keyConfigInit = (_kcType = g_kcType) => {
 	 * @param {number} _scrollNum 
 	 */
 	const changeTmpShuffleNum = (_j, _scrollNum = 1) => {
-		const tmpShuffle = changeTmpData(`shuffle`, g_limitObj.kcShuffleNums, _j, _scrollNum);
+		const tmpShuffle = changeTmpData(`shuffle`, g_keyObj[`keyCtrl${keyCtrlPtn}`].length - 1, _j, _scrollNum);
 		document.getElementById(`sArrow${_j}`).textContent = tmpShuffle + 1;
 
 		changeShuffleConfigColor(keyCtrlPtn, g_keyObj[`shuffle${keyCtrlPtn}_${g_keycons.shuffleGroupNum}`][_j], _j);
@@ -8218,13 +8217,24 @@ const scoreConvert = (_dosObj, _scoreId, _preblankFrame, _dummyNo = ``,
 	// キー変化定義
 	obj.keychFrames = [];
 	obj.keychTarget = [];
+	obj.keychTargetAlpha = [];
 	if (hasVal(getRefData(`keych`, `${scoreIdHeader}_data`))) {
 		const keychdata = splitLF2(getRefData(`keych`, `${scoreIdHeader}_data`), `,`);
 		obj.keychFrames.push(...(keychdata.filter((val, j) => j % 2 === 0)).map(val => val === `0` ? 0 : calcFrame(val)));
-		obj.keychTarget.push(...keychdata.filter((val, j) => j % 2 === 1));
+
+		keychdata.filter((val, j) => j % 2 === 1)?.forEach(targets => {
+			const targetKeyList = [], targetKeyAlpha = [];
+			targets?.split(`/`).forEach(target => {
+				targetKeyList.push(trimStr(target?.split(`:`)[0]));
+				targetKeyAlpha.push(trimStr(target?.split(`:`)[1]) || 1);
+			})
+			obj.keychTarget.push(targetKeyList);
+			obj.keychTargetAlpha.push(targetKeyAlpha);
+		});
 	}
 	obj.keychFrames.unshift(0);
-	obj.keychTarget.unshift(`0`);
+	obj.keychTarget.unshift([`0`]);
+	obj.keychTargetAlpha.unshift([1]);
 
 	return obj;
 };
@@ -9257,8 +9267,8 @@ const mainInit = _ => {
 	const filterCss = g_stateObj.filterLock === C_FLG_OFF ? g_cssObj.life_Failed : g_cssObj.life_Cleared;
 	[`filterBar0`, `filterBar1`, `borderBar0`, `borderBar1`].forEach(obj =>
 		mainSprite.appendChild(createColorObject2(obj, g_lblPosObj.filterBar, filterCss)));
-	borderBar0.style.top = wUnit(g_posObj.stepDiffY);
-	borderBar1.style.top = wUnit(g_posObj.stepDiffY + g_posObj.arrowHeight);
+	borderBar0.style.top = wUnit(g_posObj.stepDiffY + g_stateObj.hitPosition);
+	borderBar1.style.top = wUnit(g_posObj.stepDiffY + g_posObj.arrowHeight - g_stateObj.hitPosition);
 
 	if (g_appearanceRanges.includes(g_stateObj.appearance)) {
 		mainSprite.appendChild(createDivCss2Label(`filterView`, ``, g_lblPosObj.filterView));
@@ -9543,8 +9553,17 @@ const mainInit = _ => {
 		);
 	}
 
+	const msg = [];
 	if (getMusicUrl(g_stateObj.scoreId) === `nosound.mp3`) {
-		makeInfoWindow(g_msgInfoObj.I_0004, `leftToRightFade`, { _x: g_workObj.playingX, _y: g_headerObj.playingY });
+		msg.push(g_msgInfoObj.I_0004);
+	}
+	if (g_stateObj.shuffle.indexOf(`Mirror`) !== -1 &&
+		g_stateObj.dataSaveFlg && g_stateObj.autoAll === C_FLG_OFF &&
+		g_keyObj[`shuffle${keyCtrlPtn}`].filter((shuffleGr, j) => shuffleGr !== g_keyObj[`shuffle${keyCtrlPtn}_0d`][j]).length > 0) {
+		msg.push(g_msgInfoObj.I_0005);
+	}
+	if (msg.length > 0) {
+		makeInfoWindow(msg.join(`<br>`), `leftToRightFade`, { _x: g_workObj.playingX, _y: g_headerObj.playingY });
 	}
 
 	// ユーザカスタムイベント(初期)
@@ -10242,7 +10261,7 @@ const mainInit = _ => {
 		// キー変化
 		while (currentFrame >= g_scoreObj.keychFrames[keychCnts]) {
 			for (let j = 0; j < keyNum; j++) {
-				appearKeyTypes(j, g_scoreObj.keychTarget[keychCnts]);
+				appearKeyTypes(j, g_scoreObj.keychTarget[keychCnts], g_scoreObj.keychTargetAlpha[keychCnts]);
 			}
 			keychCnts++;
 		}
@@ -10437,8 +10456,8 @@ const changeAppearanceFilter = (_appearance, _num = 10) => {
 	$id(`arrowSprite${topNum}`).clipPath = topShape;
 	$id(`arrowSprite${bottomNum}`).clipPath = bottomShape;
 
-	$id(`filterBar0`).top = wUnit(g_posObj.arrowHeight * _num / 100);
-	$id(`filterBar1`).top = wUnit(g_posObj.arrowHeight * (100 - _num) / 100);
+	$id(`filterBar0`).top = wUnit(g_posObj.arrowHeight * _num / 100 + g_stateObj.hitPosition);
+	$id(`filterBar1`).top = wUnit(g_posObj.arrowHeight * (100 - _num) / 100 - g_stateObj.hitPosition);
 
 	if (g_appearanceRanges.includes(_appearance)) {
 		$id(`filterView`).top =
@@ -10473,18 +10492,23 @@ const makeCounterSymbol = (_id, _x, _class, _heightPos, _text, _display = C_DIS_
  * @param {number} _j
  * @param {string} _display 
  */
-const appearStepZone = (_j, _display) => $id(`stepRoot${_j}`).display = _display;
+const appearStepZone = (_j, _display, _alpha = 1) => {
+	$id(`stepRoot${_j}`).display = _display;
+	$id(`stepRoot${_j}`).opacity = _alpha;
+};
 
 /**
  * 部分キーのステップゾーン出現処理
  * @param {number} _j 
- * @param {string} _target 
+ * @param {array} _targets 
  */
-const appearKeyTypes = (_j, _target) => {
+const appearKeyTypes = (_j, _targets, _alphas = fillArray(_targets.length, 1)) => {
 	appearStepZone(_j, C_DIS_NONE);
-	if (g_workObj.keyGroupMaps[_j].includes(_target)) {
-		appearStepZone(_j, C_DIS_INHERIT);
-	}
+	_targets.forEach((target, k) => {
+		if (g_workObj.keyGroupMaps[_j].includes(target)) {
+			appearStepZone(_j, C_DIS_INHERIT, _alphas[k]);
+		}
+	});
 };
 
 /**
@@ -11082,6 +11106,8 @@ const resultInit = _ => {
 
 	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;
+	const shuffleName = `${getStgDetailName(g_stateObj.shuffle)}${!orgShuffleFlg && !g_stateObj.shuffle.endsWith(`+`) ? getStgDetailName('(S)') : ''}`;
 
 	/**
 	 * プレイスタイルのカスタム有無
@@ -11096,7 +11122,7 @@ const resultInit = _ => {
 		`${getKeyName(g_headerObj.keyLabels[g_stateObj.scoreId])}${transKeyName} ${getStgDetailName('key')} / ${g_headerObj.difLabels[g_stateObj.scoreId]}`,
 		`${withOptions(g_autoPlaysBase.includes(g_stateObj.autoPlay), true, `-${getStgDetailName(g_stateObj.autoPlay)}${getStgDetailName('less')}`)}`,
 		`${withOptions(g_headerObj.makerView, false, `(${g_headerObj.creatorNames[g_stateObj.scoreId]})`)}`,
-		`${withOptions(g_stateObj.shuffle, C_FLG_OFF, `[${getStgDetailName(g_stateObj.shuffle)}]`)}`
+		`${withOptions(g_stateObj.shuffle, C_FLG_OFF, `[${shuffleName}]`)}`
 	];
 	let difData = difDatas.filter(value => value !== ``).join(` `);
 	const difDataForImage = difDatas.filter((value, j) => value !== `` && j !== 2).join(` `);
@@ -11241,7 +11267,7 @@ const resultInit = _ => {
 		maxCombo: 0, fmaxCombo: 0, score: 0,
 	};
 
-	const highscoreCondition = (g_stateObj.autoAll === C_FLG_OFF && (g_stateObj.shuffle === C_FLG_OFF || mirrorName !== ``));
+	const highscoreCondition = (g_stateObj.autoAll === C_FLG_OFF && (g_stateObj.shuffle === C_FLG_OFF || (mirrorName !== `` && orgShuffleFlg)));
 	if (highscoreCondition) {
 
 		// ハイスコア差分描画
@@ -11348,7 +11374,7 @@ const resultInit = _ => {
 	const hashTag = (hasVal(g_headerObj.hashTag) ? ` ${g_headerObj.hashTag}` : ``);
 	let tweetDifData = `${getKeyName(g_headerObj.keyLabels[g_stateObj.scoreId])}${transKeyName}${getStgDetailName('k-')}${g_headerObj.difLabels[g_stateObj.scoreId]}${assistFlg}`;
 	if (g_stateObj.shuffle !== `OFF`) {
-		tweetDifData += `:${getStgDetailName(g_stateObj.shuffle)}`;
+		tweetDifData += `:${shuffleName}`;
 	}
 	const twiturl = new URL(g_localStorageUrl);
 	twiturl.searchParams.append(`scoreId`, g_stateObj.scoreId);

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2024/06/05 (v36.5.0)
+ * Revised : 2024/06/15 (v37.0.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -23,45 +23,6 @@ const C_VALIGN_BOTTOM = `bottom`;
 
 const C_LBL_BASICFONT = `"Meiryo UI", sans-serif`;
 
-/** 廃止予定の定数群 */
-const C_LBL_TITLESIZE = 32;
-const C_LBL_BTNSIZE = 28;
-const C_LBL_LNKSIZE = 16;
-
-const C_BTN_HEIGHT = 50;
-const C_LNK_HEIGHT = 30;
-const C_LEN_SETLBL_LEFT = 160;
-const C_LEN_SETLBL_WIDTH = 210;
-const C_LEN_DIFSELECTOR_WIDTH = 250;
-const C_LEN_DIFCOVER_WIDTH = 110;
-const C_LEN_SETLBL_HEIGHT = 22;
-const C_SIZ_SETLBL = 17;
-const C_LEN_SETDIFLBL_HEIGHT = 25;
-const C_SIZ_SETDIFLBL = 17;
-const C_LEN_SETMINI_WIDTH = 40;
-const C_SIZ_SETMINI = 18;
-const C_SIZ_DIFSELECTOR = 14;
-const C_SIZ_MAIN = 14;
-const C_SIZ_MUSIC_TITLE = 13;
-
-const C_LEN_JDGCHARA_WIDTH = 200;
-const C_LEN_JDGCHARA_HEIGHT = 20;
-const C_SIZ_JDGCHARA = 20;
-
-const C_LEN_JDGCNTS_WIDTH = 100;
-const C_LEN_JDGCNTS_HEIGHT = 20;
-const C_SIZ_JDGCNTS = 16;
-
-const C_LEN_GRAPH_WIDTH = 286;
-const C_LEN_GRAPH_HEIGHT = 226;
-const C_CLR_SPEEDGRAPH_SPEED = `#cc3333`;
-const C_CLR_SPEEDGRAPH_BOOST = `#999900`;
-const C_CLR_DENSITY_MAX = `#990000cc`;
-const C_CLR_DENSITY_DEFAULT = `#999999cc`;
-const C_LEN_DENSITY_DIVISION = 16;
-
-const C_MAX_ADJUSTMENT = 30;
-
 /** 設定幅、位置などを管理するプロパティ */
 const g_limitObj = {
 
@@ -122,9 +83,6 @@ const g_limitObj = {
 
     // キーコンフィグで表示するカラーピッカー数
     kcColorPickerNum: 5,
-
-    // キーコンフィグで設定できるシャッフルグループ上限数
-    kcShuffleNums: 20,
 };
 
 /** 設定項目の位置 */
@@ -2856,6 +2814,7 @@ const g_lang_msgInfoObj = {
         I_0002: `入力したキーは割り当てできません。他のキーを指定してください。`,
         I_0003: `各譜面の明細情報をクリップボードにコピーしました！`,
         I_0004: `musicUrlが設定されていないため、無音モードで再生します`,
+        I_0005: `正規のミラー譜面で無いため、ハイスコアは保存されません`,
     },
     En: {
         W_0001: `Your browser is not guaranteed to work.<br>
@@ -2905,6 +2864,7 @@ const g_lang_msgInfoObj = {
         I_0002: `The specified key cannot be assigned. Please specify another key.`,
         I_0003: `Charts information is copied to the clipboard!`,
         I_0004: `Play in silence mode because "musicUrl" is not set`,
+        I_0005: `Highscore is not saved because not a regular mirrored chart.`,
     },
 };
 
@@ -3042,6 +3002,7 @@ const g_lblNameObj = {
     'u_Random+': `Random+`,
     'u_S-Random': `S-Random`,
     'u_S-Random+': `S-Random+`,
+    'u_(S)': `(S)`,
 
     'u_ALL': `ALL`,
     'u_Onigiri': `Onigiri`,
@@ -3129,7 +3090,7 @@ const g_lblNameObj = {
  * リンク先管理
  */
 const g_linkObj = {
-    x: `https://x.com/intent/tweet`,
+    x: `https://x.com/intent/post`,
     discord: `https://discord.gg/5Hxu4wDEZR`,
 };
 

package/package.json

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