danoniplus 43.6.4 → 44.1.0

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2026/01/31
+ * Revised : 2026/02/08
  *
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 43.6.4`;
-const g_revisedDate = `2026/01/31`;
+const g_version = `Ver 44.1.0`;
+const g_revisedDate = `2026/02/08`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -3969,6 +3969,12 @@ const headerConvert = _dosObj => {
 		}
 	});
 
+	// 縦伸縮率の設定
+	const stretchYRate = [];
+	_dosObj.stretchYRate?.split(`$`).forEach((val, j) => {
+		stretchYRate[j] = hasVal(val) ? setVal(val, 1, C_TYP_FLOAT) : 1;
+	});
+	obj.stretchYRate = makeBaseArray(stretchYRate, obj.difLabels.length, 1);
 	// 最終演出表示有無（noneで無効化）
 	obj.finishView = _dosObj.finishView ?? ``;
 
@@ -9776,6 +9782,28 @@ const loadingScoreInit = async () => {
 	}
 	g_scoreObj = scoreConvert(g_rootObj, g_stateObj.scoreId, 0, dummyIdHeader);
 
+	// Motionオプション適用時の矢印別の速度を取得（配列形式）
+	g_workObj.motionOnFrames = setMotionOnFrame();
+	g_workObj.motionReverseFlg = g_workObj.motionOnFrames.filter(val => g_stateObj.speed + val < 0).length > 0;
+
+	// 矢印描画時間の引き伸ばし設定（個別加速がある場合かつ逆走を伴うモーションは初期倍速によりさらに引き伸ばしを行う）
+	// ただし、速度による引き伸ばし(boostFactor)の上限は描画の関係で2倍までとする
+	let maxBoost = 1;
+	for (let j = 0; j < g_scoreObj.boostData.length; j += 2) {
+		maxBoost = Math.max(maxBoost, g_scoreObj.boostData[j + 1]);
+	}
+	const boostFactor = 1 + (
+		(g_settings.motionDistRates[g_settings.motionNum] === 1 || !g_workObj.motionReverseFlg)
+			? 0
+			: (
+				g_stateObj.speed * g_headerObj.baseSpeed - g_settings.motionBoostFactorMinSpd > 0 && maxBoost > 1
+					? Math.min(maxBoost / 4, 1) : 0
+			)
+	);
+	g_scoreObj.distY = Math.max(
+		g_headerObj.stretchYRate[g_stateObj.scoreId], g_settings.motionDistRates[g_settings.motionNum] * boostFactor
+	) * g_posObj.distY;
+
 	// 最終フレーム数の取得
 	let lastFrame = getLastFrame(g_scoreObj) + g_headerObj.blankFrame;
 
@@ -9788,9 +9816,6 @@ const loadingScoreInit = async () => {
 	// フレームごとの速度を取得（配列形式）
 	let speedOnFrame = setSpeedOnFrame(g_scoreObj.speedData, lastFrame);
 
-	// Motionオプション適用時の矢印別の速度を取得（配列形式）
-	g_workObj.motionOnFrames = setMotionOnFrame();
-
 	// 最初のフレームで出現する矢印が、ステップゾーンに到達するまでのフレーム数を取得
 	const firstFrame = (g_scoreObj.frameNum === 0 ? 0 : g_scoreObj.frameNum + g_headerObj.blankFrame);
 	let arrivalFrame = getFirstArrivalFrame(firstFrame, speedOnFrame);
@@ -10838,7 +10863,7 @@ const getFountainTrace = (_frms, _spd) => {
 		_frms[j] = Math.floor((10 - (j - C_MOTION_STD_POS - 1) * diff) * factor);
 	}
 	return _frms;
-}
+};
 
 /**
  * 最初のフレームで出現する矢印が、ステップゾーンに到達するまでのフレーム数を取得
@@ -10850,7 +10875,7 @@ const getFirstArrivalFrame = (_startFrame, _speedOnFrame) => {
 	let startY = 0;
 	let frm = _startFrame;
 
-	while (g_posObj.distY - startY > 0) {
+	while (g_scoreObj.distY - startY > 0) {
 		startY += _speedOnFrame[frm];
 		frm++;
 	}
@@ -11198,7 +11223,7 @@ const getArrowStartFrame = (_frame, _speedOnFrame) => {
 		motionFrm: C_MOTION_STD_POS
 	};
 
-	while (g_posObj.distY - obj.startY > 0) {
+	while (g_scoreObj.distY - obj.startY > 0) {
 		obj.startY += _speedOnFrame[obj.frm - 1];
 
 		if (_speedOnFrame[obj.frm - 1] !== 0) {
@@ -12790,6 +12815,7 @@ const mainInit = () => {
 			currentArrow.y -= (g_workObj.currentSpeed * currentArrow.boostSpd +
 				(g_workObj.motionOnFrames[boostCnt] || 0) * currentArrow.boostDir) * currentArrow.dir;
 			$id(arrowName).top = wUnit(currentArrow.y);
+			g_motionAlphaFunc.get(g_stateObj.motion)(arrowName, currentArrow);
 			currentArrow.boostCnt--;
 		}
 		judgeMotionFunc[`${_name}${g_stateObj.autoAll}`](_j, arrowName, --currentArrow.cnt);
@@ -12940,8 +12966,10 @@ const mainInit = () => {
 
 				// 移動
 				if (g_workObj.currentSpeed !== 0) {
+					currentFrz.prevY = currentFrz.y;
 					currentFrz.y -= movY + (g_workObj.motionOnFrames[currentFrz.boostCnt] || 0) * currentFrz.dir * currentFrz.boostDir;
 					$id(frzName).top = wUnit(currentFrz.y);
+					g_motionAlphaFunc.get(g_stateObj.motion)(frzName, currentFrz);
 					currentFrz.boostCnt--;
 				}
 				currentFrz.cnt--;

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2026/01/23 (v43.6.0)
+ * Revised : 2026/02/08 (v44.1.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -1218,9 +1218,16 @@ const g_settings = {
     speedNum: 0,
     speedTerms: [20, 5, 1],
 
-    motions: [C_FLG_OFF, `Boost`, `Hi-Boost`, `Brake`, `Compress`, `Fountain`],
+    motions: [C_FLG_OFF, `Boost`, `Hi-Boost`, `Brake`, `Compress`, `Fountain`, `Magnet`],
     motionNum: 0,
 
+    // 移動距離倍率 (Compress, Fountain, Magnetのみ倍率を変更)
+    motionDistRates: [1, 1, 1, 1, 1.25, 3, 1.5],
+    // 速度が逆転するときのアルファ値 (g_motionAlphaFuncで使用)
+    motionAlpha: 0.625,
+    // 移動距離倍率の補正を行う最小の初期倍速
+    motionBoostFactorMinSpd: 5,
+
     reverses: [C_FLG_OFF, C_FLG_ON],
     reverseNum: 0,
 
@@ -1563,9 +1570,34 @@ const g_motionFunc = new Map([
     ['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)],
+    ['Fountain', _frms => getFountainTrace(_frms, g_stateObj.speed)],
+    ['Magnet', _frms => getFountainTrace(_frms, g_stateObj.speed * 2)],
+]);
+
+/**
+ * モーション適用中のアルファ値制御関数
+ * @param {object} _obj 対象オブジェクト
+ * @param {object} _property 対象オブジェクトのプロパティ情報 (g_attrObj[オブジェクト名])
+ */
+const g_motionAlphaFunc = new Map([
+    ['OFF', () => ``],
+    ['Boost', () => ``],
+    ['Hi-Boost', () => ``],
+    ['Brake', () => ``],
+    ['Compress', () => ``],
+    ['Fountain', (_obj, _property) => motionAlphaToggle(_obj, _property)],
+    ['Magnet', (_obj, _property) => motionAlphaToggle(_obj, _property)],
 ]);
 
+const motionAlphaToggle = (_obj, _property) => {
+    const dir = (_property.y - _property.prevY) * _property.dir;
+    if (($id(_obj).opacity === ``) && dir > 0) {
+        $id(_obj).opacity = g_settings.motionAlpha;
+    } else if (Number($id(_obj).opacity) === g_settings.motionAlpha && dir < 0) {
+        $id(_obj).opacity = ``;
+    }
+};
+
 /**
  * PlayWindow適用関数
  */
@@ -2722,6 +2754,8 @@ const g_keyObj = {
         `sleft`, `sdown`, `sup`, `sright`],
     chara13_0: [`tleft`, `tdown`, `tup`, `tright`,
         `left`, `down`, `up`, `right`, `space`, `sleft`, `sdown`, `sup`, `sright`],
+    chara13_1: [`left`, `down`, `up`, `right`, `space`, `sleft`, `sdown`, `sup`, `sright`,
+        `tleft`, `tdown`, `tup`, `tright`,],
     chara14_0: [`sleftdia`, `sleft`, `sdown`, `sup`, `sright`, `srightdia`,
         `oni`, `left`, `leftdia`, `down`, `space`, `up`, `rightdia`, `right`],
     chara14i_0: [`gor`, `space`, `iyo`, `left`, `down`, `up`, `right`,
@@ -2740,6 +2774,8 @@ const g_keyObj = {
     chara8_1: [`sleft`, `left`, `leftdia`, `down`, `space`, `up`, `rightdia`, `right`],
     chara9i_1: [`left`, `down`, `up`, `right`, `space`, `sleft`, `sdown`, `sup`, `sright`],
     chara9h_1: [`1x`, `ax`, `zx`, `sx`, `hx`, `yx`, `ux`, `mx`, `ix`],
+    chara11_1: [`left`, `leftdia`, `down`, `space`, `up`, `rightdia`, `right`,
+        `sleft`, `sdown`, `sup`, `sright`],
     chara17_1: [`aleft`, `adown`, `aup`, `aright`, `space`, `dleft`, `ddown`, `dup`, `dright`,
         `bleft`, `bdown`, `bup`, `bright`, `cleft`, `cdown`, `cup`, `cright`],
 
@@ -2796,6 +2832,8 @@ const g_keyObj = {
     color8_1_0: [2, 0, 1, 0, 2, 0, 1, 0],
     color9B_1_0: [0, 0, 0, 0, 2, 1, 1, 1, 1],
     color9i_1_0: [2, 2, 2, 2, 2, 0, 0, 0, 0],
+    color11_1_0: [0, 1, 0, 2, 0, 1, 0, 3, 3, 3, 3],
+    color13_1_0: [0, 0, 0, 0, 2, 3, 3, 3, 3, 4, 4, 4, 4],
     color17_1_0: [0, 0, 0, 0, 2, 4, 4, 4, 4, 1, 1, 1, 1, 3, 3, 3, 3],
 
     color5_2_0: [0, 0, 2, 0, 0],
@@ -2813,6 +2851,7 @@ const g_keyObj = {
     color17_0_1: [0, 1, 0, 1, 0, 1, 0, 1, 2, 3, 4, 3, 4, 3, 4, 3, 4],
 
     color9B_1_1: [0, 0, 1, 0, 2, 0, 0, 1, 0],
+    color13_1_1: [0, 0, 3, 0, 2, 0, 0, 3, 0, 4, 4, 3, 4],
     color17_1_1: [1, 1, 1, 1, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0],
 
     color9A_2_1: [4, 1, 3, 0, 2, 0, 3, 1, 4],
@@ -2856,6 +2895,8 @@ const g_keyObj = {
     shuffle5_1_0: [1, 0, 0, 0, 0],
     shuffle8_1_0: [2, 0, 0, 0, 1, 0, 0, 0],
     shuffle9i_1_0: [0, 0, 0, 0, 0, 1, 1, 1, 1],
+    shuffle11_1_0: [1, 1, 1, 2, 1, 1, 1, 0, 0, 0, 0],
+    shuffle13_1_0: [1, 1, 1, 1, 2, 3, 3, 3, 3, 0, 0, 0, 0],
     shuffle17_1_0: [0, 0, 0, 0, 1, 2, 2, 2, 2, 0, 0, 0, 0, 2, 2, 2, 2],
 
     shuffle5_2_0: [0, 0, 1, 0, 0],
@@ -2908,6 +2949,8 @@ const g_keyObj = {
     stepRtn5_1_0: [`onigiri`, 0, -90, 90, 180],
     stepRtn8_1_0: [`onigiri`, 0, -45, -90, `onigiri`, 90, 135, 180],
     stepRtn9i_1_0: [`monar`, `giko`, `c`, `morara`, `onigiri`, 0, -90, 90, 180],
+    stepRtn11_1_0: [0, -45, -90, `onigiri`, 90, 135, 180, 0, -90, 90, 180],
+    stepRtn13_1_0: [0, -90, 90, 180, `onigiri`, 0, -90, 90, 180, 0, -90, 90, 180],
     stepRtn17_1_0: [0, -45, -90, -135, `onigiri`, 45, 90, 135, 180,
         -22.5, -67.5, -112.5, -157.5, 22.5, 67.5, 112.5, 157.5],
 
@@ -2964,6 +3007,9 @@ const g_keyObj = {
     pos16i_0: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16],
     pos23_0: [0, 1, 2, 3, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26],
 
+    pos11_1: [0, 1, 2, 3, 4, 5, 6, 7.25, 8.25, 9.25, 10.25],
+    pos13_1: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9.25, 10.25, 11.25, 12.25],
+
     // 基本パターン (キーコンフィグ)
     // - 順番はchara, stepRtnと対応している。
     // - 多次元配列内はステップに対応するキーコードもしくはコード名を示す。カンマ区切りで複数指定できる。
@@ -3000,8 +3046,10 @@ const g_keyObj = {
     keyCtrl8_1: [[`Enter`], [`S`], [`D`], [`F`], [`Space`], [`J`], [`K`], [`L`]],
     keyCtrl9A_1: [[`S`], [`D`], [`E`, `R`], [`F`], [`Space`], [`Left`], [`Down`], [`Up`], [`Right`]],
     keyCtrl9i_1: [[`A`], [`S`], [`D`], [`F`], [`Space`], [`Left`], [`Down`], [`Up`], [`Right`]],
+    keyCtrl11_1: [[`S`], [`D`], [`F`], [`Space`], [`J`], [`K`], [`L`], [`Left`], [`Down`], [`Up`], [`Right`]],
     keyCtrl12_1: [[`Y`], [`U`, `I`], [`D8`, `D7`, `D9`], [`O`], [`Space`], [`B`], [`H`], [`N`, `M`], [`J`, `K`], [`Comma`], [`L`], [`Period`]],
     keyCtrl12i_1: [[`Q`], [`W`], [`E`], [`R`], [`T`], [`Y`], [`U`], [`I`], [`O`], [`P`], [`Ja-@`], [`Ja-[`]],
+    keyCtrl13_1: [[`S`], [`D`], [`E`, `R`], [`F`], [`Space`], [`J`], [`K`], [`I`], [`L`], [`Left`], [`Down`], [`Up`], [`Right`]],
     keyCtrl14_1: [[`R`, `T`], [`Y`], [`U`, `I`], [`D8`, `D6`, `D7`, `D9`, `D0`], [`O`], [`BracketLeft`, `P`], [`Space`], [`B`], [`H`], [`N`, `M`], [`J`, `K`], [`Comma`], [`L`], [`Period`]],
     keyCtrl17_1: [[`A`], [`S`], [`D`], [`F`], [`Space`], [`J`], [`K`], [`L`], [`;`], [`Z`], [`X`], [`C`], [`V`], [`N`], [`M`], [`Comma`], [`Period`]],
 
@@ -3045,6 +3093,9 @@ const g_keyObj = {
     blank12i_0: 50,
     blank23_0: 50,
 
+    blank11_1: 50,
+    blank13_1: 50,
+
     // 矢印群の倍率指定
     scale: 1,
     scale_def: 1,
@@ -3184,6 +3235,14 @@ const g_keyObj = {
         '---': [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
         'Flat': [1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1],
     },
+    scrollDir11_1: {
+        '---': [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
+        'Cross': [1, 1, 1, -1, -1, -1, -1, 1, 1, 1, 1],
+        'Split': [-1, -1, -1, -1, -1, -1, -1, 1, 1, 1, 1],
+        'Alternate': [1, -1, 1, -1, 1, -1, 1, -1, 1, -1, 1],
+        'Twist': [1, 1, -1, -1, -1, 1, 1, 1, -1, -1, 1],
+        'Asymmetry': [1, -1, 1, -1, -1, 1, -1, -1, 1, 1, -1],
+    },
     scrollDir11L_0: {
         '---': [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
         'Flat': [1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1],
@@ -3224,6 +3283,14 @@ const g_keyObj = {
         'Flat': [1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
         'Cross': [-1, -1, -1, -1, 1, 1, 1, 1, -1, -1, -1, -1, -1],
     },
+    scrollDir13_1: {
+        '---': [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
+        'Cross': [1, 1, 1, 1, -1, -1, -1, -1, -1, 1, 1, 1, 1],
+        'Split': [-1, -1, -1, -1, -1, -1, -1, -1, -1, 1, 1, 1, 1],
+        'Alternate': [1, -1, 1, -1, 1, -1, 1, -1, 1, -1, 1, -1, 1],
+        'Twist': [1, 1, -1, -1, -1, 1, 1, -1, -1, 1, 1, -1, -1],
+        'Asymmetry': [1, -1, -1, 1, -1, -1, 1, 1, -1, 1, -1, -1, 1],
+    },
     scrollDir14_0: {
         '---': [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
         'Flat': [1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1],
@@ -3299,10 +3366,11 @@ const g_keyObj = {
 
     minWidth5: 500,
     minWidth7i: 550,
+    minWidth11: 650,
     minWidth11i: 650,
     minWidth11j: 650,
     minWidth12i: 675,
-    minWidth13: 650,
+    minWidth13: 750,
     minWidth16i: 650,
     minWidth17: 825,
     minWidth23: 900,
@@ -3385,19 +3453,20 @@ const g_copyKeyPtn = {
     '12_4': `12i_0`,
     '12_5': `12i_1`,
 
-    '11_1': `11L_0`,
-    '11_2': `11i_0`,
-    '11_3': `12_0`,
-    '11_4': `12_1`,
-    '11_5': `12_2`,
-    '11_6': `12_3`,
+    '11_2': `11L_0`,
+    '11_3': `11i_0`,
+    '11_4': `12_0`,
+    '11_5': `12_1`,
+    '11_6': `12_2`,
+    '11_7': `12_3`,
 
     '11L_1': `11_0`,
-    '11L_2': `11_2`, // 1iiはcharaX_Yのマッピングが異なるため、11_2を流用
-    '11L_3': `12_0`,
-    '11L_4': `12_1`,
-    '11L_5': `12_2`,
-    '11L_6': `12_3`,
+    '11L_2': `11_1`,
+    '11L_3': `11_3`, // 1iiはcharaX_Yのマッピングが異なるため、11_3を流用
+    '11L_4': `12_0`,
+    '11L_5': `12_1`,
+    '11L_6': `12_2`,
+    '11L_7': `12_3`,
 
     '11W_1': `12_0`,
     '11W_2': `12_1`,

package/package.json

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