diff --git a/parts/scenes/launchpad.lua b/parts/scenes/launchpad.lua index 02c4cc5b..18e1d3e1 100644 --- a/parts/scenes/launchpad.lua +++ b/parts/scenes/launchpad.lua @@ -44,7 +44,15 @@ pad={x=140,y=65,page=1, {samp={tag='start',func=function()playReadySFX(0)end}}, {sfx='move'},{sfx='lock'},{sfx='drop'},{sfx='fall'}, }, - {{sfx='hold'}, {sfx='prehold'}, {}, {}, {sfx='clear_1'},{sfx='clear_2'},{sfx='clear_3'},{sfx='clear_4'}}, + { + {sfx='hold'},{sfx='prehold'}, + {samp={tag='clear_1',func=function()playClearSFX(1)end}}, + {samp={tag='clear_2',func=function()playClearSFX(2)end}}, + {samp={tag='clear_3',func=function()playClearSFX(3)end}}, + {samp={tag='clear_4',func=function()playClearSFX(4)end}}, + {samp={tag='clear_5',func=function()playClearSFX(5)end}}, + {samp={tag='clear_6',func=function()playClearSFX(6)end}}, + }, {{sfx='prerotate'}, {sfx='rotate'}, {sfx='rotatekick'}, {}, {voc='single'}, {voc='double'}, {voc='triple'}, {voc='techrash'}}, {{sfx='finesseError'},{sfx='finesseError_long'},{sfx='drop_cancel'},{}, {sfx='spin_0'}, {sfx='spin_1'}, {sfx='spin_2'}, {sfx='spin_3'}}, {{sfx='ren_1'}, {sfx='ren_2'}, {sfx='ren_3'}, {sfx='ren_4'}, {}, {sfx='warning'},{sfx='reach'}, {sfx='pc'}}, @@ -63,8 +71,22 @@ pad={x=140,y=65,page=1, {{}, {}, {}, {}, {}, {}, {}, {}}, }, { - {{}, {}, {}, {}, {sfx='move'}, {sfx='lock'}, {sfx='drop'}, {sfx='fall'},}, - {{sfx='hold'}, {sfx='prehold'},{}, {}, {sfx='clear_1'}, {sfx='clear_2'}, {sfx='clear_3'}, {sfx='clear_4'},}, + { + {samp={tag='ready3',func=function()playReadySFX(3)end}}, + {samp={tag='ready2',func=function()playReadySFX(2)end}}, + {samp={tag='ready1',func=function()playReadySFX(1)end}}, + {samp={tag='start',func=function()playReadySFX(0)end}}, + {sfx='move'},{sfx='lock'},{sfx='drop'},{sfx='fall'}, + }, + { + {sfx='hold'},{sfx='prehold'}, + {samp={tag='clear_1',func=function()playClearSFX(1)end}}, + {samp={tag='clear_2',func=function()playClearSFX(2)end}}, + {samp={tag='clear_3',func=function()playClearSFX(3)end}}, + {samp={tag='clear_4',func=function()playClearSFX(4)end}}, + {samp={tag='clear_5',func=function()playClearSFX(5)end}}, + {samp={tag='clear_6',func=function()playClearSFX(6)end}}, + }, {{voc='mini'}, {voc='b2b'}, {voc='b3b'}, {voc='perfect_clear'}, {voc='half_clear'}, {sfx='finesseError'}, {sfx='finesseError_long'}, {sfx='drop_cancel'},}, {{voc='zspin'}, {voc='sspin'}, {voc='jspin'}, {voc='lspin'}, {voc='tspin'}, {voc='ospin'}, {voc='ispin'}, {}}, {{voc='single'}, {voc='double'}, {voc='triple'},{voc='techrash'}, {sfx='ren_mega', vol=0.25},{sfx='ren_mega', vol=0.5},{sfx='ren_mega', vol=0.75},{sfx='ren_mega'}}, @@ -73,9 +95,34 @@ pad={x=140,y=65,page=1, {{sfx='ren_9'}, {sfx='ren_10'}, {sfx='ren_11'},{sfx='ren_mega'}, {voc='win'}, {voc='lose'}, {sfx='win'}, {sfx='fail'}}, }, { - {{},{},{},{},{},{},{},{}}, - {{},{},{},{},{},{},{},{}}, - {{},{},{},{},{},{},{},{}}, + { + {samp={tag='clear_1',func=function()playClearSFX(1)end}}, + {samp={tag='clear_2',func=function()playClearSFX(2)end}}, + {samp={tag='clear_3',func=function()playClearSFX(3)end}}, + {samp={tag='clear_4',func=function()playClearSFX(4)end}}, + {samp={tag='clear_5',func=function()playClearSFX(5)end}}, + {samp={tag='clear_6',func=function()playClearSFX(6)end}}, + {samp={tag='clear_7',func=function()playClearSFX(7)end}}, + {samp={tag='clear_8',func=function()playClearSFX(8)end}}, + }, + { + {samp={tag='clear_9',func=function()playClearSFX(9)end}}, + {samp={tag='clear_10',func=function()playClearSFX(10)end}}, + {samp={tag='clear_11',func=function()playClearSFX(11)end}}, + {samp={tag='clear_12',func=function()playClearSFX(12)end}}, + {samp={tag='clear_13',func=function()playClearSFX(13)end}}, + {samp={tag='clear_14',func=function()playClearSFX(14)end}}, + {samp={tag='clear_15',func=function()playClearSFX(15)end}}, + {samp={tag='clear_16',func=function()playClearSFX(16)end}}, + }, + { + {samp={tag='clear_17',func=function()playClearSFX(17)end}}, + {samp={tag='clear_18',func=function()playClearSFX(18)end}}, + {samp={tag='clear_19',func=function()playClearSFX(19)end}}, + {samp={tag='clear_20',func=function()playClearSFX(20)end}}, + {samp={tag='clear_20+',func=function()playClearSFX(21)end}}, + {},{},{} + }, {{},{},{},{},{},{},{},{}}, {{},{},{},{},{},{},{},{}}, {{},{},{},{},{},{},{},{}},