danoniplus 32.0.0 → 32.2.0

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2023/05/07
+ * Revised : 2023/05/21
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 32.0.0`;
-const g_revisedDate = `2023/05/07`;
+const g_version = `Ver 32.2.0`;
+const g_revisedDate = `2023/05/21`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -120,6 +120,10 @@ const g_presetObj = {
 let g_headerObj = {};
 let g_scoreObj = {};
 let g_attrObj = {};
+
+const g_btnFunc = {
+	base: {}, reset: {}, cxt: {},
+};
 let g_btnAddFunc = {};
 let g_btnDeleteFlg = {};
 let g_cxtAddFunc = {};
@@ -1268,6 +1272,8 @@ const createCss2Button = (_id, _text, _func = _ => true, { x = 0, y = g_sHeight
 			resetFunc(evt);
 		}
 	});
+	g_btnFunc.base[_id] = _func;
+	g_btnFunc.reset[_id] = resetFunc;
 
 	// 右クリック時の処理
 	div.oncontextmenu = evt => {
@@ -1278,6 +1284,8 @@ const createCss2Button = (_id, _text, _func = _ => true, { x = 0, y = g_sHeight
 			if (typeof g_cxtAddFunc[_id] === C_TYP_FUNCTION) {
 				g_cxtAddFunc[_id](evt, cxtFunc);
 			}
+			g_btnFunc.cxt[_id] = cxtFunc;
+
 		} else if (typeof g_cxtAddFunc[_id] === C_TYP_FUNCTION) {
 			g_cxtAddFunc[_id](evt);
 		}
@@ -2848,10 +2856,12 @@ const headerConvert = _dosObj => {
 	// 無音のフレーム数
 	obj.blankFrame = 200;
 	obj.blankFrameDef = 200;
+	obj.blankFrameDefs = [];
 	if (isNaN(parseFloat(_dosObj.blankFrame))) {
 	} else {
-		obj.blankFrame = parseInt(_dosObj.blankFrame);
-		obj.blankFrameDef = parseInt(_dosObj.blankFrame);
+		obj.blankFrameDefs = _dosObj.blankFrame.split(`$`).map(val => parseInt(val));
+		obj.blankFrame = obj.blankFrameDefs[0];
+		obj.blankFrameDef = obj.blankFrameDefs[0];
 	}
 
 	// 開始フレーム数（0以外の場合はフェードインスタート）、終了フレーム数
@@ -3095,7 +3105,8 @@ const headerConvert = _dosObj => {
 	obj.resultMotionSet = setBoolVal(_dosObj.resultMotionSet, true);
 
 	// 譜面明細の使用可否
-	obj.scoreDetailUse = setBoolVal(_dosObj.scoreDetailUse, true);
+	g_settings.scoreDetails = _dosObj.scoreDetailUse?.split(`,`).filter(val => hasVal(val) && val !== `false`) || g_settings.scoreDetailDefs;
+	g_stateObj.scoreDetail = g_settings.scoreDetails[0] || ``;
 
 	// 判定位置をBackgroundのON/OFFと連動してリセットする設定
 	obj.jdgPosReset = setBoolVal(_dosObj.jdgPosReset, true);
@@ -4521,9 +4532,12 @@ const drawSpeedGraph = _scoreId => {
 	const context = canvas.getContext(`2d`);
 	drawBaseLine(context);
 
+	const avgX = [0, 0];
+	const avgSubX = [1, 1];
 	Object.keys(speedObj).forEach((speedType, j) => {
 		context.beginPath();
 		let preY;
+		let avgSubFrame = playingFrame;
 
 		for (let i = 0; i < speedObj[speedType].frame.length; i++) {
 			const x = speedObj[speedType].frame[i] * (g_limitObj.graphWidth - 30) / playingFrame + 30;
@@ -4532,7 +4546,17 @@ const drawSpeedGraph = _scoreId => {
 			context.lineTo(x, preY);
 			context.lineTo(x, y);
 			preY = y;
+
+			const deltaFrame = speedObj[speedType].frame[i] - (speedObj[speedType].frame[i - 1] ?? startFrame);
+			avgX[j] += deltaFrame * (speedObj[speedType].speed[i - 1] ?? 1);
+			if ((speedObj[speedType].speed[i - 1] ?? 1) === 1) {
+				avgSubFrame -= deltaFrame;
+			} else {
+				avgSubX[j] += deltaFrame * (speedObj[speedType].speed[i - 1]);
+			}
 		}
+		avgX[j] /= playingFrame;
+		avgSubX[j] /= Math.max(avgSubFrame, 1);
 
 		context.lineWidth = 1;
 		context.strokeStyle = speedObj[speedType].strokeColor;
@@ -4547,7 +4571,9 @@ const drawSpeedGraph = _scoreId => {
 		context.fillText(speedType, lineX + 35, 218);
 
 		updateScoreDetailLabel(`Speed`, `${speedType}S`, speedObj[speedType].cnt, j, g_lblNameObj[`s_${speedType}`]);
+		updateScoreDetailLabel(`Speed`, `avgD${speedType}`, `${(avgSubX[j]).toFixed(2)}x`, j + 4, g_lblNameObj[`s_avgD${speedType}`]);
 	});
+	updateScoreDetailLabel(`Speed`, `avgS`, `${(avgX[0] * avgX[1]).toFixed(2)}x`, 2, g_lblNameObj.s_avg);
 };
 
 /**
@@ -4887,7 +4913,7 @@ const setDifficulty = (_initFlg) => {
 
 	// 速度設定 (Speed)
 	setSetting(0, `speed`, ` ${g_lblNameObj.multi}`);
-	if (g_headerObj.scoreDetailUse) {
+	if (g_settings.scoreDetails.length > 0) {
 		drawSpeedGraph(g_stateObj.scoreId);
 		drawDensityGraph(g_stateObj.scoreId);
 		makeDifInfo(g_stateObj.scoreId);
@@ -5004,7 +5030,7 @@ const createOptionWindow = _sprite => {
 		return detailObj;
 	};
 
-	if (g_headerObj.scoreDetailUse) {
+	if (g_settings.scoreDetails.length > 0) {
 		spriteList.speed.appendChild(
 			createCss2Button(`btnGraph`, `i`, _ => true, {
 				x: -25, y: -60, w: 30, h: 30, siz: g_limitObj.jdgCharaSiz, title: g_msgObj.graph,
@@ -6862,6 +6888,7 @@ const loadingScoreInit = async () => {
 	await loadChartFile();
 	const tkObj = getKeyInfo();
 	const [keyCtrlPtn, keyNum] = [tkObj.keyCtrlPtn, tkObj.keyNum];
+	g_headerObj.blankFrameDef = setVal(g_headerObj.blankFrameDefs[g_stateObj.scoreId], g_headerObj.blankFrameDefs[0]);
 	g_headerObj.blankFrame = g_headerObj.blankFrameDef;
 
 	// ユーザカスタムイベント
@@ -7053,18 +7080,30 @@ const applyShuffle = (_keyNum, _shuffleGroup, _style) => {
  * @param {number} _keyNum
  * @param {array} _shuffleGroup
  */
-const applyMirror = (_keyNum, _shuffleGroup, _asymFlg = false) => {
+const applyMirror = (_keyNum, _shuffleGroup, _swapFlg = false) => {
+
 	// シャッフルグループごとにミラー
 	const style = structuredClone(_shuffleGroup).map(_group => _group.reverse());
-	if (_asymFlg) {
-		// グループが4の倍数のとき、4n+1, 4n+2のみ入れ替える
-		style.forEach((group, i) => {
-			if (group.length % 4 === 0) {
-				for (let k = 0; k < group.length / 4; k++) {
-					[style[i][4 * k + 1], style[i][4 * k + 2]] = [style[i][4 * k + 2], style[i][4 * k + 1]];
-				}
+	let swapUseFlg = false;
+
+	// X-Mirror作成用の入れ替え関数
+	// グループが4の倍数のとき、4n+1, 4n+2のみ入れ替える
+	const swapGroupNums = (_group, _i, _divideNum) => {
+		if (_group.length % _divideNum === 0) {
+			swapUseFlg = true;
+			for (let k = 0; k < _group.length / _divideNum; k++) {
+				const swap1 = Math.floor(_divideNum * (k + 1 / 2) - 1);
+				const swap2 = Math.ceil(_divideNum * (k + 1 / 2));
+				[style[_i][swap1], style[_i][swap2]] = [style[_i][swap2], style[_i][swap1]];
 			}
-		});
+		}
+	};
+
+	if (_swapFlg) {
+		style.forEach((group, i) => g_settings.swapPattern.forEach(val => swapGroupNums(group, i, val)));
+		if (!swapUseFlg) {
+			g_stateObj.shuffle = `Mirror`;
+		}
 	}
 	applyShuffle(_keyNum, _shuffleGroup, style);
 };
@@ -10597,7 +10636,7 @@ const resultInit = _ => {
 
 	// ハイスコア差分計算
 	const assistFlg = (g_autoPlaysBase.includes(g_stateObj.autoPlay) ? `` : `-${g_stateObj.autoPlay}less`);
-	const mirrorName = (g_stateObj.shuffle.indexOf(`Mirror`) !== -1 ? `-Mirror` : ``);
+	const mirrorName = (g_stateObj.shuffle.indexOf(`Mirror`) !== -1 ? `-${g_stateObj.shuffle}` : ``);
 	const transKeyName = (hasVal(g_keyObj[`transKey${keyCtrlPtn}`]) ? `(${g_keyObj[`transKey${keyCtrlPtn}`]})` : ``);
 	let scoreName = `${g_headerObj.keyLabels[g_stateObj.scoreId]}${transKeyName}${getStgDetailName('k-')}${g_headerObj.difLabels[g_stateObj.scoreId]}${assistFlg}${mirrorName}`;
 	if (g_headerObj.makerView) {

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2023/05/07 (v32.0.0)
+ * Revised : 2023/05/21 (v32.2.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -883,8 +883,9 @@ const g_settings = {
     scrollNum: 0,
     scrollFlat: [`Flat`, `R-Flat`],
 
-    shuffles: [C_FLG_OFF, `Mirror`, `Asym-Mirror`, `Turning`, `Random`, `Random+`, `S-Random`, `S-Random+`],
+    shuffles: [C_FLG_OFF, `Mirror`, `X-Mirror`, `Turning`, `Random`, `Random+`, `S-Random`, `S-Random+`],
     shuffleNum: 0,
+    swapPattern: [4, 5, 6, 7],
 
     gauges: [],
     gaugeNum: 0,
@@ -910,7 +911,8 @@ const g_settings = {
 
     opacitys: [10, 25, 50, 75, 100],
 
-    scoreDetails: [`Speed`, `Density`, `ToolDif`],
+    scoreDetailDefs: [`Speed`, `Density`, `ToolDif`],
+    scoreDetails: [],
     scoreDetailCursors: [],
 };
 
@@ -934,7 +936,7 @@ const g_jumpSettingWindow = {
 const g_shuffleFunc = {
     'OFF': _ => true,
     'Mirror': (keyNum, shuffleGroup) => applyMirror(keyNum, shuffleGroup),
-    'Asym-Mirror': (keyNum, shuffleGroup) => applyMirror(keyNum, shuffleGroup, true),
+    'X-Mirror': (keyNum, shuffleGroup) => applyMirror(keyNum, shuffleGroup, true),
     'Turning': (keyNum, shuffleGroup) => applyTurning(keyNum, shuffleGroup),
     'Random': (keyNum, shuffleGroup) => applyRandom(keyNum, shuffleGroup),
     'Random+': keyNum => applyRandom(keyNum, [[...Array(keyNum).keys()]]),
@@ -1762,7 +1764,7 @@ const g_keyObj = {
     shuffle11i_0_0: [0, 0, 1, 0, 0, 2, 3, 3, 4, 3, 3],
     shuffle12_0_0: [0, 0, 0, 0, 1, 2, 2, 2, 2, 2, 2, 2],
     shuffle13_0_0: [0, 0, 0, 0, 1, 1, 1, 1, 2, 3, 3, 3, 3],
-    shuffle14_0_0: [3, 0, 0, 0, 0, 3, 1, 2, 2, 2, 2, 2, 2, 2],
+    shuffle14_0_0: [0, 0, 0, 0, 0, 0, 1, 2, 2, 2, 2, 2, 2, 2],
     shuffle14i_0_0: [0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 3, 2, 2, 2],
     shuffle15A_0_0: [0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 3, 2, 2, 2],
     shuffle16i_0_0: [0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 2, 2, 2, 2],
@@ -2635,6 +2637,10 @@ const g_lblNameObj = {
 
     s_speed: `Speed`,
     s_boost: `Boost`,
+    s_avg: `Avg.`,
+    s_avgDspeed: `AvgS)`,
+    s_avgDboost: `AvgB)`,
+
     s_apm: `APM`,
     s_time: `Time`,
     s_arrow: `Arrow`,
@@ -2679,7 +2685,7 @@ const g_lblNameObj = {
     'u_Reverse': `Reverse`,
 
     'u_Mirror': `Mirror`,
-    'u_Asym-Mirror': `Asym-Mirror`,
+    'u_X-Mirror': `X-Mirror`,
     'u_Turning': `Turning`,
     'u_Random': `Random`,
     'u_Random+': `Random+`,
@@ -2896,7 +2902,7 @@ const g_lang_msgObj = {
         colorType: `矢印・フリーズアローの配色セットをあらかじめ定義されたリストから選択できます。\nType1～4選択時は色変化が自動でOFFになり、カラーピッカーから好きな色に変更できます。\n[Type0] グラデーション切替, [Type1～4] デフォルトパターン`,
         imgType: `矢印・フリーズアローなどのオブジェクトの見た目を変更します。`,
         colorGroup: `矢印・フリーズアロー色グループの割り当てパターンを変更します。`,
-        shuffleGroup: `Mirror/Asym-Mirror/Turning/Random/S-Random選択時、シャッフルするグループを変更します。\n矢印の上にある同じ数字同士でシャッフルします。`,
+        shuffleGroup: `Mirror/X-Mirror/Turning/Random/S-Random選択時、シャッフルするグループを変更します。\n矢印の上にある同じ数字同士でシャッフルします。`,
         stepRtnGroup: `矢印などノーツの種類、回転に関するパターンを切り替えます。\nあらかじめ設定されている場合のみ変更可能です。`,
 
         pickArrow: `色番号ごとの矢印色（枠、塗りつぶし）、通常時のフリーズアロー色（枠、帯）を\nカラーピッカーから選んで変更できます。`,
@@ -2952,7 +2958,7 @@ const g_lang_msgObj = {
         colorType: `Change the color scheme set for arrows and freeze-arrows from the predefined set.\nWhen Type1 to 4 is selected, color change is automatically turned off and can be changed to any color from the color picker.\n[Type0] Switch the sequences color gradations, [Type1～4] default color scheme`,
         imgType: `Change the appearance of sequences.`,
         colorGroup: `Change the sequences color group assignment pattern.`,
-        shuffleGroup: `Change the shuffle group when Mirror, Asym-Mirror, Turning, Random or S-Random are selected.\nShuffle with the same numbers listed above.`,
+        shuffleGroup: `Change the shuffle group when Mirror, X-Mirror, Turning, Random or S-Random are selected.\nShuffle with the same numbers listed above.`,
         stepRtnGroup: `Switches the type of notes, such as arrows, and the pattern regarding rotation.\nThis can only be changed if it has been set in advance.`,
 
         pickArrow: `Change the frame or fill of arrow color and the frame or bar of normal freeze-arrow color\nfor each color number from the color picker.`,

package/package.json

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