danoniplus 36.4.1 → 36.5.0

package/README.md

@@ -2,7 +2,8 @@
 
 [![CodeFactor](https://www.codefactor.io/repository/github/cwtickle/danoniplus/badge)](https://www.codefactor.io/repository/github/cwtickle/danoniplus)
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/1213a18348c34328ac4f10c9e8a2b987)](https://app.codacy.com/gh/cwtickle/danoniplus/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
-[![CodeQL](https://github.com/cwtickle/danoniplus/workflows/CodeQL/badge.svg)](https://github.com/cwtickle/danoniplus/actions?query=workflow%3ACodeQL)  
+[![CodeQL](https://github.com/cwtickle/danoniplus/workflows/CodeQL/badge.svg)](https://github.com/cwtickle/danoniplus/actions?query=workflow%3ACodeQL)
+[![Discord](https://img.shields.io/discord/698460971231870977?style=flat&logo=discord&logoColor=%23ffffff&label=Discord&labelColor=%236666ff&color=%23000066)](https://discord.gg/YVWUdUGyMy)  
 [![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/cwtickle/danoniplus?sort=semver)](https://github.com/cwtickle/danoniplus/security/policy)
 [![GitHub All Releases](https://img.shields.io/github/downloads/cwtickle/danoniplus/total?color=%23ff3399&label=downloads%20%28recently%29)](https://github.com/cwtickle/danoniplus/releases)
 [![GitHub](https://img.shields.io/github/license/cwtickle/danoniplus)](https://github.com/cwtickle/danoniplus/blob/develop/LICENSE)  

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2024/05/18
+ * Revised : 2024/06/01
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 36.4.1`;
-const g_revisedDate = `2024/05/18`;
+const g_version = `Ver 36.5.0`;
+const g_revisedDate = `2024/06/05`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -242,7 +242,7 @@ const convertStrToVal = _str => {
  * 半角スペース、タブを文字列から除去
  * @param {string} _str 
  */
-const trimStr = _str => _str?.split(`\t`).join(``).trimStart().trimEnd();
+const trimStr = _str => _str?.split(`\t`).join(``).replace(/^ +| +$/g, ``);
 
 /*-----------------------------------------------------------*/
 /* 値や配列のチェック・変換                                    */
@@ -1582,7 +1582,8 @@ const makeSpriteData = (_data, _calcFrame = _frame => _frame) => {
 		const tmpSpriteData = tmpData.split(`,`).map(val => trimStr(val));
 
 		// 深度が"-"の場合はスキップ
-		if (!hasVal(tmpSpriteData[1], `-`)) {
+		if (tmpSpriteData[1] === undefined || tmpSpriteData[1] === `-` ||
+			(tmpSpriteData[1] === `` && ![`[loop]`, `[jump]`].includes(tmpSpriteData[2]))) {
 			return;
 		}
 
@@ -7637,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 => {
@@ -7653,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.1",
+  "version": "36.5.0",
   "description": "Dancing☆Onigiri (CW Edition) - Web-based Rhythm Game",
   "main": "index.js",
   "scripts": {