danoniplus 39.2.0 → 39.4.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.4.0`;
+const g_revisedDate = `2025/02/10`;
 
 // カスタム用バージョン (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`);
@@ -7985,7 +7986,7 @@ const loadingScoreInit = async () => {
 		g_workObj.shuffleGroupMap[_val]?.push(_i) || (g_workObj.shuffleGroupMap[_val] = [_i]));
 
 	// Mirror,Random,S-Randomの適用
-	g_shuffleFunc[g_stateObj.shuffle](keyNum, Object.values(g_workObj.shuffleGroupMap));
+	g_shuffleFunc.get(g_stateObj.shuffle)(keyNum, Object.values(g_workObj.shuffleGroupMap));
 
 	// アシスト用の配列があれば、ダミーデータで上書き
 	if (typeof g_keyObj[`assistPos${keyCtrlPtn}`] === C_TYP_OBJECT &&
@@ -8920,7 +8921,7 @@ const setSpeedOnFrame = (_speedData, _lastFrame) => {
  * Motionオプション適用時の矢印別の速度設定
  * - 矢印が表示される最大フレーム数を 縦ピクセル数×20 と定義。
  */
-const setMotionOnFrame = () => g_motionFunc[g_stateObj.motion](fillArray(g_headerObj.playingHeight * 20 + 1));
+const setMotionOnFrame = () => g_motionFunc.get(g_stateObj.motion)(fillArray(g_headerObj.playingHeight * 20 + 1));
 
 /**
  * Boost用の適用関数
@@ -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);
@@ -9931,27 +9948,31 @@ const mainInit = () => {
 	g_workObj.fadeOutNo = fillArray(wordMaxLen);
 	g_workObj.lastFadeFrame = fillArray(wordMaxLen);
 	g_workObj.wordFadeFrame = fillArray(wordMaxLen);
+	const mainCommonPos = { w: g_headerObj.playingWidth, h: g_posObj.arrowHeight };
 
 	// 背景スプライトを作成
-	createMultipleSprite(`backSprite`, g_scoreObj.backMaxDepth, { x: g_workObj.backX });
+	createMultipleSprite(`backSprite`, g_scoreObj.backMaxDepth);
+	addX(`backSprite`, `root`, g_workObj.backX);
 
 	// ステップゾーン、矢印のメインスプライトを作成
-	const mainSprite = createEmptySprite(divRoot, `mainSprite`, {
-		x: g_workObj.playingX, y: g_posObj.stepY - C_STEP_Y + g_headerObj.playingY, w: g_headerObj.playingWidth, h: g_headerObj.playingHeight,
-	});
+	const mainSprite = createEmptySprite(divRoot, `mainSprite`, mainCommonPos);
 	addTransform(`mainSprite`, `root`, `scale(${g_keyObj.scale})`);
+	addXY(`mainSprite`, `root`, g_workObj.playingX, g_posObj.stepY - C_STEP_Y + g_headerObj.playingY);
 
 	// 曲情報・判定カウント用スプライトを作成（メインスプライトより上位）
-	const infoSprite = createEmptySprite(divRoot, `infoSprite`, { x: g_workObj.playingX, y: g_headerObj.playingY, w: g_headerObj.playingWidth, h: g_headerObj.playingHeight });
+	const infoSprite = createEmptySprite(divRoot, `infoSprite`, mainCommonPos);
+	addXY(`infoSprite`, `root`, g_workObj.playingX, g_headerObj.playingY);
 
 	// 判定系スプライトを作成（メインスプライトより上位）
-	const judgeSprite = createEmptySprite(divRoot, `judgeSprite`, { x: g_workObj.playingX, y: g_headerObj.playingY, w: g_headerObj.playingWidth, h: g_headerObj.playingHeight });
+	const judgeSprite = createEmptySprite(divRoot, `judgeSprite`, mainCommonPos);
+	addXY(`judgeSprite`, `root`, g_workObj.playingX, g_headerObj.playingY);
 
 	const tkObj = getKeyInfo();
 	const [keyCtrlPtn, keyNum] = [tkObj.keyCtrlPtn, tkObj.keyNum];
 
 	// マスクスプライトを作成 (最上位)
-	createMultipleSprite(`maskSprite`, g_scoreObj.maskMaxDepth, { x: g_workObj.backX });
+	createMultipleSprite(`maskSprite`, g_scoreObj.maskMaxDepth);
+	addX(`maskSprite`, `root`, g_workObj.backX);
 
 	// カラー・モーションを適用するオブジェクトの種類
 	const objList = (g_stateObj.dummyId === `` ? [``] : [`dummy`, ``]);
@@ -9982,7 +10003,6 @@ const mainInit = () => {
 
 	// mainSprite配下に層別のスプライトを作成し、ステップゾーン・矢印本体・フリーズアローヒット部分に分ける
 	const mainSpriteN = [], stepSprite = [], arrowSprite = [], frzHitSprite = [];
-	const mainCommonPos = { w: g_headerObj.playingWidth, h: g_posObj.arrowHeight };
 
 	// Hidden+, Sudden+用のライン、パーセント表示
 	const filterCss = g_stateObj.filterLock === C_FLG_OFF ? g_cssObj.life_Failed : g_cssObj.life_Cleared;
@@ -10045,12 +10065,23 @@ const mainInit = () => {
 	}
 
 	// StepArea処理
-	g_stepAreaFunc[g_stateObj.stepArea]();
+	g_stepAreaFunc.get(g_stateObj.stepArea)();
+
+	// mainSpriteのtransform追加処理
+	addTransform(`mainSprite`, `playWindow`, g_playWindowFunc.get(g_stateObj.playWindow)());
+
+	// EffectのArrowEffect追加処理
+	g_effectFunc.get(g_stateObj.effect)();
 
 	// Appearanceのオプション適用時は一部描画を隠す
 	changeAppearanceFilter(g_appearanceRanges.includes(g_stateObj.appearance) ?
 		g_hidSudObj.filterPos : g_hidSudObj.filterPosDefault[g_stateObj.appearance], true);
 
+	// Shaking初期化
+	if (g_stateObj.shaking !== C_FLG_OFF) {
+		addXY(`mainSprite`, `shaking`, 0, 0);
+	}
+
 	// 現在の矢印・フリーズアローの速度、個別加算速度の初期化 (速度変化時に直す)
 	g_workObj.currentSpeed = 2;
 	g_workObj.boostSpd = 1;
@@ -10309,12 +10340,6 @@ const mainInit = () => {
 	// ユーザカスタムイベント(初期)
 	g_customJsObj.main.forEach(func => func());
 
-	// mainSpriteのtransform追加処理
-	addTransform(`mainSprite`, `playWindow`, g_playWindowFunc[g_stateObj.playWindow]());
-
-	// EffectのArrowEffect追加処理
-	g_effectFunc[g_stateObj.effect]();
-
 	/**
 	 * キーを押したときの処理
 	 */
@@ -11038,7 +11063,7 @@ const mainInit = () => {
 		}
 
 		// 画面揺れの設定
-		g_shakingFunc[g_stateObj.shaking]();
+		g_shakingFunc.get(g_stateObj.shaking)();
 
 		// ユーザカスタムイベント(フレーム毎)
 		g_customJsObj.mainEnterFrame.forEach(func => func());
@@ -11339,30 +11364,36 @@ const changeAppearanceFilter = (_num = 10, _shiftFlg = keyIsShift()) => {
 		_num = MAX_FILTER_POS / 2;
 	}
 
+	// アルファマスクの位置設定
 	const numPlus = (g_stateObj.appearance === `Hid&Sud+` ? _num : 0);
 	const topShape = `inset(${_num}% 0% ${numPlus}% 0%)`;
 	const bottomShape = `inset(${numPlus}% 0% ${_num}% 0%)`;
+
+	// フィルターバーの位置設定
 	const appearPers = [_num, MAX_FILTER_POS - _num];
+	const topDist = g_posObj.arrowHeight * appearPers[topNum] / MAX_FILTER_POS;
+	const bottomDist = g_posObj.arrowHeight * appearPers[bottomNum] / MAX_FILTER_POS;
 
 	for (let j = 0; j < g_stateObj.layerNum; j += 2) {
 		$id(`arrowSprite${topNum + j}`).clipPath = topShape;
 		$id(`arrowSprite${bottomNum + j}`).clipPath = bottomShape;
 
-		$id(`filterBar${topNum + j}`).top = wUnit(parseFloat($id(`arrowSprite${j}`).top) + g_posObj.arrowHeight * appearPers[topNum] / MAX_FILTER_POS);
-		$id(`filterBar${bottomNum + j}`).top = wUnit(parseFloat($id(`arrowSprite${j + 1}`).top) + g_posObj.arrowHeight * appearPers[bottomNum] / MAX_FILTER_POS);
+		$id(`filterBar${topNum + j}`).top = wUnit(parseFloat($id(`arrowSprite${j}`).top) + topDist);
+		$id(`filterBar${bottomNum + j}`).top = wUnit(parseFloat($id(`arrowSprite${j + 1}`).top) + bottomDist);
 
 		if (![`Default`, `Halfway`].includes(g_stateObj.stepArea)) {
-			$id(`filterBar${bottomNum + j}_HS`).top = wUnit(parseFloat($id(`arrowSprite${j}`).top) + g_posObj.arrowHeight * appearPers[bottomNum] / MAX_FILTER_POS);
-			$id(`filterBar${topNum + j}_HS`).top = wUnit(parseFloat($id(`arrowSprite${j + 1}`).top) + g_posObj.arrowHeight * appearPers[topNum] / MAX_FILTER_POS);
+			$id(`filterBar${bottomNum + j}_HS`).top = wUnit(parseFloat($id(`arrowSprite${j}`).top) + bottomDist);
+			$id(`filterBar${topNum + j}_HS`).top = wUnit(parseFloat($id(`arrowSprite${j + 1}`).top) + topDist);
 		}
 
 		// 階層が多い場合はShift+pgUp/pgDownで表示する階層グループを切り替え
 		if (_shiftFlg && g_stateObj.d_filterline === C_FLG_ON) {
 			[`${topNum + j}`, `${bottomNum + j}`].forEach(type => {
-				$id(`filterBar${type}`).display = (j === g_workObj.aprFilterCnt ? C_DIS_INHERIT : C_DIS_NONE);
+				const displayState = (j === g_workObj.aprFilterCnt ? C_DIS_INHERIT : C_DIS_NONE);
+				$id(`filterBar${type}`).display = displayState;
 
 				if (![`Default`, `Halfway`].includes(g_stateObj.stepArea)) {
-					$id(`filterBar${type}_HS`).display = (j === g_workObj.aprFilterCnt ? C_DIS_INHERIT : C_DIS_NONE);
+					$id(`filterBar${type}_HS`).display = displayState;
 				}
 			});
 		}
@@ -11377,6 +11408,7 @@ const changeAppearanceFilter = (_num = 10, _shiftFlg = keyIsShift()) => {
 			$id(`filterBar${(g_hidSudObj.std[g_stateObj.appearance][g_stateObj.reverse]) % 2}`).top;
 		filterView.textContent = `${_num}%`;
 
+		// スクロールが1種類でHidden+/Sudden+の場合、対面のフィルターバーは不要なため非表示にする
 		if (g_stateObj.appearance !== `Hid&Sud+` && g_workObj.dividePos.every(v => v === g_workObj.dividePos[0])) {
 			$id(`filterBar${(g_hidSudObj.std[g_stateObj.appearance][g_stateObj.reverse] + 1) % 2}`).display = C_DIS_NONE;
 		}
@@ -11453,10 +11485,14 @@ const changeReturn = (_rad, _axis) => {
 
 /**
  * AutoRetryの設定
- * @param {number} _retryNum AutoRetryの設定位置（g_settings.autoRetryNum）
+ * @param {string} _retryCondition リトライ基準となるAutoRetry名
  */
-const quickRetry = (_retryNum) => {
-	if (g_settings.autoRetryNum >= _retryNum && !g_workObj.autoRetryFlg) {
+const quickRetry = (_retryCondition) => {
+	const retryNum = g_settings.autoRetrys.findIndex(val => val === _retryCondition);
+	if (retryNum < 0) {
+		return;
+	}
+	if (g_settings.autoRetryNum >= retryNum && !g_workObj.autoRetryFlg) {
 		g_workObj.autoRetryFlg = true;
 		setTimeout(() => {
 			g_audio.pause();
@@ -11561,7 +11597,6 @@ const changeHitFrz = (_j, _k, _name, _difFrame = 0) => {
 	const styfrzBtmRoot = $id(`${_name}BtmRoot${frzNo}`);
 	const styfrzBtm = $id(`${_name}Btm${frzNo}`);
 	const styfrzTopRoot = $id(`${_name}TopRoot${frzNo}`);
-	const styfrzTop = $id(`${_name}Top${frzNo}`);
 	const styfrzBtmShadow = $id(`${_name}BtmShadow${frzNo}`);
 
 	// フリーズアロー位置の修正（ステップゾーン上に来るように）
@@ -11612,7 +11647,7 @@ const changeHitFrz = (_j, _k, _name, _difFrame = 0) => {
 	// FrzReturnの設定
 	if (g_stateObj.frzReturn !== C_FLG_OFF) {
 		if (!g_workObj.frzReturnFlg) {
-			changeReturn(4, g_frzReturnFunc[g_stateObj.frzReturn]());
+			changeReturn(4, g_frzReturnFunc.get(g_stateObj.frzReturn)());
 		}
 	}
 	g_customJsObj[`judg_${_name}Hit`].forEach(func => func(_difFrame));
@@ -11637,7 +11672,7 @@ const changeFailedFrz = (_j, _k) => {
 	// FrzReturnの設定
 	if (g_stateObj.frzReturn !== C_FLG_OFF) {
 		if (!g_workObj.frzReturnFlg) {
-			changeReturn(4, g_frzReturnFunc[g_stateObj.frzReturn]());
+			changeReturn(4, g_frzReturnFunc.get(g_stateObj.frzReturn)());
 		}
 	}
 };
@@ -11759,11 +11794,11 @@ const displayDiff = (_difFrame, _fjdg = ``, _justFrames = g_headerObj.justFrames
 	} else if (_difFrame > _justFrames) {
 		diffJDisp = `<span class="common_diffFast">Fast ${difCnt} Frames</span>`;
 		g_resultObj.fast++;
-		quickRetry(4);
+		quickRetry(`Fast/Slow`);
 	} else if (_difFrame < _justFrames * (-1)) {
 		diffJDisp = `<span class="common_diffSlow">Slow ${difCnt} Frames</span>`;
 		g_resultObj.slow++;
-		quickRetry(4);
+		quickRetry(`Fast/Slow`);
 	}
 	document.getElementById(`diff${_fjdg}J`).innerHTML = diffJDisp;
 };
@@ -11809,7 +11844,7 @@ const lifeRecovery = () => {
  */
 const lifeDamage = (_excessive = false) => {
 	g_workObj.lifeVal -= g_workObj.lifeDmg * (_excessive ? 0.25 : 1);
-	quickRetry(1);
+	quickRetry(`Miss`);
 
 	if (g_workObj.lifeVal <= 0) {
 		g_workObj.lifeVal = 0;
@@ -11857,11 +11892,11 @@ const judgeRecovery = (_name, _difFrame) => {
 
 	if (g_stateObj.freezeReturn !== C_FLG_OFF) {
 		if ((g_resultObj.ii + g_resultObj.shakin) % 100 === 0 && !g_workObj.frzReturnFlg) {
-			changeReturn(1, g_frzReturnFunc[g_stateObj.frzReturn]());
+			changeReturn(1, g_frzReturnFunc.get(g_stateObj.frzReturn)());
 		}
 	}
 	if (_name === `shakin`) {
-		quickRetry(3);
+		quickRetry(`Shakin(Great)`);
 	}
 	g_customJsObj[`judg_${_name}`].forEach(func => func(_difFrame));
 };
@@ -11900,7 +11935,7 @@ const judgeMatari = _difFrame => {
 	changeJudgeCharacter(`matari`, g_lblNameObj.j_matari);
 	comboJ.textContent = ``;
 	finishViewing();
-	quickRetry(2);
+	quickRetry(`Matari(Good)`);
 
 	g_customJsObj.judg_matari.forEach(func => func(_difFrame));
 };

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/10 (v39.4.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,11 @@ const g_moveSettingWindow = (_changePageFlg = true, _direction = 1) => {
 };
 
 /**
- * transform管理
+ * transform, 座標管理
  */
 const g_transforms = {};
+const g_posXs = {};
+const g_posYs = {};
 
 /**
  * idごとのtransformを追加・変更
@@ -1123,12 +1125,10 @@ const g_transforms = {};
  */
 const addTransform = (_id, _transformId, _transform) => {
     if (g_transforms[_id] === undefined) {
-        g_transforms[_id] = {};
+        g_transforms[_id] = new Map();
     }
-    g_transforms[_id][_transformId] = _transform;
-    const _transforms = [];
-    Object.keys(g_transforms[_id]).forEach(transformId => _transforms.push(g_transforms[_id][transformId]));
-    $id(_id).transform = _transforms.join(` `);
+    g_transforms[_id].set(_transformId, _transform);
+    $id(_id).transform = Array.from(g_transforms[_id].values()).join(` `);
 };
 
 /**
@@ -1144,61 +1144,152 @@ const addTempTransform = (_id, _transform) => {
  * transformの初期化
  */
 const resetTransform = () => {
-    Object.keys(g_transforms).forEach(_id => g_transforms[_id] = {});
+    Object.keys(g_transforms).forEach(_id => delete g_transforms[_id]);
 };
 
 /**
  * id, transformIdに合致するtransform情報の取得
  * @param {string} _id 
  * @param {string} _transformId 
- * @returns 
+ * @returns {string}
  */
 const getTransform = (_id, _transformId) => {
     return g_transforms[_id]?.[_transformId] || ``;
 };
 
+/**
+ * 座標加算処理 (X座標)
+ * @param {string} _id 
+ * @param {string} _typeId 
+ * @param {number} [_x=0] 
+ * @param {boolean} [_overwrite=false] 
+ */
+const addX = (_id, _typeId, _x = 0, _overwrite = false) => {
+    if (_overwrite) {
+        delete g_posXs?.[_id];
+    }
+    if (g_posXs[_id] === undefined) {
+        g_posXs[_id] = new Map();
+    }
+    if (g_posXs[_id].get(_typeId) !== _x) {
+        g_posXs[_id].set(_typeId, _x);
+        $id(_id).left = `${sumData(Array.from(g_posXs[_id].values()))}px`;
+    }
+};
+
+/**
+ * 座標加算処理 (Y座標)
+ * @param {string} _id 
+ * @param {string} _typeId 
+ * @param {number} [_y=0] 
+ * @param {boolean} [_overwrite=false] 
+ */
+const addY = (_id, _typeId, _y = 0, _overwrite = false) => {
+    if (_overwrite) {
+        delete g_posYs?.[_id];
+    }
+    if (g_posYs[_id] === undefined) {
+        g_posYs[_id] = new Map();
+    }
+    if (g_posYs[_id].get(_typeId) !== _y) {
+        g_posYs[_id].set(_typeId, _y);
+        $id(_id).top = `${sumData(Array.from(g_posYs[_id].values()))}px`;
+    }
+};
+
+/**
+ * 座標リセット処理（X座標）
+ * @param {string} _id 
+ * @param {string} _typeId 
+ */
+const delX = (_id, _typeId) => {
+    g_posXs[_id]?.delete(_typeId);
+    $id(_id).left = `${sumData(Array.from(g_posXs[_id].values()))}px`;
+};
+
+/**
+ * 座標リセット処理（Y座標）
+ * @param {string} _id 
+ * @param {string} _typeId 
+ */
+const delY = (_id, _typeId) => {
+    g_posYs[_id]?.delete(_typeId);
+    $id(_id).top = `${sumData(Array.from(g_posYs[_id].values()))}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) => {
+    addX(_id, _typeId, _x, _overwrite);
+    addY(_id, _typeId, _y, _overwrite);
+};
+
+/**
+ * 座標リセット処理
+ * @param {string} _id 
+ * @param {string} _typeId 
+ */
+const delXY = (_id, _typeId) => {
+    delX(_id, _typeId);
+    delY(_id, _typeId);
+};
+
+/**
+ * 座標位置情報の初期化
+ */
+const resetXY = () => {
+    Object.keys(g_posXs).forEach(_id => delete g_posXs[_id]);
+    Object.keys(g_posYs).forEach(_id => delete g_posYs[_id]);
+};
+
 /**
  * シャッフル適用関数
  * @param {number} keyNum
  * @param {array} shuffleGroup
  */
-const g_shuffleFunc = {
-    'OFF': () => true,
-    'Mirror': (keyNum, shuffleGroup) => applyMirror(keyNum, shuffleGroup),
-    'X-Mirror': (keyNum, shuffleGroup) => applyMirror(keyNum, shuffleGroup, true),
-    'Turning': (keyNum, shuffleGroup) => applyTurning(keyNum, shuffleGroup),
-    'Random': (keyNum, shuffleGroup) => applyRandom(keyNum, shuffleGroup),
-    'Random+': keyNum => applyRandom(keyNum, [[...Array(keyNum).keys()]]),
-    'S-Random': (keyNum, shuffleGroup) => {
+const g_shuffleFunc = new Map([
+    ['OFF', () => true],
+    ['Mirror', (keyNum, shuffleGroup) => applyMirror(keyNum, shuffleGroup)],
+    ['X-Mirror', (keyNum, shuffleGroup) => applyMirror(keyNum, shuffleGroup, true)],
+    ['Turning', (keyNum, shuffleGroup) => applyTurning(keyNum, shuffleGroup)],
+    ['Random', (keyNum, shuffleGroup) => applyRandom(keyNum, shuffleGroup)],
+    ['Random+', keyNum => applyRandom(keyNum, [[...Array(keyNum).keys()]])],
+    ['S-Random', (keyNum, shuffleGroup) => {
         applySRandom(keyNum, shuffleGroup, `arrow`, `frz`);
         applySRandom(keyNum, shuffleGroup, `dummyArrow`, `dummyFrz`);
-    },
-    'S-Random+': keyNum => {
+    }],
+    ['S-Random+', keyNum => {
         applySRandom(keyNum, [[...Array(keyNum).keys()]], `arrow`, `frz`);
         applySRandom(keyNum, [[...Array(keyNum).keys()]], `dummyArrow`, `dummyFrz`);
-    },
-    'Scatter': (keyNum, shuffleGroup) => {
+    }],
+    ['Scatter', (keyNum, shuffleGroup) => {
         applySRandom(keyNum, shuffleGroup, `arrow`, `frz`);
         applySRandom(keyNum, shuffleGroup, `dummyArrow`, `dummyFrz`);
-    },
-    'Scatter+': keyNum => {
+    }],
+    ['Scatter+', keyNum => {
         applySRandom(keyNum, [[...Array(keyNum).keys()]], `arrow`, `frz`);
         applySRandom(keyNum, [[...Array(keyNum).keys()]], `dummyArrow`, `dummyFrz`);
-    },
-};
+    }],
+]);
 
 /**
  * モーション適用関数
  * @param {array} frms フレーム別の速度設定用配列。配列の15がステップゾーン上、0～14は矢印の枠外管理用
  */
-const g_motionFunc = {
-    'OFF': _frms => _frms,
-    'Boost': _frms => getBoostTrace(_frms, 3),
-    'Hi-Boost': _frms => getBoostTrace(_frms, g_stateObj.speed * 2),
-    'Brake': _frms => getBrakeTrace(_frms),
-    'Compress': _frms => getBoostTrace(_frms, g_stateObj.speed * 5 / 8, -1),
-    'Fountain': _frms => getFountainTrace(_frms, g_stateObj.speed * 2),
-};
+const g_motionFunc = new Map([
+    ['OFF', _frms => _frms],
+    ['Boost', _frms => getBoostTrace(_frms, 3)],
+    ['Hi-Boost', _frms => getBoostTrace(_frms, g_stateObj.speed * 2)],
+    ['Brake', _frms => getBrakeTrace(_frms)],
+    ['Compress', _frms => getBoostTrace(_frms, g_stateObj.speed * 5 / 8, -1)],
+    ['Fountain', _frms => getFountainTrace(_frms, g_stateObj.speed * 2)],
+]);
 
 /**
  * PlayWindow適用関数
@@ -1206,87 +1297,131 @@ const g_motionFunc = {
 const g_changeStairs = (_rad) => `rotate(${_rad}deg)`;
 const g_changeSkew = (_rad) => `Skew(${_rad}deg, ${_rad}deg) scaleY(0.9)`;
 
-const g_playWindowFunc = {
-    'Default': () => ``,
-    'Stairs': () => g_changeStairs(-8),
-    'R-Stairs': () => g_changeStairs(8),
-    'Slope': () => g_changeStairs(-45),
-    'R-Slope': () => g_changeStairs(45),
-    'Distorted': () => g_changeSkew(-15),
-    'R-Distorted': () => g_changeSkew(15),
-    'SideScroll': () => g_changeStairs(-90),
-    'R-SideScroll': () => g_changeStairs(90),
-};
-
-const g_stepAreaFunc = {
-    'Default': () => ``,
-    'Halfway': () => {
-        [`stepSprite`, `arrowSprite`, `frzHitSprite`].forEach(sprite => {
+const g_playWindowFunc = new Map([
+    ['Default', () => ``],
+    ['Stairs', () => g_changeStairs(-8)],
+    ['R-Stairs', () => g_changeStairs(8)],
+    ['Slope', () => g_changeStairs(-45)],
+    ['R-Slope', () => g_changeStairs(45)],
+    ['Distorted', () => g_changeSkew(-15)],
+    ['R-Distorted', () => g_changeSkew(15)],
+    ['SideScroll', () => g_changeStairs(-90)],
+    ['R-SideScroll', () => g_changeStairs(90)],
+]);
+
+const g_arrowGroupSprite = [`stepSprite`, `arrowSprite`, `frzHitSprite`];
+const halfwayOffset = _j => (_j % 2 === 0 ? 1 : -1) * (g_headerObj.playingHeight / 2 - g_posObj.stepY + (g_posObj.stepYR - C_ARW_WIDTH) / 2);
+const g_stepAreaFunc = new Map([
+    ['Default', () => ``],
+    ['Halfway', () => {
+        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`;
+                addY(`${sprite}${j}`, `stepArea`, halfwayOffset(j));
             }
         });
-    },
-    'Mismatched': () => {
+    }],
+    ['Mismatched', () => {
         for (let j = 0; j < g_stateObj.layerNum; j++) {
             addTransform(`mainSprite${j}`, `stepArea`, `rotate(${(j % 2 === 0 ? 1 : -1) * -15}deg)`);
         }
-    },
-    'R-Mismatched': () => {
+        if (g_workObj.orgFlatFlg) {
+            g_arrowGroupSprite.forEach(sprite => {
+                for (let j = 2; j < Math.min(g_stateObj.layerNum, 4); j++) {
+                    addY(`${sprite}${j}`, `stepArea`, halfwayOffset(j));
+                }
+            });
+        }
+    }],
+    ['R-Mismatched', () => {
         for (let j = 0; j < g_stateObj.layerNum; j++) {
             addTransform(`mainSprite${j}`, `stepArea`, `rotate(${(j % 2 === 0 ? 1 : -1) * 15}deg)`);
         }
-    },
-    'X-Flower': () => {
+        if (g_workObj.orgFlatFlg) {
+            g_arrowGroupSprite.forEach(sprite => {
+                for (let j = 0; j < Math.min(g_stateObj.layerNum, 2); j++) {
+                    addY(`${sprite}${j}`, `stepArea`, halfwayOffset(j));
+                }
+            });
+        }
+    }],
+    ['2Step', () => {
+        g_arrowGroupSprite.forEach(sprite => {
+            for (let j = Math.min(g_stateObj.layerNum, 4) / 2; j < Math.min(g_stateObj.layerNum, 4); j++) {
+                addY(`${sprite}${j}`, `stepArea`, halfwayOffset(j));
+            }
+        });
+    }],
+    ['X-Flower', () => {
         for (let j = 0; j < Math.min(g_stateObj.layerNum, 4); j++) {
             addTransform(`mainSprite${j}`, `stepArea`, `rotate(${(j % 2 === 0 ? 1 : -1) * (j % 4 < 2 ? 1 : -1) * -15}deg)`);
         }
-    },
-};
+    }],
+]);
 
 /**
  * Shaking適用関数
  */
-const g_shakingFunc = {
-    'OFF': () => true,
-    'Horizontal': () => $id(`mainSprite`).left = `${(Math.abs((g_scoreObj.baseFrame / 2) % 100 - 50) - 25) / 1}px`,
-    'Vertical': () => $id(`mainSprite`).top = `${(Math.abs((g_scoreObj.baseFrame / 2) % 100 - 50) - 25) / 2}px`,
-    'Drunk': () => {
-        if (parseFloat($id(`mainSprite`).left) === 0 && parseFloat($id(`mainSprite`).top) === 0) {
-            g_workObj.drunkXFlg = [true, false][Math.floor(Math.random() * 2)];
-            g_workObj.drunkYFlg = [true, false][Math.floor(Math.random() * 2)];
+const g_shakingFunc = new Map([
+    ['OFF', () => true],
+    ['Horizontal', () => addX(`mainSprite`, `shaking`, (Math.abs((g_scoreObj.baseFrame / 2) % 100 - 50) - 25) / 1)],
+    ['Vertical', () => addY(`mainSprite`, `shaking`, (Math.abs((g_scoreObj.baseFrame / 2) % 100 - 50) - 25) / 2)],
+    ['Drunk', () => {
+        if (g_posXs.mainSprite.get(`shaking`) === 0 && g_posYs.mainSprite.get(`shaking`) === 0) {
+            g_workObj.drunkXFlg = Math.random() < 0.5;
+            g_workObj.drunkYFlg = Math.random() < 0.5;
         }
         if (g_workObj.drunkXFlg) {
-            $id(`mainSprite`).left = `${(Math.abs((g_scoreObj.baseFrame / 2) % 100 - 50) - 25) / 1}px`;
-            $id(`infoSprite`).left = $id(`mainSprite`).left;
-            $id(`judgeSprite`).left = $id(`mainSprite`).left;
+            const deltaX = (Math.abs((g_scoreObj.baseFrame / 2) % 100 - 50) - 25) / 1;
+            addX(`mainSprite`, `shaking`, deltaX);
+            addX(`infoSprite`, `shaking`, deltaX);
+            addX(`judgeSprite`, `shaking`, deltaX);
         }
         if (g_workObj.drunkYFlg) {
-            $id(`mainSprite`).top = `${(Math.abs((g_scoreObj.baseFrame / 2) % 100 - 50) - 25) / 2}px`;
-            $id(`infoSprite`).top = $id(`mainSprite`).top;
-            $id(`judgeSprite`).top = $id(`mainSprite`).top;
+            const deltaY = (Math.abs((g_scoreObj.baseFrame / 2) % 100 - 50) - 25) / 2;
+            addY(`mainSprite`, `shaking`, deltaY);
+            addY(`infoSprite`, `shaking`, deltaY);
+            addY(`judgeSprite`, `shaking`, deltaY);
         }
-    },
+    }],
+]);
+
+/**
+ * ランダムな軸を返す補助関数
+ * @returns {string} 軸
+ */
+const g_getRandomAxis = () => {
+    const axes = [`X`, `Y`, `Z`];
+    return axes[Math.floor(Math.random() * axes.length)];
+};
+
+/**
+ * 最初に選んだ軸を除く、次の軸を返す補助関数
+ * @param {string} _primaryAxis 
+ * @returns {string} 軸
+ */
+const g_getSecondaryAxis = (_primaryAxis) => {
+    const remainingAxes = [`X`, `Y`, `Z`, undefined].filter(val => val !== _primaryAxis);
+    return remainingAxes[Math.floor(Math.random() * remainingAxes.length)];
 };
 
 /**
  * FrzReturn適用関数
  */
-const g_frzReturnFunc = {
-    'OFF': () => true,
-    'X-Axis': () => [`X`],
-    'Y-Axis': () => [`Y`],
-    'Z-Axis': () => [`Z`],
-    'Random': () => [`X`, `Y`, `Z`][Math.floor(Math.random() * 3)],
-    'XY-Axis': () => [`X`, `Y`],
-    'XZ-Axis': () => [`X`, `Z`],
-    'YZ-Axis': () => [`Y`, `Z`],
-    'Random+': () => {
-        const axis1 = [`X`, `Y`, `Z`][Math.floor(Math.random() * 3)];
-        const axis2 = [`X`, `Y`, `Z`, undefined].filter(val => val !== axis1)[Math.floor(Math.random() * 3)];
+const g_frzReturnFunc = new Map([
+    ['OFF', () => true],
+    ['X-Axis', () => [`X`]],
+    ['Y-Axis', () => [`Y`]],
+    ['Z-Axis', () => [`Z`]],
+    ['Random', () => g_getRandomAxis()],
+    ['XY-Axis', () => [`X`, `Y`]],
+    ['XZ-Axis', () => [`X`, `Z`]],
+    ['YZ-Axis', () => [`Y`, `Z`]],
+    ['Random+', () => {
+        const axis1 = g_getRandomAxis();
+        const axis2 = g_getSecondaryAxis(axis1);
         return [axis1, axis2];
-    },
-};
+    }],
+]);
 
 /**
  * Effect適用関数
@@ -1306,15 +1441,15 @@ const g_setEffect = (_arrowEffect, _frzEffect = ``, _frzArrowEffect = _arrowEffe
         }
     }
 };
-const g_effectFunc = {
-    'OFF': () => true,
-    'Dizzy': () => g_setEffect(`effects-dizzy`),
-    'Spin': () => g_setEffect(`effects-spin`),
-    'Wave': () => g_setEffect(`effects-wave`, `effects-wave`),
-    'Storm': () => g_setEffect(`effects-storm`, `effects-storm`, ``),
-    'Blinking': () => g_setEffect(`effects-blinking`, `effects-blinking`, ``),
-    'Squids': () => g_setEffect(`effects-squids-arrow`, `effects-squids-frz`),
-};
+const g_effectFunc = new Map([
+    ['OFF', () => true],
+    ['Dizzy', () => g_setEffect(`effects-dizzy`)],
+    ['Spin', () => g_setEffect(`effects-spin`)],
+    ['Wave', () => g_setEffect(`effects-wave`, `effects-wave`)],
+    ['Storm', () => g_setEffect(`effects-storm`, `effects-storm`, ``)],
+    ['Blinking', () => g_setEffect(`effects-blinking`, `effects-blinking`, ``)],
+    ['Squids', () => g_setEffect(`effects-squids-arrow`, `effects-squids-frz`)],
+]);
 
 const g_keycons = {
     configTypes: [`Main`, `Replaced`, `ALL`],
@@ -1361,12 +1496,12 @@ let g_canDisabledSettings = [`motion`, `scroll`, `reverse`, `shuffle`, `autoPlay
     `excessive`, `appearance`, `playWindow`, `stepArea`, `frzReturn`, `shaking`, `effect`, `camoufrage`,
     `swapping`, `judgRange`, `autoRetry`];
 
-const g_hidSudFunc = {
-    filterPos: _filterPos => `${_filterPos}${g_lblNameObj.percent}`,
-    range: () => `${Math.round(g_posObj.arrowHeight - g_posObj.stepY)}px`,
-    hidden: _filterPos => `${Math.min(Math.round(g_posObj.arrowHeight * (100 - _filterPos) / 100), g_posObj.arrowHeight - g_posObj.stepY)}`,
-    sudden: _filterPos => `${Math.max(Math.round(g_posObj.arrowHeight * (100 - _filterPos) / 100) - g_posObj.stepY, 0)}`,
-};
+const g_hidSudFunc = new Map([
+    ['filterPos', _filterPos => `${_filterPos}${g_lblNameObj.percent}`],
+    ['range', () => `${Math.round(g_posObj.arrowHeight - g_posObj.stepY)}px`],
+    ['hidden', _filterPos => `${Math.min(Math.round(g_posObj.arrowHeight * (100 - _filterPos) / 100), g_posObj.arrowHeight - g_posObj.stepY)}`],
+    ['sudden', _filterPos => `${Math.max(Math.round(g_posObj.arrowHeight * (100 - _filterPos) / 100) - g_posObj.stepY, 0)}`],
+]);
 
 const g_hidSudObj = {
     filterPos: 10,
@@ -1400,12 +1535,12 @@ const g_hidSudObj = {
     },
     distH: {
         'Visible': () => ``,
-        'Hidden': () => `${g_hidSudFunc.filterPos(50)} (${g_hidSudFunc.hidden(50)} / ${g_hidSudFunc.range()})`,
-        'Hidden+': (_filterPos) => `${g_hidSudFunc.filterPos(_filterPos)} (${g_hidSudFunc.hidden(_filterPos)} / ${g_hidSudFunc.range()})`,
-        'Sudden': () => `${g_hidSudFunc.filterPos(40)} (${g_hidSudFunc.sudden(40)} / ${g_hidSudFunc.range()})`,
-        'Sudden+': (_filterPos) => `${g_hidSudFunc.filterPos(_filterPos)} (${g_hidSudFunc.sudden(_filterPos)} / ${g_hidSudFunc.range()})`,
-        'Hid&Sud+': (_filterPos) => `${g_hidSudFunc.filterPos(_filterPos)} (${Math.max(g_hidSudFunc.sudden(_filterPos)
-            - (g_posObj.arrowHeight - g_posObj.stepY - g_hidSudFunc.hidden(_filterPos)), 0)} / ${g_hidSudFunc.range()})`,
+        'Hidden': () => `${g_hidSudFunc.get(`filterPos`)(50)} (${g_hidSudFunc.get(`hidden`)(50)} / ${g_hidSudFunc.get(`range`)()})`,
+        'Hidden+': (_filterPos) => `${g_hidSudFunc.get(`filterPos`)(_filterPos)} (${g_hidSudFunc.get(`hidden`)(_filterPos)} / ${g_hidSudFunc.get(`range`)()})`,
+        'Sudden': () => `${g_hidSudFunc.get(`filterPos`)(40)} (${g_hidSudFunc.get(`sudden`)(40)} / ${g_hidSudFunc.get(`range`)()})`,
+        'Sudden+': (_filterPos) => `${g_hidSudFunc.get(`filterPos`)(_filterPos)} (${g_hidSudFunc.get(`sudden`)(_filterPos)} / ${g_hidSudFunc.get(`range`)()})`,
+        'Hid&Sud+': (_filterPos) => `${g_hidSudFunc.get(`filterPos`)(_filterPos)} (${Math.max(g_hidSudFunc.get(`sudden`)(_filterPos)
+            - (g_posObj.arrowHeight - g_posObj.stepY - g_hidSudFunc.get(`hidden`)(_filterPos)), 0)} / ${g_hidSudFunc.get(`range`)()})`,
     },
 };
 

package/package.json

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