danoniplus 29.2.0 → 29.3.0

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2022/11/09
+ * Revised : 2022/11/15
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 29.2.0`;
-const g_revisedDate = `2022/11/09`;
+const g_version = `Ver 29.3.0`;
+const g_revisedDate = `2022/11/15`;
 const g_alphaVersion = ``;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
@@ -2425,6 +2425,14 @@ const headerConvert = _dosObj => {
 	// ヘッダー群の格納先
 	const obj = {};
 
+	/**
+	 * ロケールを含んだヘッダーの取得
+	 * @param {object} _obj 
+	 * @param {string} _param 
+	 * @returns 
+	 */
+	const getHeader = (_obj, _param) => _obj[`${_param}${g_localeObj.val}`] ?? _obj[_param];
+
 	// フォントの設定
 	obj.customFont = _dosObj.customFont ?? ``;
 	g_headerObj.customFont = obj.customFont;
@@ -2485,7 +2493,7 @@ const headerConvert = _dosObj => {
 	obj.artistNames = [];
 	obj.musicNos = [];
 
-	const dosMusicTitle = _dosObj[`musicTitle${g_localeObj.val}`] ?? _dosObj.musicTitle;
+	const dosMusicTitle = getHeader(_dosObj, `musicTitle`);
 	if (hasVal(dosMusicTitle)) {
 		const musicData = splitLF2(dosMusicTitle);
 
@@ -2543,13 +2551,13 @@ const headerConvert = _dosObj => {
 	obj.frzAttempt = setIntVal(_dosObj.frzAttempt, C_FRM_FRZATTEMPT);
 
 	// 製作者表示
-	const dosTuning = _dosObj[`tuning${g_localeObj.val}`] ?? _dosObj.tuning;
+	const dosTuning = getHeader(_dosObj, `tuning`);
 	if (hasVal(dosTuning)) {
 		const tunings = dosTuning.split(`,`);
 		obj.tuning = escapeHtmlForEnabledTag(tunings[0]);
 		obj.creatorUrl = (tunings.length > 1 ? tunings[1] : (g_presetObj.tuningUrl ?? ``));
 	} else {
-		obj.tuning = escapeHtmlForEnabledTag(g_presetObj[`tuning${g_localeObj.val}`] ?? g_presetObj.tuning ?? `name`);
+		obj.tuning = escapeHtmlForEnabledTag(getHeader(g_presetObj, `tuning`) ?? `name`);
 		obj.creatorUrl = g_presetObj.tuningUrl ?? ``;
 	}
 	obj.tuningInit = obj.tuning;
@@ -2804,12 +2812,12 @@ const headerConvert = _dosObj => {
 	obj.readyHtml = _dosObj.readyHtml ?? ``;
 
 	// デフォルト曲名表示のフォントサイズ
-	obj.titlesize = _dosObj.titlesize ?? ``;
+	obj.titlesize = getHeader(_dosObj, `titlesize`) ?? ``;
 
 	// デフォルト曲名表示のフォント名
 	// (使用例： |titlefont=Century,Meiryo UI|)
 	obj.titlefonts = g_titleLists.defaultFonts.concat();
-	_dosObj.titlefont?.split(`$`).forEach((font, j) => obj.titlefonts[j] = `'${(font.replaceAll(`,`, `', '`))}'`);
+	getHeader(_dosObj, `titlefont`)?.split(`$`).forEach((font, j) => obj.titlefonts[j] = `'${(font.replaceAll(`,`, `', '`))}'`);
 	if (obj.titlefonts[1] === undefined) {
 		obj.titlefonts[1] = obj.titlefonts[0];
 	}
@@ -2826,7 +2834,7 @@ const headerConvert = _dosObj => {
 
 	// デフォルト曲名表示の表示位置調整
 	obj.titlepos = [[0, 0], [0, 0]];
-	_dosObj.titlepos?.split(`$`).forEach((pos, j) => obj.titlepos[j] = pos.split(`,`).map(x => parseFloat(x)));
+	getHeader(_dosObj, `titlepos`)?.split(`$`).forEach((pos, j) => obj.titlepos[j] = pos.split(`,`).map(x => parseFloat(x)));
 
 	// タイトル文字のアニメーション設定
 	obj.titleAnimationName = [`leftToRight`];
@@ -2856,7 +2864,7 @@ const headerConvert = _dosObj => {
 	}
 
 	// デフォルト曲名表示の複数行時の縦間隔
-	obj.titlelineheight = setIntVal(_dosObj.titlelineheight, ``);
+	obj.titlelineheight = setIntVal(getHeader(_dosObj, `titlelineheight`), ``);
 
 	// フリーズアローの始点で通常矢印の判定を行うか(dotさんソース方式)
 	obj.frzStartjdgUse = setBoolVal(_dosObj.frzStartjdgUse ?? g_presetObj.frzStartjdgUse);
@@ -5626,7 +5634,7 @@ const keyConfigInit = (_kcType = g_kcType) => {
 		createDescDiv(`kcDesc`, g_lblNameObj.kcDesc.split(`{0}`).join(g_kCd[C_KEY_RETRY])
 			.split(`{1}:`).join(g_isMac ? `` : `Delete:`)),
 
-		createDescDiv(`kcShuffleDesc`, g_lblNameObj.kcShuffleDesc),
+		createDescDiv(`kcShuffleDesc`, g_headerObj.shuffleUse ? g_lblNameObj.kcShuffleDesc : g_lblNameObj.kcNoShuffleDesc),
 	);
 
 	// キーの一覧を表示
@@ -7384,14 +7392,9 @@ const getBrakeTrace = _frms => {
 const getFirstArrivalFrame = (_startFrame, _speedOnFrame, _motionOnFrame) => {
 	let startY = 0;
 	let frm = _startFrame;
-	let motionFrm = C_MOTION_STD_POS;
 
 	while (g_posObj.distY - startY > 0) {
 		startY += _speedOnFrame[frm];
-
-		if (_speedOnFrame[frm] !== 0) {
-			motionFrm++;
-		}
 		frm++;
 	}
 	return frm;
@@ -8789,12 +8792,13 @@ const mainInit = _ => {
 
 			if (g_workObj.judgArrowCnt[_j] === _k - 1 && _cnt <= g_judgObj.arrowJ[g_judgPosObj.shakin]) {
 				const prevArrowName = `arrow${_j}_${g_workObj.judgArrowCnt[_j]}`;
+				const prevArrow = g_attrObj[prevArrowName];
 
-				if (g_attrObj[prevArrowName].cnt < (-1) * g_judgObj.arrowJ[g_judgPosObj.ii]) {
+				if (prevArrow.cnt < (-1) * g_judgObj.arrowJ[g_judgPosObj.ii]) {
 
 					// 自身より前の矢印が未判定の場合、強制的に枠外判定を行い矢印を削除
-					if (g_attrObj[prevArrowName].cnt >= (-1) * g_judgObj.arrowJ[g_judgPosObj.uwan]) {
-						judgeUwan(g_attrObj[prevArrowName].cnt);
+					if (prevArrow.cnt >= (-1) * g_judgObj.arrowJ[g_judgPosObj.uwan]) {
+						judgeUwan(prevArrow.cnt);
 						judgeObjDelete.arrow(_j, prevArrowName);
 					}
 				}
@@ -8809,15 +8813,15 @@ const mainInit = _ => {
 
 			if (g_workObj.judgFrzCnt[_j] === _k - 1 && _cnt <= g_judgObj.frzJ[g_judgPosObj.sfsf]) {
 				const prevFrzName = `frz${_j}_${g_workObj.judgFrzCnt[_j]}`;
+				const prevFrz = g_attrObj[prevFrzName];
 
-				if (g_attrObj[prevFrzName].isMoving &&
-					g_attrObj[prevFrzName].cnt < (-1) * g_judgObj.frzJ[g_judgPosObj.kita]) {
+				if (prevFrz.isMoving && prevFrz.cnt < (-1) * g_judgObj.frzJ[g_judgPosObj.kita]) {
 
 					// 自身より前のフリーズアローが未判定の場合、強制的に枠外判定を行いフリーズアローを削除
-					if (g_attrObj[prevFrzName].cnt >= (-1) * g_judgObj.frzJ[g_judgPosObj.iknai]) {
-						judgeIknai(g_attrObj[prevFrzName].cnt);
+					if (prevFrz.cnt >= (-1) * g_judgObj.frzJ[g_judgPosObj.iknai]) {
+						judgeIknai(prevFrz.cnt);
 						if (g_headerObj.frzStartjdgUse) {
-							judgeUwan(g_attrObj[prevFrzName].cnt);
+							judgeUwan(prevFrz.cnt);
 						}
 					}
 					judgeObjDelete.frz(_j, prevFrzName);
@@ -8921,20 +8925,21 @@ const mainInit = _ => {
 	 */
 	const movArrow = (_j, _k, _name) => {
 		const arrowName = `${_name}${_j}_${_k}`;
+		const currentArrow = g_attrObj[arrowName];
 
 		// 全体色変化 (移動時)
 		changeColorFunc[_name](_j, _k);
 
 		// 移動
 		if (g_workObj.currentSpeed !== 0) {
-			const boostCnt = g_attrObj[arrowName].boostCnt;
-			g_attrObj[arrowName].prevY = g_attrObj[arrowName].y;
-			g_attrObj[arrowName].y -= (g_workObj.currentSpeed * g_attrObj[arrowName].boostSpd + g_workObj.motionOnFrames[boostCnt] * g_attrObj[arrowName].boostDir) * g_attrObj[arrowName].dir;
-			document.getElementById(arrowName).style.top = `${g_attrObj[arrowName].y}px`;
-			g_attrObj[arrowName].boostCnt--;
-		}
-		judgeMotionFunc[`${_name}${g_stateObj.autoAll}`](_j, arrowName, --g_attrObj[arrowName].cnt);
-		judgeNextFunc[`${_name}${g_stateObj.autoAll}`](_j, _k, g_attrObj[arrowName].cnt);
+			const boostCnt = currentArrow.boostCnt;
+			currentArrow.prevY = currentArrow.y;
+			currentArrow.y -= (g_workObj.currentSpeed * currentArrow.boostSpd + g_workObj.motionOnFrames[boostCnt] * currentArrow.boostDir) * currentArrow.dir;
+			document.getElementById(arrowName).style.top = `${currentArrow.y}px`;
+			currentArrow.boostCnt--;
+		}
+		judgeMotionFunc[`${_name}${g_stateObj.autoAll}`](_j, arrowName, --currentArrow.cnt);
+		judgeNextFunc[`${_name}${g_stateObj.autoAll}`](_j, _k, currentArrow.cnt);
 	};
 
 	/**
@@ -9022,24 +9027,25 @@ const mainInit = _ => {
 	const movFrzArrow = (_j, _k, _name) => {
 		const frzNo = `${_j}_${_k}`;
 		const frzName = `${_name}${frzNo}`;
-		const movY = g_workObj.currentSpeed * g_attrObj[frzName].boostSpd * g_attrObj[frzName].dir;
+		const currentFrz = g_attrObj[frzName];
+		const movY = g_workObj.currentSpeed * currentFrz.boostSpd * currentFrz.dir;
 
-		if (!g_attrObj[frzName].judgEndFlg) {
-			if (g_attrObj[frzName].isMoving) {
+		if (!currentFrz.judgEndFlg) {
+			if (currentFrz.isMoving) {
 
 				// 全体色変化 (通常時)
 				changeColorFunc[_name](_j, _k, `Normal`);
 
 				// 移動
 				if (g_workObj.currentSpeed !== 0) {
-					g_attrObj[frzName].y -= movY + g_workObj.motionOnFrames[g_attrObj[frzName].boostCnt] * g_attrObj[frzName].dir * g_attrObj[frzName].boostDir;
-					document.getElementById(frzName).style.top = `${g_attrObj[frzName].y}px`;
-					g_attrObj[frzName].boostCnt--;
+					currentFrz.y -= movY + g_workObj.motionOnFrames[currentFrz.boostCnt] * currentFrz.dir * currentFrz.boostDir;
+					document.getElementById(frzName).style.top = `${currentFrz.y}px`;
+					currentFrz.boostCnt--;
 				}
-				g_attrObj[frzName].cnt--;
+				currentFrz.cnt--;
 
 				// 次フリーズアローへ判定を移すかチェック
-				judgeNextFunc[`${_name}${g_stateObj.autoAll}`](_j, _k, g_attrObj[frzName].cnt);
+				judgeNextFunc[`${_name}${g_stateObj.autoAll}`](_j, _k, currentFrz.cnt);
 
 			} else {
 
@@ -9047,33 +9053,33 @@ const mainInit = _ => {
 				changeColorFunc[_name](_j, _k, `Hit`);
 
 				// フリーズアローがヒット中の処理
-				if (g_attrObj[frzName].frzBarLength > 0) {
+				if (currentFrz.frzBarLength > 0) {
 
-					g_attrObj[frzName].frzBarLength -= movY * g_attrObj[frzName].dir;
-					g_attrObj[frzName].barY -= movY * g_attrObj[frzName].dividePos;
-					g_attrObj[frzName].btmY -= movY;
+					currentFrz.frzBarLength -= movY * currentFrz.dir;
+					currentFrz.barY -= movY * currentFrz.dividePos;
+					currentFrz.btmY -= movY;
 
-					$id(`${_name}Bar${frzNo}`).height = `${g_attrObj[frzName].frzBarLength}px`;
-					$id(`${_name}Bar${frzNo}`).top = `${g_attrObj[frzName].barY}px`;
-					$id(`${_name}Btm${frzNo}`).top = `${g_attrObj[frzName].btmY}px`;
-					$id(`${_name}BtmShadow${frzNo}`).top = `${g_attrObj[frzName].btmY}px`;
+					$id(`${_name}Bar${frzNo}`).height = `${currentFrz.frzBarLength}px`;
+					$id(`${_name}Bar${frzNo}`).top = `${currentFrz.barY}px`;
+					$id(`${_name}Btm${frzNo}`).top = `${currentFrz.btmY}px`;
+					$id(`${_name}BtmShadow${frzNo}`).top = `${currentFrz.btmY}px`;
 
 					if (!checkKeyUpFunc[`${_name}${g_stateObj.autoAll}`](_j)) {
-						g_attrObj[frzName].keyUpFrame++;
-						judgeMotionFunc[`${_name}KeyUp`](_j, _k, frzName, g_attrObj[frzName].cnt);
+						currentFrz.keyUpFrame++;
+						judgeMotionFunc[`${_name}KeyUp`](_j, _k, frzName, currentFrz.cnt);
 					}
 				} else {
-					judgeMotionFunc[`${_name}OK`](_j, _k, frzName, g_attrObj[frzName].cnt);
+					judgeMotionFunc[`${_name}OK`](_j, _k, frzName, currentFrz.cnt);
 				}
 			}
 			// フリーズアローが枠外に出たときの処理
-			judgeMotionFunc[`${_name}NG`](_j, _k, frzName, g_attrObj[frzName].cnt);
+			judgeMotionFunc[`${_name}NG`](_j, _k, frzName, currentFrz.cnt);
 
 		} else {
-			g_attrObj[frzName].frzBarLength -= g_workObj.currentSpeed;
-			if (g_attrObj[frzName].frzBarLength > 0) {
-				g_attrObj[frzName].y -= movY;
-				document.getElementById(frzName).style.top = `${g_attrObj[frzName].y}px`;
+			currentFrz.frzBarLength -= g_workObj.currentSpeed;
+			if (currentFrz.frzBarLength > 0) {
+				currentFrz.y -= movY;
+				document.getElementById(frzName).style.top = `${currentFrz.y}px`;
 			} else {
 				judgeObjDelete[_name](_j, frzName);
 			}
@@ -9442,8 +9448,9 @@ const changeCssMotions = (_header, _name, _frameNum) => {
 const changeHitFrz = (_j, _k, _name) => {
 	const frzNo = `${_j}_${_k}`;
 	const frzName = `${_name}${frzNo}`;
+	const currentFrz = g_attrObj[frzName];
 
-	if (g_attrObj[frzName].keyUpFrame !== 0) {
+	if (currentFrz.keyUpFrame !== 0) {
 		return;
 	}
 
@@ -9453,25 +9460,22 @@ const changeHitFrz = (_j, _k, _name) => {
 	const colorPos = g_keyObj[`color${g_keyObj.currentKey}_${g_keyObj.currentPtn}`][_j];
 
 	// フリーズアロー位置の修正（ステップゾーン上に来るように）
-	const delFrzLength = parseFloat($id(`stepRoot${_j}`).top) - g_attrObj[frzName].y;
+	const delFrzLength = parseFloat($id(`stepRoot${_j}`).top) - currentFrz.y;
 	document.getElementById(frzName).style.top = $id(`stepRoot${_j}`).top;
 
 	// 早押ししたboostCnt分のフリーズアロー終端位置の修正
-	let delFrzMotionLength = 0;
-	for (let i = 0; i < g_attrObj[frzName].cnt; i++) {
-		delFrzMotionLength += g_workObj.motionOnFrames[g_attrObj[frzName].boostCnt - i];
-	}
+	const delFrzMotionLength = sumData(g_workObj.motionOnFrames.slice(0, currentFrz.boostCnt + 1));
 
-	g_attrObj[frzName].frzBarLength -= (delFrzLength + delFrzMotionLength) * g_attrObj[frzName].dir;
-	g_attrObj[frzName].barY -= (delFrzLength + delFrzMotionLength) * g_attrObj[frzName].dividePos;
-	g_attrObj[frzName].btmY -= delFrzLength + delFrzMotionLength;
-	g_attrObj[frzName].y += delFrzLength;
-	g_attrObj[frzName].isMoving = false;
+	currentFrz.frzBarLength -= (delFrzLength + delFrzMotionLength) * currentFrz.dir;
+	currentFrz.barY -= (delFrzLength + delFrzMotionLength) * currentFrz.dividePos;
+	currentFrz.btmY -= delFrzLength + delFrzMotionLength;
+	currentFrz.y += delFrzLength;
+	currentFrz.isMoving = false;
 
-	styfrzBar.top = `${g_attrObj[frzName].barY}px`;
-	styfrzBar.height = `${g_attrObj[frzName].frzBarLength}px`;
+	styfrzBar.top = `${currentFrz.barY}px`;
+	styfrzBar.height = `${currentFrz.frzBarLength}px`;
 	styfrzBar.background = g_workObj[`${_name}HitBarColors`][_j];
-	styfrzBtm.top = `${g_attrObj[frzName].btmY}px`;
+	styfrzBtm.top = `${currentFrz.btmY}px`;
 	styfrzBtm.background = g_workObj[`${_name}HitColors`][_j];
 	styfrzBtmShadow.top = styfrzBtm.top;
 	if (_name === `frz`) {
@@ -9522,10 +9526,12 @@ const judgeArrow = _j => {
 
 	const currentNo = g_workObj.judgArrowCnt[_j];
 	const arrowName = `arrow${_j}_${currentNo}`;
+	const currentArrow = g_attrObj[arrowName];
 	const existJudgArrow = document.getElementById(arrowName) !== null;
 
 	const fcurrentNo = g_workObj.judgFrzCnt[_j];
 	const frzName = `frz${_j}_${fcurrentNo}`;
+	const currentFrz = g_attrObj[frzName];
 	const existJudgFrz = document.getElementById(frzName) !== null;
 
 	const judgeTargetArrow = _difFrame => {
@@ -9536,7 +9542,7 @@ const judgeArrow = _j => {
 			displayDiff(_difFrame);
 
 			const stepDivHit = document.querySelector(`#stepHit${_j}`);
