danoniplus 28.6.1 → 29.1.0

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2022/11/04
+ * Revised : 2022/11/05
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 28.6.1`;
-const g_revisedDate = `2022/11/04`;
+const g_version = `Ver 29.1.0`;
+const g_revisedDate = `2022/11/05`;
 const g_alphaVersion = ``;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
@@ -1809,7 +1809,7 @@ const initialControl = async () => {
 	});
 
 	// デフォルトのカラー・シャッフルグループ設定を退避
-	[`color`, `shuffle`].forEach(type => {
+	g_keycons.groups.forEach(type => {
 		const tmpName = Object.keys(g_keyObj).filter(val => val.startsWith(type));
 		tmpName.forEach(property => g_keyObj[`${property}d`] = structuredClone(g_keyObj[property]));
 	});
@@ -2485,8 +2485,9 @@ const headerConvert = _dosObj => {
 	obj.artistNames = [];
 	obj.musicNos = [];
 
-	if (hasVal(_dosObj.musicTitle)) {
-		const musicData = splitLF2(_dosObj.musicTitle);
+	const dosMusicTitle = _dosObj[`musicTitle${g_localeObj.val}`] ?? _dosObj.musicTitle;
+	if (hasVal(dosMusicTitle)) {
+		const musicData = splitLF2(dosMusicTitle);
 
 		if (hasVal(_dosObj.musicNo)) {
 			obj.musicNos = _dosObj.musicNo.split(`$`);
@@ -2766,7 +2767,7 @@ const headerConvert = _dosObj => {
 	}
 
 	// ハッシュタグ
-	obj.hashTag = setVal(_dosObj.hashTag, ``);
+	obj.hashTag = _dosObj.hashTag ?? ``;
 
 	// 自動プリロードの設定
 	obj.autoPreload = setBoolVal(_dosObj.autoPreload, true);
@@ -3317,15 +3318,8 @@ const getGaugeSetting = (_dosObj, _name, _difLength, { scoreId = 0 } = {}) => {
 			gaugeCreateFlg = setGaugeDetails(scoreId, _dosObj[`gauge${_name}`].split(`,`));
 		} else {
 			const gauges = splitLF2(_dosObj[`gauge${_name}`]);
-			const gHeaderLen = gauges.length;
-			for (let j = 0; j < gHeaderLen; j++) {
-				gaugeCreateFlg = setGaugeDetails(j, getGaugeDetailList(j, gauges[j].split(`,`)));
-			}
-			if (gHeaderLen < _difLength) {
-				const defaultGaugeList = gauges[0].split(`,`);
-				for (let j = gHeaderLen; j < _difLength; j++) {
-					gaugeCreateFlg = setGaugeDetails(j, getGaugeDetailList(j, defaultGaugeList));
-				}
+			for (let j = 0; j < _difLength; j++) {
+				gaugeCreateFlg = setGaugeDetails(j, getGaugeDetailList(j, (gauges[j] ?? gauges[0]).split(`,`)));
 			}
 		}
 
@@ -5018,7 +5012,7 @@ const createOptionWindow = _sprite => {
 				const keyCtrlPtn = `${g_keyObj.currentKey}_${g_keyObj.currentPtn}`;
 
 				// カラーグループ、シャッフルグループの設定
-				[`color`, `shuffle`].forEach(type => {
+				g_keycons.groups.forEach(type => {
 					resetGroupList(type, keyCtrlPtn);
 					if (g_keyObj.currentPtn === -1) {
 						const storageKeyName = storageObj[`${type}${addKey}`] || storageObj[`${type}${g_keyObj.currentKey}_-1_-1`];
@@ -5315,7 +5309,7 @@ const getKeyCtrl = (_localStorage, _extraKeyName = ``) => {
 			g_keyObj[`${header}${copyPtn}`] = g_keyObj[`${header}${basePtn}`];
 		});
 
-		[`color`, `shuffle`].forEach(type => {
+		g_keycons.groups.forEach(type => {
 			let maxPtn = 0;
 			while (g_keyObj[`${type}${basePtn}_${maxPtn}`] !== undefined) {
 				maxPtn++;
@@ -6166,7 +6160,7 @@ const keyConfigInit = (_kcType = g_kcType) => {
 		g_keyObj.currentPtn = searchPattern(g_keyObj.currentPtn, _sign, g_headerObj.transKeyUse);
 
 		// カラーグループ、シャッフルグループの再設定
-		[`color`, `shuffle`].forEach(type => resetGroupList(type, `${g_keyObj.currentKey}_${g_keyObj.currentPtn}`));
+		g_keycons.groups.forEach(type => resetGroupList(type, `${g_keyObj.currentKey}_${g_keyObj.currentPtn}`));
 
 		// キーコンフィグ画面を再呼び出し
 		keyConfigInit();
@@ -8044,7 +8038,7 @@ const getArrowSettings = _ => {
 			resetColorType({ _to: g_keycons.colorSelf });
 		}
 
-		[`color`, `shuffle`].forEach(type => {
+		g_keycons.groups.forEach(type => {
 			const groupNum = g_keycons[`${type}GroupNum`];
 			storageObj[`${type}${addKey}`] = structuredClone(g_keyObj[`${type}${keyCtrlPtn}_${groupNum}`]);
 			g_keyObj[`${type}${g_keyObj.currentKey}_-1_${groupNum}`] = structuredClone(g_keyObj[`${type}${keyCtrlPtn}_${groupNum}d`]);
@@ -8555,8 +8549,10 @@ const mainInit = _ => {
 			g_audio.pause();
 			clearTimeout(g_timeoutEvtId);
 			if (keyIsDown(g_kCdNameObj.shiftKey)) {
-				g_gameOverFlg = true;
-				g_finishFlg = false;
+				if (g_currentArrows !== g_fullArrows || g_stateObj.lifeMode === C_LFE_BORDER && g_workObj.lifeVal < g_workObj.lifeBorder) {
+					g_gameOverFlg = true;
+					g_finishFlg = false;
+				}
 				resultInit();
 			} else {
 				titleInit();
@@ -9536,7 +9532,7 @@ const judgeArrow = _j => {
 		if (_difCnt <= g_judgObj.arrowJ[g_judgPosObj.uwan]) {
 			const [resultFunc, resultJdg] = checkJudgment(_difCnt);
 			resultFunc(_difFrame);
-			countFastSlow(_difFrame, g_headerObj.justFrames);
+			countFastSlow(_difFrame);
 
 			const stepDivHit = document.querySelector(`#stepHit${_j}`);
 			stepDivHit.style.top = `${g_attrObj[arrowName].prevY - parseFloat($id(`stepRoot${_j}`).top) - 15}px`;
