danoniplus 38.1.1 → 38.2.0

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2024/12/07
+ * Revised : 2024/12/14
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 38.1.1`;
-const g_revisedDate = `2024/12/07`;
+const g_version = `Ver 38.2.0`;
+const g_revisedDate = `2024/12/14`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -8054,40 +8054,36 @@ const applySRandom = (_keyNum, _shuffleGroup, _arrowHeader, _frzHeader) => {
 		// 通常矢印の配置
 		const allArrows = _group.map(_key => g_scoreObj[`${_arrowHeader}Data`][_key]).flat();
 		allArrows.sort((_a, _b) => _a - _b);
-		let prev2Num = 0, prevNum = 0;
+		let prev2Num = 0, prevNum = 0, sameFlg = true;
 		allArrows.forEach(_arrow => {
 
 			// 直前の矢印のフレーム数を取得
-			if (prev2Num !== _arrow) {
-				if (prevNum !== _arrow) {
-					prev2Num = prevNum;
-					prevNum = _arrow;
-				}
-			}
+			sameFlg = true;
+			if (prev2Num !== _arrow && prevNum !== _arrow) {
+				prev2Num = prevNum;
+				prevNum = _arrow;
+				sameFlg = false;
+			}
+
+			const getFreeSpaces = ({ scatterFrame = 0, frzFlg = false, prevFlg = false } = {}) =>
+				_group.filter(_key =>
+					// 通常矢印と重ならない
+					tmpArrowData[_key].find(_other => _arrow >= _other - scatterFrame && _arrow <= _other + scatterFrame) === undefined
+					// フリーズと重ならない
+					&& (!frzFlg || tmpFrzData[_key].find(_freeze => _arrow >= _freeze.begin - scatterFrame && _arrow <= _freeze.end + scatterFrame) === undefined)
+					// 直前の矢印と重ならない
+					&& (!prevFlg || tmpArrowData[_key].find(_other => prev2Num === _other) === undefined)
+				);
 
 			// 置ける場所を検索
-			const freeSpacesFlat = _group.filter(_key =>
-				// フリーズと重ならない (前後10フレーム)
-				tmpFrzData[_key].find(_freeze => _arrow >= _freeze.begin - scatterFrame && _arrow <= _freeze.end + scatterFrame) === undefined
-				// 通常矢印と重ならない (前後10フレーム)
-				&& tmpArrowData[_key].find(_other => _arrow >= _other - scatterFrame && _arrow <= _other + scatterFrame) === undefined
-				// 直前の矢印と重ならない
-				&& tmpArrowData[_key].find(_other => prev2Num === _other) === undefined
-			);
-			const freeSpaces = _group.filter(_key =>
-				// フリーズと重ならない
-				tmpFrzData[_key].find(_freeze => _arrow >= _freeze.begin && _arrow <= _freeze.end) === undefined
-				// 通常矢印と重ならない
-				&& tmpArrowData[_key].find(_other => _arrow === _other) === undefined
-			);
-			const freeSpacesAlt = _group.filter(_key =>
-				// 通常矢印と重ならない
-				tmpArrowData[_key].find(_other => _arrow === _other) === undefined
-			);
+			const freeSpacesFlat = getFreeSpaces({ scatterFrame, frzFlg: true, prevFlg: true });
+			const freeSpaces = getFreeSpaces({ frzFlg: true });
+			const freeSpacesAlt = getFreeSpaces();
+
 			// ランダムに配置
 			let currentFreeSpaces = freeSpaces.length > 0 ? freeSpaces : freeSpacesAlt;
 			if (g_stateObj.shuffle.startsWith(`Scatter`)) {
-				currentFreeSpaces = freeSpacesFlat.length > 0 ? freeSpacesFlat : currentFreeSpaces;
+				currentFreeSpaces = freeSpacesFlat.length > 0 && !sameFlg ? freeSpacesFlat : currentFreeSpaces;
 			}
 			const random = Math.floor(Math.random() * currentFreeSpaces.length);
 			tmpArrowData[currentFreeSpaces[random]].push(_arrow);
@@ -8809,7 +8805,7 @@ const getBrakeTrace = _frms => {
 const getFountainTrace = (_frms, _spd) => {
 	const minj = C_MOTION_STD_POS + 1;
 	const maxj = C_MOTION_STD_POS + Math.ceil(400 / _spd) + 1;
-	const maxMotionFrm = Math.max(maxj, C_MOTION_STD_POS + 200);
+	const maxMotionFrm = Math.max(maxj, C_MOTION_STD_POS + g_sHeight / 2);
 	const diff = 50 / (maxj - minj);
 	const factor = 0.5 + _spd / 40;
 
@@ -8910,6 +8906,7 @@ const pushArrows = (_dataObj, _speedOnFrame, _motionOnFrame, _firstArrivalFrame)
 			return;
 		}
 
+		const calcInitBoostY = _frm => sumData(g_workObj.motionOnFrames.filter((val, j) => j <= g_workObj.motionFrame[_frm]));
 		const camelHeader = toCapitalize(_header);
 		const setcnt = (_frzFlg ? 2 : 1);
 		if (_frzFlg && _data.length % 2 !== 0) {
@@ -8931,7 +8928,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]));
+		g_workObj.initBoostY[frmPrev] = calcInitBoostY(frmPrev);
 
 		if (_frzFlg) {
 			g_workObj[`mk${camelHeader}Length`][_j] = [];
@@ -8960,7 +8957,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]));
+				g_workObj.initBoostY[tmpFrame] = calcInitBoostY(tmpFrame);
 
 			} else {
 
@@ -8977,7 +8974,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]));
+				g_workObj.initBoostY[frmPrev] = calcInitBoostY(frmPrev);
 			}
 
 			// 出現タイミングを保存

package/package.json

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