-			stepDivHit.style.top = `${g_attrObj[arrowName].prevY - parseFloat($id(`stepRoot${_j}`).top) - 15}px`;
+			stepDivHit.style.top = `${currentArrow.prevY - parseFloat($id(`stepRoot${_j}`).top) - 15}px`;
 			stepDivHit.style.opacity = 0.75;
 			stepDivHit.classList.value = ``;
 			stepDivHit.classList.add(g_cssObj[`main_step${resultJdg}`]);
@@ -9551,7 +9557,7 @@ const judgeArrow = _j => {
 
 	const judgeTargetFrzArrow = _difFrame => {
 		const _difCnt = Math.abs(_difFrame);
-		if (_difCnt <= g_judgObj.frzJ[g_judgPosObj.iknai] && !g_attrObj[frzName].judgEndFlg
+		if (_difCnt <= g_judgObj.frzJ[g_judgPosObj.iknai] && !currentFrz.judgEndFlg
 			&& g_workObj.judgFrzHitCnt[_j] <= fcurrentNo) {
 
 			if (g_headerObj.frzStartjdgUse) {
@@ -9574,8 +9580,8 @@ const judgeArrow = _j => {
 	};
 
 	let judgeFlg = false;
-	const difFrame = (existJudgArrow ? g_attrObj[arrowName].cnt : Infinity);
-	const frzDifFrame = (existJudgFrz ? g_attrObj[frzName].cnt : Infinity);
+	const difFrame = (existJudgArrow ? currentArrow.cnt : Infinity);
+	const frzDifFrame = (existJudgFrz ? currentFrz.cnt : Infinity);
 	if (difFrame < frzDifFrame) {
 		judgeFlg = judgeTargetArrow(difFrame);
 	} else if (difFrame > frzDifFrame) {

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2022/11/05 (v29.0.1)
+ * Revised : 2022/11/15 (v29.3.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -3086,6 +3086,7 @@ const g_lang_lblNameObj = {
     Ja: {
         kcDesc: `[{0}:スキップ / {1}:(代替キーのみ)キー無効化]`,
         kcShuffleDesc: `番号をクリックでシャッフルグループ、矢印をクリックでカラーグループを変更`,
+        kcNoShuffleDesc: `矢印をクリックでカラーグループを変更`,
         sdDesc: `[クリックでON/OFFを切替、灰色でOFF]`,
         kcShortcutDesc: `プレイ中ショートカット：「{0}」タイトルバック / 「{1}」リトライ`,
         transKeyDesc: `別キーモードではハイスコア、キーコンフィグ等は保存されません`,
@@ -3114,6 +3115,7 @@ const g_lang_lblNameObj = {
     En: {
         kcDesc: `[{0}:Skip / {1}:Key invalidation (Alternate keys only)]`,
         kcShuffleDesc: `Click the number to change the shuffle group, and click the arrow to change the color.`,
+        kcNoShuffleDesc: `Click the arrow to change the color group.`,
         sdDesc: `[Click to switch, gray to OFF]`,
         kcShortcutDesc: `Shortcut during play: "{0}" Return to title / "{1}" Retry the game`,
         transKeyDesc: `High score, key config, etc. are not saved in another key mode`,

package/package.json

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