danoniplus 36.4.2 → 36.5.0

package/js/danoni_main.js

@@ -8,8 +8,8 @@
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 36.4.2`;
-const g_revisedDate = `2024/06/01`;
+const g_version = `Ver 36.5.0`;
+const g_revisedDate = `2024/06/05`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -7638,6 +7638,7 @@ const applySRandom = (_keyNum, _shuffleGroup, _arrowHeader, _frzHeader) => {
 
 	const tmpArrowData = [...Array(_keyNum)].map(_ => []);
 	const tmpFrzData = [...Array(_keyNum)].map(_ => []);
+	const scatterFrame = 10;
 
 	// シャッフルグループごとに処理
 	_shuffleGroup.forEach(_group => {
@@ -7654,28 +7655,61 @@ const applySRandom = (_keyNum, _shuffleGroup, _arrowHeader, _frzHeader) => {
 		// 重ならないようにフリーズを配置
 		allFreezeArrows.forEach(_freeze => {
 			// 置ける場所を検索
+			const freeSpacesFlat = _group.filter(
+				_key => tmpFrzData[_key].find(_other => _freeze.begin - scatterFrame <= _other.end + scatterFrame) === undefined
+			);
 			const freeSpaces = _group.filter(
 				_key => tmpFrzData[_key].find(_other => _freeze.begin <= _other.end) === undefined
 			);
+			let currentFreeSpaces = freeSpaces;
+			if (g_stateObj.shuffle.startsWith(`Scatter`)) {
+				currentFreeSpaces = freeSpacesFlat.length > 0 ? freeSpacesFlat : freeSpaces;
+			}
 			// ランダムに配置
-			const random = Math.floor(Math.random() * freeSpaces.length);
-			tmpFrzData[freeSpaces[random]].push(_freeze);
+			const random = Math.floor(Math.random() * currentFreeSpaces.length);
+			tmpFrzData[currentFreeSpaces[random]].push(_freeze);
 		});
 
 		// 通常矢印の配置
 		const allArrows = _group.map(_key => g_scoreObj[`${_arrowHeader}Data`][_key]).flat();
 		allArrows.sort((_a, _b) => _a - _b);
+		let prev2Num = 0, prevNum = 0;
 		allArrows.forEach(_arrow => {
+
+			// 直前の矢印のフレーム数を取得
+			if (prev2Num !== _arrow) {
+				if (prevNum !== _arrow) {
+					prev2Num = prevNum;
+					prevNum = _arrow;
+				}
+			}
+
 			// 置ける場所を検索
+			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 random = Math.floor(Math.random() * freeSpaces.length);
-			tmpArrowData[freeSpaces[random]].push(_arrow);
+			let currentFreeSpaces = freeSpaces.length > 0 ? freeSpaces : freeSpacesAlt;
+			if (g_stateObj.shuffle.startsWith(`Scatter`)) {
+				currentFreeSpaces = freeSpacesFlat.length > 0 ? freeSpacesFlat : currentFreeSpaces;
+			}
+			const random = Math.floor(Math.random() * currentFreeSpaces.length);
+			tmpArrowData[currentFreeSpaces[random]].push(_arrow);
 		})
 	});
 

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2024/05/18 (v36.4.1)
+ * Revised : 2024/06/05 (v36.5.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -966,7 +966,7 @@ const g_settings = {
     scrolls: [],
     scrollNum: 0,
 
-    shuffles: [C_FLG_OFF, `Mirror`, `X-Mirror`, `Turning`, `Random`, `Random+`, `S-Random`, `S-Random+`],
+    shuffles: [C_FLG_OFF, `Mirror`, `X-Mirror`, `Turning`, `Random`, `Random+`, `S-Random`, `S-Random+`, `Scatter`, `Scatter+`],
     shuffleNum: 0,
     swapPattern: [4, 5, 6, 7],
 
@@ -1057,6 +1057,14 @@ const g_shuffleFunc = {
         applySRandom(keyNum, [[...Array(keyNum).keys()]], `arrow`, `frz`);
         applySRandom(keyNum, [[...Array(keyNum).keys()]], `dummyArrow`, `dummyFrz`);
     },
+    'Scatter': (keyNum, shuffleGroup) => {
+        applySRandom(keyNum, shuffleGroup, `arrow`, `frz`);
+        applySRandom(keyNum, shuffleGroup, `dummyArrow`, `dummyFrz`);
+    },
+    'Scatter+': keyNum => {
+        applySRandom(keyNum, [[...Array(keyNum).keys()]], `arrow`, `frz`);
+        applySRandom(keyNum, [[...Array(keyNum).keys()]], `dummyArrow`, `dummyFrz`);
+    },
 };
 
 /**

package/package.json

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