如改

.gitignore

@@ -21,6 +21,7 @@ RES.txt
 /MSCT_Packer.py
 /Packer/*.MPK
 /Packer/checksum.txt
+/bgArrayLib
 
 # Byte-compiled / optimized
 __pycache__/

Musicreater/__init__.py

@@ -17,8 +17,8 @@ Terms & Conditions: License.md in the root directory
 # 若需转载或借鉴 许可声明请查看仓库目录下的 License.md
 
 
-__version__ = "1.7.3"
-__vername__ = "功能结构化"
+__version__ = "1.7.4"
+__vername__ = "部分音色更新"
 __author__ = (
     ("金羿", "Eilles Wan"),
     ("诸葛亮与八卦阵", "bgArray"),

Musicreater/constants.py

@@ -225,10 +225,10 @@ MIDI_PITCHED_NOTE_NAME_TABLE: Dict[int, Tuple[str, str]] = {
     34: ("指奏电贝斯", "Electric Bass (finger)"),
     35: ("拨奏电贝斯", "Electric Bass (pick)"),
     36: ("无品贝斯", "Fretless Bass"),
-    37: ("击弦贝斯 1", "Slap Bass 1"),
-    38: ("击弦贝斯 2", "Slap Bass 2"),
-    39: ("合成贝斯 1", "Synth Bass 1"),
-    40: ("合成贝斯 2", "Synth Bass 2"),
+    37: ("击弦贝斯1", "Slap Bass 1"),
+    38: ("击弦贝斯2", "Slap Bass 2"),
+    39: ("合成贝斯1", "Synth Bass 1"),
+    40: ("合成贝斯2", "Synth Bass 2"),
     41: ("小提琴", "Violin"),
     42: ("中提琴", "Viola"),
     43: ("大提琴", "Cello"),
@@ -237,10 +237,10 @@ MIDI_PITCHED_NOTE_NAME_TABLE: Dict[int, Tuple[str, str]] = {
     46: ("弹拨弦乐（弦乐拨奏）", "Pizzicato Strings"),
     47: ("竖琴", "Orchestral Harp"),
     48: ("定音鼓", "Timpani"),
-    49: ("弦乐合奏 1", "String Ensemble 1"),
-    50: ("弦乐合奏 2", "String Ensemble 2"),
-    51: ("合成弦乐 1", "Synth Strings 1"),
-    52: ("合成弦乐 2", "Synth Strings 2"),
+    49: ("弦乐合奏1", "String Ensemble 1"),
+    50: ("弦乐合奏2", "String Ensemble 2"),
+    51: ("合成弦乐1", "Synth Strings 1"),
+    52: ("合成弦乐2", "Synth Strings 2"),
     53: ("合唱“啊”音", "Choir Aahs"),
     54: ("人声“嘟”音", "Voice Oohs"),
     55: ("合成人声", "Synth Voice"),
@@ -269,18 +269,18 @@ MIDI_PITCHED_NOTE_NAME_TABLE: Dict[int, Tuple[str, str]] = {
     78: ("尺八", "Shakuhachi"),
     79: ("哨子", "Whistle"),
     80: ("陶笛", "Ocarina"),
-    81: ("方波", "Lead 1 (square)"),
-    82: ("锯齿波", "Lead 2 (sawtooth)"),
+    81: ("合成方波", "Lead 1 (square)"),
+    82: ("锯齿波音", "Lead 2 (sawtooth)"),
     83: ("汽笛风琴", "Lead 3 (calliope)"),
     84: ("合成吹管", "Lead 4 (chiff)"),
     85: ("合成电吉他", "Lead 5 (charang)"),
     86: ("人声键盘", "Lead 6 (voice)"),
     87: ("五度音", "Lead 7 (fifths)"),
-    88: ("低音+主音", "Lead 8 (bass+lead)"),
-    89: ("新纪元", "Pad 1 (new age)"),
+    88: ("低音与主音", "Lead 8 (bass+lead)"),
+    89: ("新纪", "Pad 1 (new age)"),
     90: ("暖温", "Pad 2 (warm)"),
-    91: ("复合成音", "Pad 3 (polysynth)"),
-    92: ("人声合唱", "Pad 4 (choir)"),
+    91: ("复音", "Pad 3 (polysynth)"),
+    92: ("合声", "Pad 4 (choir)"),
     93: ("弓弦", "Pad 5 (bowed)"),
     94: ("银铃", "Pad 6 (metallic)"),
     95: ("荣光", "Pad 7 (halo)"),
@@ -335,17 +335,17 @@ MIDI_PERCUSSION_NOTE_NAME_TABLE: Dict[int, Tuple[str, str]] = {
     46: ("开镲", "Open Hi-Hat"),
     47: ("低音中桶鼓", "Low-Mid Tom"),
     48: ("高音中桶鼓", "Hi Mid Tom 2"),
-    49: ("强音钹 1", "Crash Cymbal 1"),
+    49: ("强音钹1", "Crash Cymbal 1"),
     50: ("高桶鼓", "High Tom"),
-    51: ("打点钹 1", "Ride Cymbal 1"),
-    52: ("钹", "Chinese Cymbal"),
+    51: ("打点钹1", "Ride Cymbal 1"),
+    52: ("铙钹", "Chinese Cymbal"),
     53: ("圆铃", "Ride Bell"),
     54: ("铃鼓", "Tambourine"),
     55: ("小钹铜钹", "Splash Cymbal"),
     56: ("牛铃", "Cowbell"),
-    57: ("强音钹 2", "Crash Cymbal 2"),
+    57: ("强音钹2", "Crash Cymbal 2"),
     58: ("颤音器", "Vibra-Slap"),
-    59: ("打点钹 2", "Ride Cymbal 2"),
+    59: ("打点钹2", "Ride Cymbal 2"),
     60: ("高音邦加鼓", "Hi Bongo"),
     61: ("低音邦加鼓", "Low Bongo"),
     62: ("弱音高音康加鼓", "Mute Hi Conga"),
@@ -356,7 +356,7 @@ MIDI_PERCUSSION_NOTE_NAME_TABLE: Dict[int, Tuple[str, str]] = {
     67: ("高音阿哥哥", "High Agogo"),
     68: ("低音阿哥哥", "Low Agogo"),
     69: ("串珠", "Cabasa"),
-    70: ("沙铃", "Maracas"),
+    70: ("沙槌", "Maracas"),
     71: ("短口哨", "Short Whistle"),
     72: ("长口哨", "Long Whistle"),
     73: ("短刮壶", "Short Guiro"),
@@ -610,7 +610,7 @@ MM_CLASSIC_PERCUSSION_INSTRUMENT_TABLE: Dict[int, Tuple[str, int]] = {
     67: ("note.bell", 4),
     68: ("note.hat", -1),
     69: ("note.hat", -1),
-    70: ("note.flute", 5),
+    70: ("note.snare", -1),
     71: ("note.flute", 5),
     72: ("note.hat", -1),
     73: ("note.hat", -1),
@@ -796,7 +796,7 @@ MM_TOUCH_PERCUSSION_INSTRUMENT_TABLE: Dict[int, Tuple[str, int]] = {
     67: ("note.bell", 4),
     68: ("note.hat", -1),
     69: ("note.hat", -1),
-    70: ("note.flute", 5),
+    70: ("note.snare", -1),
     71: ("note.flute", 5),
     72: ("note.hat", -1),
     73: ("note.hat", -1),

Packer/MSCT_Packer.py

@@ -42,7 +42,7 @@ import dill
 import brotli
 
 
-def enpack_llc_pack(sth, to_dist: str):
+def enpack_msct_pack(sth, to_dist: str):
     packing_bytes = brotli.compress(
         dill.dumps(
             sth,
@@ -59,12 +59,12 @@ def enpack_llc_pack(sth, to_dist: str):
 
 with open("./Packer/checksum.txt", "w", encoding="utf-8") as f:
     f.write("MSCT_MAIN:\n")
-    f.write(enpack_llc_pack(MSCT_MAIN, "./Packer/MSCT_MAIN.MPK").hexdigest())
+    f.write(enpack_msct_pack(MSCT_MAIN, "./Packer/MSCT_MAIN.MPK").hexdigest())
     f.write("\nMSCT_PLUGIN:\n")
-    f.write(enpack_llc_pack(MSCT_PLUGIN, "./Packer/MSCT_PLUGIN.MPK").hexdigest())
+    f.write(enpack_msct_pack(MSCT_PLUGIN, "./Packer/MSCT_PLUGIN.MPK").hexdigest())
     f.write("\nMSCT_PLUGIN_FUNCTION:\n")
     f.write(
-        enpack_llc_pack(
+        enpack_msct_pack(
             MSCT_PLUGIN_FUNCTION, "./Packer/MSCT_PLUGIN_FUNCTION.MPK"
         ).hexdigest()
     )