danoniplus 31.3.1 → 31.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/js/danoni_main.js +29 -12
- package/js/lib/danoni_constants.js +84 -77
- package/package.json +1 -1
package/js/danoni_main.js
CHANGED
|
@@ -4,12 +4,12 @@
|
|
|
4
4
|
*
|
|
5
5
|
* Source by tickle
|
|
6
6
|
* Created : 2018/10/08
|
|
7
|
-
* Revised : 2023/04/
|
|
7
|
+
* Revised : 2023/04/08
|
|
8
8
|
*
|
|
9
9
|
* https://github.com/cwtickle/danoniplus
|
|
10
10
|
*/
|
|
11
|
-
const g_version = `Ver 31.
|
|
12
|
-
const g_revisedDate = `2023/04/
|
|
11
|
+
const g_version = `Ver 31.4.0`;
|
|
12
|
+
const g_revisedDate = `2023/04/08`;
|
|
13
13
|
const g_alphaVersion = ``;
|
|
14
14
|
|
|
15
15
|
// カスタム用バージョン (danoni_custom.js 等で指定可)
|
|
@@ -525,7 +525,7 @@ const transCode = _setCode => {
|
|
|
525
525
|
* 特定キーをブロックする処理
|
|
526
526
|
* @param {string} _setCode
|
|
527
527
|
*/
|
|
528
|
-
const blockCode = _setCode => !C_BLOCK_KEYS.
|
|
528
|
+
const blockCode = _setCode => !C_BLOCK_KEYS.includes(_setCode);
|
|
529
529
|
|
|
530
530
|
|
|
531
531
|
/*-----------------------------------------------------------*/
|
|
@@ -2668,9 +2668,9 @@ const headerConvert = _dosObj => {
|
|
|
2668
2668
|
g_settings.speeds = [...Array((obj.maxSpeed - obj.minSpeed) * 20 + 1).keys()].map(i => obj.minSpeed + i / 20);
|
|
2669
2669
|
|
|
2670
2670
|
// プレイ中のショートカットキー
|
|
2671
|
-
obj.keyRetry = setIntVal(_dosObj.keyRetry, C_KEY_RETRY);
|
|
2671
|
+
obj.keyRetry = setIntVal(getKeyCtrlVal(_dosObj.keyRetry), C_KEY_RETRY);
|
|
2672
2672
|
obj.keyRetryDef = obj.keyRetry;
|
|
2673
|
-
obj.keyTitleBack = setIntVal(_dosObj.keyTitleBack, C_KEY_TITLEBACK);
|
|
2673
|
+
obj.keyTitleBack = setIntVal(getKeyCtrlVal(_dosObj.keyTitleBack), C_KEY_TITLEBACK);
|
|
2674
2674
|
obj.keyTitleBackDef = obj.keyTitleBack;
|
|
2675
2675
|
|
|
2676
2676
|
// フリーズアローの許容フレーム数設定
|
|
@@ -3499,6 +3499,19 @@ const getGaugeSetting = (_dosObj, _name, _difLength, { scoreId = 0 } = {}) => {
|
|
|
3499
3499
|
*/
|
|
3500
3500
|
const getKeyName = _key => hasVal(g_keyObj[`keyName${_key}`]) ? g_keyObj[`keyName${_key}`] : _key;
|
|
3501
3501
|
|
|
3502
|
+
/**
|
|
3503
|
+
* KeyBoardEvent.code の値をCW Edition用のキーコードに変換
|
|
3504
|
+
* 簡略指定ができるように、以下の記述を許容
|
|
3505
|
+
* 例) KeyD -> D, ArrowDown -> Down, AltLeft -> Alt
|
|
3506
|
+
* @param {string} _kCdN
|
|
3507
|
+
* @returns
|
|
3508
|
+
*/
|
|
3509
|
+
const getKeyCtrlVal = _kCdN => {
|
|
3510
|
+
const convVal = Object.keys(g_kCdN).findIndex(val =>
|
|
3511
|
+
[_kCdN, `Key${_kCdN}`, `Arrow${_kCdN}`].includes(g_kCdN[val]) || _kCdN === replaceStr(g_kCdN[val], g_escapeStr.keyCtrlName));
|
|
3512
|
+
return convVal !== -1 ? convVal : parseInt(_kCdN, 10);
|
|
3513
|
+
};
|
|
3514
|
+
|
|
3502
3515
|
/**
|
|
3503
3516
|
* 一時的な追加キーの設定
|
|
3504
3517
|
* @param {object} _dosObj
|
|
@@ -3517,9 +3530,9 @@ const keysConvert = (_dosObj, { keyExtraList = _dosObj.keyExtraList?.split(`,`)
|
|
|
3517
3530
|
|
|
3518
3531
|
const existParam = (_data, _paramName) => !hasVal(_data) && g_keyObj[_paramName] !== undefined;
|
|
3519
3532
|
const toString = _str => _str;
|
|
3520
|
-
const toNumber = _num => parseInt(_num, 10);
|
|
3521
3533
|
const toFloat = _num => parseFloat(_num);
|
|
3522
|
-
const toKeyCtrlArray = _str =>
|
|
3534
|
+
const toKeyCtrlArray = _str =>
|
|
3535
|
+
makeBaseArray(_str.split(`/`).map(n => getKeyCtrlVal(n)), g_keyObj.minKeyCtrlNum, 0);
|
|
3523
3536
|
const toSplitArrayStr = _str => _str.split(`/`).map(n => n);
|
|
3524
3537
|
|
|
3525
3538
|
/**
|
|
@@ -3756,10 +3769,10 @@ const keysConvert = (_dosObj, { keyExtraList = _dosObj.keyExtraList?.split(`,`)
|
|
|
3756
3769
|
newKeySingleParam(newKey, `scale`, C_TYP_FLOAT);
|
|
3757
3770
|
|
|
3758
3771
|
// プレイ中ショートカット:リトライ (keyRetryX_Y)
|
|
3759
|
-
newKeySingleParam(newKey, `keyRetry`,
|
|
3772
|
+
newKeySingleParam(newKey, `keyRetry`, C_TYP_STRING);
|
|
3760
3773
|
|
|
3761
3774
|
// プレイ中ショートカット:タイトルバック (keyTitleBackX_Y)
|
|
3762
|
-
newKeySingleParam(newKey, `keyTitleBack`,
|
|
3775
|
+
newKeySingleParam(newKey, `keyTitleBack`, C_TYP_STRING);
|
|
3763
3776
|
|
|
3764
3777
|
// 別キーフラグ (transKeyX_Y)
|
|
3765
3778
|
newKeySingleParam(newKey, `transKey`, C_TYP_STRING);
|
|
@@ -3777,6 +3790,10 @@ const keysConvert = (_dosObj, { keyExtraList = _dosObj.keyExtraList?.split(`,`)
|
|
|
3777
3790
|
// アシストパターン (assistX_Y)
|
|
3778
3791
|
// |assist(newKey)=Onigiri::0,0,0,0,0,1/AA::0,0,0,1,1,1$...|
|
|
3779
3792
|
newKeyPairParam(newKey, `assist`, `assistPos`);
|
|
3793
|
+
|
|
3794
|
+
// keyRetry, keyTitleBackのキー名をキーコードに変換
|
|
3795
|
+
const keyTypePatterns = Object.keys(g_keyObj).filter(val => val.startsWith(`keyRetry${newKey}`) || val.startsWith(`keyTitleBack${newKey}`));
|
|
3796
|
+
keyTypePatterns.forEach(name => g_keyObj[name] = getKeyCtrlVal(g_keyObj[name]));
|
|
3780
3797
|
});
|
|
3781
3798
|
|
|
3782
3799
|
return keyExtraList;
|
|
@@ -5213,10 +5230,10 @@ const createOptionWindow = _sprite => {
|
|
|
5213
5230
|
|
|
5214
5231
|
const keyCtrlPtn = `${g_keyObj.currentKey}_${g_keyObj.currentPtn}`;
|
|
5215
5232
|
if (g_headerObj.keyRetryDef === C_KEY_RETRY) {
|
|
5216
|
-
g_headerObj.keyRetry = setIntVal(g_keyObj[`keyRetry${keyCtrlPtn}`], g_headerObj.keyRetryDef);
|
|
5233
|
+
g_headerObj.keyRetry = setIntVal(getKeyCtrlVal(g_keyObj[`keyRetry${keyCtrlPtn}`]), g_headerObj.keyRetryDef);
|
|
5217
5234
|
}
|
|
5218
5235
|
if (g_headerObj.keyTitleBackDef === C_KEY_TITLEBACK) {
|
|
5219
|
-
g_headerObj.keyTitleBack = setIntVal(g_keyObj[`keyTitleBack${keyCtrlPtn}`], g_headerObj.keyTitleBackDef);
|
|
5236
|
+
g_headerObj.keyTitleBack = setIntVal(getKeyCtrlVal(g_keyObj[`keyTitleBack${keyCtrlPtn}`]), g_headerObj.keyTitleBackDef);
|
|
5220
5237
|
}
|
|
5221
5238
|
}
|
|
5222
5239
|
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
*
|
|
6
6
|
* Source by tickle
|
|
7
7
|
* Created : 2019/11/19
|
|
8
|
-
* Revised : 2023/04/
|
|
8
|
+
* Revised : 2023/04/08 (v31.4.0)
|
|
9
9
|
*
|
|
10
10
|
* https://github.com/cwtickle/danoniplus
|
|
11
11
|
*/
|
|
@@ -600,15 +600,49 @@ const g_typeLists = {
|
|
|
600
600
|
// Motionオプション配列の基準位置
|
|
601
601
|
const C_MOTION_STD_POS = 15;
|
|
602
602
|
|
|
603
|
-
// キーブロック対象(
|
|
603
|
+
// キーブロック対象(KeyBoardEvent.codeを指定)
|
|
604
604
|
const C_BLOCK_KEYS = [
|
|
605
|
-
|
|
606
|
-
|
|
607
|
-
|
|
608
|
-
|
|
609
|
-
27 /* Esc */
|
|
605
|
+
`Backspace`, `Tab`, `Enter`, `ControlLeft`, `ControlRight`, `AltLeft`, `AltRight`, `Space`,
|
|
606
|
+
`PageUp`, `PageDown`, `End`, `Home`,
|
|
607
|
+
`ArrowLeft`, `ArrowDown`, `ArrowUp`, `ArrowRight`, `Delete`,
|
|
608
|
+
`F1`, `F2`, `F3`, `F4`, `F6`, `F7`, `F8`, `F9`, `F10`, `F11`, `F12`, `F13`, `F14`, `F15`, `Escape`
|
|
610
609
|
];
|
|
611
610
|
|
|
611
|
+
/**
|
|
612
|
+
* 特殊文字列の置き換えリスト
|
|
613
|
+
* (置き換え元、置き換え先の組で二次元配列として定義。主にreplaceStr関数で使用)
|
|
614
|
+
*/
|
|
615
|
+
const g_escapeStr = {
|
|
616
|
+
escape: [[`&`, `&`], [`<`, `<`], [`>`, `>`], [`"`, `"`]],
|
|
617
|
+
escapeTag: [
|
|
618
|
+
[`*amp*`, `&`], [`*pipe*`, `|`], [`*dollar*`, `$`], [`*rsquo*`, `’`],
|
|
619
|
+
[`*quot*`, `"`], [`*comma*`, `‚`], [`*squo*`, `'`], [`*bkquo*`, ```],
|
|
620
|
+
[`*lt*`, `<`], [`*gt*`, `>`], [`*lbrace*`, `{`], [`*rbrace*`, `}`],
|
|
621
|
+
],
|
|
622
|
+
unEscapeTag: [
|
|
623
|
+
[`&`, `&`], [`’`, `’`], [`"`, `"`], [`‚`, `,`],
|
|
624
|
+
[`<`, `<`], [`>`, `>`], [`'`, `'`], [```, `\``],
|
|
625
|
+
],
|
|
626
|
+
escapeCode: [
|
|
627
|
+
[`<script>`, ``], [`</script>`, ``],
|
|
628
|
+
],
|
|
629
|
+
musicNameSimple: [
|
|
630
|
+
[`<br>`, ` `], [`<nbr>`, ``], [`<dbr>`, ` `],
|
|
631
|
+
],
|
|
632
|
+
musicNameMultiLine: [
|
|
633
|
+
[`<nbr>`, `<br>`], [`<dbr>`, `<br>`],
|
|
634
|
+
],
|
|
635
|
+
frzName: [
|
|
636
|
+
[`leftdia`, `frzLdia`], [`rightdia`, `frzRdia`],
|
|
637
|
+
[`left`, `frzLeft`], [`down`, `frzDown`], [`up`, `frzUp`], [`right`, `frzRight`],
|
|
638
|
+
[`space`, `frzSpace`], [`iyo`, `frzIyo`], [`gor`, `frzGor`], [`oni`, `foni`],
|
|
639
|
+
],
|
|
640
|
+
keyCtrlName: [
|
|
641
|
+
[`Left`, ``], [`Digit`, `D`], [`Numpad`, `N`], [`Semicolon`, `;`],
|
|
642
|
+
[`Multiply`, `*`], [`Add`, `+`], [`Subtract`, `-`], [`Decimal`, `.`], [`Divide`, `Div`],
|
|
643
|
+
],
|
|
644
|
+
};
|
|
645
|
+
|
|
612
646
|
/** 設定・オプション画面用共通 */
|
|
613
647
|
const g_graphColorObj = {
|
|
614
648
|
max: `#993333cc`,
|
|
@@ -1771,52 +1805,52 @@ const g_keyObj = {
|
|
|
1771
1805
|
|
|
1772
1806
|
// 基本パターン (キーコンフィグ)
|
|
1773
1807
|
// - 順番はchara, stepRtnと対応している。
|
|
1774
|
-
// -
|
|
1775
|
-
keyCtrl5_0: [[
|
|
1776
|
-
keyCtrl7_0: [[
|
|
1777
|
-
keyCtrl7i_0: [[
|
|
1778
|
-
keyCtrl8_0: [[
|
|
1779
|
-
keyCtrl9A_0: [[
|
|
1780
|
-
keyCtrl9B_0: [[
|
|
1781
|
-
keyCtrl9i_0: [[
|
|
1782
|
-
keyCtrl11_0: [[
|
|
1783
|
-
keyCtrl11L_0: [[
|
|
1784
|
-
keyCtrl11W_0: [[
|
|
1785
|
-
keyCtrl11i_0: [[
|
|
1786
|
-
keyCtrl12_0: [[
|
|
1787
|
-
keyCtrl13_0: [[
|
|
1788
|
-
keyCtrl14_0: [[
|
|
1789
|
-
keyCtrl14i_0: [[
|
|
1790
|
-
keyCtrl15A_0: [[
|
|
1791
|
-
keyCtrl15B_0: [[
|
|
1792
|
-
keyCtrl16i_0: [[
|
|
1793
|
-
keyCtrl17_0: [[
|
|
1794
|
-
keyCtrl23_0: [[
|
|
1795
|
-
[
|
|
1808
|
+
// - 多次元配列内はステップに対応するキーコードもしくはコード名を示す。カンマ区切りで複数指定できる。
|
|
1809
|
+
keyCtrl5_0: [[`Left`], [`Down`], [`Up`], [`Right`], [`Space`]],
|
|
1810
|
+
keyCtrl7_0: [[`S`], [`D`], [`F`], [`Space`], [`J`], [`K`], [`L`]],
|
|
1811
|
+
keyCtrl7i_0: [[`Z`], [`X`], [`C`], [`Left`], [`Down`], [`Up`], [`Right`]],
|
|
1812
|
+
keyCtrl8_0: [[`S`], [`D`], [`F`], [`Space`], [`J`], [`K`], [`L`], [`Enter`]],
|
|
1813
|
+
keyCtrl9A_0: [[`S`], [`D`], [`E`, `R`], [`F`], [`Space`], [`J`], [`K`], [`I`], [`L`]],
|
|
1814
|
+
keyCtrl9B_0: [[`A`], [`S`], [`D`], [`F`], [`Space`], [`J`], [`K`], [`L`], [`;`]],
|
|
1815
|
+
keyCtrl9i_0: [[`Left`], [`Down`], [`Up`], [`Right`], [`A`], [`S`], [`D`], [`F`], [`Space`]],
|
|
1816
|
+
keyCtrl11_0: [[`Left`], [`Down`], [`Up`], [`Right`], [`S`], [`D`], [`F`], [`Space`], [`J`], [`K`], [`L`]],
|
|
1817
|
+
keyCtrl11L_0: [[`W`], [`E`], [`D3`, `D4`], [`R`], [`S`], [`D`], [`F`], [`Space`], [`J`], [`K`], [`L`]],
|
|
1818
|
+
keyCtrl11W_0: [[`D1`, `D2`], [`T`], [`Y`], [`D0`, `Minus`], [`S`], [`D`], [`F`], [`Space`], [`J`], [`K`], [`L`]],
|
|
1819
|
+
keyCtrl11i_0: [[`S`], [`X`, `C`], [`D`], [`E`, `R`], [`F`], [`Space`], [`J`], [`M`, `Comma`], [`K`], [`I`, `O`], [`L`]],
|
|
1820
|
+
keyCtrl12_0: [[`U`], [`I`], [`D8`, `D9`], [`O`], [`Space`], [`N`], [`J`], [`M`], [`K`], [`Comma`], [`L`], [`Period`]],
|
|
1821
|
+
keyCtrl13_0: [[`Left`], [`Down`], [`Up`], [`Right`], [`S`], [`D`], [`E`, `R`], [`F`], [`Space`], [`J`], [`K`], [`I`], [`L`]],
|
|
1822
|
+
keyCtrl14_0: [[`T`, `Y`], [`U`], [`I`], [`D8`, `D7`, `D9`, `D0`], [`O`], [`BracketLeft`, `P`], [`Space`], [`N`], [`J`], [`M`], [`K`], [`Comma`], [`L`], [`Period`]],
|
|
1823
|
+
keyCtrl14i_0: [[`Z`, `W`], [`X`, `E`], [`C`, `R`], [`Left`], [`Down`], [`Up`], [`Right`], [`S`], [`D`], [`F`], [`Space`], [`J`], [`K`], [`L`]],
|
|
1824
|
+
keyCtrl15A_0: [[`W`], [`E`], [`D3`, `D4`], [`R`], [`Left`], [`Down`], [`Up`], [`Right`], [`S`], [`D`], [`F`], [`Space`], [`J`], [`K`], [`L`]],
|
|
1825
|
+
keyCtrl15B_0: [[`W`], [`E`], [`D3`, `D4`], [`R`], [`U`], [`I`], [`D8`, `D9`], [`O`], [`S`], [`D`], [`F`], [`Space`], [`J`], [`K`], [`L`]],
|
|
1826
|
+
keyCtrl16i_0: [[`Z`, `W`], [`X`, `E`], [`C`, `R`], [`Left`], [`Down`], [`Up`], [`Right`], [`A`], [`S`], [`D`], [`F`], [`Space`], [`J`], [`K`], [`L`], [`;`]],
|
|
1827
|
+
keyCtrl17_0: [[`A`], [`Z`], [`S`], [`X`], [`D`], [`C`], [`F`], [`V`], [`Space`], [`N`], [`J`], [`M`], [`K`], [`Comma`], [`L`], [`Period`], [`;`]],
|
|
1828
|
+
keyCtrl23_0: [[`W`], [`E`], [`D3`, `D4`], [`R`], [`U`], [`I`], [`D8`, `D9`], [`O`],
|
|
1829
|
+
[`Z`], [`S`], [`X`], [`D`], [`C`], [`F`], [`V`], [`Space`], [`N`], [`J`], [`M`], [`K`], [`Comma`], [`L`], [`Period`]],
|
|
1796
1830
|
|
|
1797
1831
|
// 変則パターン (キーコンフィグ)
|
|
1798
1832
|
// - _0 の数字部分をカウントアップすることで実現できる。
|
|
1799
|
-
keyCtrl5_1: [[
|
|
1800
|
-
keyCtrl7_1: [[
|
|
1801
|
-
keyCtrl8_1: [[
|
|
1802
|
-
keyCtrl9A_1: [[
|
|
1803
|
-
keyCtrl9i_1: [[
|
|
1804
|
-
keyCtrl12_1: [[
|
|
1805
|
-
keyCtrl14_1: [[
|
|
1806
|
-
keyCtrl17_1: [[
|
|
1833
|
+
keyCtrl5_1: [[`Space`], [`Left`], [`Down`], [`Up`], [`Right`]],
|
|
1834
|
+
keyCtrl7_1: [[`S`], [`E`], [`F`], [`Space`, `G`, `H`], [`J`], [`I`], [`L`]],
|
|
1835
|
+
keyCtrl8_1: [[`Enter`], [`S`], [`D`], [`F`], [`Space`], [`J`], [`K`], [`L`]],
|
|
1836
|
+
keyCtrl9A_1: [[`S`], [`D`], [`E`, `R`], [`F`], [`Space`], [`Left`], [`Down`], [`Up`], [`Right`]],
|
|
1837
|
+
keyCtrl9i_1: [[`A`], [`S`], [`D`], [`F`], [`Space`], [`Left`], [`Down`], [`Up`], [`Right`]],
|
|
1838
|
+
keyCtrl12_1: [[`Y`], [`U`, `I`], [`D8`, `D7`, `D9`], [`O`], [`Space`], [`B`], [`H`], [`N`, `M`], [`J`, `K`], [`Comma`], [`L`], [`Period`]],
|
|
1839
|
+
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`]],
|
|
1840
|
+
keyCtrl17_1: [[`A`], [`S`], [`D`], [`F`], [`Space`], [`J`], [`K`], [`L`], [`;`], [`Z`], [`X`], [`C`], [`V`], [`N`], [`M`], [`Comma`], [`Period`]],
|
|
1807
1841
|
|
|
1808
|
-
keyCtrl5_2: [[
|
|
1809
|
-
keyCtrl8_2: [[
|
|
1810
|
-
keyCtrl12_2: [[
|
|
1811
|
-
keyCtrl14_2: [[
|
|
1842
|
+
keyCtrl5_2: [[`D`], [`F`], [`Space`], [`J`], [`K`]],
|
|
1843
|
+
keyCtrl8_2: [[`Space`], [`N`], [`J`], [`M`], [`K`], [`Comma`], [`L`], [`Period`]],
|
|
1844
|
+
keyCtrl12_2: [[`W`], [`E`], [`D3`, `D4`], [`R`], [`Shift`], [`Z`], [`S`], [`X`], [`D`], [`C`], [`F`], [`V`]],
|
|
1845
|
+
keyCtrl14_2: [[`Tab`, `Q`], [`W`], [`E`], [`D3`, `D2`, `D4`, `D5`], [`R`], [`Y`, `T`], [`Shift`], [`Z`], [`S`], [`X`], [`D`], [`C`], [`F`], [`V`]],
|
|
1812
1846
|
|
|
1813
|
-
keyCtrl8_3: [[
|
|
1814
|
-
keyCtrl12_3: [[
|
|
1815
|
-
keyCtrl14_3: [[
|
|
1847
|
+
keyCtrl8_3: [[`Space`], [`B`], [`H`], [`N`, `M`], [`J`, `K`], [`Comma`], [`L`], [`Period`]],
|
|
1848
|
+
keyCtrl12_3: [[`W`], [`E`, `R`], [`D3`, `D4`, `D5`], [`T`], [`Shift`], [`Z`], [`S`], [`X`, `C`], [`D`, `F`], [`V`], [`G`], [`B`]],
|
|
1849
|
+
keyCtrl14_3: [[`Tab`, `Q`], [`W`], [`E`, `R`], [`D3`, `D2`, `D4`, `D5`, `D6`], [`T`], [`U`, `Y`], [`Shift`], [`Z`], [`S`], [`X`, `C`], [`D`, `F`], [`V`], [`G`], [`B`]],
|
|
1816
1850
|
|
|
1817
|
-
keyCtrl8_4: [[
|
|
1851
|
+
keyCtrl8_4: [[`Shift`], [`Z`], [`S`], [`X`], [`D`], [`C`], [`F`], [`V`]],
|
|
1818
1852
|
|
|
1819
|
-
keyCtrl8_5: [[
|
|
1853
|
+
keyCtrl8_5: [[`Shift`], [`Z`], [`S`], [`X`, `C`], [`D`, `F`], [`V`], [`G`], [`B`]],
|
|
1820
1854
|
|
|
1821
1855
|
// 矢印間隔補正
|
|
1822
1856
|
blank: 55,
|
|
@@ -2119,6 +2153,10 @@ Object.keys(g_keyObj).filter(val => val.startsWith(`chara`) &&
|
|
|
2119
2153
|
setKeyDfVal(charaPtn.slice(`chara`.length));
|
|
2120
2154
|
});
|
|
2121
2155
|
|
|
2156
|
+
// キー名をキーコードに変換
|
|
2157
|
+
Object.keys(g_keyObj).filter(val => val.startsWith(`keyCtrl`)).forEach(property =>
|
|
2158
|
+
g_keyObj[property].forEach((list, j) => g_keyObj[property][j] = list.map(valN => getKeyCtrlVal(valN))));
|
|
2159
|
+
|
|
2122
2160
|
// キーパターンのコピー処理
|
|
2123
2161
|
// ただし、すでに定義済みの場合は定義済みのものを優先する
|
|
2124
2162
|
Object.keys(g_copyKeyPtn).forEach(keyPtnTo => {
|
|
@@ -2337,37 +2375,6 @@ const g_dfColorBaseObj = {
|
|
|
2337
2375
|
},
|
|
2338
2376
|
};
|
|
2339
2377
|
|
|
2340
|
-
/**
|
|
2341
|
-
* 特殊文字列の置き換えリスト
|
|
2342
|
-
* (置き換え元、置き換え先の組で二次元配列として定義。主にreplaceStr関数で使用)
|
|
2343
|
-
*/
|
|
2344
|
-
const g_escapeStr = {
|
|
2345
|
-
escape: [[`&`, `&`], [`<`, `<`], [`>`, `>`], [`"`, `"`]],
|
|
2346
|
-
escapeTag: [
|
|
2347
|
-
[`*amp*`, `&`], [`*pipe*`, `|`], [`*dollar*`, `$`], [`*rsquo*`, `’`],
|
|
2348
|
-
[`*quot*`, `"`], [`*comma*`, `‚`], [`*squo*`, `'`], [`*bkquo*`, ```],
|
|
2349
|
-
[`*lt*`, `<`], [`*gt*`, `>`], [`*lbrace*`, `{`], [`*rbrace*`, `}`],
|
|
2350
|
-
],
|
|
2351
|
-
unEscapeTag: [
|
|
2352
|
-
[`&`, `&`], [`’`, `’`], [`"`, `"`], [`‚`, `,`],
|
|
2353
|
-
[`<`, `<`], [`>`, `>`], [`'`, `'`], [```, `\``],
|
|
2354
|
-
],
|
|
2355
|
-
escapeCode: [
|
|
2356
|
-
[`<script>`, ``], [`</script>`, ``],
|
|
2357
|
-
],
|
|
2358
|
-
musicNameSimple: [
|
|
2359
|
-
[`<br>`, ` `], [`<nbr>`, ``], [`<dbr>`, ` `],
|
|
2360
|
-
],
|
|
2361
|
-
musicNameMultiLine: [
|
|
2362
|
-
[`<nbr>`, `<br>`], [`<dbr>`, `<br>`],
|
|
2363
|
-
],
|
|
2364
|
-
frzName: [
|
|
2365
|
-
[`leftdia`, `frzLdia`], [`rightdia`, `frzRdia`],
|
|
2366
|
-
[`left`, `frzLeft`], [`down`, `frzDown`], [`up`, `frzUp`], [`right`, `frzRight`],
|
|
2367
|
-
[`space`, `frzSpace`], [`iyo`, `frzIyo`], [`gor`, `frzGor`], [`oni`, `foni`],
|
|
2368
|
-
],
|
|
2369
|
-
};
|
|
2370
|
-
|
|
2371
2378
|
/**
|
|
2372
2379
|
* 文字列部分一致用リスト
|
|
2373
2380
|
*/
|