From 507931694e01afe2241564681e1d0335309de3ac Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Wed, 4 Jan 2012 04:15:37 +0000 Subject: [PATCH] genmidi: Add some missing percussion instruments. This adds a good number of the missing percussion instruments. These come from a dump of Matt Cadirao (horncomposer)'s modified version of the old GENMIDI lump. --- CREDITS | 6 ++++ lumps/genmidi/config.py | 44 +++++++++++++-------------- lumps/genmidi/instruments/perc35.sbi | Bin 0 -> 52 bytes lumps/genmidi/instruments/perc36.sbi | Bin 0 -> 52 bytes lumps/genmidi/instruments/perc37.sbi | Bin 0 -> 52 bytes lumps/genmidi/instruments/perc38.sbi | Bin 0 -> 52 bytes lumps/genmidi/instruments/perc39.sbi | Bin 0 -> 52 bytes lumps/genmidi/instruments/perc40.sbi | Bin 0 -> 52 bytes lumps/genmidi/instruments/perc41.sbi | Bin 0 -> 52 bytes lumps/genmidi/instruments/perc42.sbi | Bin 0 -> 52 bytes lumps/genmidi/instruments/perc43.sbi | Bin 0 -> 52 bytes lumps/genmidi/instruments/perc44.sbi | Bin 0 -> 52 bytes lumps/genmidi/instruments/perc45.sbi | Bin 0 -> 52 bytes lumps/genmidi/instruments/perc46.sbi | Bin 0 -> 52 bytes lumps/genmidi/instruments/perc47.sbi | Bin 0 -> 52 bytes lumps/genmidi/instruments/perc48.sbi | Bin 0 -> 52 bytes lumps/genmidi/instruments/perc49.sbi | Bin 0 -> 52 bytes lumps/genmidi/instruments/perc50.sbi | Bin 0 -> 52 bytes lumps/genmidi/instruments/perc51.sbi | Bin 0 -> 52 bytes lumps/genmidi/instruments/perc52.sbi | Bin 0 -> 52 bytes lumps/genmidi/instruments/perc53.sbi | Bin 0 -> 52 bytes lumps/genmidi/instruments/perc54.sbi | Bin 0 -> 52 bytes lumps/genmidi/instruments/perc57.sbi | Bin 0 -> 52 bytes lumps/genmidi/instruments/perc59.sbi | Bin 0 -> 52 bytes 24 files changed, 28 insertions(+), 22 deletions(-) create mode 100644 lumps/genmidi/instruments/perc35.sbi create mode 100644 lumps/genmidi/instruments/perc36.sbi create mode 100644 lumps/genmidi/instruments/perc37.sbi create mode 100644 lumps/genmidi/instruments/perc38.sbi create mode 100644 lumps/genmidi/instruments/perc39.sbi create mode 100644 lumps/genmidi/instruments/perc40.sbi create mode 100644 lumps/genmidi/instruments/perc41.sbi create mode 100644 lumps/genmidi/instruments/perc42.sbi create mode 100644 lumps/genmidi/instruments/perc43.sbi create mode 100644 lumps/genmidi/instruments/perc44.sbi create mode 100644 lumps/genmidi/instruments/perc45.sbi create mode 100644 lumps/genmidi/instruments/perc46.sbi create mode 100644 lumps/genmidi/instruments/perc47.sbi create mode 100644 lumps/genmidi/instruments/perc48.sbi create mode 100644 lumps/genmidi/instruments/perc49.sbi create mode 100644 lumps/genmidi/instruments/perc50.sbi create mode 100644 lumps/genmidi/instruments/perc51.sbi create mode 100644 lumps/genmidi/instruments/perc52.sbi create mode 100644 lumps/genmidi/instruments/perc53.sbi create mode 100644 lumps/genmidi/instruments/perc54.sbi create mode 100644 lumps/genmidi/instruments/perc57.sbi create mode 100644 lumps/genmidi/instruments/perc59.sbi 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 0000000000000000000000000000000000000000..edf0e47428da6319971f9408bb6502b2ec69fb52 GIT binary patch literal 52 qcmWG`@|1E+&Mz%4$xK#oN-Qo`a49OyWk3Ur3@5)!PG?|*2m=67NeTx5 literal 0 HcmV?d00001 diff --git a/lumps/genmidi/instruments/perc36.sbi b/lumps/genmidi/instruments/perc36.sbi new file mode 100644 index 0000000000000000000000000000000000000000..83ef764febd8ba77b7ccfd4987c93c00e7a0f304 GIT binary patch literal 52 kcmWG`@|1E)EG|}XDJsoXFl4|E7#U7}mz>VPzyg*A0Oo}U00000 literal 0 HcmV?d00001 diff --git a/lumps/genmidi/instruments/perc37.sbi b/lumps/genmidi/instruments/perc37.sbi new file mode 100644 index 0000000000000000000000000000000000000000..56e3d3deb4dfb1736b4a4de38b6dc2603639ddd8 GIT binary patch literal 52 lcmWG`@{|hBOi5J;F3C*JX21$qm^c|0{!;wKz`z5R2LSAo2W literal 0 HcmV?d00001 diff --git a/lumps/genmidi/instruments/perc41.sbi b/lumps/genmidi/instruments/perc41.sbi new file mode 100644 index 0000000000000000000000000000000000000000..d7f3603a8592ed23b6b155a9b026b39aad4b217a GIT binary patch literal 52 jcmWG`@|5z)FIRBO$ literal 0 HcmV?d00001 diff --git a/lumps/genmidi/instruments/perc44.sbi b/lumps/genmidi/instruments/perc44.sbi new file mode 100644 index 0000000000000000000000000000000000000000..7adceb92d4969b9ac5de158e9db9bc26ff09a127 GIT binary patch literal 52 mcmWG`@{|flO-amA@W|BlNGxH%0@&Hv7z)c3zcVngfn@>leg_r+ literal 0 HcmV?d00001 diff --git a/lumps/genmidi/instruments/perc45.sbi b/lumps/genmidi/instruments/perc45.sbi new file mode 100644 index 0000000000000000000000000000000000000000..1bd632ffedd55339b8aec395ce7dcefdf83bcf50 GIT binary patch literal 52 dcmWG`@|5z)FINc3&tnEMdR~*x6YbwzRT*Wnkh0O9KGs=?3=z literal 0 HcmV?d00001 diff --git a/lumps/genmidi/instruments/perc47.sbi b/lumps/genmidi/instruments/perc47.sbi new file mode 100644 index 0000000000000000000000000000000000000000..acb3aa92683713e48f1e443ca3bb2697c5f3213d GIT binary patch literal 52 hcmWG`@|5z)FW2?WOi>8Q&t7`}gFXM;%s0M|(dQvd(} literal 0 HcmV?d00001 diff --git a/lumps/genmidi/instruments/perc49.sbi b/lumps/genmidi/instruments/perc49.sbi new file mode 100644 index 0000000000000000000000000000000000000000..8fb6a1472a5066d83db533c89b5ae4d76125753d GIT binary patch literal 52 pcmWG`@|1EeN-WM$aIVZvO3YC(WWWIYEK&@gzJB`3z|04h0{|jl3BLdU literal 0 HcmV?d00001 diff --git a/lumps/genmidi/instruments/perc50.sbi b/lumps/genmidi/instruments/perc50.sbi new file mode 100644 index 0000000000000000000000000000000000000000..6adaa151960243d7a622b6d861d78fa09fdde78a GIT binary patch literal 52 ecmWG`@|5z(OwUjV$n+a literal 0 HcmV?d00001 diff --git a/lumps/genmidi/instruments/perc52.sbi b/lumps/genmidi/instruments/perc52.sbi new file mode 100644 index 0000000000000000000000000000000000000000..81944bef295ece56157b2618f74ebc39ac265a52 GIT binary patch literal 52 pcmWG`@|1GU$jnPEPE~NO%uPznVZZ?VtO^W8TR(keVCDnM0RSua34;It literal 0 HcmV?d00001 diff --git a/lumps/genmidi/instruments/perc53.sbi b/lumps/genmidi/instruments/perc53.sbi new file mode 100644 index 0000000000000000000000000000000000000000..e9bbe07affa7e65de00aca2863dfaa41bdddb8db GIT binary patch literal 52 kcmWG`@{|h7Oi5L6O3le(zz&$1q!|8vVPRol;sPrG0MptAK>z>% literal 0 HcmV?d00001 diff --git a/lumps/genmidi/instruments/perc54.sbi b/lumps/genmidi/instruments/perc54.sbi new file mode 100644 index 0000000000000000000000000000000000000000..f975b53ba06ca7335f93641e62bb5db3efa99a90 GIT binary patch literal 52 lcmWG`@{|fm%uUKKEy~PGWxxtpSrr&2e`jWAVBiDG0|56i2HOAt literal 0 HcmV?d00001 diff --git a/lumps/genmidi/instruments/perc57.sbi b/lumps/genmidi/instruments/perc57.sbi new file mode 100644 index 0000000000000000000000000000000000000000..5ea17e5753a85433ef0e35ec355d956fd354ae66 GIT binary patch literal 52 pcmWG`@|1EeN-WM$aIVZvO3YC(V!#0WEK&@gzJB`3z|04h0{|j|3BUjV literal 0 HcmV?d00001 diff --git a/lumps/genmidi/instruments/perc59.sbi b/lumps/genmidi/instruments/perc59.sbi new file mode 100644 index 0000000000000000000000000000000000000000..2c13953cccf226ddbbf207f147ef3a44eb7ae29a GIT binary patch literal 52 ocmWG`@{|h7Oi5L6uFOqJ%uz66zy$m(dJLbxer9E0<^xLt01Iabc>n+a literal 0 HcmV?d00001