danoniplus 44.1.1 → 44.3.0

package/README.md

@@ -1,6 +1,7 @@
 # Dancing☆Onigiri (CW Edition)
 
 [![CodeQL](https://github.com/cwtickle/danoniplus/workflows/CodeQL/badge.svg)](https://github.com/cwtickle/danoniplus/actions?query=workflow%3ACodeQL)
+![CodeRabbit Pull Request Reviews](https://img.shields.io/coderabbit/prs/github/cwtickle/danoniplus?utm_source=oss&utm_medium=github&utm_campaign=cwtickle%2Fdanoniplus&labelColor=171717&color=FF570A&link=https%3A%2F%2Fcoderabbit.ai&label=CodeRabbit+Reviews)
 [![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)

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2026/02/15
+ * Revised : 2026/02/20
  *
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 44.1.1`;
-const g_revisedDate = `2026/02/15`;
+const g_version = `Ver 44.3.0`;
+const g_revisedDate = `2026/02/20`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -1895,6 +1895,8 @@ const clearWindow = (_redrawFlg = false, _customDisplayName = ``) => {
 
 	// ボタン、オブジェクトをクリア (divRoot配下のもの)
 	deleteChildspriteAll(`divRoot`);
+	divRoot.style.perspective = ``;
+	divRoot.style.perspectiveOrigin = ``;
 
 	// 拡張範囲を取得
 	const diffX = (_customDisplayName === `Main` && g_workObj.nonDefaultSc ?
@@ -6730,7 +6732,7 @@ const drawSpeedGraph = _scoreId => {
 		for (let i = 0; i < speedData?.length; i += 2) {
 			if (speedData[i] >= startFrame) {
 				frame.push(speedData[i] - startFrame);
-				speed.push(speedData[i + 1]);
+				speed.push(getSpeedFactor(speedData[i + 1]));
 				tmpSpeedPoint.push(speedData[i] - startFrame);
 			}
 			speedObj[speedType].cnt++;
@@ -8111,8 +8113,8 @@ const gaugeFormat = (_mode, _border, _rcv, _dmg, _init, _lifeValFlg) => {
 	const [rateText, allowableCntsText] = getAccuracy(borderVal, realRcv, realDmg, initVal, allCnt);
 	g_workObj.requiredAccuracy = rateText;
 
-	// 許容ミス数のみ、オンマウスで表示するためpointer-eventsを有効にする
-	return `<div id="gaugeDivCover" class="settings_gaugeDivCover">
+	// このテーブルのみpointer-eventsを有効にする（オンマウス許可）
+	return `<div id="gaugeDivCover" class="settings_gaugeDivCover" style="pointer-events: auto;">
 		<div id="lblGaugeDivTable" class="settings_gaugeDivTable">
 			<div id="lblGaugeStart" class="settings_gaugeDivTableCol settings_gaugeStart">
 				${g_lblNameObj.g_start}
@@ -8143,9 +8145,8 @@ const gaugeFormat = (_mode, _border, _rcv, _dmg, _init, _lifeValFlg) => {
 			<div id="dataGaugeDamage" class="settings_gaugeDivTableCol settings_gaugeVal settings_gaugeEtc">
 				${dmgText}
 			</div>
-			<div id="dataGaugeRate" class="settings_gaugeDivTableCol settings_gaugeVal settings_gaugeEtc" 
-				title="${allowableCntsText}" style="pointer-events: auto;">
-				${rateText}
+			<div id="dataGaugeRate" class="settings_gaugeDivTableCol settings_gaugeVal settings_gaugeEtc" style="line-height: 12px;">
+				${rateText}<br><span style="font-size: 10px;">${allowableCntsText}</span>
 			</div>
 		</div>
 	</div>
@@ -8169,7 +8170,7 @@ const getAccuracy = (_border, _rcv, _dmg, _init, _allCnt) => {
 
 	// 許容ミス数の計算
 	const allowableCnts = Math.min(_allCnt - minRecovery, _allCnt);
-	let allowableCntsText = _allCnt > 0 ? (allowableCnts >= 0 ? `${allowableCnts}miss↓` : `Impossible (${allowableCnts}miss)`) : ``;
+	let allowableCntsText = _allCnt > 0 && allowableCnts !== 0 ? (allowableCnts > 0 ? `${allowableCnts}miss↓` : `(${allowableCnts}miss)`) : ``;
 
 	if ((_rcv === 0 && _dmg === 0) || _rcv < 0 || _dmg < 0) {
 		rateText = `----`;
@@ -8393,7 +8394,7 @@ const createSettingsDisplayWindow = _sprite => {
 				const prevDisp = g_settings.displayNum[_name];
 				const [prevBarColor, prevBgColor] = [cssBarList[prevDisp], cssBgList[prevDisp]];
 
-				g_settings.displayNum[_name] = (prevDisp + _scrollNum) % (_filterFlg ? 2 : list.length);
+				g_settings.displayNum[_name] = nextPos(prevDisp, _scrollNum, _filterFlg ? 2 : list.length);
 				const nextDisp = g_settings.displayNum[_name];
 				const [nextBarColor, nextBgColor] = [cssBarList[nextDisp], cssBgList[nextDisp]];
 
@@ -8421,7 +8422,7 @@ const createSettingsDisplayWindow = _sprite => {
 			if (g_settings[`d_${_name}s`] !== undefined) {
 				displaySprite.appendChild(
 					makeSettingLblCssButton(`${linkId}R`, `>`, _heightPos, () => switchDisplay(1, false), {
-						x: 175 + 180 * _widthPos, w: 25,
+						x: 175 + 180 * _widthPos, w: 25, cxtFunc: () => switchDisplay(-1, false),
 					}, g_cssObj.button_Mini)
 				);
 			}
@@ -10215,7 +10216,7 @@ const scoreConvert = (_dosObj, _scoreId, _preblankFrame, _dummyNo = ``,
 		const dosSpeedData = getRefData(_header, `${_scoreNo}${_footer}`);
 		const speedData = [];
 
-		if (hasVal(dosSpeedData) && g_stateObj.d_speed === C_FLG_ON) {
+		if (hasVal(dosSpeedData) && g_stateObj.d_speed !== C_FLG_OFF) {
 			const tmpArrayData = splitLF(dosSpeedData);
 
 			tmpArrayData.filter(data => hasVal(data)).forEach(tmpData => {
@@ -10787,6 +10788,27 @@ const getStartFrame = (_lastFrame, _fadein = 0, _scoreId = g_stateObj.scoreId) =
 	return frameNum;
 };
 
+/**
+ * 速度補正値の算出
+ * @param {number} _speed 
+ * @returns {number}
+ */
+const getSpeedFactor = _speed => {
+	if (Math.abs(_speed) === 1) {
+		// ±1 はそのまま返して符号を保持
+		return _speed;
+	}
+	if (g_stateObj.d_speed === `Extreme`) {
+		// |speed|>1 を強めに、<1 を弱めに
+		return _speed * (Math.abs(_speed) > 1 ? 1.5 : 0.75);
+	}
+	if (g_stateObj.d_speed === `Soft`) {
+		// 変化幅を緩和（符号は維持）
+		return (1 + Math.abs(_speed)) / 2 * Math.sign(_speed);
+	}
+	return _speed;
+}
+
 /**
  * 各フレームごとの速度を格納
  * @param {object} _speedData 
@@ -10800,7 +10822,7 @@ const setSpeedOnFrame = (_speedData, _lastFrame) => {
 
 	for (let frm = 0, s = 0; frm <= _lastFrame; frm++) {
 		while (frm >= _speedData?.[s]) {
-			currentSpeed = _speedData[s + 1] * g_stateObj.speed * g_headerObj.baseSpeed * 2;
+			currentSpeed = getSpeedFactor(_speedData[s + 1]) * g_stateObj.speed * g_headerObj.baseSpeed * 2;
 			s += 2;
 		}
 		speedOnFrame[frm] = currentSpeed;
@@ -11056,6 +11078,7 @@ const pushArrows = (_dataObj, _speedOnFrame, _firstArrivalFrame) => {
 				} else {
 					_data[k] = tmpObj.frm;
 				}
+				_data[k + 1] = getSpeedFactor(_data[k + 1]);
 			}
 			for (let k = 0; k < delIdx; k++) {
 				_data.shift();
@@ -11936,6 +11959,12 @@ const mainInit = () => {
 
 	// ステップゾーン、矢印のメインスプライトを作成
 	const mainSprite = createEmptySprite(divRoot, `mainSprite`, mainCommonPos);
+	if (g_stateObj.frzReturn !== C_FLG_OFF) {
+		divRoot.style.perspective = `1400px`;
+		divRoot.style.perspectiveOrigin = `center 60%`;
+		mainSprite.style.transformOrigin = `center 55%`;
+	}
+
 	addTransform(`mainSprite`, `root`, `scale(${g_workObj.scale})`);
 	addXY(`mainSprite`, `root`, g_workObj.playingX, g_posObj.stepY - C_STEP_Y + g_headerObj.playingY);
 
@@ -13465,7 +13494,32 @@ const changeReturn = (_rad, _axis) => {
 	if (_axis[1] !== undefined) {
 		_transform += ` rotate${_axis[1]}(${_rad}deg)`;
 	}
-	if (document.getElementById(`mainSprite`) !== null) {
+	const sprite = document.getElementById(`mainSprite`);
+	if (sprite !== null) {
+		sprite.style.transformStyle = `preserve-3d`;
+		const rad360 = _rad % 360;
+
+		let isBack = false;
+
+		// 単軸回転
+		if (_axis.length === 1) {
+			const axis = _axis[0];
+			if (axis === 'Y' || axis === 'X') {
+				isBack = rad360 > 90 && rad360 < 270;
+			}
+			// Z軸は平面回転なので「裏側」は存在しない
+		}
+
+		// 2軸回転（XZ / XY / YZ）
+		if (_axis.length === 2) {
+			// 2軸回転は「どちらかの軸が裏側なら裏側」とみなす
+			const [a1, a2] = _axis;
+			const back1 = (a1 === 'Y' || a1 === 'X') && (rad360 > 90 && rad360 < 270);
+			const back2 = (a2 === 'Y' || a2 === 'X') && (rad360 > 90 && rad360 < 270);
+			isBack = back1 || back2;
+		}
+		sprite.style.opacity = isBack ? 0.7 : 1;
+
 		addTransform(`mainSprite`, `frzReturn`, _transform);
 
 		if (_rad < 360 && g_workObj.frzReturnFlg) {
@@ -14176,6 +14230,10 @@ const resultInit = () => {
 	const withOptions = (_flg, _defaultSet, _displayText = _flg) =>
 		(_flg !== _defaultSet ? getStgDetailName(_displayText) : ``);
 
+	const withDisplays = (_flg, _defaultSet, _displayText = _flg) =>
+	(_flg !== _defaultSet
+		? getStgDetailName(_displayText) + (_flg === C_FLG_OFF ? `` : ` : ${getStgDetailName(_flg)}`) : ``);
+
 	// 譜面名の組み立て処理 (Ex: 9Akey / Normal-Leftless (maker) [X-Mirror])
 	const keyUnitName = getStgDetailName(getKeyUnitName(g_keyObj.currentKey));
 	const difDatas = [
@@ -14207,34 +14265,40 @@ const resultInit = () => {
 
 	// Display設定の組み立て処理 (Ex: Step : FlatBar, Judge, Life : OFF)
 	let displayData = [
-		withOptions(g_stateObj.d_stepzone, C_FLG_ON, g_lblNameObj.rd_StepZone +
-			`${g_stateObj.d_stepzone === C_FLG_OFF ? `` : ` : ${g_stateObj.d_stepzone}`}`),
-		withOptions(g_stateObj.d_judgment, C_FLG_ON, g_lblNameObj.rd_Judgment),
-		withOptions(g_stateObj.d_fastslow, C_FLG_ON, g_lblNameObj.rd_FastSlow),
-		withOptions(g_stateObj.d_lifegauge, C_FLG_ON, g_lblNameObj.rd_LifeGauge),
-		withOptions(g_stateObj.d_score, C_FLG_ON, g_lblNameObj.rd_Score),
-		withOptions(g_stateObj.d_musicinfo, C_FLG_ON, g_lblNameObj.rd_MusicInfo),
-		withOptions(g_stateObj.d_filterline, C_FLG_ON, g_lblNameObj.rd_FilterLine),
+		withDisplays(g_stateObj.d_stepzone, C_FLG_ON, g_lblNameObj.rd_StepZone),
+		withDisplays(g_stateObj.d_judgment, C_FLG_ON, g_lblNameObj.rd_Judgment),
+		withDisplays(g_stateObj.d_fastslow, C_FLG_ON, g_lblNameObj.rd_FastSlow),
+		withDisplays(g_stateObj.d_lifegauge, C_FLG_ON, g_lblNameObj.rd_LifeGauge),
+		withDisplays(g_stateObj.d_score, C_FLG_ON, g_lblNameObj.rd_Score),
+		withDisplays(g_stateObj.d_musicinfo, C_FLG_ON, g_lblNameObj.rd_MusicInfo),
+		withDisplays(g_stateObj.d_filterline, C_FLG_ON, g_lblNameObj.rd_FilterLine),
 	].filter(value => value !== ``).join(`, `);
 	if (displayData === ``) {
 		displayData = `All Visible`;
 	} else {
-		if (!displayData.includes(`,`) && g_stateObj.d_stepzone !== C_FLG_OFF) {
-		} else {
-			displayData += ` : OFF`;
+		// 表示設定のOFF項目を末尾にまとめる
+		const displayList = displayData.split(`, `).sort((a, b) => b.includes(`:`) - a.includes(`:`));
+		displayData = displayList.join(`, `);
+		if (!displayList.at(-1).includes(`:`)) {
+			displayData += ` : ${getStgDetailName(C_FLG_OFF)}`;
 		}
 	}
 
 	let display2Data = [
-		withOptions(g_stateObj.d_speed, C_FLG_ON, g_lblNameObj.rd_Speed),
-		withOptions(g_stateObj.d_color, C_FLG_ON, g_lblNameObj.rd_Color),
-		withOptions(g_stateObj.d_lyrics, C_FLG_ON, g_lblNameObj.rd_Lyrics),
-		withOptions(g_stateObj.d_background, C_FLG_ON, g_lblNameObj.rd_Background),
-		withOptions(g_stateObj.d_arroweffect, C_FLG_ON, g_lblNameObj.rd_ArrowEffect),
-		withOptions(g_stateObj.d_special, C_FLG_ON, g_lblNameObj.rd_Special),
+		withDisplays(g_stateObj.d_speed, C_FLG_ON, g_lblNameObj.rd_Speed),
+		withDisplays(g_stateObj.d_color, C_FLG_ON, g_lblNameObj.rd_Color),
+		withDisplays(g_stateObj.d_lyrics, C_FLG_ON, g_lblNameObj.rd_Lyrics),
+		withDisplays(g_stateObj.d_background, C_FLG_ON, g_lblNameObj.rd_Background),
+		withDisplays(g_stateObj.d_arroweffect, C_FLG_ON, g_lblNameObj.rd_ArrowEffect),
+		withDisplays(g_stateObj.d_special, C_FLG_ON, g_lblNameObj.rd_Special),
 	].filter(value => value !== ``).join(`, `);
 	if (display2Data !== ``) {
-		display2Data += ` : OFF`;
+		// 表示設定のOFF項目を末尾にまとめる
+		const display2List = display2Data.split(`, `).sort((a, b) => b.includes(`:`) - a.includes(`:`));
+		display2Data = display2List.join(`, `);
+		if (!display2List.at(-1).includes(`:`)) {
+			display2Data += ` : ${getStgDetailName(C_FLG_OFF)}`;
+		}
 	}
 
 	const [lblRX, dataRX] = [20, 60];

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2026/02/15 (v44.1.1)
+ * Revised : 2026/02/18 (v44.2.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -1281,6 +1281,7 @@ const g_settings = {
 
     // Display設定の拡張リスト
     d_stepZones: [`FlatBar`],
+    d_speeds: [`Extreme`, `Soft`],
 
     displayNum: {
         stepZone: 0,
@@ -4120,6 +4121,8 @@ const g_lblNameObj = {
     'u_Easy': `Easy`,
 
     'u_FlatBar': `FlatBar`,
+    'u_Extreme': `Extreme`,
+    'u_Soft': `Soft`,
 
     'u_Visible': `Visible`,
     'u_Hidden': `Hidden`,

package/package.json

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