archives/freedoom
2
0
Fork 0
mirror of https://github.com/freedoom/freedoom.git synced 2025-09-02 16:25:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

dmxgus: Improvements to similarity groups.

Browse source 
Split the piano and bass guitar groups into separate groups to give more
variation. Move several instruments around which don't fit, and move
several random percussion instruments into an enlargened "blank" group
since these percussion effects are not really similar to each other and
it's better to leave them out than play something that sounds wrong.
This commit is contained in:
Simon Howard 2018-05-05 22:41:14 -04:00
parent caa6f46a59
commit bf93839ed5
1 changed files with 27 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

53
lumps/dmxgus/config.py
View file

@ -274,8 +274,8 @@ PATCH_FILE_SIZES = {
SIMILAR_GROUPS = [ SIMILAR_GROUPS = [
# Pianos. # Pianos.
('synpiano', 'acpiano', 'britepno', 'honky', 'epiano1', 'epiano2', ('synpiano', 'acpiano', 'britepno', 'honky'),
'celeste', 'glocken'), ('glocken', 'epiano1', 'epiano2', 'celeste'),
# Harpsichord sounds noticeably different to pianos: # Harpsichord sounds noticeably different to pianos:
('hrpschrd', 'clavinet'), ('hrpschrd', 'clavinet'),
# Xylophone etc. # Xylophone etc.
@ -286,19 +286,19 @@ SIMILAR_GROUPS = [
# Accordion/Harmonica: # Accordion/Harmonica:
('accordn', 'harmonca', 'concrtna'), ('accordn', 'harmonca', 'concrtna'),
# Guitars. # Guitars.
('nyguitar', 'acguitar', 'jazzgtr', 'cleangtr', 'mutegtr'), ('nyguitar', 'acguitar', 'jazzgtr'),
# Overdriven/distortion guitars sound different. Besides, we # Overdriven/distortion guitars sound different. Besides, we
# definitely want at least one of these. # definitely want at least one of these.
('odguitar', 'distgtr', 'gtrharm'), ('odguitar', 'distgtr', 'gtrharm', 'cleangtr', 'bagpipes'),
# Basses. # Basses.
('synbass2', 'acbass', 'fngrbass', 'pickbass', 'fretless', 'slapbas1', ('synbass2', 'acbass', 'fngrbass', 'pickbass', 'basslead', 'fretless'),
'slapbas2', 'synbass1', 'basslead'), ('synbass1', 'slapbas1', 'slapbas2', 'mutegtr'),
# Violin and similar string instruments. # Violin and similar string instruments.
('violin', 'viola', 'cello', 'contraba', 'tremstr', 'pizzcato', ('violin', 'viola', 'cello', 'contraba', 'pizzcato', 'harp'),
'harp'),
# Other stringed (?) # Other stringed (?)
('synstr2', 'slowstr', 'marcato', 'synstr1', 'choir', 'doo', 'voices', ('synstr2', 'slowstr', 'marcato', 'synstr1', 'choir', 'doo', 'voices',
'orchhit', 'polysyn', 'bowglass'), 'orchhit', 'polysyn', 'bowglass', 'tremstr',
'fantasia', 'warmpad', 'ghostie', 'metalpad', 'sweeper', 'halopad'),
# Trumpet and other brass. # Trumpet and other brass.
('trumpet', 'trombone', 'tuba', 'mutetrum', 'frenchrn', 'hitbrass', ('trumpet', 'trombone', 'tuba', 'mutetrum', 'frenchrn', 'hitbrass',
'synbras1', 'synbras2'), 'synbras1', 'synbras2'),
@ -307,23 +307,17 @@ SIMILAR_GROUPS = [
'bassoon', 'clarinet'), 'bassoon', 'clarinet'),
# Pipe instruments. # Pipe instruments.
('recorder', 'flute', 'piccolo', 'woodflut', 'bottle', 'shakazul', ('recorder', 'flute', 'piccolo', 'woodflut', 'bottle', 'shakazul',
'whistle', 'ocarina', 'bagpipes', 'fiddle', 'shannai', 'whistle', 'ocarina', 'fiddle', 'shannai', 'calliope', 'chiflead',
'calliope', 'chiflead', 'charang'), 'charang'),
# Leads: # Leads:
('sqrwave', 'sawwave', 'voxlead', 'lead5th'), ('sqrwave', 'sawwave', 'voxlead', 'lead5th'),
# Odd stringed instruments. # Odd stringed instruments.
('sitar', 'banjo', 'shamisen', 'koto'), ('sitar', 'banjo', 'shamisen', 'koto'),
# Special effects. Blank unless popular enough to appear.
('blank', 'fantasia', 'warmpad', 'ghostie',
'metalpad', 'halopad', 'sweeper', 'aurora', 'soundtrk', 'crystal',
'atmosphr', 'freshair', 'unicorn', 'echovox', 'startrak', 'fx-fret',
'fx-blow', 'seashore', 'jungle', 'telephon', 'helicptr', 'applause',
'pistol'),
# Percussion sounds. # Percussion sounds.
# Kick: # Kick:
('kick2', 'steeldrm', 'taiko', 'kick1'), ('kick2', 'taiko', 'kick1'),
# Conga: # Conga:
('congahi2', 'congahi1', 'congalo'), ('congahi2', 'congahi1', 'congalo'),
# Snare drums: # Snare drums:
@ -334,16 +328,23 @@ SIMILAR_GROUPS = [
# Cymbal crash: # Cymbal crash:
('cymsplsh', 'cymcrsh2', 'cymcrsh1', 'revcym', 'cymchina'), ('cymsplsh', 'cymcrsh2', 'cymcrsh1', 'revcym', 'cymchina'),
# Cymbal ride: # Cymbal ride:
('cymride1', 'cymride2', 'cymbell'), ('cymride1', 'cymride2', 'cymbell', 'hihatop'),
# Hi-hat: # Hi-hat:
('hihatpd', 'hihatcl', 'hihatop'), ('hihatpd', 'hihatcl'),
# Metallic sounding: # Metallic sounding:
('bongohi', 'bongolo', 'timbaleh', 'timbalel', 'cowbell', ('bongohi', 'bongolo', 'timbaleh', 'timbalel', 'cowbell'),
'agogohi', 'agogolo', 'agogo', 'triangl1', 'triangl2'),
# Click: # Click:
('stickrim', 'woodblk1', 'woodblk2', 'woodblk', 'tamborin', 'clave'), ('stickrim', 'woodblk1', 'woodblk2', 'woodblk', 'clave'),
# Random things.
('cabasa', 'whistle1', 'whistle2', 'vibslap', 'maracas', # Random instruments we don't include unless they're popular enough.
'guiro1', 'guiro2', 'cuica1', 'cuica2'), ('blank',
# Special effects:
'unicorn', 'soundtrk', 'aurora', 'crystal', 'atmosphr', 'freshair',
'echovox', 'startrak', 'fx-fret', 'fx-blow', 'seashore', 'jungle',
'telephon', 'helicptr', 'applause', 'pistol',
# Percussion:
'cabasa', 'whistle1', 'whistle2', 'vibslap', 'maracas', 'guiro1',
'guiro2', 'cuica1', 'cuica2', 'steeldrm', 'agogohi', 'agogolo',
'agogo', 'triangl1', 'triangl2' , 'tamborin'),
] ]