danoniplus 28.3.1 → 28.5.0

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2022/10/16
+ * Revised : 2022/10/29
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 28.3.1`;
-const g_revisedDate = `2022/10/16`;
+const g_version = `Ver 28.5.0`;
+const g_revisedDate = `2022/10/29`;
 const g_alphaVersion = ``;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
@@ -7345,34 +7345,39 @@ const setSpeedOnFrame = (_speedData, _lastFrame) => {
 
 /**
  * Motionオプション適用時の矢印別の速度設定
- * - 配列の数字は小さいほどステップゾーンに近いことを示す。
- * - 15がステップゾーン上、0～14は矢印の枠外管理用
+ * - 矢印が表示される最大フレーム数を 縦ピクセル数×20 と定義。
  */
-const setMotionOnFrame = _ => {
+const setMotionOnFrame = _ => g_motionFunc[g_stateObj.motion]([...Array(g_sHeight * 20 + 1)].fill(0));
 
-	// 矢印が表示される最大フレーム数
-	const motionLastFrame = g_sHeight * 20;
-	const brakeLastFrame = g_sHeight / 2;
-
-	const motionOnFrame = [...Array(motionLastFrame + 1)].fill(0);
-
-	if (g_stateObj.motion === C_FLG_OFF) {
-	} else if (g_stateObj.motion === `Boost`) {
-		// ステップゾーンに近づくにつれて加速量を大きくする (16 → 85)
-		for (let j = C_MOTION_STD_POS + 1; j < C_MOTION_STD_POS + 70; j++) {
-			motionOnFrame[j] = (C_MOTION_STD_POS + 70 - j) * 3 / 50;
-		}
-	} else if (g_stateObj.motion === `Brake`) {
-		// 初期は+2x、ステップゾーンに近づくにつれて加速量を下げる (20 → 34)
-		for (let j = C_MOTION_STD_POS + 5; j < C_MOTION_STD_POS + 19; j++) {
-			motionOnFrame[j] = (j - 15) * 4 / 14;
-		}
-		for (let j = C_MOTION_STD_POS + 19; j <= brakeLastFrame; j++) {
-			motionOnFrame[j] = 4;
-		}
+/**
+ * Boost用の適用関数
+ * - ステップゾーンに近づくにつれて加速量を大きく/小さくする (16 → 85)
+ * @param {array} _frms 
+ * @param {number} _spd 
+ * @param {number} _pnFlg 正負(1 もしくは -1) 
+ * @returns 
+ */
+const getBoostTrace = (_frms, _spd, _pnFlg = 1) => {
+	for (let j = C_MOTION_STD_POS + 1; j < C_MOTION_STD_POS + 70; j++) {
+		_frms[j] = (C_MOTION_STD_POS + 70 - j) * _pnFlg * _spd / 50;
 	}
+	return _frms;
+};
 
-	return motionOnFrame;
+/**
+ * Brake用の適用関数
+ * - 初期は+2x、ステップゾーンに近づくにつれて加速量を下げる (20 → 34)
+ * @param {array} _frms 
+ * @returns 
+ */
+const getBrakeTrace = _frms => {
+	for (let j = C_MOTION_STD_POS + 5; j < C_MOTION_STD_POS + 19; j++) {
+		_frms[j] = (j - 15) * 4 / 14;
+	}
+	for (let j = C_MOTION_STD_POS + 19; j <= g_sHeight / 2; j++) {
+		_frms[j] = 4;
+	}
+	return _frms;
 };
 
 /**
@@ -7390,7 +7395,6 @@ const getFirstArrivalFrame = (_startFrame, _speedOnFrame, _motionOnFrame) => {
 		startY += _speedOnFrame[frm];
 
 		if (_speedOnFrame[frm] !== 0) {
-			startY += _motionOnFrame[motionFrm];
 			motionFrm++;
 		}
 		frm++;
@@ -7416,6 +7420,8 @@ const pushArrows = (_dataObj, _speedOnFrame, _motionOnFrame, _firstArrivalFrame)
 
 	/** 矢印の移動距離 */
 	g_workObj.initY = [];
+	/** 矢印の移動距離 (Motion加算分) */
+	g_workObj.initBoostY = [];
 	/** 矢印がステップゾーンに到達するまでのフレーム数 */
 	g_workObj.arrivalFrame = [];
 	/** Motionの適用フレーム数 */
@@ -7469,6 +7475,7 @@ const pushArrows = (_dataObj, _speedOnFrame, _motionOnFrame, _firstArrivalFrame)
 		g_workObj.initY[frmPrev] = tmpObj.startY;
 		g_workObj.arrivalFrame[frmPrev] = tmpObj.arrivalFrm;
 		g_workObj.motionFrame[frmPrev] = tmpObj.motionFrm;
+		g_workObj.initBoostY[frmPrev] = sumData(g_workObj.motionOnFrames.filter((val, j) => j < g_workObj.motionFrame[frmPrev]));
 
 		if (_frzFlg) {
 			g_workObj[`mk${camelHeader}Length`][_j] = [];
@@ -7496,6 +7503,7 @@ const pushArrows = (_dataObj, _speedOnFrame, _motionOnFrame, _firstArrivalFrame)
 				g_workObj.initY[tmpFrame] = g_workObj.initY[frmPrev];
 				g_workObj.arrivalFrame[tmpFrame] = g_workObj.arrivalFrame[frmPrev];
 				g_workObj.motionFrame[tmpFrame] = g_workObj.motionFrame[frmPrev];
+				g_workObj.initBoostY[tmpFrame] = sumData(g_workObj.motionOnFrames.filter((val, j) => j < g_workObj.motionFrame[frmPrev]));
 
 			} else {
 
@@ -7512,6 +7520,7 @@ const pushArrows = (_dataObj, _speedOnFrame, _motionOnFrame, _firstArrivalFrame)
 				g_workObj.initY[frmPrev] = tmpObj.startY;
 				g_workObj.arrivalFrame[frmPrev] = tmpObj.arrivalFrm;
 				g_workObj.motionFrame[frmPrev] = tmpObj.motionFrm;
+				g_workObj.initBoostY[frmPrev] = sumData(g_workObj.motionOnFrames.filter((val, j) => j < g_workObj.motionFrame[frmPrev]));
 			}
 
 			// 出現タイミングを保存
@@ -7537,18 +7546,13 @@ const pushArrows = (_dataObj, _speedOnFrame, _motionOnFrame, _firstArrivalFrame)
 	if (hasArrayList(_dataObj.boostData, 2)) {
 		let delBoostIdx = 0;
 		for (let k = _dataObj.boostData.length - 2; k >= 0; k -= 2) {
-			if (_dataObj.boostData[k] < g_scoreObj.frameNum) {
-				delBoostIdx = k + 2;
+			tmpObj = getArrowStartFrame(_dataObj.boostData[k], _speedOnFrame, _motionOnFrame);
+			if (tmpObj.frm < g_scoreObj.frameNum) {
+				_dataObj.boostData[k] = g_scoreObj.frameNum;
+				delBoostIdx = k;
 				break;
 			} else {
-				tmpObj = getArrowStartFrame(_dataObj.boostData[k], _speedOnFrame, _motionOnFrame);
-				if (tmpObj.frm < g_scoreObj.frameNum) {
-					_dataObj.boostData[k] = g_scoreObj.frameNum;
-					delBoostIdx = k;
-					break;
-				} else {
-					_dataObj.boostData[k] = tmpObj.frm;
-				}
+				_dataObj.boostData[k] = tmpObj.frm;
 			}
 		}
 		for (let k = 0; k < delBoostIdx; k++) {
@@ -7710,7 +7714,6 @@ const getArrowStartFrame = (_frame, _speedOnFrame, _motionOnFrame) => {
 		obj.startY += _speedOnFrame[obj.frm];
 
 		if (_speedOnFrame[obj.frm] !== 0) {
-			obj.startY += _motionOnFrame[obj.motionFrm];
 			obj.motionFrm++;
 		}
 		obj.frm--;
@@ -8261,6 +8264,7 @@ const mainInit = _ => {
 	// 現在の矢印・フリーズアローの速度、個別加算速度の初期化 (速度変化時に直す)
 	g_workObj.currentSpeed = 2;
 	g_workObj.boostSpd = 1;
+	g_workObj.boostDir = 1;
 
 	// 開始位置、楽曲再生位置の設定
 	const firstFrame = g_scoreObj.frameNum;
@@ -8321,7 +8325,7 @@ const mainInit = _ => {
 
 	// フレーム数
 	divRoot.appendChild(
-		createDivCss2Label(`lblframe`, g_scoreObj.frameNum, { x: 0, y: 0, w: 100, h: 30, siz: 20, display: g_workObj.lifegaugeDisp, })
+		createDivCss2Label(`lblframe`, g_scoreObj.nominalFrameNum, { x: 0, y: 0, w: 100, h: 30, siz: 20, display: g_workObj.lifegaugeDisp, })
 	);
 
 	// ライフ(数字)部作成
@@ -8774,7 +8778,12 @@ const mainInit = _ => {
 	judgeMotionFunc.dummyArrowON = (_j, _arrowName, _cnt) => judgeMotionFunc.dummyArrowOFF(_j, _arrowName, _cnt);
 
 	/**
-	 * 次フリーズアローへ判定を移すかチェック
+	 * 次矢印・フリーズアローへ判定を移すかチェック
+	 * 
+	 * - 判定対象の矢印／フリーズアローが未判定の状態で、現在の矢印／フリーズアローの判定領域が回復判定内に入った場合、
+	 *   自身より前の判定をNG判定とした上で、判定対象の矢印／フリーズアローを強制的に削除
+	 * - ただし、判定対象の矢印／フリーズアローがジャスト付近の場合は判定対象を優先する
+	 *   (フリーズアローの場合、ヒット中の場合も判定対象が優先される)
 	 * 
 	 * @param _j 矢印の位置
 	 * @param _k 矢印の表示順
@@ -8782,22 +8791,39 @@ const mainInit = _ => {
 	 */
 	const judgeNextFunc = {
 
+		arrowOFF: (_j, _k, _cnt) => {
+
+			if (g_workObj.judgArrowCnt[_j] === _k - 1 && _cnt <= g_judgObj.arrowJ[g_judgPosObj.shakin]) {
+				const prevArrowName = `arrow${_j}_${g_workObj.judgArrowCnt[_j]}`;
+
+				if (g_attrObj[prevArrowName].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);
+						judgeObjDelete.arrow(_j, prevArrowName);
+					}
+				}
+			}
+		},
+
+		arrowON: (_j, _k, _cnt) => true,
+		dummyArrowOFF: (_j, _k, _cnt) => true,
+		dummyArrowON: (_j, _k, _cnt) => true,
+
 		frzOFF: (_j, _k, _cnt) => {
 
-			// フリーズアローの判定領域に入った場合、前のフリーズアローを強制的に削除
-			// ただし、前のフリーズアローが押下中または判定領域がジャスト付近(キター領域)の場合は削除しない
-			// 削除する場合、前のフリーズアローの判定はイクナイ(＆ウワァン)扱い
-			if (g_workObj.judgFrzCnt[_j] !== _k && _cnt <= g_judgObj.frzJ[g_judgPosObj.sfsf] + 1) {
+			if (g_workObj.judgFrzCnt[_j] === _k - 1 && _cnt <= g_judgObj.frzJ[g_judgPosObj.sfsf]) {
 				const prevFrzName = `frz${_j}_${g_workObj.judgFrzCnt[_j]}`;
 
 				if (g_attrObj[prevFrzName].isMoving &&
 					g_attrObj[prevFrzName].cnt < (-1) * g_judgObj.frzJ[g_judgPosObj.kita]) {
 
-					// 枠外判定前の場合、このタイミングで枠外判定を行う
+					// 自身より前のフリーズアローが未判定の場合、強制的に枠外判定を行いフリーズアローを削除
 					if (g_attrObj[prevFrzName].cnt >= (-1) * g_judgObj.frzJ[g_judgPosObj.iknai]) {
-						judgeIknai(_cnt);
+						judgeIknai(g_attrObj[prevFrzName].cnt);
 						if (g_headerObj.frzStartjdgUse) {
-							judgeUwan(_cnt);
+							judgeUwan(g_attrObj[prevFrzName].cnt);
 						}
 					}
 					judgeObjDelete.frz(_j, prevFrzName);
@@ -8847,12 +8873,13 @@ const mainInit = _ => {
 	 * @param {string} _color 矢印色
 	 */
 	const makeArrow = (_j, _arrowCnt, _name, _color) => {
-		const boostSpdDir = g_workObj.boostSpd * g_workObj.scrollDir[_j];
 		const dividePos = g_workObj.dividePos[_j];
 		const colorPos = g_keyObj[`color${keyCtrlPtn}`][_j];
 
 		const arrowName = `${_name}${_j}_${_arrowCnt}`;
-		const firstPosY = C_STEP_Y + g_posObj.reverseStepY * dividePos + g_workObj.initY[g_scoreObj.frameNum] * boostSpdDir;
+		const firstPosY = C_STEP_Y + g_posObj.reverseStepY * dividePos +
+			(g_workObj.initY[g_scoreObj.frameNum] * g_workObj.boostSpd +
+				g_workObj.initBoostY[g_scoreObj.frameNum] * g_workObj.boostDir) * g_workObj.scrollDir[_j];
 
 		const stepRoot = createEmptySprite(arrowSprite[dividePos], arrowName, {
 			x: g_workObj.stepX[_j], y: firstPosY, w: C_ARW_WIDTH, h: C_ARW_WIDTH,
@@ -8860,7 +8887,8 @@ const mainInit = _ => {
 		g_attrObj[arrowName] = {
 			cnt: g_workObj.arrivalFrame[g_scoreObj.frameNum] + 1,
 			boostCnt: g_workObj.motionFrame[g_scoreObj.frameNum],
-			boostSpd: boostSpdDir, dividePos: dividePos,
+			boostSpd: g_workObj.boostSpd, dividePos: dividePos,
+			dir: g_workObj.scrollDir[_j], boostDir: g_workObj.boostDir,
 			prevY: firstPosY, y: firstPosY,
 		};
 		arrowSprite[dividePos].appendChild(stepRoot);
@@ -8907,11 +8935,12 @@ const mainInit = _ => {
 		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_workObj.motionOnFrames[boostCnt]) * g_attrObj[arrowName].boostSpd;
+			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);
 	};
 
 	/**
@@ -8923,11 +8952,12 @@ const mainInit = _ => {
 	 * @param {string} _barColor 
 	 */
 	const makeFrzArrow = (_j, _arrowCnt, _name, _normalColor, _barColor) => {
-		const boostSpdDir = g_workObj.boostSpd * g_workObj.scrollDir[_j];
 		const dividePos = g_workObj.dividePos[_j];
 		const frzNo = `${_j}_${_arrowCnt}`;
 		const frzName = `${_name}${frzNo}`;
-		const firstPosY = C_STEP_Y + g_posObj.reverseStepY * dividePos + g_workObj.initY[g_scoreObj.frameNum] * boostSpdDir;
+		const firstPosY = C_STEP_Y + g_posObj.reverseStepY * dividePos +
+			(g_workObj.initY[g_scoreObj.frameNum] * g_workObj.boostSpd +
+				g_workObj.initBoostY[g_scoreObj.frameNum] * g_workObj.boostDir) * g_workObj.scrollDir[_j];
 		const firstBarLength = g_workObj[`mk${toCapitalize(_name)}Length`][_j][(_arrowCnt - 1) * 2] * g_workObj.boostSpd;
 
 		const frzRoot = createEmptySprite(arrowSprite[dividePos], frzName, {
@@ -8937,10 +8967,8 @@ const mainInit = _ => {
 			cnt: g_workObj.arrivalFrame[g_scoreObj.frameNum] + 1,
 			boostCnt: g_workObj.motionFrame[g_scoreObj.frameNum],
 			judgEndFlg: false, isMoving: true, frzBarLength: firstBarLength, keyUpFrame: 0,
-			boostSpd: boostSpdDir, dividePos: dividePos, dir: g_workObj.scrollDir[_j],
-			y: firstPosY,
-			barY: C_ARW_WIDTH / 2 - firstBarLength * dividePos,
-			btmY: firstBarLength * g_workObj.scrollDir[_j],
+			boostSpd: g_workObj.boostSpd, dividePos: dividePos, dir: g_workObj.scrollDir[_j], boostDir: g_workObj.boostDir,
+			y: firstPosY, barY: C_ARW_WIDTH / 2 - firstBarLength * dividePos, btmY: firstBarLength * g_workObj.scrollDir[_j],
 		};
 		arrowSprite[dividePos].appendChild(frzRoot);
 
@@ -9000,7 +9028,7 @@ const mainInit = _ => {
 	const movFrzArrow = (_j, _k, _name) => {
 		const frzNo = `${_j}_${_k}`;
 		const frzName = `${_name}${frzNo}`;
-		const movY = g_workObj.currentSpeed * g_attrObj[frzName].boostSpd;
+		const movY = g_workObj.currentSpeed * g_attrObj[frzName].boostSpd * g_attrObj[frzName].dir;
 
 		if (!g_attrObj[frzName].judgEndFlg) {
 			if (g_attrObj[frzName].isMoving) {
@@ -9010,7 +9038,7 @@ const mainInit = _ => {
 
 				// 移動
 				if (g_workObj.currentSpeed !== 0) {
-					g_attrObj[frzName].y -= movY + g_workObj.motionOnFrames[g_attrObj[frzName].boostCnt] * g_attrObj[frzName].boostSpd;
+					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--;
 				}
@@ -9064,7 +9092,7 @@ const mainInit = _ => {
 	const flowTimeline = _ => {
 
 		const currentFrame = g_scoreObj.frameNum;
-		lblframe.textContent = currentFrame;
+		lblframe.textContent = g_scoreObj.nominalFrameNum;
 
 		// キーの押下状態を取得
 		for (let j = 0; j < keyNum; j++) {
@@ -9117,6 +9145,7 @@ const mainInit = _ => {
 		}
 		while (g_workObj.boostData !== undefined && currentFrame >= g_workObj.boostData[boostCnts]) {
 			g_workObj.boostSpd = g_workObj.boostData[boostCnts + 1];
+			g_workObj.boostDir = (g_workObj.boostSpd > 0 ? 1 : -1);
 			boostCnts += 2;
 		}
 
@@ -9439,7 +9468,7 @@ const changeHitFrz = (_j, _k, _name) => {
 	// 早押ししたboostCnt分のフリーズアロー終端位置の修正
 	let delFrzMotionLength = 0;
 	for (let i = 0; i < g_attrObj[frzName].cnt; i++) {
-		delFrzMotionLength += g_workObj.motionOnFrames[g_attrObj[frzName].boostCnt - i] * g_attrObj[frzName].boostSpd;
+		delFrzMotionLength += g_workObj.motionOnFrames[g_attrObj[frzName].boostCnt - i];
 	}
 
 	g_attrObj[frzName].frzBarLength -= (delFrzLength + delFrzMotionLength) * g_attrObj[frzName].dir;

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2022/10/16 (v28.3.1)
+ * Revised : 2022/10/20 (v28.4.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -746,7 +746,7 @@ const g_settings = {
     speedNum: 0,
     speedTerms: [20, 5, 1],
 
-    motions: [C_FLG_OFF, `Boost`, `Brake`],
+    motions: [C_FLG_OFF, `Boost`, `Hi-Boost`, `Brake`],
     motionNum: 0,
 
     reverses: [C_FLG_OFF, C_FLG_ON],
@@ -815,6 +815,18 @@ const g_shuffleFunc = {
     },
 };
 
+/**
+ * モーション適用関数
+ * - frmsはフレーム別の速度設定用配列。
+ * - 配列の15がステップゾーン上、0～14は矢印の枠外管理用
+ */
+const g_motionFunc = {
+    'OFF': _frms => _frms,
+    'Boost': _frms => getBoostTrace(_frms, 3),
+    'Hi-Boost': _frms => getBoostTrace(_frms, g_stateObj.speed * 2),
+    'Brake': _frms => getBrakeTrace(_frms),
+};
+
 const g_keycons = {
     configTypes: [`Main`, `Replaced`, `ALL`],
     configTypeNum: 0,
@@ -2968,6 +2980,7 @@ const g_lblNameObj = {
     'u_OFF': `OFF`,
     'u_ON': `ON`,
     'u_Boost': `Boost`,
+    'u_Hi-Boost': `Hi-Boost`,
     'u_Brake': `Brake`,
 
     'u_Cross': `Cross`,

package/package.json

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