Fix custom MIDI instruments sounding incorrect; add two more microphone instrument...

* Custom instruments update

* Update the soundfont file to bank 100 and add a readme to its comments section

* Update the various instruments to use bank 100.

diff --git a/Resources/Audio/MidiCustom/space-station-14.sf2 b/Resources/Audio/MidiCustom/space-station-14.sf2
index 54c6eb619633b5df214a0c4d2556b022c2c29aef..879bb082dcef03c7cdeebd301db41c91631747eb 100644 (file)
Binary files a/Resources/Audio/MidiCustom/space-station-14.sf2 and b/Resources/Audio/MidiCustom/space-station-14.sf2 differ

diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index 2461328f1d986af702f508e18b5778c3601f1f0a..877a64b20e3456983043c5fc13c345d5a558d22a 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -1009,8 +1009,8 @@
   - type: Instrument
     allowPercussion: false
     handheld: true
-    bank: 1
     program: 2
+    bank: 100 # Defined in space-station-14.sf2
 
 - type: entity
   parent: MusicianPDA

diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_brass.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_brass.yml
index ec07fe028711160d6edd67c4d670d644fdb4cd94..f38b78711d90c170bf7cde5e20e764074e04abd7 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_brass.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_brass.yml
@@ -52,6 +52,6 @@
   components:
   - type: Instrument
     program: 3
-    bank: 1
+    bank: 100 # Defined in space-station-14.sf2
   - type: Sprite
     sprite: Objects/Fun/Instruments/euphonium.rsi

diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
index ac6f25c08b42efbdabf0a5c86fc3b87adc1e635e..c6ba706d0613da721834758ad08e09246636254d 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
@@ -131,7 +131,7 @@
   components:
   - type: Instrument
     program: 1
-    bank: 1
+    bank: 100 # Defined in space-station-14.sf2
   - type: Sprite
     sprite: Objects/Fun/Instruments/bike_horn.rsi
   - type: Tag

diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml
index 75277e5c4e07d83421bce0ce3dd5df889afdfaad..e073f40942ed0e077d1787e213882b085b0dc3a9 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml
@@ -54,7 +54,9 @@
     instrumentList:
       "Aah": {52: 0}
       "Ooh": {53: 0}
-      "Kweh": {4: 1}
+      "Kweh": {4: 100} # Defined in space-station-14.sf2
+      "Waa": {5: 100} # Defined in space-station-14.sf2
+      "Wah": {6: 100} # Defined in space-station-14.sf2
   - type: Sprite
     sprite: Objects/Fun/Instruments/microphone.rsi
   - type: Item

diff --git a/Resources/Prototypes/Entities/Objects/Fun/pai.yml b/Resources/Prototypes/Entities/Objects/Fun/pai.yml
index 2ba5acfbf18cb468b21f58b324a8d590e3def7a7..ad23694a47570e2bf37a4a4e515897a3937c073a 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Fun/pai.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/pai.yml
@@ -9,8 +9,8 @@
   - type: Instrument
     allowPercussion: false
     handheld: false
-    bank: 1
     program: 2
+    bank: 100 # Defined in space-station-14.sf2
   - type: UserInterface
     interfaces:
       enum.StoreUiKey.Key: