diff --git a/CREDITS b/CREDITS index 14b01ce5..fcf1e75d 100644 --- a/CREDITS +++ b/CREDITS @@ -671,3 +671,9 @@ D: sprites F: z86 S: Z86 D: sprites + +F: horncomposer +N: Matt Cadirao +S: horncomposer +D: genmidi instruments + diff --git a/lumps/genmidi/config.py b/lumps/genmidi/config.py index 43c1ca07..285af82c 100644 --- a/lumps/genmidi/config.py +++ b/lumps/genmidi/config.py @@ -204,31 +204,31 @@ INSTRUMENTS = [ # specified. PERCUSSION = [ - NullInstrument, # TODO - #35 Acoustic Bass Drum - NullInstrument, # TODO - #36 Bass Drum 1 - NullInstrument, # TODO - #37 Side Stick - NullInstrument, # TODO - #38 Acoustic Snare - NullInstrument, # TODO - #39 Hand Clap - NullInstrument, # TODO - #40 Electric Snare - NullInstrument, # TODO - #41 Low Floor Tom - NullInstrument, # TODO - #42 Closed Hi Hat - NullInstrument, # TODO - #43 High Floor Tom - NullInstrument, # TODO - #44 Pedal Hi-Hat - NullInstrument, # TODO - #45 Low Tom - NullInstrument, # TODO - #46 Open Hi-Hat - NullInstrument, # TODO - #47 Low-Mid Tom - NullInstrument, # TODO - #48 Hi-Mid Tom - NullInstrument, # TODO - #49 Crash Cymbal 1 - NullInstrument, # TODO - #50 High Tom - NullInstrument, # TODO - #51 Ride Cymbal 1 - NullInstrument, # TODO - #52 Chinese Cymbal - NullInstrument, # TODO - #53 Ride Bell - NullInstrument, # TODO - #54 Tambourine + Instrument("perc35.sbi", note=On4.A), # #35 Acoustic Bass Drum + Instrument("perc36.sbi", note=On4.A), # #36 Bass Drum 1 + Instrument("perc37.sbi", note=On1.C), # #37 Side Stick + Instrument("perc38.sbi", note=On3.Gs), # #38 Acoustic Snare + Instrument("perc39.sbi", note=O3.C), # #39 Hand Clap + Instrument("perc40.sbi", note=On1.Cs), # #40 Electric Snare + Instrument("perc41.sbi", note=On3.D), # #41 Low Floor Tom + Instrument("perc42.sbi", note=O1.Gs), # #42 Closed Hi Hat + Instrument("perc43.sbi", note=On3.Gs), # #43 High Floor Tom + Instrument("perc44.sbi", note=O1.Gs), # #44 Pedal Hi-Hat + Instrument("perc45.sbi", note=On2.C), # #45 Low Tom + Instrument("perc46.sbi", note=O1.Gs), # #46 Open Hi-Hat + Instrument("perc47.sbi", note=On2.Fs), # #47 Low-Mid Tom + Instrument("perc48.sbi", note=On2.A), # #48 Hi-Mid Tom + Instrument("perc49.sbi", note=On1.C), # #49 Crash Cymbal 1 + Instrument("perc50.sbi", note=On1.Cs), # #50 High Tom + Instrument("perc51.sbi", note=On1.B), # #51 Ride Cymbal 1 + Instrument("perc52.sbi", note=On1.C), # #52 Chinese Cymbal + Instrument("perc53.sbi", note=O1.E), # #53 Ride Bell + Instrument("perc54.sbi", note=O0.E), # #54 Tambourine NullInstrument, # TODO - #55 Splash Cymbal NullInstrument, # TODO - #56 Cowbell - NullInstrument, # TODO - #57 Crash Cymbal 2 + Instrument("perc57.sbi", note=On1.As), # #57 Crash Cymbal 2 NullInstrument, # TODO - #58 Vibraslap - NullInstrument, # TODO - #59 Ride Cymbal 2 + Instrument("perc59.sbi", note=O0.E), # #59 Ride Cymbal 2 NullInstrument, # TODO - #60 Hi Bongo NullInstrument, # TODO - #61 Low Bongo NullInstrument, # TODO - #62 Mute Hi Conga diff --git a/lumps/genmidi/instruments/perc35.sbi b/lumps/genmidi/instruments/perc35.sbi new file mode 100644 index 00000000..edf0e474 Binary files /dev/null and b/lumps/genmidi/instruments/perc35.sbi differ diff --git a/lumps/genmidi/instruments/perc36.sbi b/lumps/genmidi/instruments/perc36.sbi new file mode 100644 index 00000000..83ef764f Binary files /dev/null and b/lumps/genmidi/instruments/perc36.sbi differ diff --git a/lumps/genmidi/instruments/perc37.sbi b/lumps/genmidi/instruments/perc37.sbi new file mode 100644 index 00000000..56e3d3de Binary files /dev/null and b/lumps/genmidi/instruments/perc37.sbi differ diff --git a/lumps/genmidi/instruments/perc38.sbi b/lumps/genmidi/instruments/perc38.sbi new file mode 100644 index 00000000..1d62e339 Binary files /dev/null and b/lumps/genmidi/instruments/perc38.sbi differ diff --git a/lumps/genmidi/instruments/perc39.sbi b/lumps/genmidi/instruments/perc39.sbi new file mode 100644 index 00000000..79f71e22 Binary files /dev/null and b/lumps/genmidi/instruments/perc39.sbi differ diff --git a/lumps/genmidi/instruments/perc40.sbi b/lumps/genmidi/instruments/perc40.sbi new file mode 100644 index 00000000..d89aa7ce Binary files /dev/null and b/lumps/genmidi/instruments/perc40.sbi differ diff --git a/lumps/genmidi/instruments/perc41.sbi b/lumps/genmidi/instruments/perc41.sbi new file mode 100644 index 00000000..d7f3603a Binary files /dev/null and b/lumps/genmidi/instruments/perc41.sbi differ diff --git a/lumps/genmidi/instruments/perc42.sbi b/lumps/genmidi/instruments/perc42.sbi new file mode 100644 index 00000000..39252b5a Binary files /dev/null and b/lumps/genmidi/instruments/perc42.sbi differ diff --git a/lumps/genmidi/instruments/perc43.sbi b/lumps/genmidi/instruments/perc43.sbi new file mode 100644 index 00000000..9c5bafb5 Binary files /dev/null and b/lumps/genmidi/instruments/perc43.sbi differ diff --git a/lumps/genmidi/instruments/perc44.sbi b/lumps/genmidi/instruments/perc44.sbi new file mode 100644 index 00000000..7adceb92 Binary files /dev/null and b/lumps/genmidi/instruments/perc44.sbi differ diff --git a/lumps/genmidi/instruments/perc45.sbi b/lumps/genmidi/instruments/perc45.sbi new file mode 100644 index 00000000..1bd632ff Binary files /dev/null and b/lumps/genmidi/instruments/perc45.sbi differ diff --git a/lumps/genmidi/instruments/perc46.sbi b/lumps/genmidi/instruments/perc46.sbi new file mode 100644 index 00000000..d725199d Binary files /dev/null and b/lumps/genmidi/instruments/perc46.sbi differ diff --git a/lumps/genmidi/instruments/perc47.sbi b/lumps/genmidi/instruments/perc47.sbi new file mode 100644 index 00000000..acb3aa92 Binary files /dev/null and b/lumps/genmidi/instruments/perc47.sbi differ diff --git a/lumps/genmidi/instruments/perc48.sbi b/lumps/genmidi/instruments/perc48.sbi new file mode 100644 index 00000000..954c5dea Binary files /dev/null and b/lumps/genmidi/instruments/perc48.sbi differ diff --git a/lumps/genmidi/instruments/perc49.sbi b/lumps/genmidi/instruments/perc49.sbi new file mode 100644 index 00000000..8fb6a147 Binary files /dev/null and b/lumps/genmidi/instruments/perc49.sbi differ diff --git a/lumps/genmidi/instruments/perc50.sbi b/lumps/genmidi/instruments/perc50.sbi new file mode 100644 index 00000000..6adaa151 Binary files /dev/null and b/lumps/genmidi/instruments/perc50.sbi differ diff --git a/lumps/genmidi/instruments/perc51.sbi b/lumps/genmidi/instruments/perc51.sbi new file mode 100644 index 00000000..3211a558 Binary files /dev/null and b/lumps/genmidi/instruments/perc51.sbi differ diff --git a/lumps/genmidi/instruments/perc52.sbi b/lumps/genmidi/instruments/perc52.sbi new file mode 100644 index 00000000..81944bef Binary files /dev/null and b/lumps/genmidi/instruments/perc52.sbi differ diff --git a/lumps/genmidi/instruments/perc53.sbi b/lumps/genmidi/instruments/perc53.sbi new file mode 100644 index 00000000..e9bbe07a Binary files /dev/null and b/lumps/genmidi/instruments/perc53.sbi differ diff --git a/lumps/genmidi/instruments/perc54.sbi b/lumps/genmidi/instruments/perc54.sbi new file mode 100644 index 00000000..f975b53b Binary files /dev/null and b/lumps/genmidi/instruments/perc54.sbi differ diff --git a/lumps/genmidi/instruments/perc57.sbi b/lumps/genmidi/instruments/perc57.sbi new file mode 100644 index 00000000..5ea17e57 Binary files /dev/null and b/lumps/genmidi/instruments/perc57.sbi differ diff --git a/lumps/genmidi/instruments/perc59.sbi b/lumps/genmidi/instruments/perc59.sbi new file mode 100644 index 00000000..2c13953c Binary files /dev/null and b/lumps/genmidi/instruments/perc59.sbi differ