@@ -9554,15 +9550,23 @@ const judgeArrow = _j => {
 
 	const judgeTargetFrzArrow = _difFrame => {
 		const _difCnt = Math.abs(_difFrame);
-		if (_difCnt <= g_judgObj.frzJ[g_judgPosObj.sfsf] && !g_attrObj[frzName].judgEndFlg) {
-			if (g_headerObj.frzStartjdgUse &&
-				(g_workObj.judgFrzHitCnt[_j] === undefined || g_workObj.judgFrzHitCnt[_j] <= fcurrentNo)) {
+		if (_difCnt <= g_judgObj.frzJ[g_judgPosObj.iknai] && !g_attrObj[frzName].judgEndFlg
+			&& g_workObj.judgFrzHitCnt[_j] <= fcurrentNo) {
+
+			if (g_headerObj.frzStartjdgUse) {
 				const [resultFunc] = checkJudgment(_difCnt);
 				resultFunc(_difFrame);
-				countFastSlow(_difFrame, g_headerObj.justFrames);
-				g_workObj.judgFrzHitCnt[_j] = fcurrentNo + 1;
+			} else {
+				displayDiff(_difFrame, `F`);
+			}
+			countFastSlow(_difFrame);
+
+			if (_difCnt <= g_judgObj.frzJ[g_judgPosObj.sfsf]) {
+				changeHitFrz(_j, fcurrentNo, `frz`);
+			} else {
+				changeFailedFrz(_j, fcurrentNo);
 			}
-			changeHitFrz(_j, fcurrentNo, `frz`);
+			g_workObj.judgFrzHitCnt[_j] = fcurrentNo + 1;
 			return true;
 		}
 		return false;
@@ -9584,9 +9588,10 @@ const judgeArrow = _j => {
 /**
  * タイミングズレを表示
  * @param {number} _difFrame 
+ * @param {string} _fjdg
  * @param {number} _justFrames
  */
-const displayDiff = (_difFrame, _justFrames = 0) => {
+const displayDiff = (_difFrame, _fjdg = ``, _justFrames = g_headerObj.justFrames) => {
 	let diffJDisp = ``;
 	g_workObj.diffList.push(_difFrame);
 	const difCnt = Math.abs(_difFrame);
@@ -9595,7 +9600,7 @@ const displayDiff = (_difFrame, _justFrames = 0) => {
 	} else if (_difFrame < _justFrames * (-1)) {
 		diffJDisp = `<span class="common_shobon">Slow ${difCnt} Frames</span>`;
 	}
-	diffJ.innerHTML = diffJDisp;
+	document.getElementById(`diff${_fjdg}J`).innerHTML = diffJDisp;
 };
 
 /**
@@ -9603,7 +9608,7 @@ const displayDiff = (_difFrame, _justFrames = 0) => {
  * @param {number} _difFrame 
  * @param {number} _justFrames 
  */
-const countFastSlow = (_difFrame, _justFrames = 0) => {
+const countFastSlow = (_difFrame, _justFrames = g_headerObj.justFrames) => {
 	if (_difFrame > _justFrames) {
 		g_resultObj.fast++;
 	} else if (_difFrame < _justFrames * (-1)) {
@@ -9658,13 +9663,13 @@ const lifeDamage = _ => {
  * 判定キャラクタの表示、判定済矢印数・判定数のカウンタ
  * @param {string} _name 
  * @param {string} _character 
- * @param {string} _freezeFlg 
+ * @param {string} _fjdg 
  */
-const changeJudgeCharacter = (_name, _character, _freezeFlg = ``) => {
+const changeJudgeCharacter = (_name, _character, _fjdg = ``) => {
 	g_resultObj[_name]++;
 	g_currentArrows++;
-	document.querySelector(`#chara${_freezeFlg}J`).innerHTML = `<span class="common_${_name}">${_character}</span>`;
-	document.querySelector(`#chara${_freezeFlg}J`).setAttribute(`cnt`, C_FRM_JDGMOTION);
+	document.querySelector(`#chara${_fjdg}J`).innerHTML = `<span class="common_${_name}">${_character}</span>`;
+	document.querySelector(`#chara${_fjdg}J`).setAttribute(`cnt`, C_FRM_JDGMOTION);
 	document.querySelector(`#lbl${toCapitalize(_name)}`).textContent = g_resultObj[_name];
 };
 
@@ -9688,7 +9693,7 @@ const judgeRecovery = (_name, _difFrame) => {
 	changeJudgeCharacter(_name, g_lblNameObj[`j_${_name}`]);
 
 	updateCombo();
-	displayDiff(_difFrame, g_headerObj.justFrames);
+	displayDiff(_difFrame);
 
 	lifeRecovery();
 	finishViewing();
@@ -9730,7 +9735,7 @@ const judgeMatari = _difFrame => {
 	changeJudgeCharacter(`matari`, g_lblNameObj.j_matari);
 	comboJ.textContent = ``;
 
-	displayDiff(_difFrame, g_headerObj.justFrames);
+	displayDiff(_difFrame);
 	finishViewing();
 
 	g_customJsObj.judg_matari.forEach(func => func(_difFrame));

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2022/10/20 (v28.4.0)
+ * Revised : 2022/11/05 (v29.0.1)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -845,6 +845,8 @@ const g_keycons = {
     shuffleGroups: [0],
     shuffleGroupNum: 0,
     groupSelf: `S`,
+
+    groups: [`color`, `shuffle`],
 };
 
 let g_displays = [`stepZone`, `judgment`, `fastSlow`, `lifeGauge`, `score`, `musicInfo`, `filterLine`,
@@ -2566,7 +2568,7 @@ const g_keyObj = {
 const keyCtrlName = Object.keys(g_keyObj).filter(val => val.startsWith(`keyCtrl`));
 keyCtrlName.forEach(property => g_keyObj[`${property}d`] = copyArray2d(g_keyObj[property]));
 
-[`color`, `shuffle`].forEach(type => {
+g_keycons.groups.forEach(type => {
     const tmpName = Object.keys(g_keyObj).filter(val => val.startsWith(type) && val.endsWith(`_0`));
     tmpName.forEach(property => g_keyObj[`${property.slice(0, -2)}`] = g_keyObj[property].concat());
 });

package/package.json

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