danoniplus 29.2.0 → 29.3.1

package/README.md

@@ -7,45 +7,50 @@
 [![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)
 [![GitHub](https://img.shields.io/github/license/cwtickle/danoniplus)](https://github.com/cwtickle/danoniplus/blob/develop/LICENSE)  
 ![AboutDanOni](http://cw7.sakura.ne.jp/danoni/wiki/danonitop.png)
+ 
+*Dancing Onigiri "CW Edition"* is a rhythm game. 
+You can create original game data by combining a set of published sources with music files and sequences (text file). See the [wiki](https://github.com/cwtickle/danoniplus-docs/wiki) for details.
+
+The source released here is the **HTML5 (HTML Living Standard) version** of the rhythm game *"Dancing Onigiri"* that was previously released as Flash.
 
 Dancing☆Onigiri (CW Edition)は、ブラウザで動作するキーボードを使ったリズムゲームです。  
 公開しているソース一式と、音楽ファイル・譜面データ(テキスト)を組み合わせることで  
-オリジナルのゲームデータを作ることができます。詳細は[Wiki](https://github.com/cwtickle/danoniplus/wiki)をご覧ください。  
-*Dancing Onigiri "CW Edition"* is a rhythm game. 
-You can create original game data by combining a set of published sources with music files and sequences (text file). See the [wiki](https://github.com/cwtickle/danoniplus/wiki/Sidebar-En) for details.
+オリジナルのゲームデータを作ることができます。詳細は[Wiki](https://github.com/cwtickle/danoniplus/wiki)をご覧ください。 
 
 ここで公開しているソースは、以前Flashとして公開していたリズムゲーム  
 「Dancing☆Onigiri」の **HTML5 (HTML Living Standard)** 版です。  
 これまでのParaFla版に比べ、さまざまな機能強化を行っています。  
-The source released here is the **HTML5 (HTML Living Standard) version** of the rhythm game *"Dancing Onigiri"* that was previously released as Flash.
-Compared to the previous ParaFla version, we have made various enhancements.
 
 ## Demo
-- [Demo1](http://cw7.sakura.ne.jp/danoni/2013/0237_Cllema.html) クレマ / 木下たまき  
-- [Demo2](http://cw7.sakura.ne.jp/danoni/2017/0305_ShiningStar.html) シャイニングスター / 魔王魂  
-- [Demo3](http://cw7.sakura.ne.jp/danoni/2018/0315_PetitMagie.html) プチ・マギエ / Napi  
+- [Demo1](https://cw7.sakura.ne.jp/danoni/2013/0237_Cllema.html) クレマ / Kinoshita Tamaki  
+- [Demo2](https://cw7.sakura.ne.jp/danoni/2017/0305_ShiningStar.html) シャイニングスター / MaouDamashii 
+- [Demo3](https://cw7.sakura.ne.jp/danoni/2018/0315_PetitMagie.html) プチ・マギエ / Napi  
 
 ## How to Play / 遊び方
+This is a rhythm game, using Keyboard on the website.   
+There are many playstyles in the *Dancing Onigiri*. For example, 5keys, 7keys, 11keys, etc.  
+The details are as follows.  
+-> [How to Play](https://github.com/cwtickle/danoniplus-docs/wiki/AboutGameSystem)
+
 リズムに合わせてやってくる矢印・フリーズアローを、ステップゾーン上で押すリズムゲームです。  
 キーボードを使って遊びます。  
-This is a rhythm game, using Keyboard on the website.   
 下記は7keyの例ですが、他にも5keyや11keyなど多様なプレイスタイルがあります。  
-There are many playstyles in the *Dancing Onigiri*. For example, 5keys, 7keys, 11keys, etc.
 
-詳細は下記をご覧ください。(The details are as follows.)  
+詳細は下記をご覧ください。  
 -> [How to Play](https://github.com/cwtickle/danoniplus/wiki/AboutGameSystem)
 
 ![HowtoPlay](http://cw7.sakura.ne.jp/danoni/wiki/howtoplay1.png)  
-(画像は開発中のものです）
+(The image is under development. / 画像は開発中のものです）
 
 ### Rule / ゲームのルール
-タイミング良くキーボードを押すと(・∀・)ｲｲ!!や(ﾟ∀ﾟ)ｷﾀｰ!!となり、ライフが上がります。  
-一方、タイミングを外すと(´・ω・\`)ｼｮﾎﾞｰﾝ、(\`Д´)ｳﾜｧﾝ、(・A・)ｲｸﾅｲとなり、ライフが下がります。  
-ゲーム終了までにライフゲージのライフが残っているか、ノルマ以上であればゲームクリアです。  
 When you press the keyboard with good timing *:D Perfect!!* *:) O.K.* and life will go up.
 On the other hand, if you remove the timing *:( Bad*, *:_( Miss*, *:( N.G.* will be, life falls.
 If the life of the life gauge remains by the end of the game or it is over the quota, the game is cleared.
 
+タイミング良くキーボードを押すと(・∀・)ｲｲ!!や(ﾟ∀ﾟ)ｷﾀｰ!!となり、ライフが上がります。  
+一方、タイミングを外すと(´・ω・\`)ｼｮﾎﾞｰﾝ、(\`Д´)ｳﾜｧﾝ、(・A・)ｲｸﾅｲとなり、ライフが下がります。  
+ゲーム終了までにライフゲージのライフが残っているか、ノルマ以上であればゲームクリアです。  
+
 ## Works / 公開作品
 - [Dancing☆Onigiri 難易度表 for.js](http://dodl4.g3.xrea.com/) 
 - [多鍵データベース](http://apoi108.sakura.ne.jp/danoni/ta/index.php)
@@ -53,43 +58,43 @@ If the life of the life gauge remains by the end of the game or it is over the q
 - [Dancing☆Onigiri 作品一覧](https://cw7.sakura.ne.jp/lst/)  
 
 ## How to Make / 作り方
-- [譜面の作成概要](https://github.com/cwtickle/danoniplus/wiki/HowToMake)
-- [ParaFla!ソース利用者向け移行方法](https://github.com/cwtickle/danoniplus/wiki/forParaFlaUser)
+- [How to make chart overview](https://github.com/cwtickle/danoniplus-docs/wiki/HowtoMake) / [譜面の作成概要](https://github.com/cwtickle/danoniplus/wiki/HowtoMake)
+- [ParaFla!ソース利用者向け移行方法 (Japanese Only)](https://github.com/cwtickle/danoniplus/wiki/forParaFlaUser)
 
 ### How to Install / 導入方法
-- [Releases](https://github.com/cwtickle/danoniplus/releases)からダウンロードします。(Download from [Releases](https://github.com/cwtickle/danoniplus/releases).)
-- npmからの導入も可能です。(You can install from npm.)
+- Download from [Changelog](https://github.com/cwtickle/danoniplus-docs/wiki/Changelog-latest). You can also install from npm.
+    - [Releases](https://github.com/cwtickle/danoniplus/releases)からダウンロードします。npmからの導入も可能です。
 ```
 npm i danoniplus
 ```
-- バージョン名を直接指定するときは下記のように @以降をバージョン指定します。  
-(When directly specifying the version name, specify the version after @ as shown below.)
+- When directly specifying the version name, specify the version after @ as shown below.
+    - バージョン名を直接指定するときは下記のように @以降をバージョン指定します。
 ```
 npm i danoniplus@26.1.2
 ```
 
 ## System requirements / 動作環境
-ブラウザで動作します。(Using browser.)  
-- Google Chrome, Opera, Vivaldi (WebKit), Firefox (Gecko)※  
-※Firefoxの場合、環境により動作が安定しない場合があります。  
+- Windows, Mac OS, Linux, Android, iPad OS
+- Google Chrome, Microsoft Edge, Opera, Vivaldi, Safari (WebKit), Firefox (Gecko) 
+
+## Difference from Flash Version / Flash版との差異 (Japanese Only)
+*Dancing Onigiri "CW Edition"* basically conforms to the specifications of *ParaFla!* Version, but the details are different from the conventional ones. See below for details.
 
-## Difference from Flash Version / Flash版との差異について
 Dancing☆Onigiri (CW Edition)では基本的にParaFla!版の仕様に準拠していますが、  
 細かい点が従来と異なります。詳細は下記をご覧ください。  
-*Dancing Onigiri "CW Edition"* basically conforms to the specifications of *ParaFla!* Version,
-but the details are different from the conventional ones. See below for details.
-- [Flash版との差異](https://github.com/cwtickle/danoniplus/wiki/DifferenceFromFlashVer)  
+- [Difference from Flash Version / Flash版との差異 (Japanese)](https://github.com/cwtickle/danoniplus/wiki/DifferenceFromFlashVer)  
 
-## How to Contribute / 開発者の方へ 
-開発にご協力いただける方は、下記をご覧ください。GitHubアカウントの無い方でも協力できます！  
+## How to Contribute / 開発者の方へ  
 If you would like to cooperate with the development, please see below. Even if you don't have a GitHub account, you can cooperate!
-- [貢献の仕方 / How to Contribute](https://github.com/cwtickle/danoniplus/blob/develop/.github/CONTRIBUTING.md)   
-- [要望・不具合報告用Gitter](https://gitter.im/danonicw/community)
-- [コントリビューター / Contributors](https://github.com/cwtickle/danoniplus/blob/develop/CONTRIBUTORS.md)
+
+開発にご協力いただける方は、下記をご覧ください。GitHubアカウントの無い方でも協力できます！  
+- [How to Contribute / 貢献の仕方](https://github.com/cwtickle/danoniplus/blob/develop/.github/CONTRIBUTING.md)   
+- [Gitter for requests and bug reports / 要望・不具合報告(Gitter)](https://gitter.im/danonicw/community)
+- [Contributors / コントリビューター](https://github.com/cwtickle/danoniplus/blob/develop/CONTRIBUTORS.md)
 
 ## Community / コミュニティ
-- [Dancing☆Onigiri Discordサーバー](https://discord.gg/TegbHFY7zg)
-- [得点報告用Gitter](https://gitter.im/danonicw/freeboard)
+- [Dancing☆Onigiri Discord server](https://discord.gg/TegbHFY7zg)
+- [Gitter for score reporting / 得点報告(Gitter)](https://gitter.im/danonicw/freeboard)
 - [Twitter #danoni](https://twitter.com/search?q=%23danoni&src=typed_query&f=live)
 
 ## Related Tools Repository / 関連リポジトリ・ツール
@@ -101,7 +106,7 @@ If you would like to cooperate with the development, please see below. Even if y
 - [Dancing☆Onigiri Chart Converter](https://github.com/cwtickle/danoniplus-converter) @cwtickle
 - [ダンおにゲージ計算機 (Gauge Calculator)](http://www.omission0.com/other/gauge_calculator/) @goe0
 
-### キリズマ
+### Kirizma / キリズマ
 - [キリズマ譜面データ変換機](https://github.com/suzme/kirizma-converter) @suzme
 - [キリズマ歌詞表示作成ツール](https://github.com/prlg25/kirizma_lyric) @prlg25
 - [キリズマ難易度表](https://github.com/suzme/kirizma) @suzme

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2022/11/09
+ * Revised : 2022/12/09
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 29.2.0`;
-const g_revisedDate = `2022/11/09`;
+const g_version = `Ver 29.3.1`;
+const g_revisedDate = `2022/12/09`;
 const g_alphaVersion = ``;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
@@ -1509,7 +1509,7 @@ const drawBaseSpriteData = (_spriteData, _name, _condition = true) => {
 			baseSprite.innerHTML = _spriteData.htmlText;
 		}
 	}
-}
+};
 
 /**
  * 背景・マスクモーションの表示（タイトル・リザルト用）
@@ -2425,6 +2425,14 @@ const headerConvert = _dosObj => {
 	// ヘッダー群の格納先
 	const obj = {};
 
+	/**
+	 * ロケールを含んだヘッダーの取得
+	 * @param {object} _obj 
+	 * @param {string} _param 
+	 * @returns 
+	 */
+	const getHeader = (_obj, _param) => _obj[`${_param}${g_localeObj.val}`] ?? _obj[_param];
+
 	// フォントの設定
 	obj.customFont = _dosObj.customFont ?? ``;
 	g_headerObj.customFont = obj.customFont;
@@ -2485,7 +2493,7 @@ const headerConvert = _dosObj => {
 	obj.artistNames = [];
 	obj.musicNos = [];
 
-	const dosMusicTitle = _dosObj[`musicTitle${g_localeObj.val}`] ?? _dosObj.musicTitle;
+	const dosMusicTitle = getHeader(_dosObj, `musicTitle`);
 	if (hasVal(dosMusicTitle)) {
 		const musicData = splitLF2(dosMusicTitle);
 
@@ -2543,13 +2551,13 @@ const headerConvert = _dosObj => {
 	obj.frzAttempt = setIntVal(_dosObj.frzAttempt, C_FRM_FRZATTEMPT);
 
 	// 製作者表示
-	const dosTuning = _dosObj[`tuning${g_localeObj.val}`] ?? _dosObj.tuning;
+	const dosTuning = getHeader(_dosObj, `tuning`);
 	if (hasVal(dosTuning)) {
 		const tunings = dosTuning.split(`,`);
 		obj.tuning = escapeHtmlForEnabledTag(tunings[0]);
 		obj.creatorUrl = (tunings.length > 1 ? tunings[1] : (g_presetObj.tuningUrl ?? ``));
 	} else {
-		obj.tuning = escapeHtmlForEnabledTag(g_presetObj[`tuning${g_localeObj.val}`] ?? g_presetObj.tuning ?? `name`);
+		obj.tuning = escapeHtmlForEnabledTag(getHeader(g_presetObj, `tuning`) ?? `name`);
 		obj.creatorUrl = g_presetObj.tuningUrl ?? ``;
 	}
 	obj.tuningInit = obj.tuning;
@@ -2804,12 +2812,12 @@ const headerConvert = _dosObj => {
 	obj.readyHtml = _dosObj.readyHtml ?? ``;
 
 	// デフォルト曲名表示のフォントサイズ
-	obj.titlesize = _dosObj.titlesize ?? ``;
+	obj.titlesize = getHeader(_dosObj, `titlesize`) ?? ``;
 
 	// デフォルト曲名表示のフォント名
 	// (使用例： |titlefont=Century,Meiryo UI|)
 	obj.titlefonts = g_titleLists.defaultFonts.concat();
-	_dosObj.titlefont?.split(`$`).forEach((font, j) => obj.titlefonts[j] = `'${(font.replaceAll(`,`, `', '`))}'`);
+	getHeader(_dosObj, `titlefont`)?.split(`$`).forEach((font, j) => obj.titlefonts[j] = `'${(font.replaceAll(`,`, `', '`))}'`);
 	if (obj.titlefonts[1] === undefined) {
 		obj.titlefonts[1] = obj.titlefonts[0];
 	}
@@ -2826,7 +2834,7 @@ const headerConvert = _dosObj => {
 
 	// デフォルト曲名表示の表示位置調整
 	obj.titlepos = [[0, 0], [0, 0]];
-	_dosObj.titlepos?.split(`$`).forEach((pos, j) => obj.titlepos[j] = pos.split(`,`).map(x => parseFloat(x)));
+	getHeader(_dosObj, `titlepos`)?.split(`$`).forEach((pos, j) => obj.titlepos[j] = pos.split(`,`).map(x => parseFloat(x)));
 
 	// タイトル文字のアニメーション設定
 	obj.titleAnimationName = [`leftToRight`];
@@ -2856,7 +2864,7 @@ const headerConvert = _dosObj => {
 	}
 
 	// デフォルト曲名表示の複数行時の縦間隔
-	obj.titlelineheight = setIntVal(_dosObj.titlelineheight, ``);
+	obj.titlelineheight = setIntVal(getHeader(_dosObj, `titlelineheight`), ``);
 
 	// フリーズアローの始点で通常矢印の判定を行うか(dotさんソース方式)
 	obj.frzStartjdgUse = setBoolVal(_dosObj.frzStartjdgUse ?? g_presetObj.frzStartjdgUse);
@@ -3329,7 +3337,7 @@ const getGaugeSetting = (_dosObj, _name, _difLength, { scoreId = 0 } = {}) => {
 		const gaugeDetails = [
 			g_presetObj.gaugeCustom[_name].Border, g_presetObj.gaugeCustom[_name].Recovery,
 			g_presetObj.gaugeCustom[_name].Damage, g_presetObj.gaugeCustom[_name].Init,
-		]
+		];
 		if (gaugeUpdateFlg) {
 			gaugeCreateFlg = setGaugeDetails(scoreId, gaugeDetails);
 		} else {
@@ -3813,7 +3821,7 @@ const titleInit = _ => {
 		// ヘルプ
 		createCss2Button(`btnHelp`, `?`, _ => true,
 			Object.assign(g_lblPosObj.btnHelp, {
-				resetFunc: _ => openLink(`https://github.com/cwtickle/danoniplus/wiki/AboutGameSystem`),
+				resetFunc: _ => openLink(g_lblNameObj.helpUrl),
 			}), g_cssObj.button_Setting),
 
 		// 製作者表示
@@ -3832,7 +3840,7 @@ const titleInit = _ => {
 		// セキュリティリンク
 		createCss2Button(`lnkComparison`, `🛡`, _ => true,
 			Object.assign(g_lblPosObj.lnkComparison, {
-				resetFunc: _ => openLink(`https://github.com/cwtickle/danoniplus/security/policy`),
+				resetFunc: _ => openLink(g_lblNameObj.securityUrl),
 			}), g_cssObj.button_Tweet),
 	);
 
@@ -3958,7 +3966,7 @@ const setWindowStyle = (_text, _bkColor, _textColor, _align = C_ALIGN_LEFT) => {
 	const tmplbl = createDivCss2Label(`lblTmpWarning`, _text, {
 		x: 0, y: 70, w: g_sWidth, h: 20, siz: C_SIZ_MAIN, lineHeight: `15px`, fontFamily: getBasicFont(),
 		whiteSpace: `normal`,
-	})
+	});
 	divRoot.appendChild(tmplbl);
 	const range = new Range();
 	range.selectNode(tmplbl);
@@ -4271,7 +4279,7 @@ const createOptionWindow = _sprite => {
 		lnkDifficulty,
 		makeMiniCssButton(`lnkDifficulty`, `R`, 0, _ => nextDifficulty(), { dy: -10, dh: 10 }),
 		makeMiniCssButton(`lnkDifficulty`, `L`, 0, _ => nextDifficulty(-1), { dy: -10, dh: 10 }),
-	)
+	);
 	createScText(spriteList.difficulty, `Difficulty`);
 	if (g_headerObj.difSelectorUse) {
 		createScText(spriteList.difficulty, `DifficultyList`, { x: 147, y: -10, targetLabel: `lnkDifficulty` });
@@ -4627,7 +4635,7 @@ const createOptionWindow = _sprite => {
 					`****** ${g_lblNameObj.s_printTitle} [${g_version}] ******\r\n\r\n`
 					+ `\t${g_lblNameObj.s_printHeader}\r\n\r\n${printData}`, g_msgInfoObj.I_0003
 				);
-			}, g_lblPosObj.lnkDifInfo, g_cssObj.button_RevON),
+			}, g_lblPosObj.lnkDifInfo),
 		);
 		createScText(lnkDifInfo, `DifInfo`, { targetLabel: `lnkDifInfo`, x: -10 });
 	};
@@ -4921,7 +4929,7 @@ const createOptionWindow = _sprite => {
 		createDivCss2Label(`lblFadeinBar`, `<input id="fadeinSlider" type="range" value="${g_stateObj.fadein}" min="0" max="99" step="1">`,
 			g_lblPosObj.lblFadeinBar),
 
-	)
+	);
 
 	const fadeinSlider = document.querySelector(`#fadeinSlider`);
 	fadeinSlider.addEventListener(`input`, _ =>
@@ -5160,7 +5168,7 @@ const createGeneralSetting = (_obj, _settingName, { unitName = ``,
 				setSetting(skipTerms[0] * (-1), _settingName, unitName, roundNum);
 				addLFunc();
 			}),
-		)
+		);
 
 		// 右回し・左回しボタン（内側）
 		if (skipTerms[1] > 1) {
@@ -5626,7 +5634,7 @@ const keyConfigInit = (_kcType = g_kcType) => {
 		createDescDiv(`kcDesc`, g_lblNameObj.kcDesc.split(`{0}`).join(g_kCd[C_KEY_RETRY])
 			.split(`{1}:`).join(g_isMac ? `` : `Delete:`)),
 
-		createDescDiv(`kcShuffleDesc`, g_lblNameObj.kcShuffleDesc),
+		createDescDiv(`kcShuffleDesc`, g_headerObj.shuffleUse ? g_lblNameObj.kcShuffleDesc : g_lblNameObj.kcNoShuffleDesc),
 	);
 
 	// キーの一覧を表示
@@ -5937,7 +5945,7 @@ const keyConfigInit = (_kcType = g_kcType) => {
 			}),
 			makeMiniKCButton(`lnkImgType`, `L`, _ => setImgType(-1), { x: imgBaseX - 10, y: imgBaseY }),
 			makeMiniKCButton(`lnkImgType`, `R`, _ => setImgType(), { x: imgBaseX + g_sWidth / 6, y: imgBaseY }),
-		)
+		);
 	}
 
 	// カラー/シャッフルグループ切替ボタン（カラー/シャッフルパターンが複数ある場合のみ）
@@ -7384,14 +7392,9 @@ const getBrakeTrace = _frms => {
 const getFirstArrivalFrame = (_startFrame, _speedOnFrame, _motionOnFrame) => {
 	let startY = 0;
 	let frm = _startFrame;
-	let motionFrm = C_MOTION_STD_POS;
 
 	while (g_posObj.distY - startY > 0) {
 		startY += _speedOnFrame[frm];
-
-		if (_speedOnFrame[frm] !== 0) {
-			motionFrm++;
-		}
 		frm++;
 	}
 	return frm;
@@ -7503,7 +7506,7 @@ const pushArrows = (_dataObj, _speedOnFrame, _motionOnFrame, _firstArrivalFrame)
 			} else {
 
 				// 速度変化が間に入るときは再計算
-				if (arrowArrivalFrm < spdPrev) {
+				while (arrowArrivalFrm < spdPrev) {
 					spdk -= 2;
 					spdNext = spdPrev;
 					spdPrev = _dataObj.speedData[spdk];
@@ -7656,7 +7659,7 @@ const pushArrows = (_dataObj, _speedOnFrame, _motionOnFrame, _firstArrivalFrame)
 		}
 
 		// カットした箇所をリストから削除
-		if (getLength(_data[startNum], _type) > 0) {
+		if (getLength(_data[startNum]) > 0) {
 			_data[startNum] = _data[startNum].filter(list => getLength(list) > 0);
 		}
 
@@ -7706,9 +7709,9 @@ const getArrowStartFrame = (_frame, _speedOnFrame, _motionOnFrame) => {
 	};
 
 	while (g_posObj.distY - obj.startY > 0) {
-		obj.startY += _speedOnFrame[obj.frm];
+		obj.startY += _speedOnFrame[obj.frm - 1];
 
-		if (_speedOnFrame[obj.frm] !== 0) {
+		if (_speedOnFrame[obj.frm - 1] !== 0) {
 			obj.motionFrm++;
 		}
 		obj.frm--;
@@ -7770,7 +7773,7 @@ const convertReplaceNums = _ => {
 const pushColors = (_header, _frame, _val, _colorCd, _allFlg) => {
 
 	const tkObj = getKeyInfo();
-	const grdFlg = (g_colorType === `Type0` ? !g_headerObj.defaultColorgrd[0] : g_headerObj.defaultColorgrd[0])
+	const grdFlg = (g_colorType === `Type0` ? !g_headerObj.defaultColorgrd[0] : g_headerObj.defaultColorgrd[0]);
 	const colorCd = makeColorGradation(_colorCd, { _defaultColorgrd: [grdFlg, g_headerObj.defaultColorgrd[1]] });
 	const addAll = Number(_allFlg) * 1000;
 	const allUseTypes = [];
@@ -8789,12 +8792,13 @@ const mainInit = _ => {
 
 			if (g_workObj.judgArrowCnt[_j] === _k - 1 && _cnt <= g_judgObj.arrowJ[g_judgPosObj.shakin]) {
 				const prevArrowName = `arrow${_j}_${g_workObj.judgArrowCnt[_j]}`;
+				const prevArrow = g_attrObj[prevArrowName];
 
-				if (g_attrObj[prevArrowName].cnt < (-1) * g_judgObj.arrowJ[g_judgPosObj.ii]) {
+				if (prevArrow.cnt < (-1) * g_judgObj.arrowJ[g_judgPosObj.ii]) {
 
 					// 自身より前の矢印が未判定の場合、強制的に枠外判定を行い矢印を削除
-					if (g_attrObj[prevArrowName].cnt >= (-1) * g_judgObj.arrowJ[g_judgPosObj.uwan]) {
-						judgeUwan(g_attrObj[prevArrowName].cnt);
+					if (prevArrow.cnt >= (-1) * g_judgObj.arrowJ[g_judgPosObj.uwan]) {
+						judgeUwan(prevArrow.cnt);
 						judgeObjDelete.arrow(_j, prevArrowName);
 					}
 				}
@@ -8809,15 +8813,15 @@ const mainInit = _ => {
 
 			if (g_workObj.judgFrzCnt[_j] === _k - 1 && _cnt <= g_judgObj.frzJ[g_judgPosObj.sfsf]) {
 				const prevFrzName = `frz${_j}_${g_workObj.judgFrzCnt[_j]}`;
+				const prevFrz = g_attrObj[prevFrzName];
 
-				if (g_attrObj[prevFrzName].isMoving &&
-					g_attrObj[prevFrzName].cnt < (-1) * g_judgObj.frzJ[g_judgPosObj.kita]) {
+				if (prevFrz.isMoving && prevFrz.cnt < (-1) * g_judgObj.frzJ[g_judgPosObj.kita]) {
 
 					// 自身より前のフリーズアローが未判定の場合、強制的に枠外判定を行いフリーズアローを削除
-					if (g_attrObj[prevFrzName].cnt >= (-1) * g_judgObj.frzJ[g_judgPosObj.iknai]) {
-						judgeIknai(g_attrObj[prevFrzName].cnt);
+					if (prevFrz.cnt >= (-1) * g_judgObj.frzJ[g_judgPosObj.iknai]) {
+						judgeIknai(prevFrz.cnt);
 						if (g_headerObj.frzStartjdgUse) {
-							judgeUwan(g_attrObj[prevFrzName].cnt);
+							judgeUwan(prevFrz.cnt);
 						}
 					}
 					judgeObjDelete.frz(_j, prevFrzName);
@@ -8921,20 +8925,21 @@ const mainInit = _ => {
 	 */
 	const movArrow = (_j, _k, _name) => {
 		const arrowName = `${_name}${_j}_${_k}`;
+		const currentArrow = g_attrObj[arrowName];
 
 		// 全体色変化 (移動時)
 		changeColorFunc[_name](_j, _k);
 
 		// 移動
 		if (g_workObj.currentSpeed !== 0) {
-			const boostCnt = g_attrObj[arrowName].boostCnt;
-			g_attrObj[arrowName].prevY = g_attrObj[arrowName].y;
-			g_attrObj[arrowName].y -= (g_workObj.currentSpeed * g_attrObj[arrowName].boostSpd + g_workObj.motionOnFrames[boostCnt] * g_attrObj[arrowName].boostDir) * g_attrObj[arrowName].dir;
-			document.getElementById(arrowName).style.top = `${g_attrObj[arrowName].y}px`;
-			g_attrObj[arrowName].boostCnt--;
-		}
-		judgeMotionFunc[`${_name}${g_stateObj.autoAll}`](_j, arrowName, --g_attrObj[arrowName].cnt);
-		judgeNextFunc[`${_name}${g_stateObj.autoAll}`](_j, _k, g_attrObj[arrowName].cnt);
+			const boostCnt = currentArrow.boostCnt;
+			currentArrow.prevY = currentArrow.y;
+			currentArrow.y -= (g_workObj.currentSpeed * currentArrow.boostSpd + g_workObj.motionOnFrames[boostCnt] * currentArrow.boostDir) * currentArrow.dir;
+			document.getElementById(arrowName).style.top = `${currentArrow.y}px`;
+			currentArrow.boostCnt--;
+		}
+		judgeMotionFunc[`${_name}${g_stateObj.autoAll}`](_j, arrowName, --currentArrow.cnt);
+		judgeNextFunc[`${_name}${g_stateObj.autoAll}`](_j, _k, currentArrow.cnt);
 	};
 
 	/**
@@ -9022,24 +9027,25 @@ const mainInit = _ => {
 	const movFrzArrow = (_j, _k, _name) => {
 		const frzNo = `${_j}_${_k}`;
 		const frzName = `${_name}${frzNo}`;
-		const movY = g_workObj.currentSpeed * g_attrObj[frzName].boostSpd * g_attrObj[frzName].dir;
+		const currentFrz = g_attrObj[frzName];
+		const movY = g_workObj.currentSpeed * currentFrz.boostSpd * currentFrz.dir;
 
-		if (!g_attrObj[frzName].judgEndFlg) {
-			if (g_attrObj[frzName].isMoving) {
+		if (!currentFrz.judgEndFlg) {
+			if (currentFrz.isMoving) {
 
 				// 全体色変化 (通常時)
 				changeColorFunc[_name](_j, _k, `Normal`);
 
 				// 移動
 				if (g_workObj.currentSpeed !== 0) {
-					g_attrObj[frzName].y -= movY + g_workObj.motionOnFrames[g_attrObj[frzName].boostCnt] * g_attrObj[frzName].dir * g_attrObj[frzName].boostDir;
-					document.getElementById(frzName).style.top = `${g_attrObj[frzName].y}px`;
-					g_attrObj[frzName].boostCnt--;
+					currentFrz.y -= movY + g_workObj.motionOnFrames[currentFrz.boostCnt] * currentFrz.dir * currentFrz.boostDir;
+					document.getElementById(frzName).style.top = `${currentFrz.y}px`;
+					currentFrz.boostCnt--;
 				}
-				g_attrObj[frzName].cnt--;
+				currentFrz.cnt--;
 
 				// 次フリーズアローへ判定を移すかチェック
-				judgeNextFunc[`${_name}${g_stateObj.autoAll}`](_j, _k, g_attrObj[frzName].cnt);
+				judgeNextFunc[`${_name}${g_stateObj.autoAll}`](_j, _k, currentFrz.cnt);
 
 			} else {
 
@@ -9047,33 +9053,33 @@ const mainInit = _ => {
 				changeColorFunc[_name](_j, _k, `Hit`);
 
 				// フリーズアローがヒット中の処理
-				if (g_attrObj[frzName].frzBarLength > 0) {
+				if (currentFrz.frzBarLength > 0) {
 
-					g_attrObj[frzName].frzBarLength -= movY * g_attrObj[frzName].dir;
-					g_attrObj[frzName].barY -= movY * g_attrObj[frzName].dividePos;
-					g_attrObj[frzName].btmY -= movY;
+					currentFrz.frzBarLength -= movY * currentFrz.dir;
+					currentFrz.barY -= movY * currentFrz.dividePos;
+					currentFrz.btmY -= movY;
 
-					$id(`${_name}Bar${frzNo}`).height = `${g_attrObj[frzName].frzBarLength}px`;
-					$id(`${_name}Bar${frzNo}`).top = `${g_attrObj[frzName].barY}px`;
-					$id(`${_name}Btm${frzNo}`).top = `${g_attrObj[frzName].btmY}px`;
-					$id(`${_name}BtmShadow${frzNo}`).top = `${g_attrObj[frzName].btmY}px`;
+					$id(`${_name}Bar${frzNo}`).height = `${currentFrz.frzBarLength}px`;
+					$id(`${_name}Bar${frzNo}`).top = `${currentFrz.barY}px`;
+					$id(`${_name}Btm${frzNo}`).top = `${currentFrz.btmY}px`;
+					$id(`${_name}BtmShadow${frzNo}`).top = `${currentFrz.btmY}px`;
 
 					if (!checkKeyUpFunc[`${_name}${g_stateObj.autoAll}`](_j)) {
-						g_attrObj[frzName].keyUpFrame++;
-						judgeMotionFunc[`${_name}KeyUp`](_j, _k, frzName, g_attrObj[frzName].cnt);
+						currentFrz.keyUpFrame++;
+						judgeMotionFunc[`${_name}KeyUp`](_j, _k, frzName, currentFrz.cnt);
 					}
 				} else {
-					judgeMotionFunc[`${_name}OK`](_j, _k, frzName, g_attrObj[frzName].cnt);
+					judgeMotionFunc[`${_name}OK`](_j, _k, frzName, currentFrz.cnt);
 				}
 			}
 			// フリーズアローが枠外に出たときの処理
-			judgeMotionFunc[`${_name}NG`](_j, _k, frzName, g_attrObj[frzName].cnt);
+			judgeMotionFunc[`${_name}NG`](_j, _k, frzName, currentFrz.cnt);
 
 		} else {
-			g_attrObj[frzName].frzBarLength -= g_workObj.currentSpeed;
-			if (g_attrObj[frzName].frzBarLength > 0) {
-				g_attrObj[frzName].y -= movY;
-				document.getElementById(frzName).style.top = `${g_attrObj[frzName].y}px`;
+			currentFrz.frzBarLength -= g_workObj.currentSpeed;
+			if (currentFrz.frzBarLength > 0) {
+				currentFrz.y -= movY;
+				document.getElementById(frzName).style.top = `${currentFrz.y}px`;
 			} else {
 				judgeObjDelete[_name](_j, frzName);
 			}
@@ -9442,8 +9448,9 @@ const changeCssMotions = (_header, _name, _frameNum) => {
 const changeHitFrz = (_j, _k, _name) => {
 	const frzNo = `${_j}_${_k}`;
 	const frzName = `${_name}${frzNo}`;
+	const currentFrz = g_attrObj[frzName];
 
-	if (g_attrObj[frzName].keyUpFrame !== 0) {
+	if (currentFrz.keyUpFrame !== 0) {
 		return;
 	}
 
@@ -9453,25 +9460,22 @@ const changeHitFrz = (_j, _k, _name) => {
 	const colorPos = g_keyObj[`color${g_keyObj.currentKey}_${g_keyObj.currentPtn}`][_j];
 
 	// フリーズアロー位置の修正（ステップゾーン上に来るように）
-	const delFrzLength = parseFloat($id(`stepRoot${_j}`).top) - g_attrObj[frzName].y;
+	const delFrzLength = parseFloat($id(`stepRoot${_j}`).top) - currentFrz.y;
 	document.getElementById(frzName).style.top = $id(`stepRoot${_j}`).top;
 
 	// 早押ししたboostCnt分のフリーズアロー終端位置の修正
-	let delFrzMotionLength = 0;
-	for (let i = 0; i < g_attrObj[frzName].cnt; i++) {
-		delFrzMotionLength += g_workObj.motionOnFrames[g_attrObj[frzName].boostCnt - i];
-	}
+	const delFrzMotionLength = sumData(g_workObj.motionOnFrames.slice(0, currentFrz.boostCnt + 1));
 
-	g_attrObj[frzName].frzBarLength -= (delFrzLength + delFrzMotionLength) * g_attrObj[frzName].dir;
-	g_attrObj[frzName].barY -= (delFrzLength + delFrzMotionLength) * g_attrObj[frzName].dividePos;
-	g_attrObj[frzName].btmY -= delFrzLength + delFrzMotionLength;
-	g_attrObj[frzName].y += delFrzLength;
-	g_attrObj[frzName].isMoving = false;
+	currentFrz.frzBarLength -= (delFrzLength + delFrzMotionLength) * currentFrz.dir;
+	currentFrz.barY -= (delFrzLength + delFrzMotionLength) * currentFrz.dividePos;
+	currentFrz.btmY -= delFrzLength + delFrzMotionLength;
+	currentFrz.y += delFrzLength;
+	currentFrz.isMoving = false;
 
-	styfrzBar.top = `${g_attrObj[frzName].barY}px`;
-	styfrzBar.height = `${g_attrObj[frzName].frzBarLength}px`;
+	styfrzBar.top = `${currentFrz.barY}px`;
+	styfrzBar.height = `${currentFrz.frzBarLength}px`;
 	styfrzBar.background = g_workObj[`${_name}HitBarColors`][_j];
-	styfrzBtm.top = `${g_attrObj[frzName].btmY}px`;
+	styfrzBtm.top = `${currentFrz.btmY}px`;
 	styfrzBtm.background = g_workObj[`${_name}HitColors`][_j];
 	styfrzBtmShadow.top = styfrzBtm.top;
 	if (_name === `frz`) {
@@ -9522,10 +9526,12 @@ const judgeArrow = _j => {
 
 	const currentNo = g_workObj.judgArrowCnt[_j];
 	const arrowName = `arrow${_j}_${currentNo}`;
+	const currentArrow = g_attrObj[arrowName];
 	const existJudgArrow = document.getElementById(arrowName) !== null;
 
 	const fcurrentNo = g_workObj.judgFrzCnt[_j];
 	const frzName = `frz${_j}_${fcurrentNo}`;
+	const currentFrz = g_attrObj[frzName];
 	const existJudgFrz = document.getElementById(frzName) !== null;
 
 	const judgeTargetArrow = _difFrame => {
@@ -9536,7 +9542,7 @@ const judgeArrow = _j => {
 			displayDiff(_difFrame);
 
 			const stepDivHit = document.querySelector(`#stepHit${_j}`);
-			stepDivHit.style.top = `${g_attrObj[arrowName].prevY - parseFloat($id(`stepRoot${_j}`).top) - 15}px`;
+			stepDivHit.style.top = `${currentArrow.prevY - parseFloat($id(`stepRoot${_j}`).top) - 15}px`;
 			stepDivHit.style.opacity = 0.75;
 			stepDivHit.classList.value = ``;
 			stepDivHit.classList.add(g_cssObj[`main_step${resultJdg}`]);
@@ -9551,7 +9557,7 @@ const judgeArrow = _j => {
 
 	const judgeTargetFrzArrow = _difFrame => {
 		const _difCnt = Math.abs(_difFrame);
-		if (_difCnt <= g_judgObj.frzJ[g_judgPosObj.iknai] && !g_attrObj[frzName].judgEndFlg
+		if (_difCnt <= g_judgObj.frzJ[g_judgPosObj.iknai] && !currentFrz.judgEndFlg
 			&& g_workObj.judgFrzHitCnt[_j] <= fcurrentNo) {
 
 			if (g_headerObj.frzStartjdgUse) {
@@ -9574,8 +9580,8 @@ const judgeArrow = _j => {
 	};
 
 	let judgeFlg = false;
-	const difFrame = (existJudgArrow ? g_attrObj[arrowName].cnt : Infinity);
-	const frzDifFrame = (existJudgFrz ? g_attrObj[frzName].cnt : Infinity);
+	const difFrame = (existJudgArrow ? currentArrow.cnt : Infinity);
+	const frzDifFrame = (existJudgFrz ? currentFrz.cnt : Infinity);
 	if (difFrame < frzDifFrame) {
 		judgeFlg = judgeTargetArrow(difFrame);
 	} else if (difFrame > frzDifFrame) {

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2022/11/05 (v29.0.1)
+ * Revised : 2022/12/09 (v29.3.1)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -341,7 +341,7 @@ const g_windowAlign = {
         $id(`canvas-frame`).marginLeft = `auto`;
         $id(`canvas-frame`).marginRight = `0px`;
     },
-}
+};
 
 const g_imgObj = {};
 
@@ -422,7 +422,7 @@ const resetImgs = (_baseDir = ``, _exp = `svg`) => {
     if (g_presetObj.customImageList !== undefined) {
         g_presetObj.customImageList.forEach(image => reloadImgCustomObj(image, _baseDir, _exp));
     }
-}
+};
 
 const reloadImgObj = _ => {
     g_imgObj.arrow = C_IMG_ARROW;
@@ -642,7 +642,7 @@ const g_pointAllocation = {
     sfsf: 4,
     maxCombo: 2,
     fmaxCombo: 2,
-}
+};
 
 let C_WOD_FRAME = 30;
 
@@ -904,7 +904,7 @@ const g_posObj = {
     stepYR: 0,
     stepDiffY: 0,
     arrowHeight: 0,
-}
+};
 
 const g_diffObj = {
     arrowJdgY: 0,
@@ -2876,7 +2876,7 @@ const g_lang_msgInfoObj = {
         I_0003: `Charts information is copied to the clipboard!`,
         I_0004: `Play in silence mode because "musicUrl" is not set`,
     },
-}
+};
 
 /**
  * ショートカット表示のデフォルト値設定
@@ -3086,6 +3086,7 @@ const g_lang_lblNameObj = {
     Ja: {
         kcDesc: `[{0}:スキップ / {1}:(代替キーのみ)キー無効化]`,
         kcShuffleDesc: `番号をクリックでシャッフルグループ、矢印をクリックでカラーグループを変更`,
+        kcNoShuffleDesc: `矢印をクリックでカラーグループを変更`,
         sdDesc: `[クリックでON/OFFを切替、灰色でOFF]`,
         kcShortcutDesc: `プレイ中ショートカット：「{0}」タイトルバック / 「{1}」リトライ`,
         transKeyDesc: `別キーモードではハイスコア、キーコンフィグ等は保存されません`,
@@ -3110,10 +3111,14 @@ const g_lang_lblNameObj = {
         j_iknai: "(・A・)ｲｸﾅｲ",
 
         j_adj: `推定Adj`,
+
+        helpUrl: `https://github.com/cwtickle/danoniplus/wiki/AboutGameSystem`,
+        securityUrl: `https://github.com/cwtickle/danoniplus/security/policy`,
     },
     En: {
         kcDesc: `[{0}:Skip / {1}:Key invalidation (Alternate keys only)]`,
         kcShuffleDesc: `Click the number to change the shuffle group, and click the arrow to change the color.`,
+        kcNoShuffleDesc: `Click the arrow to change the color group.`,
         sdDesc: `[Click to switch, gray to OFF]`,
         kcShortcutDesc: `Shortcut during play: "{0}" Return to title / "{1}" Retry the game`,
         transKeyDesc: `High score, key config, etc. are not saved in another key mode`,
@@ -3138,6 +3143,9 @@ const g_lang_lblNameObj = {
         j_iknai: ":( N.G.",
 
         j_adj: `Est-Adj.`,
+
+        helpUrl: `https://github.com/cwtickle/danoniplus-docs/wiki/AboutGameSystem`,
+        securityUrl: `https://github.com/cwtickle/danoniplus-docs/wiki/SecurityPolicy`,
     },
 };
 
@@ -3610,4 +3618,4 @@ const loadLegacySettingFunc = _ => {
     if (typeof g_presetKeysData === C_TYP_STRING) {
         g_presetObj.keysData = g_presetKeysData;
     }
-}
+};

package/js/lib/danoni_legacy_function.js

@@ -291,7 +291,7 @@ function createButton(_obj, _func) {
     div.onmouseover = _ => {
         style.backgroundColor = _obj.hoverColor;
         style.cursor = `pointer`;
-    }
+    };
     const lsnrkeyTS = g_handler.addListener(div, `touchstart`, _ => {
         style.backgroundColor = _obj.hoverColor;
         style.cursor = `pointer`;
@@ -301,7 +301,7 @@ function createButton(_obj, _func) {
     div.onmouseout = _ => {
         style.backgroundColor = _obj.normalColor;
         style.cursor = `default`;
-    }
+    };
     const lsnrkeyTE = g_handler.addListener(div, `touchend`, _ => {
         style.backgroundColor = _obj.normalColor;
         style.cursor = `default`;

package/js/lib/danoni_localbinary.js

@@ -12,7 +12,7 @@
 
 function loadBinary() {
     if (location.href.match(`^file`)) {
-        C_IMG_ARROW = `data:image/svg+xml,${encodeURIComponent('<svg id="arrow" data-name="arrow" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 500 500"><defs><style>.cls-1{fill:none;stroke:#000;stroke-miterlimit:10;stroke-width:20px;}</style></defs><polygon class="cls-1" points="288.91 42.76 32.94 249.83 288.91 456.9 249.87 314.02 466.8 314.02 466.8 187.71 249.87 187.71 288.91 42.76"/></svg>')}`
+        C_IMG_ARROW = `data:image/svg+xml,${encodeURIComponent('<svg id="arrow" data-name="arrow" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 500 500"><defs><style>.cls-1{fill:none;stroke:#000;stroke-miterlimit:10;stroke-width:20px;}</style></defs><polygon class="cls-1" points="288.91 42.76 32.94 249.83 288.91 456.9 249.87 314.02 466.8 314.02 466.8 187.71 249.87 187.71 288.91 42.76"/></svg>')}`;
         C_IMG_ARROWSD = `data:image/svg+xml,${encodeURIComponent('<svg id="arrowShadow" data-name="arrowShadow" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 500 500"><defs><style>.cls-1{stroke:#000;stroke-miterlimit:10;stroke-width:30px;}</style></defs><polygon class="cls-1" points="288.91 42.76 32.94 249.83 288.91 456.9 249.87 314.02 466.8 314.02 466.8 187.71 249.87 187.71 288.91 42.76"/></svg>')}`;
         C_IMG_ONIGIRI = `data:image/svg+xml,${encodeURIComponent('<svg id="onigiri" data-name="onigiri" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 500 500"><defs><style>.cls-1{fill:none;stroke-width:12px;}.cls-1,.cls-2{stroke:#000;stroke-miterlimit:10;}.cls-2{stroke-width:10px;}</style></defs><line class="cls-1" x1="160.22" y1="238.02" x2="124.03" y2="275.84"/><line class="cls-1" x1="354.94" y1="238.9" x2="391.19" y2="277"/><polyline class="cls-1" points="190.92 262 256.82 433 322.73 262"/><line class="cls-1" x1="205.47" y1="309" x2="308.18" y2="308"/><rect class="cls-2" x="192.63" y="42" width="128.39" height="150"/><line class="cls-1" x1="181.5" y1="42" x2="59.96" y2="195"/><line class="cls-1" x1="331.29" y1="42" x2="444.27" y2="183"/><path class="cls-1" d="M66,213c-81.9,97.55-79.69,176.84,7.71,277"/><path class="cls-1" d="M422,483.88c85.52-95,87.73-172.58,7.71-270.88"/></svg>')}`;
         C_IMG_AASD = `data:image/svg+xml,${encodeURIComponent('<svg id="aaShadow" data-name="aaShadow" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 500 500"><defs><style>.cls-1{stroke:#000;stroke-miterlimit:10;}</style></defs><polygon class="cls-1" points="177.5 25.5 49.5 180.5 6.5 274.5 -0.5 347.5 13.5 416.5 82 500 410.85 499 479.85 418 500 332 480 250 438 162 333 25 177.5 25.5"/></svg>')}`;

package/js/template/danoni_setting.js

@@ -153,7 +153,7 @@ g_presetObj.customDesignUse = {
 	back: `false`,
 	backMain: `false`,
 	ready: `false`,
-}
+};
 
 /**
   デフォルト画像セットの設定

package/package.json

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