danoniplus 30.1.2 → 30.2.1

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2023/02/15
+ * Revised : 2023/02/18
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 30.1.2`;
-const g_revisedDate = `2023/02/15`;
+const g_version = `Ver 30.2.1`;
+const g_revisedDate = `2023/02/18`;
 const g_alphaVersion = ``;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
@@ -7134,6 +7134,31 @@ const scoreConvert = (_dosObj, _scoreId, _preblankFrame, _dummyNo = ``,
 		return [];
 	};
 
+	/**
+	 * スクロール変化データの分解
+	 * @param {number} _scoreNo 
+	 */
+	const setScrollchData = (_scoreNo) => {
+		const dosScrollchData = _dosObj[`scrollch${_scoreNo}_data`] || _dosObj.scrollch_data;
+		const scrollchData = [];
+
+		if (hasVal(dosScrollchData)) {
+			splitLF(dosScrollchData).filter(data => hasVal(data)).forEach(tmpData => {
+				const tmpScrollchData = tmpData.split(`,`);
+				if (isNaN(parseInt(tmpScrollchData[0]))) {
+					return;
+				}
+				const frame = calcFrame(tmpScrollchData[0]);
+				const arrowNum = parseFloat(tmpScrollchData[1]);
+				const scrollDir = parseFloat(tmpScrollchData[2] ?? `1`);
+
+				scrollchData.push([frame, arrowNum, frame, scrollDir]);
+			});
+			return scrollchData.sort((_a, _b) => _a[0] - _b[0]).flat();
+		}
+		return [];
+	};
+
 	/**
 	 * 譜面データの優先順配列の取得
 	 * @param {string} _header 
@@ -7155,24 +7180,23 @@ const scoreConvert = (_dosObj, _scoreId, _preblankFrame, _dummyNo = ``,
 	const getPriorityHeader = _ => {
 		const list = [];
 		const anotherKeyFlg = hasVal(g_keyObj[`transKey${_keyCtrlPtn}`]);
-		const addPriorityList = (_type = ``) => {
-			if (anotherKeyFlg) {
-				list.push(`${_type}A`);
-			}
-			list.push(_type);
-		};
 		let type = ``;
 		if (g_stateObj.scroll !== `---`) {
 			type = `Alt`;
 		} else if (g_stateObj.reverse === C_FLG_ON) {
 			type = `Rev`;
 		}
-		if (type !== ``) {
-			addPriorityList(type);
+
+		if (anotherKeyFlg) {
+			list.push(`${g_stateObj.scroll}A`);
+			list.push(`${type}A`);
+			list.push(`A`);
 		}
-		addPriorityList();
+		list.push(g_stateObj.scroll);
+		list.push(type);
+		list.push(``);
 
-		return list;
+		return makeDedupliArray(list);
 	};
 
 	/**
@@ -7327,6 +7351,9 @@ const scoreConvert = (_dosObj, _scoreId, _preblankFrame, _dummyNo = ``,
 		obj.dummyFrzCssMotionData = setCssMotionData(`frz`, _dummyNo);
 	}
 
+	// スクロール変化データの分解
+	obj.scrollchData = setScrollchData(scoreIdHeader);
+
 	// 歌詞データの分解 (3つで1セット, セット毎の改行区切り可)
 	obj.wordData = [];
 	obj.wordMaxDepth = -1;
@@ -7368,7 +7395,7 @@ const scoreConvert = (_dosObj, _scoreId, _preblankFrame, _dummyNo = ``,
 	// キー変化定義
 	obj.keychFrames = [];
 	if (hasVal(_dosObj[`keych${setScoreIdHeader(g_stateObj.scoreId, g_stateObj.scoreLockFlg)}_data`])) {
-		const keychdata = _dosObj[`keych${setScoreIdHeader(g_stateObj.scoreId, g_stateObj.scoreLockFlg)}_data`]?.split(`,`);
+		const keychdata = splitLF2(_dosObj[`keych${setScoreIdHeader(g_stateObj.scoreId, g_stateObj.scoreLockFlg)}_data`], `,`);
 		obj.keychFrames = keychdata.filter((val, j) => j % 2 === 0);
 		obj.keychTarget = keychdata.filter((val, j) => j % 2 === 1);
 	} else {
@@ -7688,29 +7715,31 @@ const pushArrows = (_dataObj, _speedOnFrame, _motionOnFrame, _firstArrivalFrame)
 	}
 
 	// 個別加速のタイミング更新
-	let tmpObj;
-	g_workObj.boostData = [];
-	g_workObj.boostData.length = 0;
-	if (hasArrayList(_dataObj.boostData, 2)) {
-		let delBoostIdx = 0;
-		for (let k = _dataObj.boostData.length - 2; k >= 0; 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 {
-				_dataObj.boostData[k] = tmpObj.frm;
+	const getTimingData = _data => {
+		if (hasArrayList(_data, 2)) {
+			let delIdx = 0;
+			for (let k = _data.length - 2; k >= 0; k -= 2) {
+				const tmpObj = getArrowStartFrame(_data[k], _speedOnFrame, _motionOnFrame);
+				if (tmpObj.frm < g_scoreObj.frameNum) {
+					_data[k] = g_scoreObj.frameNum;
+					delIdx = k;
+					break;
+				} else {
+					_data[k] = tmpObj.frm;
+				}
 			}
+			for (let k = 0; k < delIdx; k++) {
+				_data.shift();
+			}
+			return copyArray2d(_data);
 		}
-		for (let k = 0; k < delBoostIdx; k++) {
-			_dataObj.boostData.shift();
-		}
-		g_workObj.boostData = copyArray2d(_dataObj.boostData);
-	}
+		return [];
+	};
+	g_workObj.boostData = getTimingData(_dataObj.boostData);
 
 	/**
-	 * 色変化・モーションデータのタイミング更新
+	 * 色変化・モーションデータ・スクロール反転データのタイミング更新
+	 * - この関数を使用する場合、配列グループの先頭2つが「フレーム数、矢印番号」となっていないと動作しない
 	 * @param {string} _type 
 	 * @param {string} _header 
 	 * @param {function} _setFunc 
@@ -7731,6 +7760,7 @@ const pushArrows = (_dataObj, _speedOnFrame, _motionOnFrame, _firstArrivalFrame)
 			const calcFrameFlg = (_colorFlg && !isFrzHitColor(baseData[k + 1]) && !baseData[k + 3]) || _calcFrameFlg;
 
 			if (baseData[k] < g_scoreObj.frameNum) {
+				// フェードイン直前にある色変化・モーションデータ・スクロール反転データを取得して格納
 				if (!hasValInArray(baseData[k + 1], frontData)) {
 					frontData.unshift(baseData.slice(k + 1, k + _term));
 				}
@@ -7816,13 +7846,15 @@ const pushArrows = (_dataObj, _speedOnFrame, _motionOnFrame, _firstArrivalFrame)
 		return _data;
 	};
 
-	// 個別・全体色変化、モーションデータのタイミング更新
+	// 個別・全体色変化、モーションデータ・スクロール反転データのタイミング更新
 	[``, `dummy`].forEach(type =>
 		calcDataTiming(`color`, type, pushColors, { _colorFlg: true }));
 
 	g_typeLists.arrow.forEach(header =>
 		calcDataTiming(`cssMotion`, header, pushCssMotions, { _calcFrameFlg: true }));
 
+	calcDataTiming(`scrollch`, ``, pushScrollchs, { _calcFrameFlg: true });
+
 	g_fadeinStockList.forEach(type =>
 		_dataObj[`${type}Data`] = calcAnimationData(type, _dataObj[`${type}Data`]));
 
@@ -8056,6 +8088,48 @@ const pushCssMotions = (_header, _frame, _val, _styleName, _styleNameRev) => {
 	}
 };
 
+/**
+ * スクロール変化情報の格納
+ * @param {string} _header 
+ * @param {number} _frameArrow 
+ * @param {number} _frameStep 
+ * @param {number} _val 
+ * @param {number} _scrollDir 
+ */
+const pushScrollchs = (_header, _frameArrow, _val, _frameStep, _scrollDir) => {
+	const tkObj = getKeyInfo();
+
+	const frameArrow = Math.max(_frameArrow, g_scoreObj.frameNum);
+	const frameStep = Math.max(_frameStep, g_scoreObj.frameNum);
+
+	if (g_workObj.mkScrollchArrow[frameArrow] === undefined) {
+		g_workObj.mkScrollchArrow[frameArrow] = [];
+		g_workObj.mkScrollchArrowDir[frameArrow] = [];
+	}
+	if (g_workObj.mkScrollchStep[frameStep] === undefined) {
+		g_workObj.mkScrollchStep[frameStep] = [];
+		g_workObj.mkScrollchStepDir[frameStep] = [];
+	}
+	if (_val < 20 || _val >= 1000) {
+		const realVal = g_workObj.replaceNums[_val % 1000];
+		g_workObj.mkScrollchArrow[frameArrow].push(realVal);
+		g_workObj.mkScrollchArrowDir[frameArrow].push(_scrollDir);
+		g_workObj.mkScrollchStep[frameStep].push(realVal);
+		g_workObj.mkScrollchStepDir[frameStep].push(_scrollDir);
+
+	} else {
+		const colorNum = _val - 20;
+		for (let j = 0; j < tkObj.keyNum; j++) {
+			if (g_keyObj[`color${tkObj.keyCtrlPtn}`][j] === colorNum) {
+				g_workObj.mkScrollchArrow[frameArrow].push(j);
+				g_workObj.mkScrollchArrowDir[frameArrow].push(_scrollDir);
+				g_workObj.mkScrollchStep[frameStep].push(j);
+				g_workObj.mkScrollchStepDir[frameStep].push(_scrollDir);
+			}
+		}
+	}
+};
+
 /**
  * メイン画面前の初期化処理
  */
@@ -8071,6 +8145,7 @@ const getArrowSettings = _ => {
 
 	g_workObj.stepX = [];
 	g_workObj.scrollDir = [];
+	g_workObj.scrollDirDefault = [];
 	g_workObj.dividePos = [];
 	g_workObj.stepRtn = copyArray2d(g_keyObj[`stepRtn${keyCtrlPtn}`]);
 	g_workObj.stepHitRtn = copyArray2d(g_keyObj[`stepRtn${keyCtrlPtn}`]);
@@ -8142,6 +8217,7 @@ const getArrowSettings = _ => {
 			});
 		});
 	}
+	g_workObj.scrollDirDefault = g_workObj.scrollDir.concat();
 
 	Object.keys(g_resultObj).forEach(judgeCnt => g_resultObj[judgeCnt] = 0);
 	g_resultObj.spState = ``;
@@ -9333,6 +9409,10 @@ const mainInit = _ => {
 			keychCnts++;
 		}
 
+		// スクロール変化
+		changeScrollArrowDirs(currentFrame);
+		changeStepY(currentFrame);
+
 		// ダミー矢印生成（背面に表示するため先に処理）
 		if (g_workObj.mkDummyArrow[currentFrame] !== undefined) {
 			g_workObj.mkDummyArrow[currentFrame].forEach(data =>
@@ -9626,6 +9706,38 @@ const changeCssMotions = (_header, _name, _frameNum) => {
 	}
 };
 
+/**
+ * スクロール方向の変更（矢印・フリーズアロー）
+ * @param {number} _frameNum 
+ */
+const changeScrollArrowDirs = (_frameNum) => {
+	const frameData = g_workObj.mkScrollchArrow[_frameNum];
+	if (frameData !== undefined) {
+		for (let j = 0; j < frameData.length; j++) {
+			const targetj = frameData[j];
+			g_workObj.scrollDir[targetj] = g_workObj.scrollDirDefault[targetj] * g_workObj.mkScrollchArrowDir[_frameNum][j];
+			g_workObj.dividePos[targetj] = (g_workObj.scrollDir[targetj] === 1 ? 0 : 1);
+		}
+	}
+};
+
+/**
+ * ステップゾーンの位置反転
+ * @param {number} _frameNum 
+ */
+const changeStepY = (_frameNum) => {
+	const frameData = g_workObj.mkScrollchStep[_frameNum];
+	if (frameData !== undefined) {
+		for (let j = 0; j < frameData.length; j++) {
+			const targetj = frameData[j];
+			const dividePos = (g_workObj.scrollDirDefault[targetj] * g_workObj.mkScrollchStepDir[_frameNum][j] === 1 ? 0 : 1);
+			const baseY = C_STEP_Y + g_posObj.reverseStepY * dividePos;
+			$id(`stepRoot${targetj}`).top = `${baseY}px`;
+			$id(`frzHit${targetj}`).top = `${baseY}px`;
+		}
+	}
+};
+
 /**
  * フリーズアローヒット時の描画変更
  * @param {number} _j 

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2023/02/14 (v30.1.1)
+ * Revised : 2023/02/17 (v30.2.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -486,7 +486,7 @@ const g_typeLists = {
     frzColor: [`Normal`, `NormalBar`, `Hit`, `HitBar`],
     dataList: [
         `Arrow`, `FrzArrow`, `FrzLength`,
-        `Color`, `ColorCd`,
+        `Color`, `ColorCd`, `ScrollchArrow`, `ScrollchStep`, `ScrollchArrowDir`, `ScrollchStepDir`,
         `FColorNormal`, `FColorNormalCd`, `FColorNormalBar`, `FColorNormalBarCd`,
         `FColorHit`, `FColorHitCd`, `FColorHitBar`, `FColorHitBarCd`,
         `ArrowCssMotion`, `ArrowCssMotionName`,

package/package.json

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