danoniplus 39.2.0 → 39.3.0

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2025/02/08
+ * Revised : 2025/02/09
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 39.2.0`;
-const g_revisedDate = `2025/02/08`;
+const g_version = `Ver 39.3.0`;
+const g_revisedDate = `2025/02/09`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -1538,6 +1538,7 @@ const makeBgCanvas = (_ctx, { w = g_sWidth, h = g_sHeight } = {}) => {
 const clearWindow = (_redrawFlg = false, _customDisplayName = ``) => {
 	resetKeyControl();
 	resetTransform();
+	resetXY();
 
 	// ボタン、オブジェクトをクリア (divRoot配下のもの)
 	deleteChildspriteAll(`divRoot`);
@@ -9624,6 +9625,7 @@ const getArrowSettings = () => {
 	g_workObj.keyCtrl = structuredClone(g_keyObj[`keyCtrl${keyCtrlPtn}`]);
 	g_workObj.diffList = [];
 	g_workObj.mainEndTime = 0;
+	g_stateObj.layerNum = 2;
 
 	g_workObj.keyGroupMaps = tkObj.keyGroupMaps;
 	g_workObj.keyGroupList = tkObj.keyGroupList;
@@ -9672,9 +9674,6 @@ const getArrowSettings = () => {
 		g_workObj.stepX[j] = g_keyObj.blank * stdPos + (g_headerObj.playingWidth - C_ARW_WIDTH) / 2;
 		const baseLayer = g_keyObj[`layerGroup${keyCtrlPtn}`]?.[j] || 0;
 		g_workObj.dividePos[j] = baseLayer * 2 + ((posj <= divideCnt ? 0 : 1) + (scrollDirOptions[j] === 1 ? 0 : 1) + (g_stateObj.reverse === C_FLG_OFF ? 0 : 1)) % 2;
-		if (g_stateObj.stepArea === `X-Flower`) {
-			g_workObj.dividePos[j] = (g_workObj.stepX[j] < (g_headerObj.playingWidth - C_ARW_WIDTH) / 2 ? 0 : 1) * 2 + g_workObj.dividePos[j] % 2;
-		}
 		g_workObj.scrollDir[j] = (posj <= divideCnt ? 1 : -1) * scrollDirOptions[j] * (g_stateObj.reverse === C_FLG_OFF ? 1 : -1);
 
 		eachOrAll.forEach(type => {
@@ -9692,6 +9691,24 @@ const getArrowSettings = () => {
 			g_workObj[`frzHitShadowColors${type}`][j] = g_headerObj.frzShadowColor[colorj][1] || ``;
 		});
 	}
+	g_workObj.orgFlatFlg = g_workObj.dividePos.every(v => v === g_workObj.dividePos[0]);
+	if (g_stateObj.stepArea === `X-Flower` || (g_stateObj.stepArea.includes(`Mismatched`) && g_workObj.orgFlatFlg)) {
+		for (let j = 0; j < keyNum; j++) {
+			g_workObj.dividePos[j] = (g_workObj.stepX[j] < (g_headerObj.playingWidth - C_ARW_WIDTH) / 2 ? 0 : 1) * 2 + g_workObj.dividePos[j] % 2;
+		}
+	}
+	if (g_stateObj.stepArea === `2Step`) {
+		for (let j = 0; j < keyNum; j++) {
+			if (g_workObj.orgFlatFlg && g_workObj.stepX[j] >= (g_headerObj.playingWidth - C_ARW_WIDTH) / 2) {
+				g_workObj.dividePos[j] = Math.floor(g_workObj.dividePos[j] / 2) * 2 + (g_workObj.dividePos[j] + 1) % 2;
+				g_workObj.scrollDir[j] *= -1;
+			}
+			if (g_workObj.dividePos[j] % 2 === (Number(g_stateObj.reverse === C_FLG_ON) + 1) % 2) {
+				g_workObj.dividePos[j] = g_stateObj.layerNum + g_workObj.dividePos[j] + Number(g_stateObj.reverse === C_FLG_ON ? 1 : -1);
+				g_workObj.scrollDir[j] *= -1;
+			}
+		}
+	}
 	g_workObj.scrollDirDefault = g_workObj.scrollDir.concat();
 	g_workObj.dividePosDefault = g_workObj.dividePos.concat();
 	g_stateObj.layerNum = Math.max(g_stateObj.layerNum, Math.ceil((Math.max(...g_workObj.dividePos) + 1) / 2) * 2);

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2025/02/08 (v39.2.0)
+ * Revised : 2025/02/09 (v39.3.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -1068,7 +1068,7 @@ const g_settings = {
     playWindows: [`Default`, `Stairs`, `R-Stairs`, `Slope`, `R-Slope`, `Distorted`, `R-Distorted`, `SideScroll`, `R-SideScroll`],
     playWindowNum: 0,
 
-    stepAreas: [`Default`, `Halfway`, `Mismatched`, `R-Mismatched`, `X-Flower`],
+    stepAreas: [`Default`, `Halfway`, `2Step`, `Mismatched`, `R-Mismatched`, `X-Flower`],
     stepAreaNum: 0,
 
     frzReturns: [C_FLG_OFF, `X-Axis`, `Y-Axis`, `Z-Axis`, `Random`, `XY-Axis`, `XZ-Axis`, `YZ-Axis`, `Random+`],
@@ -1110,9 +1110,10 @@ const g_moveSettingWindow = (_changePageFlg = true, _direction = 1) => {
 };
 
 /**
- * transform管理
+ * transform, 座標管理
  */
 const g_transforms = {};
+const g_posXYs = {};
 
 /**
  * idごとのtransformを追加・変更
@@ -1147,6 +1148,57 @@ const resetTransform = () => {
     Object.keys(g_transforms).forEach(_id => g_transforms[_id] = {});
 };
 
+/**
+ * 座標計算
+ * @param {string} _id 
+ * @param {string} _typeId 
+ */
+const calcXY = (_id, _typeId) => {
+    const _posXs = [], _posYs = [];
+    Object.keys(g_posXYs[_id]).forEach(typeId => {
+        _posXs.push(g_posXYs[_id][typeId][0]);
+        _posYs.push(g_posXYs[_id][typeId][1]);
+    });
+    $id(_id).left = `${sumData(_posXs)}px`;
+    $id(_id).top = `${sumData(_posYs)}px`;
+};
+
+/**
+ * 座標加算処理
+ * @param {string} _id 
+ * @param {string} _typeId 
+ * @param {number} _x 
+ * @param {number} _y 
+ * @param {boolean} [_overwrite=false]
+ */
+const addXY = (_id, _typeId, _x = 0, _y = 0, _overwrite = false) => {
+    if (_overwrite) {
+        delete g_posXYs?.[_id];
+    }
+    if (g_posXYs[_id] === undefined) {
+        g_posXYs[_id] = {};
+    }
+    g_posXYs[_id][_typeId] = [_x, _y];
+    calcXY(_id, _typeId);
+};
+
+/**
+ * 座標リセット処理
+ * @param {string} _id 
+ * @param {string} _typeId 
+ */
+const delXY = (_id, _typeId) => {
+    delete g_posXYs[_id][_typeId];
+    calcXY(_id, _typeId);
+};
+
+/**
+ * 座標位置情報の初期化
+ */
+const resetXY = () => {
+    Object.keys(g_posXYs).forEach(_id => delete g_posXYs[_id]);
+};
+
 /**
  * id, transformIdに合致するtransform情報の取得
  * @param {string} _id 
@@ -1218,12 +1270,13 @@ const g_playWindowFunc = {
     'R-SideScroll': () => g_changeStairs(90),
 };
 
+const g_arrowGroupSprite = [`stepSprite`, `arrowSprite`, `frzHitSprite`];
 const g_stepAreaFunc = {
     'Default': () => ``,
     'Halfway': () => {
-        [`stepSprite`, `arrowSprite`, `frzHitSprite`].forEach(sprite => {
+        g_arrowGroupSprite.forEach(sprite => {
             for (let j = 0; j < g_stateObj.layerNum; j++) {
-                $id(`${sprite}${j}`).top = `${(j % 2 === 0 ? 1 : -1) * (g_headerObj.playingHeight / 2 - g_posObj.stepY + (g_posObj.stepYR - C_ARW_WIDTH) / 2)}px`;
+                addXY(`${sprite}${j}`, `stepArea`, 0, (j % 2 === 0 ? 1 : -1) * (g_headerObj.playingHeight / 2 - g_posObj.stepY + (g_posObj.stepYR - C_ARW_WIDTH) / 2));
             }
         });
     },
@@ -1231,11 +1284,32 @@ const g_stepAreaFunc = {
         for (let j = 0; j < g_stateObj.layerNum; j++) {
             addTransform(`mainSprite${j}`, `stepArea`, `rotate(${(j % 2 === 0 ? 1 : -1) * -15}deg)`);
         }
+        if (g_workObj.orgFlatFlg) {
+            g_arrowGroupSprite.forEach(sprite => {
+                for (let j = 2; j < Math.min(g_stateObj.layerNum, 4); j++) {
+                    addXY(`${sprite}${j}`, `stepArea`, 0, (j % 2 === 0 ? 1 : -1) * (g_headerObj.playingHeight / 2 - g_posObj.stepY + (g_posObj.stepYR - C_ARW_WIDTH) / 2));
+                }
+            });
+        }
     },
     'R-Mismatched': () => {
         for (let j = 0; j < g_stateObj.layerNum; j++) {
             addTransform(`mainSprite${j}`, `stepArea`, `rotate(${(j % 2 === 0 ? 1 : -1) * 15}deg)`);
         }
+        if (g_workObj.orgFlatFlg) {
+            g_arrowGroupSprite.forEach(sprite => {
+                for (let j = 0; j < Math.min(g_stateObj.layerNum, 2); j++) {
+                    addXY(`${sprite}${j}`, `stepArea`, 0, (j % 2 === 0 ? 1 : -1) * (g_headerObj.playingHeight / 2 - g_posObj.stepY + (g_posObj.stepYR - C_ARW_WIDTH) / 2));
+                }
+            });
+        }
+    },
+    '2Step': () => {
+        g_arrowGroupSprite.forEach(sprite => {
+            for (let j = Math.min(g_stateObj.layerNum, 4) / 2; j < Math.min(g_stateObj.layerNum, 4); j++) {
+                addXY(`${sprite}${j}`, `stepArea`, 0, (j % 2 === 0 ? 1 : -1) * (g_headerObj.playingHeight / 2 - g_posObj.stepY + (g_posObj.stepYR - C_ARW_WIDTH) / 2));
+            }
+        });
     },
     'X-Flower': () => {
         for (let j = 0; j < Math.min(g_stateObj.layerNum, 4); j++) {

package/package.json

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