danoniplus 26.1.2 → 26.2.0

package/README.md

@@ -83,9 +83,9 @@ but the details are different from the conventional ones. See below for details.
 ## How to Contribute / 開発者の方へ 
 開発にご協力いただける方は、下記をご覧ください。GitHubアカウントの無い方でも協力できます！  
 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/blob/develop/.github/CONTRIBUTING.md)   
+- [貢献の仕方 / How to Contribute](https://github.com/cwtickle/danoniplus/blob/develop/.github/CONTRIBUTING.md)   
 - [要望・不具合報告用Gitter](https://gitter.im/danonicw/community)
-- [コントリビューター / Contributors](https://github.com/cwtickle/blob/develop/CONTRIBUTORS.md)
+- [コントリビューター / Contributors](https://github.com/cwtickle/danoniplus/blob/develop/CONTRIBUTORS.md)
 
 ## Community / コミュニティ
 - [Dancing☆Onigiri Discordサーバー](https://discord.gg/TegbHFY7zg)

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2022/02/16
+ * Revised : 2022/02/20
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 26.1.2`;
-const g_revisedDate = `2022/02/16`;
+const g_version = `Ver 26.2.0`;
+const g_revisedDate = `2022/02/20`;
 const g_alphaVersion = ``;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
@@ -241,11 +241,11 @@ const hasArrayList = (_data, _length = 1) => _data !== undefined && _data.length
 /**
  * 重複を排除した配列の生成
  * @param {array} _array1 
- * @param {array} _array2 
+ * @param {...any} _arrays 
  * @returns 
  */
-const makeDedupliArray = (_array1, _array2) =>
-	Array.from((new Set([..._array1, ..._array2])).values());
+const makeDedupliArray = (_array1, ..._arrays) =>
+	Array.from((new Set([..._array1, ..._arrays.flat()])).values());
 
 /**
  * 部分一致検索（リストのいずれかに合致、大小文字問わず）
@@ -1508,7 +1508,14 @@ function initAfterDosLoaded() {
 
 		// 譜面ヘッダー、特殊キー情報の読込
 		Object.assign(g_headerObj, headerConvert(g_rootObj));
-		keysConvert(g_rootObj);
+		if (typeof g_presetKeysData === C_TYP_STRING) {
+			keysConvert(dosConvert(g_presetKeysData));
+			g_headerObj.undefinedKeyLists = g_headerObj.undefinedKeyLists.filter(key => g_keyObj[`chara${key}_0`] === undefined);
+		}
+		g_headerObj.keyExtraList = keysConvert(g_rootObj, {
+			keyExtraList: (g_rootObj.keyExtraList !== undefined ?
+				makeDedupliArray(g_rootObj.keyExtraList.split(`,`), g_headerObj.undefinedKeyLists) : g_headerObj.undefinedKeyLists),
+		});
 
 		// キー数情報を初期化
 		g_keyObj.currentKey = g_headerObj.keyLabels[g_stateObj.scoreId];
@@ -3067,8 +3074,9 @@ function headerConvert(_dosObj) {
 		obj.lifeInits = [25];
 		obj.creatorNames = [obj.tuning];
 	}
-	const keyLists = obj.keyLabels.filter((x, j, self) => self.indexOf(x) === j);
+	const keyLists = makeDedupliArray(obj.keyLabels);
 	obj.keyLists = keyLists.sort((a, b) => parseInt(a) - parseInt(b));
+	obj.undefinedKeyLists = obj.keyLists.filter(key => g_keyObj[`chara${key}_0`] === undefined);
 
 	// 譜面変更セレクターの利用有無
 	obj.difSelectorUse = (setVal(_dosObj.difSelectorUse, obj.keyLabels.length > 5, C_TYP_BOOLEAN));
@@ -3798,12 +3806,11 @@ const getKeyName = _key => hasVal(g_keyObj[`keyName${_key}`]) ? g_keyObj[`keyNam
  * 一時的な追加キーの設定
  * @param {object} _dosObj 
  */
-function keysConvert(_dosObj) {
+function keysConvert(_dosObj, { keyExtraList = _dosObj.keyExtraList.split(`,`) } = {}) {
 
-	if (_dosObj.keyExtraList === undefined) {
-		return;
+	if (keyExtraList === undefined) {
+		return [];
 	}
-	const keyExtraList = _dosObj.keyExtraList.split(`,`);
 
 	const existParam = (_data, _paramName) => !hasVal(_data) && g_keyObj[_paramName] !== undefined;
 	const toString = _str => _str;
@@ -3996,6 +4003,8 @@ function keysConvert(_dosObj) {
 		// |assist(newKey)=Onigiri::0,0,0,0,0,1/AA::0,0,0,1,1,1$...|
 		newKeyPairParam(newKey, `assist`, `assistPos`);
 	});
+
+	return keyExtraList;
 }
 
 
@@ -4981,8 +4990,6 @@ function createOptionWindow(_sprite) {
 		// ---------------------------------------------------
 		// 1. キーコンフィグ設定 (KeyConfig)
 
-		// 特殊キーフラグ
-		g_stateObj.extraKeyFlg = false;
 
 		g_keyObj.currentKey = g_headerObj.keyLabels[g_stateObj.scoreId];
 		const isNotSameKey = (g_keyObj.prevKey !== g_keyObj.currentKey);
@@ -4990,15 +4997,8 @@ function createOptionWindow(_sprite) {
 		if (g_headerObj.dummyScoreNos !== undefined) {
 			g_stateObj.dummyId = setVal(g_headerObj.dummyScoreNos[g_stateObj.scoreId], ``, C_TYP_NUMBER);
 		}
-
-		if (g_rootObj.keyExtraList !== undefined) {
-			g_rootObj.keyExtraList.split(`,`).some(extraKey => {
-				if (g_keyObj.currentKey === extraKey) {
-					g_stateObj.extraKeyFlg = true;
-					return true;
-				}
-			});
-		}
+		// 特殊キーフラグ
+		g_stateObj.extraKeyFlg = g_headerObj.keyExtraList.includes(g_keyObj.currentKey);
 
 		// ---------------------------------------------------
 		// 2. 初期化設定
@@ -5236,8 +5236,8 @@ function createLblSetting(_settingName, _adjY = 0, _settingLabel = _settingName)
  * @param {string} _name 
  */
 function getStgDetailName(_name) {
-	return g_lblNameObj[`u_${_name}`] === undefined || typeof g_lblRenames !== C_TYP_OBJECT || !g_lblRenames[g_currentPage] ?
-		_name : g_lblNameObj[`u_${_name}`];
+	return g_lblNameObj[`u_${_name}`] !== undefined && (typeof g_lblRenames !== C_TYP_OBJECT ||
+		(typeof g_lblRenames === C_TYP_OBJECT && g_lblRenames[g_currentPage])) ? g_lblNameObj[`u_${_name}`] : _name;
 }
 
 /**

package/js/template/danoni_setting.js

@@ -1,7 +1,7 @@
 'use strict';
 /**
  * Dancing☆Onigiri 設定用jsファイル
- * Template Update: 2022/01/26 (v25.5.1)
+ * Template Update: 2022/02/20 (v26.2.0)
  * 
  * このファイルでは、作品全体に対しての初期設定を行うことができます。
  * 譜面データ側で個別に同様の項目が設定されている場合は、譜面データ側の設定が優先されます。
@@ -260,4 +260,36 @@ const g_presetStockForceDelList = {
 	word: [],
 	back: [],
 	mask: [],
-};
+};
+
+/**
+ * 特殊キー定義（共通）
+ * 指定方法は作品別に特殊キーを定義する方法と同じ（ただし、keyExtraList必須）
+ * 
+ * 定義方法は下記を参照のこと
+ * https://github.com/cwtickle/danoniplus/wiki/keys
+ * https://github.com/cwtickle/danoniplus/wiki/tips-0004-extrakeys
+ */
+/*
+const g_presetKeysData = `
+
+|keyExtraList=6,9v|
+|color6=0,1,0,1,0,2$2,0,1,0,1,0|
+|chara6=left,leftdia,down,rightdia,right,space$space,left,leftdia,down,rightdia,right|
+|div6=6$6|
+|stepRtn6=0,45,-90,135,180,onigiri$onigiri,0,45,-90,135,180|
+|keyCtrl6=75/0,79/0,76/0,80/0,187/0,32/0$32/0,75/0,79/0,76/0,80/0,187/0|
+|shuffle6=1,1,1,1,1,0$0,1,1,1,1,1|
+
+|chara9v=9B_0$9B_0|
+|color9v=1,0,1,0,2,0,1,0,1$9B_0|
+|div9v=9$9|
+|keyCtrl9v=52/0,82/0,70/0,86/0,32/0,78/0,74/0,73/0,57/0$9B_0|
+|pos9v=0,1,2,3,4,5,6,7,8$0,1,2,3,4,5,6,7,8|
+|scroll9v=---::1,1,-1,-1,-1,-1,-1,1,1/flat::1,1,1,1,1,1,1,1,1$9B_0|
+|shuffle9v=9B_0$9B_0|
+|stepRtn9v=90,120,150,180,onigiri,0,30,60,90$9B_0|
+|transKey9v=$9B|
+
+`;
+*/

package/package.json

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