diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt index d2e2b127ef..c853815376 100644 --- a/Docs/Changelog_sm5.txt +++ b/Docs/Changelog_sm5.txt @@ -8,6 +8,17 @@ ________________________________________________________________________________ StepMania 5.0 Preview 2 | 201107?? -------------------------------------------------------------------------------- +2011/07/03 +---------- +* [Player] Bring mMods from OpenITG over. Also, a metric was added, + "MModHighCap", to cap the speed mod if required for playing songs like + Tsuhsuixamush. Set the metric to 0 or less to remove the cap. [AJ, sharksoda, + Wolfman2000] + +2011/07/02 +---------- +* [ScreenEdit] Fixed a crash when hitting Enter in the F1 help menu. [AJ] + 2011/06/30 ---------- * [NotesAll] Use #FIRSTSECOND, #LASTSECOND, and #LASTSECONDHINT instead of the diff --git a/NoteSkins/kb7/retrobar-iidx/metrics.ini b/NoteSkins/kb7/retrobar-iidx/metrics.ini index 3e010e338c..9a306a981e 100644 --- a/NoteSkins/kb7/retrobar-iidx/metrics.ini +++ b/NoteSkins/kb7/retrobar-iidx/metrics.ini @@ -4,7 +4,12 @@ DrawHoldHeadForTapsOnSameRow=0 StartDrawingHoldBodyOffsetFromHead=0 StopDrawingHoldBodyOffsetFromTail=-32 +TapNoteAnimationIsVivid=0 + # control the vertical +TapNoteNoteColorTextureCoordSpacingX=0 +TapNoteNoteColorTextureCoordSpacingY=0 + TapNoteAdditionTextureCoordOffsetX=0 TapNoteAdditionTextureCoordOffsetY=0.5 diff --git a/NoteSkins/kb7/retrobar-o2jam/metrics.ini b/NoteSkins/kb7/retrobar-o2jam/metrics.ini index 3e010e338c..9a306a981e 100644 --- a/NoteSkins/kb7/retrobar-o2jam/metrics.ini +++ b/NoteSkins/kb7/retrobar-o2jam/metrics.ini @@ -4,7 +4,12 @@ DrawHoldHeadForTapsOnSameRow=0 StartDrawingHoldBodyOffsetFromHead=0 StopDrawingHoldBodyOffsetFromTail=-32 +TapNoteAnimationIsVivid=0 + # control the vertical +TapNoteNoteColorTextureCoordSpacingX=0 +TapNoteNoteColorTextureCoordSpacingY=0 + TapNoteAdditionTextureCoordOffsetX=0 TapNoteAdditionTextureCoordOffsetY=0.5 diff --git a/NoteSkins/kb7/retrobar-razor_o2/noteskin.ini b/NoteSkins/kb7/retrobar-razor_o2/metrics.ini similarity index 100% rename from NoteSkins/kb7/retrobar-razor_o2/noteskin.ini rename to NoteSkins/kb7/retrobar-razor_o2/metrics.ini diff --git a/Songs/StepMania 5/MechaTribe Assault/Mecha-Tribe Assault.ssc b/Songs/StepMania 5/MechaTribe Assault/Mecha-Tribe Assault.ssc index 57eb33af09..6e799ec8de 100644 --- a/Songs/StepMania 5/MechaTribe Assault/Mecha-Tribe Assault.ssc +++ b/Songs/StepMania 5/MechaTribe Assault/Mecha-Tribe Assault.ssc @@ -1,4 +1,4 @@ -#VERSION:0.72; +#VERSION:0.73; #TITLE:Mecha-Tribe Assault; #SUBTITLE:; #ARTIST:Kommisar; @@ -104,7 +104,8 @@ ,288.000000=Verse 9B ,304.000000=Fin ; -#ATTACKS:; +#ATTACKS: +; #NOTES: 0000 0000 @@ -3595,29 +3596,29 @@ M00M ,288.000000=Verse 9B ,304.000000=Fin ; -#ATTACKS:; +#ATTACKS: +; #NOTES: -// measure 0 000000 000000 000000 000000 -, // measure 1 +, 000000 000000 000000 000000 -, // measure 2 +, 000000 000000 000000 000000 -, // measure 3 +, 000000 000000 000000 000000 -, // measure 4 +, 000001 001000 000000 @@ -3626,7 +3627,7 @@ M00M 010000 000000 000010 -, // measure 5 +, 010000 000100 000000 @@ -3635,7 +3636,7 @@ M00M 000001 000000 001000 -, // measure 6 +, 000010 010000 000000 @@ -3644,7 +3645,7 @@ M00M 000100 000000 000010 -, // measure 7 +, 000001 000100 000000 @@ -3653,7 +3654,7 @@ M00M 000010 000000 100000 -, // measure 8 +, 000100 000001 000000 @@ -3662,7 +3663,7 @@ M00M 001000 000000 000001 -, // measure 9 +, 000010 001000 000000 @@ -3671,7 +3672,7 @@ M00M 000010 000000 001000 -, // measure 10 +, 000100 010000 000000 @@ -3680,7 +3681,7 @@ M00M 010000 000000 100000 -, // measure 11 +, 000100 000010 000000 @@ -3689,7 +3690,7 @@ M00M 000010 000000 100000 -, // measure 12 +, 001000 000100 000000 @@ -3698,7 +3699,7 @@ M00M 000001 000000 010001 -, // measure 13 +, 000000 000000 010000 @@ -3715,7 +3716,7 @@ M00M 000001 100000 000010 -, // measure 14 +, 010000 000100 000000 @@ -3724,7 +3725,7 @@ M00M 001000 000000 001010 -, // measure 15 +, 000000 000000 000010 @@ -3741,7 +3742,7 @@ M00M 001000 000001 001000 -, // measure 16 +, 000100 100000 000000 @@ -3750,7 +3751,7 @@ M00M 001000 000000 001010 -, // measure 17 +, 000000 000000 000010 @@ -3767,7 +3768,7 @@ M00M 100000 000100 001000 -, // measure 18 +, 000010 000001 000000 @@ -3776,7 +3777,7 @@ M00M 001000 000000 001100 -, // measure 19 +, 000200 000000 000000 @@ -3793,7 +3794,7 @@ M00M 000000 000000 000000 -, // measure 20 +, 100000 001000 000000 @@ -3802,7 +3803,7 @@ M00M 010000 000000 010010 -, // measure 21 +, 000000 000000 000010 @@ -3819,7 +3820,7 @@ M00M 100000 000001 010000 -, // measure 22 +, 000010 010000 000000 @@ -3828,7 +3829,7 @@ M00M 001000 000000 001010 -, // measure 23 +, 000000 000000 000010 @@ -3845,7 +3846,7 @@ M00M 000100 100000 000100 -, // measure 24 +, 001000 000001 000000 @@ -3854,7 +3855,7 @@ M00M 000100 000000 001100 -, // measure 25 +, 000000 000000 001000 @@ -3871,7 +3872,7 @@ M00M 000001 000100 001000 -, // measure 26 +, 010000 100000 000000 @@ -3880,7 +3881,7 @@ M00M 000100 000000 001100 -, // measure 27 +, 002000 000000 000000 @@ -3897,7 +3898,7 @@ M00M 000000 000000 000000 -, // measure 28 +, 100000 000010 010000 @@ -3906,7 +3907,7 @@ M00M 000010 001000 000010 -, // measure 29 +, 000001 000010 001000 @@ -3915,7 +3916,7 @@ M00M 000010 100000 000010 -, // measure 30 +, 010000 001000 000100 @@ -3924,7 +3925,7 @@ M00M 001000 010000 000100 -, // measure 31 +, 100000 000000 100000 @@ -3941,7 +3942,7 @@ M00M 000000 000100 001000 -, // measure 32 +, 000001 010000 000010 @@ -3950,7 +3951,7 @@ M00M 010000 001000 010000 -, // measure 33 +, 100000 010000 001000 @@ -3959,7 +3960,7 @@ M00M 010000 000001 010000 -, // measure 34 +, 000010 000100 001000 @@ -3968,7 +3969,7 @@ M00M 001000 000010 000100 -, // measure 35 +, 000001 000000 000001 @@ -3985,7 +3986,7 @@ M00M 000000 001000 000100 -, // measure 36 +, 020000 000010 030010 @@ -3994,7 +3995,7 @@ M00M 001030 002000 000001 -, // measure 37 +, 003001 000002 010000 @@ -4003,7 +4004,7 @@ M00M 000010 001000 000100 -, // measure 38 +, 200000 000001 300001 @@ -4012,7 +4013,7 @@ M00M 010003 020000 030010 -, // measure 39 +, 004000 000004 000000 @@ -4029,7 +4030,7 @@ M00M 000000 003003 000000 -, // measure 40 +, 000020 010000 010030 @@ -4038,7 +4039,7 @@ M00M 030100 000200 100000 -, // measure 41 +, 100300 200000 000010 @@ -4047,7 +4048,7 @@ M00M 010000 000100 001000 -, // measure 42 +, 000002 100000 100003 @@ -4056,7 +4057,7 @@ M00M 300010 000020 010030 -, // measure 43 +, 000400 400000 000000 @@ -4073,7 +4074,7 @@ M00M 000000 300300 000000 -, // measure 44 +, 010000 000010 010000 @@ -4090,7 +4091,7 @@ M00M 000010 010000 000000 -, // measure 45 +, 000001 001000 000001 @@ -4107,7 +4108,7 @@ M00M 001000 000001 000000 -, // measure 46 +, 100000 010000 100000 @@ -4124,7 +4125,7 @@ M00M 010000 100000 000000 -, // measure 47 +, 000040 004000 000000 @@ -4141,7 +4142,7 @@ M00M 000000 003030 000000 -, // measure 48 +, 000010 010000 000010 @@ -4158,7 +4159,7 @@ M00M 010000 000010 000000 -, // measure 49 +, 100000 000100 100000 @@ -4175,7 +4176,7 @@ M00M 000100 100000 000000 -, // measure 50 +, 000001 000010 000001 @@ -4192,7 +4193,7 @@ M00M 000010 000001 000000 -, // measure 51 +, 040000 000400 000000 @@ -4209,7 +4210,7 @@ M00M 000000 030300 000000 -, // measure 52 +, 000010 001000 000001 @@ -4218,7 +4219,7 @@ M00M 010000 001000 100000 -, // measure 53 +, 000100 001000 100000 @@ -4227,7 +4228,7 @@ M00M 010000 000001 000100 -, // measure 54 +, 000010 001000 010000 @@ -4236,7 +4237,7 @@ M00M 100000 000001 000100 -, // measure 55 +, 001000 000100 100000 @@ -4245,7 +4246,7 @@ M00M 000100 100000 000100 -, // measure 56 +, 001000 010000 000100 @@ -4254,7 +4255,7 @@ M00M 010000 001000 100000 -, // measure 57 +, 000100 001000 000001 @@ -4263,7 +4264,7 @@ M00M 010000 001000 000100 -, // measure 58 +, 000001 001000 000010 @@ -4272,7 +4273,7 @@ M00M 100000 000100 001000 -, // measure 59 +, 000010 010000 000001 @@ -4281,47 +4282,47 @@ M00M 000100 000010 001000 -, // measure 60 +, 000002 010000 100000 010000 -, // measure 61 +, 002003 000100 000010 000100 -, // measure 62 +, 023000 100000 001000 100000 -, // measure 63 +, 030002 000100 010000 000100 -, // measure 64 +, 000023 010000 001000 010000 -, // measure 65 +, 000230 100000 010000 100000 -, // measure 66 +, 002300 000100 000010 000100 -, // measure 67 +, 203000 000010 001000 300010 -, // measure 68 +, 000001 000000 010000 @@ -4330,7 +4331,7 @@ M00M 000000 000010 001000 -, // measure 69 +, 000010 000000 100000 @@ -4339,7 +4340,7 @@ M00M 000000 000010 010000 -, // measure 70 +, 000010 000000 001000 @@ -4348,7 +4349,7 @@ M00M 000000 000010 000001 -, // measure 71 +, 000010 000000 100000 @@ -4357,7 +4358,7 @@ M00M 000000 010000 001000 -, // measure 72 +, 010000 000000 100000 @@ -4366,7 +4367,7 @@ M00M 000000 000001 000100 -, // measure 73 +, 000001 000000 010000 @@ -4375,7 +4376,7 @@ M00M 000000 000010 100000 -, // measure 74 +, 000010 000000 001000 @@ -4384,7 +4385,7 @@ M00M 000000 000100 010000 -, // measure 75 +, 000100 000000 001000 @@ -4393,24 +4394,2612 @@ M00M 000000 000022 220000 -, // measure 76 +, 000000 000000 000000 000000 -, // measure 77 +, 000000 000000 000000 000000 -, // measure 78 +, 000000 000000 000000 330033 -, // measure 79 +, MMMMMM 000000 000000 000000 ; + +//---------------pump-single - Vin.il---------------- +#NOTEDATA:; +#STEPSTYPE:pump-single; +#DESCRIPTION:Vin.il; +#CHARTSTYLE:Pad; +#DIFFICULTY:Hard; +#METER:19; +#RADARVALUES:1.000,1.000,1.000,0.448,0.538,569.000,106.000,47.000,50.000,16.000,0.000,0.000,0.000,1.000,1.000,1.000,0.448,0.538,569.000,106.000,47.000,50.000,16.000,0.000,0.000,0.000; +#CREDIT:Vin.il; +#OFFSET:-0.028000; +#BPMS:0.000000=180.000000 +; +#STOPS:; +#DELAYS:; +#WARPS:; +#TIMESIGNATURES:0.000000=4=4 +; +#TICKCOUNTS:0.000000=4 +,303.500000=16 +; +#COMBOS:0.000000=1 +; +#SPEEDS:0.000000=1.000000=0.000000=0 +,76.000000=0.500000=0.375000=0 +,76.750000=1.000000=0.375000=0 +,77.500000=0.500000=0.375000=0 +,78.250000=1.000000=0.375000=0 +,79.000000=0.500000=0.375000=0 +,79.500000=1.000000=0.375000=0 +,108.000000=0.500000=0.375000=0 +,108.750000=1.000000=0.375000=0 +,109.500000=0.500000=0.375000=0 +,110.250000=1.000000=0.375000=0 +,111.000000=0.500000=0.375000=0 +,111.500000=1.000000=0.375000=0 +,206.000000=1.250000=0.000000=0 +,206.500000=1.500000=0.000000=0 +,207.000000=1.750000=0.000000=0 +,207.500000=2.000000=0.000000=0 +,272.000000=1.500000=0.250000=0 +,272.500000=2.000000=0.250000=0 +,273.000000=1.500000=0.250000=0 +,273.500000=2.000000=0.250000=0 +,274.000000=1.500000=0.250000=0 +,274.500000=2.000000=0.250000=0 +,275.000000=1.500000=0.250000=0 +,275.500000=2.000000=0.250000=0 +,276.000000=1.500000=0.250000=0 +,276.500000=2.000000=0.250000=0 +,277.000000=1.500000=0.250000=0 +,277.500000=2.000000=0.250000=0 +,278.000000=1.500000=0.250000=0 +,278.500000=2.000000=0.250000=0 +,279.000000=1.500000=0.250000=0 +,279.500000=2.000000=0.250000=0 +,280.000000=1.500000=0.250000=0 +,280.500000=2.000000=0.250000=0 +,281.000000=1.500000=0.250000=0 +,281.500000=2.000000=0.250000=0 +,282.000000=1.500000=0.250000=0 +,282.500000=2.000000=0.250000=0 +,283.000000=1.500000=0.250000=0 +,283.500000=2.000000=0.250000=0 +,284.000000=1.000000=0.250000=0 +,284.500000=2.000000=0.250000=0 +,285.000000=1.500000=0.250000=0 +,285.500000=2.000000=0.250000=0 +,286.000000=1.500000=0.250000=0 +,286.500000=2.000000=0.250000=0 +,287.000000=1.500000=0.250000=0 +,287.500000=2.000000=0.250000=0 +,288.000000=1.500000=0.250000=0 +,288.500000=2.000000=0.250000=0 +,289.000000=1.500000=0.250000=0 +,289.500000=2.000000=0.250000=0 +,290.000000=1.500000=0.250000=0 +,290.500000=2.000000=0.250000=0 +,291.000000=1.500000=0.250000=0 +,291.500000=2.000000=0.250000=0 +,292.000000=1.500000=0.250000=0 +,292.500000=2.000000=0.250000=0 +,293.000000=1.500000=0.250000=0 +,293.500000=2.000000=0.250000=0 +,294.000000=1.500000=0.250000=0 +,294.500000=2.000000=0.250000=0 +,295.000000=1.500000=0.250000=0 +,295.500000=2.000000=0.250000=0 +,296.000000=1.500000=0.250000=0 +,296.500000=2.000000=0.250000=0 +,297.000000=1.500000=0.250000=0 +,297.500000=2.000000=0.250000=0 +,298.000000=1.500000=0.250000=0 +,298.500000=2.000000=0.250000=0 +,299.000000=1.500000=0.250000=0 +,299.500000=2.000000=0.250000=0 +,300.000000=1.500000=0.250000=0 +,300.500000=2.000000=0.250000=0 +,301.000000=1.500000=0.250000=0 +,301.500000=2.000000=0.250000=0 +,302.000000=1.500000=0.250000=0 +,302.500000=2.000000=0.250000=0 +,303.000000=1.500000=0.250000=0 +,303.500000=2.000000=12.500000=0 +; +#SCROLLS:0.000000=1.000000 +,204.000000=0.500000 +,272.000000=0.250000 +; +#FAKES:; +#LABELS:0.000000=Song Start +,16.000000=Verse 1A +,32.000000=Verse 1B +,48.000000=Verse 2A +,64.000000=Verse 2B +,80.000000=Verse 3A +,96.000000=Verse 3B +,112.000000=Verse 4A +,128.000000=Verse 4B +,144.000000=Verse 5A +,160.000000=Verse 5B +,176.000000=Verse 6A +,192.000000=Verse 6B +,208.000000=Verse 7A +,224.000000=Verse 7B +,240.000000=Verse 8A +,256.000000=Verse 8B +,272.000000=Verse 9A +,288.000000=Verse 9B +,304.000000=Fin +; +#ATTACKS:TIME=101.194664:LEN=7.000000:MODS=*0.2399996928003932 Reverse, Overhead; +#NOTES: +// measure 0 +00000 +00000 +00000 +00000 +, // measure 1 +00000 +00000 +00000 +00000 +, // measure 2 +00000 +00000 +00000 +00000 +, // measure 3 +00000 +00000 +00000 +00000 +, // measure 4 +00110 +00000 +00010 +00100 +00010 +00000 +00010 +10100 +, // measure 5 +00010 +10100 +00010 +00000 +00010 +01100 +00010 +01000 +, // measure 6 +01100 +00000 +01000 +00100 +01000 +00000 +01000 +00101 +, // measure 7 +01000 +00101 +01000 +00000 +01000 +00110 +01000 +00010 +, // measure 8 +10100 +00000 +10000 +00100 +10000 +00000 +10000 +00110 +, // measure 9 +10000 +00110 +10000 +00000 +10000 +00101 +10000 +00001 +, // measure 10 +00101 +00000 +00001 +00100 +00001 +00000 +00001 +01100 +, // measure 11 +00001 +01100 +00001 +00000 +00001 +10100 +00001 +10000 +, // measure 12 +00101 +10000 +00010 +00110 +00010 +01000 +00100 +01001 +, // measure 13 +00100 +00000 +01001 +00000 +00100 +00000 +00010 +00000 +10000 +00000 +00110 +00000 +01000 +00100 +01000 +00100 +, // measure 14 +10000 +10000 +10100 +10000 +00001 +00001 +00101 +00001 +, // measure 15 +01000 +00000 +01000 +00000 +01100 +00000 +01000 +00000 +00010 +00000 +00010 +00000 +00010 +00100 +00010 +00100 +, // measure 16 +00001 +00000 +00100 +00000 +00101 +00000 +00001 +10000 +00100 +00000 +10000 +00000 +10100 +00000 +10000 +00010 +, // measure 17 +00100 +00000 +00010 +00000 +00110 +00000 +00010 +01000 +00100 +00000 +01000 +00000 +01000 +00100 +01000 +00010 +, // measure 18 +00100 +00000 +00001 +00100 +00001 +00000 +01000 +00000 +00100 +00000 +10000 +00100 +10000 +00000 +00001 +00000 +, // measure 19 +01101 +00000 +00000 +01010 +00000 +00000 +10110 +00000 +00000 +10001 +00000 +00000 +01101 +00000 +01010 +00000 +, // measure 20 +10010 +00000 +10000 +00000 +00100 +00000 +10000 +00000 +00100 +00000 +01000 +00000 +00010 +00000 +00100 +00001 +, // measure 21 +01000 +00000 +01000 +00000 +00100 +00000 +01000 +00000 +00100 +00000 +10000 +00000 +00001 +00100 +01000 +10000 +, // measure 22 +00010 +00000 +00010 +00000 +00100 +00000 +00010 +00100 +00000 +00100 +00001 +10000 +00100 +00000 +00100 +01000 +, // measure 23 +00001 +00000 +00001 +00100 +00001 +00100 +00000 +00010 +01000 +00100 +10000 +00010 +01000 +00000 +00010 +00100 +, // measure 24 +00001 +00000 +00001 +00000 +00100 +00000 +00001 +00000 +00100 +00000 +00010 +00000 +01000 +00000 +00100 +10000 +, // measure 25 +00010 +00000 +00010 +00000 +00100 +00000 +00010 +00000 +00100 +00000 +00001 +00000 +10000 +00100 +00010 +00001 +, // measure 26 +01000 +00000 +01000 +00000 +00100 +00000 +01000 +00100 +00000 +00100 +10000 +00001 +00100 +00000 +00100 +00000 +, // measure 27 +10110 +00000 +00000 +01010 +00000 +00000 +01101 +00000 +00000 +10001 +00000 +00000 +10110 +00000 +01010 +00000 +, // measure 28 +01001 +00001 +01101 +00001 +01001 +00001 +01001 +00001 +, // measure 29 +10010 +10000 +10110 +10000 +10010 +10000 +10010 +10000 +, // measure 30 +10010 +00010 +10110 +00010 +10010 +00010 +10010 +00010 +, // measure 31 +01001 +00000 +00100 +00000 +10010 +00000 +00100 +00000 +01000 +00001 +00100 +00001 +01000 +00010 +00100 +00001 +, // measure 32 +10001 +10000 +10101 +10000 +10001 +10000 +10001 +10000 +, // measure 33 +10001 +00001 +10101 +00001 +10001 +00001 +10001 +00001 +, // measure 34 +01010 +01000 +01110 +01000 +01010 +01000 +01010 +01000 +, // measure 35 +01010 +00000 +00100 +00000 +10001 +00000 +00100 +00000 +01000 +00100 +00010 +00001 +00100 +00010 +01000 +00100 +, // measure 36 +10000 +00010 +00110 +10000 +00010 +00110 +10000 +00010 +, // measure 37 +00110 +01000 +00001 +00101 +01000 +00001 +01000 +00001 +, // measure 38 +00101 +01000 +01100 +00001 +01000 +01100 +00001 +01000 +, // measure 39 +01100 +00000 +00010 +00000 +00010 +00000 +01000 +00000 +01000 +00000 +00100 +00000 +00100 +10000 +00001 +01000 +, // measure 40 +00010 +10000 +10100 +00010 +10000 +10100 +00010 +10000 +, // measure 41 +10100 +00001 +01000 +01100 +00001 +01000 +00001 +01000 +, // measure 42 +01100 +00001 +00101 +01000 +00001 +00101 +01000 +00001 +, // measure 43 +00101 +00000 +10000 +00000 +10000 +00000 +00001 +00000 +00001 +00000 +00100 +00000 +00100 +00010 +01000 +00001 +, // measure 44 +10000 +00100 +10000 +00100 +01000 +00000 +00001 +00100 +00001 +00100 +00010 +00000 +10000 +00100 +00001 +00000 +, // measure 45 +00010 +00100 +00010 +00100 +00001 +00000 +01000 +00100 +01000 +00100 +10000 +00000 +01000 +00100 +00010 +00000 +, // measure 46 +10000 +00010 +00100 +00010 +10000 +00000 +00001 +01000 +00100 +00000 +00100 +00000 +10000 +00100 +00010 +00000 +, // measure 47 +00001 +00100 +00001 +00000 +00001 +00000 +10000 +00000 +10000 +00000 +00100 +00000 +01000 +00100 +00010 +00001 +, // measure 48 +01000 +00100 +00010 +00100 +01000 +00000 +00010 +00100 +01000 +00100 +00010 +00000 +01000 +00100 +00010 +00000 +, // measure 49 +00001 +00100 +10000 +00100 +00001 +00000 +10000 +00100 +00001 +00100 +10000 +00000 +00001 +00100 +10000 +00000 +, // measure 50 +00010 +00100 +01000 +00100 +00010 +00000 +00001 +00100 +10000 +00000 +00001 +00000 +10000 +00100 +00001 +00000 +, // measure 51 +00010 +01000 +00010 +01000 +00010 +10000 +00010 +10000 +00001 +10000 +00001 +10000 +00001 +01000 +00001 +01000 +, // measure 52 +00020 +00000 +01130 +00000 +01000 +00100 +02000 +00000 +, // measure 53 +03002 +00000 +00100 +00000 +01103 +00000 +00000 +00000 +01000 +00000 +00010 +00000 +00100 +00010 +01000 +00100 +, // measure 54 +20000 +30101 +00002 +02003 +, // measure 55 +03100 +00000 +00100 +10000 +00020 +00030 +01010 +01010 +, // measure 56 +02010 +00100 +03001 +01000 +02010 +00100 +03001 +01000 +, // measure 57 +01020 +00100 +10030 +00010 +01020 +00100 +10030 +00010 +, // measure 58 +20010 +00100 +30001 +10000 +20010 +00100 +30001 +10000 +, // measure 59 +01002 +00000 +00100 +00000 +10003 +00000 +00001 +00000 +01002 +00000 +00100 +00000 +10003 +00000 +00001 +10000 +, // measure 60 +00020 +00000 +00100 +00000 +00100 +00030 +02000 +00000 +, // measure 61 +03020 +00100 +20030 +30002 +, // measure 62 +02003 +03100 +02000 +03100 +02000 +03100 +20000 +30000 +, // measure 63 +00002 +00103 +00002 +00103 +00020 +00130 +00020 +00130 +, // measure 64 +02001 +00100 +03010 +01000 +02001 +00100 +03010 +01000 +, // measure 65 +10020 +00100 +01030 +00010 +10020 +00100 +01030 +00010 +, // measure 66 +20001 +00100 +30010 +10000 +20001 +00100 +30010 +10000 +, // measure 67 +10002 +00100 +01003 +00001 +10002 +00100 +01003 +00001 +, // measure 68 +20101 +00000 +00000 +00000 +, // measure 69 +30002 +00000 +00000 +00000 +, // measure 70 +02003 +00000 +00000 +03020 +, // measure 71 +00230 +00000 +00320 +00000 +, // measure 72 +20030 +00000 +00000 +00000 +, // measure 73 +30002 +00000 +00000 +00000 +, // measure 74 +02003 +00000 +00000 +00000 +, // measure 75 +03020 +00000 +00000 +00000 +00000 +00000 +00000 +00000 +00000 +00000 +00000 +00000 +00000 +00000 +02000 +M0000 +, // measure 76 +00M00 +0000M +00M00 +M0000 +00M00 +0000M +00M00 +M0000 +00M00 +0000M +00M00 +M0000 +00M00 +0000M +00M00 +M0000 +, // measure 77 +00M00 +0000M +00M00 +M0000 +00M00 +0000M +00M00 +M0000 +00M00 +0000M +00M00 +M0000 +00M00 +0000M +00M00 +M0000 +, // measure 78 +00M00 +0000M +00M00 +M0000 +00M00 +0000M +00M00 +M0000 +00M00 +0000M +00M00 +M0000 +00M00 +0000M +00M00 +M0000 +, // measure 79 +03M30 +00000 +00000 +00000 +; + +//---------------pump-single - Vin.il---------------- +#NOTEDATA:; +#STEPSTYPE:pump-single; +#DESCRIPTION:Vin.il; +#CHARTSTYLE:Pad; +#DIFFICULTY:Medium; +#METER:13; +#RADARVALUES:0.925,1.000,1.000,0.667,0.195,454.000,156.000,70.000,0.000,0.000,0.000,0.000,0.000,0.925,1.000,1.000,0.667,0.195,454.000,156.000,70.000,0.000,0.000,0.000,0.000,0.000; +#CREDIT:Vin.il; +#OFFSET:-0.028000; +#BPMS:0.000000=180.000000 +; +#STOPS:; +#DELAYS:; +#WARPS:; +#TIMESIGNATURES:0.000000=4=4 +; +#TICKCOUNTS:0.000000=4 +,303.500000=8 +; +#COMBOS:0.000000=1 +; +#SPEEDS:0.000000=4.000000=0.000000=0 +,76.000000=2.000000=4.000000=0 +,108.000000=1.000000=4.000000=0 +,206.000000=2.000000=2.000000=0 +,303.500000=0.000000=12.500000=0 +; +#SCROLLS:0.000000=0.250000 +,80.000000=0.500000 +,112.000000=1.000000 +,204.000000=0.500000 +,272.000000=0.250000 +; +#FAKES:; +#LABELS:0.000000=Song Start +,16.000000=Verse 1A +,32.000000=Verse 1B +,48.000000=Verse 2A +,64.000000=Verse 2B +,80.000000=Verse 3A +,96.000000=Verse 3B +,112.000000=Verse 4A +,128.000000=Verse 4B +,144.000000=Verse 5A +,160.000000=Verse 5B +,176.000000=Verse 6A +,192.000000=Verse 6B +,208.000000=Verse 7A +,224.000000=Verse 7B +,240.000000=Verse 8A +,256.000000=Verse 8B +,272.000000=Verse 9A +,288.000000=Verse 9B +,304.000000=Fin +; +#ATTACKS: +; +#NOTES: +// measure 0 +00000 +00000 +00000 +00000 +, // measure 1 +00000 +00000 +00000 +00000 +, // measure 2 +00000 +00000 +00000 +00000 +, // measure 3 +00000 +00000 +00000 +00000 +, // measure 4 +00110 +00000 +00010 +10010 +00000 +00000 +10000 +10001 +, // measure 5 +00000 +10001 +00000 +00000 +00000 +01001 +00000 +00000 +, // measure 6 +01100 +00000 +01000 +01001 +00000 +00000 +00001 +10001 +, // measure 7 +00000 +10001 +00000 +00000 +00000 +10010 +00000 +00000 +, // measure 8 +10100 +00000 +10000 +10010 +00000 +00000 +00010 +01010 +, // measure 9 +00000 +01010 +00000 +00000 +00000 +01001 +00000 +00000 +, // measure 10 +00101 +00000 +00001 +01001 +00000 +00000 +01000 +01010 +, // measure 11 +00000 +01010 +00000 +00000 +00000 +10010 +00000 +00000 +, // measure 12 +10100 +10000 +00001 +00101 +00000 +00001 +01000 +01100 +, // measure 13 +00000 +00000 +01010 +00000 +00000 +00000 +00010 +00000 +10000 +00000 +10010 +00000 +00010 +00000 +00100 +00001 +, // measure 14 +01000 +01000 +00010 +00110 +00000 +00010 +10000 +10100 +, // measure 15 +00000 +00000 +10001 +00000 +00000 +00000 +00001 +00000 +01000 +00000 +01001 +00000 +00001 +00000 +00100 +00010 +, // measure 16 +10000 +00100 +10000 +10001 +00000 +00001 +00100 +01001 +, // measure 17 +00100 +00000 +01001 +00000 +00000 +00000 +00100 +00000 +10000 +00000 +10010 +00000 +00010 +00000 +00100 +00001 +, // measure 18 +01000 +00100 +01000 +01010 +00000 +00010 +00100 +10010 +, // measure 19 +01001 +00000 +00000 +00100 +00000 +00000 +10010 +00000 +00000 +00100 +00000 +00000 +01010 +00000 +00100 +00000 +, // measure 20 +10001 +00001 +00000 +01001 +01000 +00010 +00100 +00001 +, // measure 21 +10001 +00000 +10000 +00000 +00000 +00000 +10010 +00000 +00010 +00000 +01000 +00000 +00100 +10000 +00010 +00000 +, // measure 22 +01010 +00000 +01000 +00000 +00010 +00000 +00100 +00001 +00000 +10000 +00000 +00001 +00100 +00000 +00010 +00000 +, // measure 23 +01010 +00000 +00010 +10000 +00000 +10010 +00000 +10000 +00001 +00100 +00001 +00000 +00100 +00010 +01000 +00000 +, // measure 24 +01010 +01000 +00000 +01001 +00001 +10000 +00100 +01000 +, // measure 25 +01010 +00000 +00010 +00000 +00000 +00000 +10010 +00000 +10000 +00000 +00001 +00000 +00100 +00010 +10000 +00000 +, // measure 26 +10001 +00000 +00001 +00000 +10000 +00000 +00100 +01000 +00000 +00010 +00000 +01000 +00100 +00000 +10000 +00000 +, // measure 27 +10001 +00000 +00000 +00100 +00000 +00000 +01010 +00000 +00000 +00100 +00000 +00000 +01001 +00000 +00100 +00000 +, // measure 28 +10010 +10000 +10001 +00001 +01001 +00000 +00100 +00000 +, // measure 29 +10010 +10000 +10001 +00001 +01001 +00000 +00100 +00000 +, // measure 30 +01001 +01000 +01010 +00010 +10010 +00000 +00100 +00000 +, // measure 31 +01001 +00100 +01010 +00100 +10010 +10100 +10001 +00101 +, // measure 32 +10001 +00001 +01001 +01000 +01010 +00000 +00100 +00000 +, // measure 33 +10001 +00001 +01001 +01000 +01010 +00000 +00100 +00000 +, // measure 34 +01010 +00010 +10010 +10000 +10001 +00000 +00100 +00000 +, // measure 35 +01010 +00100 +10010 +00100 +10001 +01001 +01010 +10010 +, // measure 36 +20001 +00100 +30100 +20001 +00100 +30100 +20001 +00100 +, // measure 37 +30100 +20001 +00100 +30100 +20001 +30100 +20001 +30100 +, // measure 38 +10002 +00100 +00103 +10002 +00100 +00103 +10002 +00100 +, // measure 39 +00103 +00000 +00001 +01000 +00001 +00000 +10000 +00010 +10000 +00000 +00010 +01000 +00010 +01000 +00010 +00000 +, // measure 40 +01020 +00100 +00130 +01020 +00100 +00130 +01020 +00100 +, // measure 41 +00130 +01020 +00100 +00130 +01020 +00130 +01020 +00130 +, // measure 42 +02010 +00100 +03100 +02010 +00100 +03100 +02010 +00100 +, // measure 43 +03100 +00000 +01000 +00001 +01000 +00000 +00010 +10000 +00010 +00000 +10000 +00001 +10000 +00001 +10000 +00000 +, // measure 44 +00001 +00100 +00001 +00000 +01000 +00000 +00010 +00000 +10000 +00100 +10000 +00000 +00001 +00000 +10000 +00000 +, // measure 45 +00010 +00100 +00010 +00000 +10000 +00000 +00001 +00000 +01000 +00100 +01000 +00000 +00001 +00000 +10000 +00000 +, // measure 46 +00010 +01000 +00010 +00000 +10000 +00000 +00001 +00000 +01000 +00010 +01000 +00000 +00010 +00000 +10000 +00000 +, // measure 47 +10001 +00001 +00101 +10000 +10100 +00010 +00110 +01010 +, // measure 48 +01000 +00100 +01000 +00000 +00001 +00000 +10000 +00000 +00010 +00100 +00010 +00000 +01000 +00000 +00010 +00000 +, // measure 49 +10000 +00100 +10000 +00000 +00010 +00000 +01000 +00000 +00001 +00100 +00001 +00000 +01000 +00000 +00010 +00000 +, // measure 50 +10000 +00001 +10000 +00000 +00010 +00000 +01000 +00000 +00001 +10000 +00001 +00000 +10000 +00000 +00010 +00000 +, // measure 51 +01010 +01000 +01100 +00010 +00110 +10000 +10100 +10001 +, // measure 52 +00102 +00103 +20100 +30020 +, // measure 53 +02030 +00000 +03100 +00000 +00020 +00000 +10030 +10001 +, // measure 54 +20001 +30000 +10001 +10001 +10002 +00003 +02000 +03000 +, // measure 55 +00020 +00130 +02000 +03100 +, // measure 56 +02010 +00100 +03100 +01010 +01020 +00100 +00130 +10010 +, // measure 57 +20010 +00100 +30100 +10010 +10020 +00100 +00130 +10001 +, // measure 58 +10002 +00100 +00103 +10001 +20001 +00100 +30100 +01001 +, // measure 59 +01002 +00000 +00100 +00000 +00103 +00000 +01001 +00000 +02001 +00000 +00100 +00000 +03100 +00000 +00010 +01000 +, // measure 60 +00100 +10100 +10001 +00101 +, // measure 61 +20002 +00000 +00000 +30003 +10010 +00000 +01010 +00000 +, // measure 62 +02001 +03000 +02001 +03000 +02001 +03000 +01020 +00030 +, // measure 63 +20010 +30000 +20010 +30000 +01002 +00003 +01002 +00003 +, // measure 64 +00200 +00310 +00200 +00301 +00200 +01300 +00200 +10300 +, // measure 65 +00020 +00130 +02000 +03100 +00002 +00103 +20000 +30100 +, // measure 66 +01002 +00103 +00102 +10003 +20001 +30100 +20100 +30010 +, // measure 67 +10020 +00130 +00120 +01030 +02010 +03001 +01002 +00100 +, // measure 68 +20000 +00000 +00000 +00000 +, // measure 69 +00000 +00000 +00000 +00003 +, // measure 70 +00200 +00000 +00000 +00000 +30000 +00000 +02000 +00300 +, // measure 71 +00002 +03000 +20000 +00003 +, // measure 72 +00002 +00000 +00000 +00000 +, // measure 73 +00000 +00000 +00000 +00000 +, // measure 74 +00000 +00000 +00000 +00000 +, // measure 75 +00000 +00000 +00000 +00000 +00000 +00000 +00000 +00000 +00000 +00000 +00000 +00000 +00000 +30003 +20002 +00000 +, // measure 76 +00000 +00000 +00000 +00000 +, // measure 77 +00000 +00000 +00000 +00000 +, // measure 78 +00000 +00000 +00000 +00000 +, // measure 79 +30003 +00000 +00000 +00000 +; + +//---------------pump-single - Vin.il---------------- +#NOTEDATA:; +#STEPSTYPE:pump-single; +#DESCRIPTION:Vin.il; +#CHARTSTYLE:Pad; +#DIFFICULTY:Easy; +#METER:6; +#RADARVALUES:0.456,0.602,0.600,0.181,0.000,253.000,63.000,19.000,0.000,0.000,0.000,0.000,0.000,0.456,0.602,0.600,0.181,0.000,253.000,63.000,19.000,0.000,0.000,0.000,0.000,0.000; +#CREDIT:Vin.il; +#OFFSET:-0.028000; +#BPMS:0.000000=180.000000 +; +#STOPS:; +#DELAYS:; +#WARPS:; +#TIMESIGNATURES:0.000000=4=4 +; +#TICKCOUNTS:0.000000=2 +,204.000000=0 +,206.000000=2 +,240.000000=1 +,248.000000=2 +,256.000000=1 +,303.500000=4 +; +#COMBOS:0.000000=1 +,206.000000=4 +,208.000000=1 +,240.000000=2 +,241.000000=4 +,242.000000=2 +,243.000000=4 +,244.000000=2 +,245.000000=4 +,246.000000=2 +,247.000000=4 +,248.000000=1 +,256.000000=2 +,257.000000=4 +,258.000000=2 +,259.000000=4 +,260.000000=2 +,261.000000=4 +,262.000000=2 +,263.000000=4 +,264.000000=2 +,265.000000=4 +,266.000000=2 +,267.000000=4 +,268.000000=2 +,269.000000=4 +,270.000000=2 +,271.000000=4 +,272.000000=1 +; +#SPEEDS:0.000000=1.000000=0.000000=0 +,248.000000=0.750000=0.500000=0 +,248.500000=1.000000=0.500000=0 +,249.000000=0.750000=0.500000=0 +,249.500000=1.000000=0.500000=0 +,250.000000=0.750000=0.500000=0 +,250.500000=1.000000=0.500000=0 +,251.000000=0.750000=0.500000=0 +,251.500000=1.000000=0.500000=0 +,252.000000=0.750000=0.500000=0 +,252.500000=1.000000=0.500000=0 +,253.000000=0.750000=0.500000=0 +,253.500000=1.000000=0.500000=0 +,254.000000=0.750000=0.500000=0 +,254.500000=1.000000=0.500000=0 +,255.000000=0.750000=0.500000=0 +,255.500000=1.000000=0.500000=0 +,303.500000=0.000000=12.500000=0 +; +#SCROLLS:0.000000=1.000000 +,76.000000=0.500000 +,80.000000=1.000000 +,108.000000=0.500000 +,112.000000=1.000000 +,204.000000=0.500000 +,208.000000=1.000000 +,272.000000=0.250000 +; +#FAKES:; +#LABELS:0.000000=Song Start +,16.000000=Verse 1A +,32.000000=Verse 1B +,48.000000=Verse 2A +,64.000000=Verse 2B +,80.000000=Verse 3A +,96.000000=Verse 3B +,112.000000=Verse 4A +,128.000000=Verse 4B +,144.000000=Verse 5A +,160.000000=Verse 5B +,176.000000=Verse 6A +,192.000000=Verse 6B +,208.000000=Verse 7A +,224.000000=Verse 7B +,240.000000=Verse 8A +,256.000000=Verse 8B +,272.000000=Verse 9A +,288.000000=Verse 9B +,304.000000=Fin +; +#ATTACKS:; +#NOTES: +// measure 0 +00000 +00000 +00000 +00000 +, // measure 1 +00000 +00000 +00000 +00000 +, // measure 2 +00000 +00000 +00000 +00000 +, // measure 3 +00000 +00000 +00000 +00000 +, // measure 4 +10000 +00000 +00000 +00001 +00000 +00000 +00000 +01000 +, // measure 5 +00000 +01001 +00000 +00000 +00000 +00001 +00000 +00000 +, // measure 6 +10000 +00000 +00000 +00001 +00000 +00000 +00000 +01000 +, // measure 7 +00000 +01001 +00000 +00000 +00000 +00001 +00000 +00000 +, // measure 8 +10000 +00000 +00000 +10010 +00000 +00000 +00000 +00001 +, // measure 9 +00000 +01001 +00000 +00000 +00000 +00100 +00000 +00000 +, // measure 10 +00001 +00000 +00000 +01001 +00000 +00000 +00000 +10000 +, // measure 11 +00000 +10010 +00000 +00000 +00000 +00100 +00000 +00000 +, // measure 12 +00001 +00100 +00000 +00001 +00000 +10000 +00000 +00001 +, // measure 13 +00000 +00101 +00000 +00000 +00000 +01001 +00000 +00000 +, // measure 14 +10000 +00100 +00000 +10000 +00000 +00001 +00000 +10000 +, // measure 15 +00000 +10100 +00000 +00000 +00000 +10010 +00000 +00000 +, // measure 16 +00010 +00100 +00000 +00010 +00000 +01000 +00000 +00010 +, // measure 17 +00000 +00110 +00000 +00000 +00000 +10010 +00000 +00000 +, // measure 18 +01000 +00100 +00000 +01000 +00000 +00010 +00000 +01000 +, // measure 19 +00001 +00000 +00000 +10001 +00000 +00000 +10000 +00010 +, // measure 20 +01000 +00001 +00000 +01000 +00000 +00010 +00000 +10000 +, // measure 21 +00001 +01000 +00000 +00001 +00000 +10000 +00000 +00010 +, // measure 22 +00100 +00001 +00000 +01000 +00000 +00010 +00000 +10000 +, // measure 23 +00100 +01000 +00000 +00001 +00000 +10000 +00000 +00010 +, // measure 24 +10000 +00010 +00000 +10000 +00000 +00001 +00000 +01000 +, // measure 25 +00010 +10000 +00000 +00010 +00000 +01000 +00000 +00001 +, // measure 26 +00100 +00010 +00000 +10000 +00000 +00001 +00000 +01000 +, // measure 27 +00010 +00000 +00000 +01010 +00000 +00000 +01000 +00001 +, // measure 28 +10000 +10100 +10000 +00001 +, // measure 29 +10000 +10100 +10000 +00001 +, // measure 30 +01000 +01100 +01000 +00001 +, // measure 31 +01000 +01100 +00010 +00110 +, // measure 32 +10000 +10100 +10000 +00001 +, // measure 33 +10000 +10100 +10000 +00001 +, // measure 34 +01000 +01100 +01000 +00001 +, // measure 35 +01000 +01100 +00010 +00110 +, // measure 36 +10000 +00100 +00000 +10000 +00100 +00000 +10000 +00100 +, // measure 37 +00000 +10000 +00100 +00000 +10000 +00001 +00100 +00000 +, // measure 38 +00001 +00100 +00000 +00001 +00100 +00000 +00001 +00100 +, // measure 39 +00001 +01001 +10000 +10010 +, // measure 40 +00010 +00100 +00000 +00010 +00100 +00000 +00010 +00100 +, // measure 41 +00000 +00010 +00100 +00000 +00010 +01000 +00100 +00000 +, // measure 42 +01000 +00100 +00000 +01000 +00100 +00000 +01000 +00100 +, // measure 43 +01000 +01001 +00010 +10010 +, // measure 44 +10000 +00001 +00100 +00000 +00001 +10000 +00100 +00000 +, // measure 45 +10000 +00001 +00100 +00000 +00001 +10000 +00100 +00000 +, // measure 46 +01000 +00010 +00100 +00000 +00010 +01000 +00100 +00000 +, // measure 47 +01010 +00001 +10000 +00001 +, // measure 48 +01000 +00010 +00100 +00000 +00010 +01000 +00100 +00000 +, // measure 49 +01000 +00010 +00100 +00000 +00010 +01000 +00100 +00000 +, // measure 50 +10000 +00001 +00100 +00000 +00001 +10000 +00100 +00000 +, // measure 51 +20002 +00000 +00000 +00000 +00000 +00000 +00000 +30003 +, // measure 52 +10001 +00101 +10001 +10100 +, // measure 53 +10001 +01001 +10001 +10010 +, // measure 54 +01010 +01010 +10001 +10001 +, // measure 55 +01010 +01010 +10001 +10001 +, // measure 56 +01010 +01100 +01010 +00110 +, // measure 57 +01010 +01001 +01010 +10010 +, // measure 58 +10001 +10001 +01010 +01010 +, // measure 59 +10001 +10001 +01010 +01010 +, // measure 60 +20001 +00000 +30002 +00000 +, // measure 61 +20003 +00000 +30020 +00000 +, // measure 62 +02030 +00000 +00000 +00000 +, // measure 63 +03020 +00000 +00000 +00000 +, // measure 64 +20030 +00000 +00000 +00000 +, // measure 65 +30002 +00000 +00000 +00000 +, // measure 66 +02003 +00000 +00000 +00000 +, // measure 67 +03020 +00000 +00000 +00000 +, // measure 68 +20030 +00000 +00000 +00000 +, // measure 69 +00000 +00000 +00000 +00000 +, // measure 70 +30002 +00000 +00000 +02003 +, // measure 71 +03020 +00000 +00230 +00000 +, // measure 72 +00302 +00000 +00000 +00000 +, // measure 73 +00000 +00000 +00000 +00000 +, // measure 74 +00000 +00000 +00000 +00000 +, // measure 75 +00000 +00000 +00000 +00000 +00000 +00000 +00000 +20000 +, // measure 76 +00000 +00000 +00000 +00000 +, // measure 77 +00000 +00000 +00000 +00000 +, // measure 78 +00000 +00000 +00000 +00000 +, // measure 79 +30003 +00000 +00000 +00000 +; diff --git a/Songs/StepMania 5/Springtime/Springtime.ssc b/Songs/StepMania 5/Springtime/Springtime.ssc index ea75091094..39a5766bdf 100644 --- a/Songs/StepMania 5/Springtime/Springtime.ssc +++ b/Songs/StepMania 5/Springtime/Springtime.ssc @@ -1,4 +1,4 @@ -#VERSION:0.72; +#VERSION:0.73; #TITLE:Springtime; #SUBTITLE:; #ARTIST:Kommisar; @@ -14,9 +14,10 @@ #CDTITLE:; #MUSIC:Kommisar - Springtime.mp3; #OFFSET:-0.125000; -#SAMPLESTART:42.939999; +#SAMPLESTART:105.760086; #SAMPLELENGTH:9.360000; #SELECTABLE:YES; +#DISPLAYBPM:181.699997; #BPMS:0.000000=181.699997 ,304.000000=90.850998 ,311.000000=181.701996 @@ -1777,29 +1778,29 @@ M300 #FAKES:; #LABELS:0.000000=Song Start ; -#ATTACKS:; +#ATTACKS: +; #NOTES: -// measure 0 0000 0000 0000 0000 -, // measure 1 +, 0000 0000 0000 0000 -, // measure 2 +, 0000 0000 0000 0000 -, // measure 3 +, 0000 0000 0000 0000 -, // measure 4 +, 0001 0000 1000 @@ -1816,7 +1817,7 @@ M300 0000 0001 0000 -, // measure 5 +, 0100 0000 0010 @@ -1833,7 +1834,7 @@ M300 0000 1000 0000 -, // measure 6 +, 0001 0000 0100 @@ -1850,7 +1851,7 @@ M300 0000 0100 0000 -, // measure 7 +, 0010 0000 0001 @@ -1867,7 +1868,7 @@ M300 0030 0002 0003 -, // measure 8 +, 1000 0000 0010 @@ -1884,7 +1885,7 @@ M300 0000 1000 0000 -, // measure 9 +, 0001 0000 1000 @@ -1901,7 +1902,7 @@ M300 0000 0100 0000 -, // measure 10 +, 0010 0000 0001 @@ -1918,7 +1919,7 @@ M300 0000 0010 0000 -, // measure 11 +, 0001 0000 0001 @@ -1935,7 +1936,7 @@ M300 3000 0002 0003 -, // measure 12 +, 1000 0010 0010 @@ -1944,7 +1945,7 @@ M300 0001 0010 0000 -, // measure 13 +, 0100 0000 1000 @@ -1961,7 +1962,7 @@ M300 0000 0100 0000 -, // measure 14 +, 0010 0001 0001 @@ -1970,7 +1971,7 @@ M300 0010 1000 0000 -, // measure 15 +, 0100 0000 0010 @@ -1987,7 +1988,7 @@ M300 0300 0002 0003 -, // measure 16 +, 1000 0001 0001 @@ -1996,7 +1997,7 @@ M300 0001 1000 0000 -, // measure 17 +, 0010 0000 1000 @@ -2013,7 +2014,7 @@ M300 0000 0010 0000 -, // measure 18 +, 0100 0001 1000 @@ -2022,7 +2023,7 @@ M300 0010 0001 0000 -, // measure 19 +, 1000 0000 0010 @@ -2039,7 +2040,7 @@ M300 0100 0001 0000 -, // measure 20 +, 1000 0010 0010 @@ -2048,7 +2049,7 @@ M300 0001 0010 0000 -, // measure 21 +, 0100 0000 1000 @@ -2065,7 +2066,7 @@ M300 0000 0100 0000 -, // measure 22 +, 0010 0001 0001 @@ -2074,7 +2075,7 @@ M300 0010 1000 0000 -, // measure 23 +, 0100 0000 0010 @@ -2091,7 +2092,7 @@ M300 0300 0002 0003 -, // measure 24 +, 1000 0001 0001 @@ -2100,7 +2101,7 @@ M300 0001 1000 0000 -, // measure 25 +, 0010 0000 1000 @@ -2117,7 +2118,7 @@ M300 0000 0010 0000 -, // measure 26 +, 1000 0100 0010 @@ -2126,7 +2127,7 @@ M300 1000 0010 0000 -, // measure 27 +, 0100 0001 0100 @@ -2143,7 +2144,7 @@ M300 0003 2000 3000 -, // measure 28 +, 0010 0000 0100 @@ -2160,7 +2161,7 @@ M300 0000 0010 0100 -, // measure 29 +, 0002 0000 0003 @@ -2177,7 +2178,7 @@ M300 0000 0000 0000 -, // measure 30 +, 0000 0000 0000 @@ -2194,7 +2195,7 @@ M300 0100 1000 0020 -, // measure 31 +, 0000 0000 0030 @@ -2211,7 +2212,7 @@ M300 0030 0200 0300 -, // measure 32 +, 0001 0000 1000 @@ -2228,7 +2229,7 @@ M300 0000 0001 0010 -, // measure 33 +, 0002 0000 0003 @@ -2245,7 +2246,7 @@ M300 0000 0000 0000 -, // measure 34 +, 0000 0000 3000 @@ -2262,7 +2263,7 @@ M300 0100 1000 0000 -, // measure 35 +, 0010 0100 0010 @@ -2279,7 +2280,7 @@ M300 3000 0020 0030 -, // measure 36 +, 1000 0100 0100 @@ -2288,7 +2289,7 @@ M300 0001 0100 0010 -, // measure 37 +, 1000 0001 0001 @@ -2297,7 +2298,7 @@ M300 0001 1000 0100 -, // measure 38 +, 1000 0010 0010 @@ -2306,7 +2307,7 @@ M300 0001 0010 0100 -, // measure 39 +, 1000 0001 1000 @@ -2323,7 +2324,7 @@ M300 0010 0100 0000 -, // measure 40 +, 1000 0100 0100 @@ -2332,7 +2333,7 @@ M300 0001 1000 0100 -, // measure 41 +, 1000 0001 0010 @@ -2341,7 +2342,7 @@ M300 1000 0010 1000 -, // measure 42 +, 0001 0100 0100 @@ -2350,7 +2351,7 @@ M300 1000 0001 0010 -, // measure 43 +, 0100 1000 0100 @@ -2367,7 +2368,7 @@ M300 0001 1000 0000 -, // measure 44 +, 0010 0000 0100 @@ -2384,7 +2385,7 @@ M300 0000 0010 0100 -, // measure 45 +, 0002 0000 0003 @@ -2401,7 +2402,7 @@ M300 0000 0000 0000 -, // measure 46 +, 0000 0000 0000 @@ -2418,7 +2419,7 @@ M300 0100 1000 0020 -, // measure 47 +, 0000 0000 0030 @@ -2435,7 +2436,7 @@ M300 0030 0200 0300 -, // measure 48 +, 0001 0000 1000 @@ -2452,7 +2453,7 @@ M300 0000 0001 0010 -, // measure 49 +, 0002 0000 0003 @@ -2469,7 +2470,7 @@ M300 0000 0000 0000 -, // measure 50 +, 0000 0000 3000 @@ -2486,7 +2487,7 @@ M300 0100 1000 0000 -, // measure 51 +, 0010 0100 0010 @@ -2503,7 +2504,7 @@ M300 3000 0020 0030 -, // measure 52 +, 1000 0000 0001 @@ -2512,7 +2513,7 @@ M300 0000 0100 0100 -, // measure 53 +, 1000 0000 0010 @@ -2521,7 +2522,7 @@ M300 0000 0001 0001 -, // measure 54 +, 0100 0000 0010 @@ -2530,7 +2531,7 @@ M300 0000 0100 0100 -, // measure 55 +, 0010 0000 0001 @@ -2539,7 +2540,7 @@ M300 0000 0010 0010 -, // measure 56 +, 1000 0000 0010 @@ -2548,7 +2549,7 @@ M300 0000 0010 0010 -, // measure 57 +, 1000 0000 0100 @@ -2557,7 +2558,7 @@ M300 0000 0001 0001 -, // measure 58 +, 1000 0000 0010 @@ -2566,7 +2567,7 @@ M300 0000 0100 0100 -, // measure 59 +, 0010 0000 0001 @@ -2575,7 +2576,7 @@ M300 0000 0010 0010 -, // measure 60 +, 1000 0000 0001 @@ -2592,7 +2593,7 @@ M300 0000 0001 0000 -, // measure 61 +, 1000 0000 0010 @@ -2609,7 +2610,7 @@ M300 0000 0001 0000 -, // measure 62 +, 1000 0000 0001 @@ -2626,7 +2627,7 @@ M300 0000 0001 0000 -, // measure 63 +, 1000 0000 0001 @@ -2643,7 +2644,7 @@ M300 0000 0001 0000 -, // measure 64 +, 1000 0000 0010 @@ -2660,7 +2661,7 @@ M300 0000 0001 0000 -, // measure 65 +, 0010 0000 0100 @@ -2677,7 +2678,7 @@ M300 0000 0001 0000 -, // measure 66 +, 1000 0000 0100 @@ -2694,7 +2695,7 @@ M300 0000 0001 0000 -, // measure 67 +, 1000 0000 0010 @@ -2711,7 +2712,7 @@ M300 0000 0001 0000 -, // measure 68 +, 1000 0010 0010 @@ -2720,7 +2721,7 @@ M300 0001 0010 0000 -, // measure 69 +, 0100 0000 1000 @@ -2737,7 +2738,7 @@ M300 0000 0100 0000 -, // measure 70 +, 0010 0001 0001 @@ -2746,7 +2747,7 @@ M300 0010 1000 0000 -, // measure 71 +, 0100 0000 0010 @@ -2763,7 +2764,7 @@ M300 0000 0001 0000 -, // measure 72 +, 1000 0001 0001 @@ -2772,7 +2773,7 @@ M300 0001 1000 0000 -, // measure 73 +, 0010 0000 1000 @@ -2789,7 +2790,7 @@ M300 0000 0010 0000 -, // measure 74 +, 0100 0001 1000 @@ -2798,7 +2799,7 @@ M300 0010 0001 0000 -, // measure 75 +, 1000 0000 1000 @@ -2815,7 +2816,7 @@ M300 0001 1000 0000 -, // measure 76 +, 0001 0000 0010 @@ -2848,7 +2849,7 @@ M300 0000 0000 3000 -, // measure 77 +, 0000 0000 0000 @@ -2881,7 +2882,7 @@ M300 0000 0000 3000 -, // measure 78 +, 0040 0000 0000 @@ -2914,7 +2915,7 @@ M300 0000 0003 0000 -, // measure 79 +, 0000 0000 0100 @@ -2931,7 +2932,7 @@ M300 0000 0000 0000 -, // measure 80 +, 0000 0000 0000 @@ -2948,7 +2949,7 @@ M300 0001 1000 0000 -, // measure 81 +, 0001 0010 0001 @@ -2965,7 +2966,7 @@ M300 0000 0000 0000 -, // measure 82 +, 0203 0300 0020 @@ -2982,7 +2983,7 @@ M300 0000 0000 0000 -, // measure 83 +, 0300 0000 1000 @@ -2999,7 +3000,7 @@ M300 0000 0000 0000 -, // measure 84 +, 0000 0000 0000 @@ -3016,7 +3017,7 @@ M300 0001 0100 0000 -, // measure 85 +, 0001 0010 0001 @@ -3033,7 +3034,7 @@ M300 0000 0001 1000 -, // measure 86 +, 0001 1000 0020 @@ -3050,7 +3051,7 @@ M300 0000 0000 0000 -, // measure 87 +, 0000 0003 0100 @@ -3067,7 +3068,7 @@ M300 0000 0000 0000 -, // measure 88 +, 0000 0000 0000 @@ -3084,7 +3085,7 @@ M300 0000 0300 0000 -, // measure 89 +, 0020 0000 0000 @@ -3101,7 +3102,7 @@ M300 0000 0000 0000 -, // measure 90 +, 0000 0000 0000 @@ -3118,7 +3119,7 @@ M300 0000 0010 0000 -, // measure 91 +, 0001 0000 0010 @@ -3135,7 +3136,7 @@ M300 0000 0001 0000 -, // measure 92 +, 0100 0000 0001 @@ -3152,7 +3153,7 @@ M300 0000 0010 0000 -, // measure 93 +, 0001 0000 1000 @@ -3169,7 +3170,7 @@ M300 1000 0001 0000 -, // measure 94 +, 2000 3000 0002 @@ -3186,12 +3187,12 @@ M300 0000 0000 0000 -, // measure 95 +, 0000 0000 0000 0000 -, // measure 96 +, 0000 0000 0000 @@ -5536,3 +5537,5072 @@ M300 0000 0000 ; + +//---------------pump-single - Vin.il / Aegis---------------- +#NOTEDATA:; +#STEPSTYPE:pump-single; +#DESCRIPTION:Vin.il / Aegis; +#CHARTSTYLE:Pad; +#DIFFICULTY:Medium; +#METER:10; +#RADARVALUES:1.000,1.000,0.581,1.000,0.201,694.000,75.000,173.000,0.000,0.000,0.000,0.000,0.000,1.000,1.000,0.581,1.000,0.201,694.000,75.000,173.000,0.000,0.000,0.000,0.000,0.000; +#CREDIT:Vin.il; +#OFFSET:-0.125000; +#BPMS:0.000000=181.699997 +; +#STOPS:; +#DELAYS:; +#WARPS:; +#TIMESIGNATURES:0.000000=4=4 +; +#TICKCOUNTS:0.000000=4 +,384.000000=13 +; +#COMBOS:0.000000=1 +; +#SPEEDS:0.000000=1.000000=0.000000=0 +,384.000000=1.500000=0.500000=0 +; +#SCROLLS:0.000000=1.000000 +,304.000000=0.500000 +,318.000000=1.000000 +,386.000000=0.000010 +; +#FAKES:; +#LABELS:0.000000=Song Start +; +#ATTACKS: +; +#NOTES: +// measure 0 +00000 +00000 +00000 +00000 +, // measure 1 +00000 +00000 +00000 +00000 +, // measure 2 +00000 +00000 +00000 +00000 +, // measure 3 +00000 +00000 +00000 +00000 +, // measure 4 +00100 +00000 +01001 +00000 +00010 +10000 +00001 +01000 +, // measure 5 +00100 +00000 +10100 +00000 +00100 +01000 +00010 +00100 +, // measure 6 +00001 +00000 +01001 +00000 +00001 +01000 +00100 +10000 +, // measure 7 +00100 +00000 +00100 +01000 +00010 +00100 +00001 +00000 +, // measure 8 +00100 +00000 +00000 +00000 +01010 +00000 +00000 +00000 +01000 +00020 +00000 +00030 +00100 +00000 +00010 +00000 +, // measure 9 +10000 +00000 +00000 +00000 +10010 +00000 +00000 +00000 +10000 +00200 +00000 +00300 +01000 +00000 +00001 +00000 +, // measure 10 +00100 +00000 +00000 +00000 +00101 +00000 +00000 +00000 +00100 +00002 +00000 +00003 +10000 +00000 +00100 +00000 +, // measure 11 +01000 +00000 +00001 +00000 +01000 +00000 +00001 +00000 +10000 +00010 +10000 +00010 +00200 +00000 +00300 +00000 +, // measure 12 +00001 +00100 +00001 +10000 +00000 +00010 +01000 +00001 +, // measure 13 +10000 +00100 +01000 +00010 +00100 +00001 +10000 +00100 +, // measure 14 +00000 +01000 +00010 +00001 +00000 +00010 +00100 +00010 +, // measure 15 +10000 +00010 +01000 +00100 +10000 +00001 +01000 +10000 +, // measure 16 +00000 +00100 +00001 +01000 +00000 +00100 +00010 +00001 +, // measure 17 +00100 +10000 +00010 +00001 +00100 +00010 +01000 +00100 +, // measure 18 +00000 +10000 +00001 +00100 +00000 +00010 +01000 +00100 +, // measure 19 +01000 +00001 +10000 +00100 +01000 +02000 +03001 +00002 +, // measure 20 +10003 +00010 +01000 +00100 +10000 +00001 +01000 +00001 +, // measure 21 +10000 +00010 +01000 +00100 +10000 +00010 +01000 +01000 +, // measure 22 +00001 +01000 +00010 +10000 +00100 +01000 +00010 +00001 +, // measure 23 +00100 +10000 +00010 +00100 +00001 +10000 +00001 +00001 +, // measure 24 +01000 +10000 +00100 +00001 +01000 +00100 +01000 +00010 +, // measure 25 +10000 +01000 +00100 +00010 +00100 +00001 +10000 +10000 +, // measure 26 +00100 +10000 +00010 +01000 +00100 +10000 +00010 +00100 +, // measure 27 +00001 +00002 +00003 +00000 +10000 +20000 +30000 +00000 +00001 +00002 +00003 +00000 +10000 +20000 +30000 +00000 +00010 +00020 +00030 +00000 +01000 +02000 +03000 +00000 +00010 +00020 +00030 +00000 +01000 +02000 +03000 +00000 +, // measure 28 +00100 +10000 +00100 +02000 +10000 +00000 +03100 +00000 +, // measure 29 +10000 +01000 +00100 +00020 +00100 +00000 +01030 +00000 +, // measure 30 +00010 +10000 +00001 +00100 +00010 +10000 +00001 +00100 +, // measure 31 +00010 +01000 +00100 +10100 +10000 +00001 +10001 +10000 +, // measure 32 +00001 +01000 +10000 +02000 +00010 +00000 +03100 +00000 +, // measure 33 +10000 +00010 +00100 +00020 +00001 +00000 +00130 +00000 +, // measure 34 +00001 +10000 +00100 +01000 +00001 +10000 +00100 +01000 +, // measure 35 +00010 +00020 +00030 +00000 +01000 +02000 +03000 +00000 +00010 +00020 +00030 +00000 +01000 +02000 +03000 +00000 +00001 +00002 +00003 +00000 +10000 +20000 +30000 +00000 +00001 +00002 +00003 +00000 +10000 +20000 +30000 +00000 +, // measure 36 +00010 +00100 +00010 +00002 +00003 +00010 +10000 +00010 +, // measure 37 +00100 +00010 +01000 +00001 +10000 +00010 +01000 +00100 +, // measure 38 +10000 +00010 +01000 +20000 +30000 +01000 +00001 +01000 +, // measure 39 +02100 +03100 +10200 +10300 +21000 +31000 +02100 +03100 +, // measure 40 +00010 +00100 +00001 +00020 +00030 +00001 +00100 +00010 +, // measure 41 +01000 +00100 +10000 +01000 +00100 +00010 +00100 +00001 +, // measure 42 +00100 +00010 +01000 +00200 +00300 +10000 +00010 +00100 +, // measure 43 +00201 +00301 +00012 +00013 +00120 +00130 +01200 +01300 +, // measure 44 +00010 +00100 +00001 +02000 +00010 +00000 +03100 +00000 +, // measure 45 +01000 +00010 +00100 +00002 +10000 +00000 +00103 +00000 +, // measure 46 +00010 +01000 +00100 +10000 +00010 +01000 +00100 +10000 +, // measure 47 +00010 +01000 +00100 +10010 +00100 +00001 +01001 +00100 +, // measure 48 +10000 +00010 +00100 +02000 +10000 +00000 +03100 +00000 +, // measure 49 +00010 +01000 +00001 +00200 +00010 +00000 +00301 +00000 +, // measure 50 +10000 +00100 +01000 +00010 +10000 +00100 +01000 +00010 +, // measure 51 +10000 +20000 +30000 +00000 +00001 +00002 +00003 +00000 +10000 +20000 +30000 +00000 +00001 +00002 +00003 +00000 +01000 +02000 +03000 +00000 +00010 +00020 +00030 +00000 +01000 +02000 +03000 +00000 +00010 +00020 +00030 +00000 +, // measure 52 +02020 +03030 +00220 +00330 +02020 +03030 +02002 +03003 +, // measure 53 +02020 +03030 +20020 +30030 +02020 +03030 +02200 +03300 +, // measure 54 +02002 +03003 +00202 +00303 +02002 +03003 +02200 +03300 +, // measure 55 +20020 +30030 +02002 +03003 +10010 +01001 +10010 +00000 +, // measure 56 +20002 +30003 +02002 +03003 +20002 +30003 +20200 +30300 +, // measure 57 +20002 +30003 +00202 +00303 +20002 +30003 +20020 +30030 +, // measure 58 +20200 +30300 +20020 +30030 +00220 +00330 +20020 +30030 +, // measure 59 +00020 +20030 +30200 +02300 +03002 +00203 +00320 +10030 +, // measure 60 +20100 +30100 +01200 +01300 +02010 +03010 +00120 +00130 +, // measure 61 +00201 +00301 +01002 +01003 +02100 +03100 +10200 +10300 +, // measure 62 +20010 +30010 +10020 +10030 +20010 +30010 +10020 +10030 +, // measure 63 +00200 +02300 +03020 +00230 +00302 +20003 +30020 +00130 +, // measure 64 +00201 +00301 +10002 +10003 +20010 +30010 +01020 +01030 +, // measure 65 +02001 +03001 +10002 +10003 +20100 +30100 +01200 +01300 +, // measure 66 +02001 +03001 +01002 +01003 +02001 +03001 +01002 +01003 +, // measure 67 +00200 +20300 +30020 +00230 +00302 +20003 +30200 +01300 +, // measure 68 +00010 +00001 +00010 +00100 +00000 +00001 +00010 +00100 +, // measure 69 +01000 +10000 +00100 +00001 +00100 +10000 +00100 +00001 +, // measure 70 +00000 +01000 +10000 +01000 +00000 +00100 +10000 +00001 +, // measure 71 +01000 +10000 +00100 +00001 +10000 +00010 +00100 +00001 +, // measure 72 +00000 +00100 +00010 +01000 +00000 +00010 +00100 +00001 +, // measure 73 +00100 +00010 +01000 +10000 +01000 +00010 +10000 +00100 +, // measure 74 +00000 +10000 +01000 +00100 +00000 +00010 +01000 +00100 +, // measure 75 +01000 +00000 +00001 +00000 +10000 +00000 +00010 +00000 +10000 +00010 +10000 +00010 +10000 +00010 +10000 +00010 +, // measure 76 +00100 +00000 +00000 +00000 +00000 +00000 +00001 +00000 +00000 +00000 +00000 +00000 +00100 +00000 +00000 +00000 +00000 +00000 +00020 +00000 +00000 +00000 +00000 +00000 +00000 +00000 +00000 +00000 +00000 +00000 +00000 +00000 +00000 +00000 +00000 +00000 +00000 +00000 +00000 +00030 +00000 +00000 +00000 +00000 +10000 +00000 +00000 +00000 +, // measure 77 +00100 +00000 +00000 +00100 +00000 +00000 +01000 +00000 +00020 +00000 +00000 +00000 +00000 +00000 +00000 +00000 +, // measure 78 +00000 +00000 +00030 +00000 +00100 +00000 +00010 +00000 +02000 +03000 +00002 +00003 +20000 +30000 +00100 +02000 +, // measure 79 +00000 +00000 +00000 +00000 +03000 +00000 +00000 +00000 +00010 +00000 +00000 +00000 +00100 +00000 +00000 +00000 +00001 +00002 +00003 +00000 +10000 +20000 +30000 +00000 +00001 +00002 +00003 +00000 +10000 +20000 +30000 +00000 +, // measure 80 +00100 +01000 +10000 +01000 +00100 +01000 +10000 +01000 +, // measure 81 +00100 +10000 +00001 +10000 +00100 +10000 +00001 +10000 +, // measure 82 +00100 +00001 +00010 +10000 +00010 +00001 +00100 +10000 +, // measure 83 +00010 +00100 +01001 +00100 +10000 +01001 +10010 +00100 +, // measure 84 +00001 +00010 +00100 +00010 +00001 +00010 +00100 +00010 +, // measure 85 +00001 +10000 +00010 +10000 +00001 +10000 +00010 +10000 +, // measure 86 +00001 +01000 +10000 +01000 +00001 +01000 +10000 +00100 +, // measure 87 +00001 +00000 +00000 +00000 +10000 +00000 +00000 +00000 +01000 +00000 +00000 +00000 +00100 +00000 +00000 +00000 +00010 +00020 +00030 +00000 +01000 +02000 +03000 +00000 +00010 +00020 +00030 +00000 +01000 +02000 +03000 +00000 +, // measure 88 +00001 +00100 +00010 +02000 +00100 +00000 +03010 +00100 +, // measure 89 +00001 +10000 +00010 +01000 +00200 +00000 +10300 +00000 +, // measure 90 +00010 +10000 +00010 +01000 +00001 +00100 +00010 +01000 +, // measure 91 +00100 +10000 +00100 +10000 +00100 +00001 +00100 +00001 +, // measure 92 +00010 +00100 +01000 +10000 +00010 +00100 +00001 +00100 +, // measure 93 +00010 +01000 +00100 +01000 +10000 +00100 +00001 +00100 +, // measure 94 +00010 +01000 +00100 +10000 +00001 +00100 +00010 +01000 +, // measure 95 +00010 +00020 +00030 +00000 +01000 +02000 +03000 +00000 +00010 +00020 +00030 +00000 +01000 +02000 +03000 +00000 +00001 +00002 +00003 +00000 +10000 +20000 +30000 +00000 +00001 +00002 +00003 +00000 +10000 +20000 +30000 +00000 +, // measure 96 +20002 +00000 +00000 +00000 +, // measure 97 +00000 +00000 +00000 +00000 +00000 +30003 +00000 +00000 +; + +//---------------pump-single - Vin.il---------------- +#NOTEDATA:; +#STEPSTYPE:pump-single; +#DESCRIPTION:Vin.il; +#CHARTSTYLE:Pad; +#DIFFICULTY:Easy; +#METER:7; +#RADARVALUES:0.572,0.594,0.380,0.101,0.012,455.000,49.000,13.000,0.000,0.000,0.000,0.000,0.000,0.572,0.594,0.380,0.101,0.012,455.000,49.000,13.000,0.000,0.000,0.000,0.000,0.000; +#CREDIT:Vin.il; +#OFFSET:-0.125000; +#BPMS:0.000000=181.699997 +,304.000000=90.850998 +,311.000000=181.701996 +; +#STOPS:; +#DELAYS:; +#WARPS:; +#TIMESIGNATURES:0.000000=4=4 +; +#TICKCOUNTS:0.000000=2 +; +#COMBOS:0.000000=1 +; +#SPEEDS:0.000000=1.000000=0.000000=0 +,380.000000=0.062500=0.062500=0 +,380.062500=1.000000=0.062500=0 +,380.500000=0.062500=0.062500=0 +,380.562500=1.000000=0.062500=0 +,381.000000=0.062500=0.062500=0 +,381.062500=1.000000=0.062500=0 +,381.250000=0.062500=0.062500=0 +,381.312500=1.000000=0.062500=0 +,381.750000=0.062500=0.062500=0 +,381.812500=1.000000=0.062500=0 +,382.500000=0.062500=0.062500=0 +,382.562500=1.000000=0.062500=0 +,383.000000=0.062500=0.062500=0 +,383.062500=1.000000=0.062500=0 +; +#SCROLLS:0.000000=1.000000 +; +#FAKES:; +#LABELS:0.000000=Song Start +; +#ATTACKS: +; +#NOTES: +00000 +00000 +00000 +00000 +, +00000 +00000 +00000 +00000 +, +00000 +00000 +00000 +00000 +, +00000 +00000 +00000 +00000 +, +10000 +00000 +10100 +00000 +00000 +10000 +00001 +00000 +, +00001 +00000 +00101 +00000 +00000 +00001 +01000 +00000 +, +01000 +00000 +01100 +00000 +00000 +01000 +00010 +00000 +, +00010 +00000 +00000 +00100 +00001 +01000 +00100 +00000 +, +01000 +00000 +01100 +00000 +00000 +01000 +00010 +00000 +, +00010 +00000 +00110 +00000 +00000 +00010 +10000 +00000 +, +10000 +00000 +10100 +00000 +00000 +10000 +00001 +00000 +, +00001 +00100 +00001 +00100 +00010 +10000 +00200 +00300 +, +01000 +00000 +01001 +00000 +00001 +00000 +00100 +00001 +, +10000 +00000 +00000 +00100 +01000 +00000 +00010 +00100 +, +00001 +00000 +01001 +00000 +01000 +00000 +00100 +01000 +, +00010 +00000 +00000 +00100 +00001 +00000 +10000 +00100 +, +10000 +00000 +10010 +00000 +00010 +00000 +00100 +00001 +, +00100 +00010 +00000 +01000 +00100 +00000 +10000 +00001 +, +01000 +01001 +00001 +00100 +, +00010 +00100 +00010 +00000 +10000 +00100 +10000 +00000 +, +00001 +00000 +00101 +00000 +00001 +00100 +00010 +00000 +, +01000 +00100 +00000 +00100 +10000 +00000 +00010 +00100 +, +00010 +00000 +00110 +00000 +00010 +01000 +00100 +00000 +, +10000 +00001 +00000 +00001 +00100 +00000 +00010 +01000 +, +00010 +00000 +01010 +00000 +01000 +00100 +01000 +00000 +, +00001 +10000 +00000 +10000 +00010 +00000 +00010 +01000 +, +00001 +00000 +00101 +00000 +00001 +01000 +00100 +00000 +, +10000 +00010 +10000 +00010 +01000 +00001 +00200 +00300 +, +00001 +00000 +00001 +20000 +00000 +30000 +00000 +00100 +, +10000 +00000 +00010 +00100 +00020 +00000 +00000 +00000 +, +00030 +00000 +00100 +00000 +00001 +00100 +00001 +02000 +, +03000 +00000 +00100 +00000 +01000 +00000 +00010 +00100 +, +00010 +00000 +00010 +02000 +00000 +03000 +00000 +00100 +, +01000 +00000 +00001 +00100 +00002 +00000 +00000 +00000 +, +00003 +00000 +00100 +00000 +00010 +00100 +00010 +10000 +, +00100 +00000 +01000 +00000 +00100 +10000 +00002 +00003 +, +00100 +00000 +00001 +00000 +00100 +00000 +00010 +01000 +, +00100 +00000 +10000 +00000 +00100 +00000 +01000 +00010 +, +00100 +00001 +00000 +10000 +00000 +00100 +00000 +00100 +, +01000 +00010 +00100 +00000 +00001 +00000 +01000 +00100 +, +01000 +00000 +01000 +00000 +00100 +00000 +10000 +00001 +, +00100 +00000 +00010 +00000 +00100 +00000 +00001 +10000 +, +00100 +01000 +00000 +00010 +00000 +00100 +00000 +00100 +, +00001 +10000 +00100 +10000 +00100 +00000 +01000 +00010 +, +00100 +00000 +00101 +00000 +00001 +10000 +00100 +00000 +, +10000 +00000 +10100 +00000 +10000 +00010 +00100 +00000 +, +00010 +00000 +01010 +00000 +01000 +00100 +01000 +00001 +, +00000 +00000 +00100 +00000 +00001 +00000 +10000 +00100 +, +01000 +00000 +01100 +00000 +00100 +01000 +00010 +00000 +, +00100 +00000 +00101 +00000 +00001 +01000 +00100 +00000 +, +01000 +01010 +00010 +00100 +, +00010 +00100 +00001 +00000 +01000 +00100 +20000 +30000 +, +00010 +00110 +00010 +01010 +, +01000 +01100 +01000 +01010 +, +00001 +00101 +00001 +10001 +, +10000 +10100 +10000 +10001 +, +01000 +00000 +00010 +00100 +00001 +00000 +01000 +00000 +, +00001 +00000 +10000 +00100 +01000 +00000 +00001 +00000 +, +10000 +00000 +00001 +00100 +00010 +00000 +01000 +00000 +, +00010 +00000 +01000 +00100 +10000 +00000 +00001 +00000 +, +01000 +00000 +01010 +00000 +00010 +00100 +00001 +00000 +, +10000 +00000 +10001 +00000 +00001 +00100 +00010 +00000 +, +01000 +00000 +01100 +00000 +00100 +10000 +00010 +00000 +, +10000 +00000 +10100 +00000 +00100 +01000 +00001 +00000 +, +00100 +00001 +00100 +00000 +00001 +00000 +01000 +00000 +, +00100 +10000 +00100 +00000 +10000 +00000 +00010 +00000 +, +00100 +00010 +00100 +00000 +00010 +00000 +10000 +00000 +, +00100 +01000 +00100 +00000 +01000 +00000 +00001 +00000 +, +00100 +00000 +00101 +00000 +00001 +01000 +00100 +00000 +, +00100 +10000 +00000 +00010 +00100 +00000 +00001 +00000 +, +00100 +00000 +00110 +00000 +00010 +10000 +00100 +00000 +, +00100 +01000 +00000 +00001 +00100 +00000 +00010 +00000 +, +00100 +00000 +00110 +00000 +00010 +10000 +00100 +00000 +, +00100 +01000 +00000 +00001 +00100 +00000 +00010 +00000 +, +00100 +00000 +00101 +00000 +00001 +01000 +00100 +00000 +, +00100 +10000 +00000 +00010 +00100 +00000 +00001 +00000 +, +00100 +00000 +00001 +20000 +00000 +00000 +30000 +00000 +10000 +00000 +00000 +00001 +00200 +00000 +00000 +00000 +, +00300 +00000 +00100 +00000 +00010 +01000 +00100 +00000 +10000 +00000 +00001 +00000 +00100 +00000 +00001 +00000 +, +10000 +00100 +10001 +00000 +00001 +00000 +00100 +00001 +, +01000 +00000 +00100 +00000 +10100 +00000 +10000 +00010 +, +00100 +00000 +00001 +00100 +00001 +00000 +10000 +00000 +, +10100 +00000 +00010 +00100 +00010 +00000 +01000 +00000 +, +01100 +00000 +00010 +00000 +01000 +00000 +00100 +01000 +, +00001 +00000 +00100 +00000 +00110 +00000 +00010 +10000 +, +00100 +00000 +01000 +00100 +01000 +00000 +00010 +00000 +, +00110 +00000 +10000 +00100 +10000 +00000 +00001 +00000 +, +00101 +00000 +00001 +01000 +00001 +01000 +00000 +00000 +, +00000 +01000 +00100 +00000 +00100 +10000 +00010 +00000 +, +00110 +00100 +00101 +00001 +, +10001 +00000 +10000 +00000 +00100 +10000 +00100 +00000 +, +01000 +00000 +00001 +00100 +00001 +00000 +01000 +00000 +, +00010 +00000 +10000 +00000 +10100 +00000 +00100 +10000 +, +00001 +00100 +00010 +00000 +01010 +00000 +01000 +00000 +, +00100 +00000 +10000 +00100 +10000 +00100 +01000 +00001 +, +00100 +00010 +02020 +00000 +00000 +00000 +00000 +00000 +, +00000 +00000 +00000 +00000 +00000 +00000 +00000 +03030 +; + +//---------------pump-single - Vin.il - Another CZ---------------- +#NOTEDATA:; +#STEPSTYPE:pump-single; +#DESCRIPTION:Vin.il - Another CZ; +#CHARTSTYLE:Pad - ACZ; +#DIFFICULTY:Challenge; +#METER:21; +#RADARVALUES:1.000,1.000,0.620,0.488,1.000,1006.000,80.000,63.000,0.000,0.000,0.000,0.000,0.000,1.000,1.000,0.620,0.488,1.000,1006.000,80.000,63.000,0.000,0.000,0.000,0.000,0.000; +#CREDIT:Vin.il; +#OFFSET:-0.084000; +#BPMS:0.000000=181.699997 +,44.000000=363.399994 +,47.000000=726.799988 +,48.000000=181.699997 +,300.000000=363.399994 +,304.000000=181.699997 +; +#STOPS:; +#DELAYS:44.500000=0.082554 +,45.000000=0.082554 +,45.500000=0.082554 +,46.000000=0.082554 +,46.250000=0.041277 +,46.500000=0.041277 +,46.750000=0.041277 +,47.000000=0.041277 +,48.000000=0.247661 +,300.500000=0.082558 +,301.000000=0.082558 +,301.500000=0.082558 +,302.000000=0.082558 +,302.250000=0.041275 +,302.500000=0.041275 +,302.750000=0.041275 +,303.000000=0.041275 +,303.250000=0.041275 +,303.500000=0.041275 +,303.750000=0.041275 +,304.000000=0.041275 +; +#WARPS:; +#TIMESIGNATURES:0.000000=4=4 +; +#TICKCOUNTS:0.000000=4 +,384.000000=8 +; +#COMBOS:0.000000=1 +; +#SPEEDS:0.000000=1.000000=0.000000=0 +,174.750000=0.500000=0.500000=0 +,175.000000=1.000000=0.500000=0 +,175.250000=0.500000=0.250000=0 +,175.375000=1.000000=0.250000=0 +,175.500000=0.500000=0.250000=0 +,175.625000=1.000000=0.250000=0 +,175.750000=0.500000=0.250000=0 +,175.875000=1.000000=0.250000=0 +,304.000000=2.000000=14.000000=0 +,384.000000=1000.000000=6.500000=0 +; +#SCROLLS:0.000000=1.000000 +,174.500000=0.000000 +,176.000000=1.000000 +,304.000000=0.250000 +,318.000000=0.500000 +,384.000000=0.001000 +; +#FAKES:; +#LABELS:0.000000=Song Start +; +#ATTACKS:; +#NOTES: +// measure 0 +00000 +00000 +00000 +00000 +, // measure 1 +00000 +00000 +00000 +00000 +, // measure 2 +00000 +00000 +00000 +00000 +, // measure 3 +00000 +00000 +00000 +00000 +, // measure 4 +10000 +00000 +00001 +00100 +00001 +00000 +01000 +00100 +01000 +00010 +00000 +00000 +01010 +00000 +01010 +00000 +, // measure 5 +10000 +00000 +00001 +00100 +00001 +00000 +01000 +00100 +01000 +00010 +00000 +00000 +01010 +00000 +01010 +00000 +, // measure 6 +00010 +00000 +01000 +00100 +01000 +00000 +00001 +00100 +00001 +10000 +00000 +00000 +10001 +00000 +10001 +00000 +, // measure 7 +00010 +00000 +01000 +00100 +01000 +00000 +00001 +00000 +00101 +00000 +00101 +00000 +20002 +00000 +30003 +00000 +, // measure 8 +00001 +00000 +01000 +00100 +01000 +00000 +00010 +00100 +00010 +10000 +00000 +00100 +10000 +00001 +00100 +00000 +, // measure 9 +00001 +00000 +01000 +00100 +01000 +00000 +00010 +00100 +00010 +10000 +00000 +00100 +10000 +00001 +00100 +00000 +, // measure 10 +00010 +00000 +10000 +00100 +10000 +00000 +00001 +00100 +00001 +01000 +00000 +00100 +01000 +00010 +00100 +00000 +, // measure 11 +00010 +00000 +00100 +00000 +00010 +00000 +10000 +00000 +00010 +01000 +00100 +10000 +00002 +00000 +00003 +00000 +, // measure 12 +00001 +00000 +00010 +00100 +01000 +00000 +00001 +00000 +01000 +00100 +00010 +00100 +01000 +00000 +00001 +00000 +, // measure 13 +10000 +00000 +00100 +00000 +00000 +00000 +10000 +00100 +00010 +00000 +00001 +00000 +00010 +00000 +00010 +00000 +, // measure 14 +00001 +00000 +10000 +00000 +10000 +00000 +01000 +00100 +00010 +00000 +10000 +00000 +00010 +00100 +01000 +00100 +, // measure 15 +00010 +00000 +10000 +00000 +00000 +00000 +00001 +00100 +01000 +00000 +10000 +00000 +01000 +00100 +00010 +00100 +, // measure 16 +00001 +00000 +00010 +00100 +00010 +00000 +00001 +00000 +10000 +01000 +00100 +01000 +10000 +00100 +01000 +00010 +, // measure 17 +00100 +00000 +00001 +00000 +00000 +00000 +00010 +00001 +00100 +00000 +01000 +00000 +10000 +00000 +00100 +00000 +, // measure 18 +10000 +00000 +01000 +00100 +01000 +00000 +10000 +00000 +00001 +00010 +00100 +00010 +00001 +00100 +00010 +01000 +, // measure 19 +00100 +10000 +00010 +00000 +00110 +01001 +00110 +10001 +, // measure 20 +00100 +00000 +10000 +00100 +10000 +00000 +00010 +00100 +00010 +00100 +00001 +00010 +00100 +00000 +01000 +00000 +, // measure 21 +00010 +00000 +00100 +00000 +01000 +00000 +10000 +01000 +00100 +00000 +00010 +00000 +01000 +00000 +00001 +00000 +, // measure 22 +00100 +00000 +00010 +00100 +00010 +00000 +10000 +00100 +10000 +00100 +01000 +10000 +00100 +00000 +00001 +00000 +, // measure 23 +10000 +00000 +00100 +00000 +00000 +00000 +01000 +00100 +00010 +00100 +01000 +00010 +00100 +00000 +00001 +00000 +, // measure 24 +10000 +00000 +00010 +00100 +00001 +00000 +01000 +00100 +10000 +00010 +01000 +00001 +00100 +00000 +00010 +00000 +, // measure 25 +01000 +00000 +00100 +00000 +00000 +00000 +10000 +00100 +00001 +00000 +00010 +00000 +00100 +00000 +00100 +00000 +, // measure 26 +00010 +10000 +10100 +00001 +00100 +00010 +01000 +00100 +, // measure 27 +10000 +00001 +10000 +00001 +10000 +00001 +10000 +00001 +01000 +00010 +01000 +00010 +10000 +00000 +00001 +00000 +, // measure 28 +10001 +00000 +00001 +00000 +00101 +00000 +00100 +00000 +00010 +00000 +01000 +00000 +01100 +00000 +00100 +10000 +, // measure 29 +00001 +00000 +01000 +00000 +01001 +00000 +00001 +00000 +10000 +00000 +00010 +00000 +10010 +00000 +00010 +10000 +, // measure 30 +00010 +00100 +00010 +00000 +00110 +00000 +00010 +00000 +01000 +00100 +10000 +00001 +01000 +00010 +00100 +00001 +, // measure 31 +20000 +00000 +30001 +10001 +00101 +00001 +10100 +10000 +, // measure 32 +01010 +00000 +01000 +00000 +01100 +00000 +00100 +00000 +10000 +00000 +00001 +00000 +00101 +00000 +00100 +00010 +, // measure 33 +01000 +00000 +00001 +00000 +01001 +00000 +01000 +00000 +00010 +00000 +10000 +00000 +10010 +00000 +10000 +00010 +, // measure 34 +10000 +00100 +10000 +00000 +10100 +00000 +10000 +00000 +00001 +00100 +00010 +01000 +00001 +10000 +00100 +01000 +, // measure 35 +00010 +00100 +00010 +00100 +00010 +00100 +00010 +00100 +00010 +10000 +00100 +10000 +00010 +00100 +00010 +01000 +, // measure 36 +00002 +00003 +00200 +00000 +00000 +00300 +00020 +00000 +00000 +00030 +02000 +03000 +00020 +00030 +00002 +00003 +, // measure 37 +00200 +00300 +20000 +00000 +00100 +00000 +00000 +30000 +00002 +00000 +00000 +00000 +00100 +00000 +00000 +00003 +, // measure 38 +20000 +30000 +00200 +00000 +00000 +00300 +00020 +00000 +00000 +00030 +00200 +00000 +00000 +00300 +00010 +00000 +, // measure 39 +00001 +00100 +00010 +00001 +00100 +10000 +00100 +01000 +10000 +00100 +00001 +10000 +00010 +01000 +00100 +10000 +, // measure 40 +00020 +00030 +00200 +00000 +00000 +00300 +00002 +00000 +00000 +00003 +20000 +30000 +00002 +00003 +00020 +00030 +, // measure 41 +00200 +00300 +02000 +00000 +00100 +00000 +00000 +03000 +00020 +00000 +00000 +00000 +00100 +00000 +00000 +00030 +, // measure 42 +02000 +03000 +00200 +00000 +00000 +00300 +20000 +00000 +00000 +30000 +00002 +00000 +00000 +00003 +00100 +00000 +, // measure 43 +00010 +00100 +00001 +00010 +00100 +01000 +00100 +10000 +00010 +00000 +00000 +00000 +00000 +00000 +00000 +00000 +, // measure 44 +01010 +00000 +00010 +00000 +00110 +00000 +01000 +00000 +00100 +00000 +10000 +00000 +10001 +00000 +00001 +10000 +, // measure 45 +00100 +00000 +01000 +00010 +00100 +00001 +10000 +00000 +10010 +00000 +10000 +00000 +00101 +00000 +00001 +01000 +, // measure 46 +00001 +00100 +00001 +00000 +10100 +00000 +00001 +00000 +00010 +00100 +01000 +00010 +00100 +01000 +10000 +00001 +, // measure 47 +00100 +00010 +01000 +00100 +10000 +00010 +00100 +01000 +00100 +00010 +01000 +00100 +00010 +00001 +00100 +00010 +, // measure 48 +10000 +00000 +10000 +00000 +10100 +00000 +00001 +00000 +00100 +00000 +00010 +00000 +01010 +00000 +01000 +00010 +, // measure 49 +00100 +00000 +00001 +00100 +00010 +01000 +00100 +00000 +10010 +00000 +00010 +00000 +01100 +00000 +01000 +00001 +, // measure 50 +01000 +00100 +01000 +00000 +00110 +00000 +01000 +00000 +10000 +00100 +00001 +10000 +00100 +00001 +00010 +01000 +, // measure 51 +00100 +10000 +00001 +00100 +00010 +10000 +00100 +00001 +00100 +10000 +00001 +00100 +10000 +01000 +00100 +10000 +, // measure 52 +00001 +00000 +00100 +00000 +01001 +00000 +10000 +00000 +00001 +00000 +00100 +00000 +01001 +00000 +10000 +00010 +, // measure 53 +01000 +00000 +00100 +00000 +01001 +00000 +00010 +00000 +01000 +00000 +00100 +00000 +01001 +00000 +00001 +01000 +, // measure 54 +00010 +00000 +00100 +00000 +10010 +00000 +01000 +00000 +00010 +00000 +00100 +00000 +10010 +00000 +01000 +00001 +, // measure 55 +10000 +00000 +00100 +00000 +10010 +00000 +00001 +00000 +10000 +00000 +00100 +00000 +10010 +00000 +00010 +10000 +, // measure 56 +00001 +00000 +00100 +00000 +01001 +00000 +10000 +00000 +00001 +00000 +00100 +00000 +01001 +00000 +10000 +00010 +, // measure 57 +01000 +00000 +00100 +00000 +01001 +00000 +00010 +00000 +01000 +00000 +00100 +00000 +01001 +00000 +00001 +01000 +, // measure 58 +00010 +00000 +00100 +00000 +10010 +00000 +01000 +00000 +00010 +00000 +00100 +00000 +10010 +00000 +01000 +00001 +, // measure 59 +10000 +00000 +00100 +00000 +10010 +00000 +00001 +00000 +10000 +00000 +00100 +00000 +10010 +00000 +00010 +10000 +, // measure 60 +00001 +00000 +00100 +00001 +00100 +00010 +01000 +00100 +01000 +00010 +00100 +00001 +00100 +00010 +01000 +00100 +, // measure 61 +01000 +00010 +10000 +00100 +10000 +00010 +00100 +00001 +01000 +00100 +10000 +00100 +10000 +00010 +00100 +00001 +, // measure 62 +01000 +00100 +00010 +00001 +01000 +00100 +00010 +00001 +10000 +01000 +00100 +00010 +10000 +01000 +00100 +00010 +, // measure 63 +00200 +00300 +00002 +00003 +02000 +03000 +00002 +00003 +00200 +00300 +00002 +00003 +02000 +03000 +00020 +00030 +, // measure 64 +10000 +00000 +00100 +01000 +00100 +10000 +00001 +00100 +00001 +10000 +00100 +01000 +00100 +10000 +00001 +00100 +, // measure 65 +00001 +10000 +00010 +00100 +00010 +10000 +00100 +01000 +00001 +00100 +00010 +00100 +00010 +10000 +00100 +01000 +, // measure 66 +00001 +00100 +10000 +01000 +00001 +00100 +10000 +01000 +00010 +00001 +00100 +10000 +00010 +00001 +00100 +10000 +, // measure 67 +00200 +00300 +02000 +03000 +00002 +00003 +02000 +03000 +00200 +00300 +02000 +03000 +00002 +00003 +20000 +30000 +, // measure 68 +00010 +00100 +00100 +00010 +00110 +01000 +00100 +10000 +, // measure 69 +00001 +00000 +00100 +00000 +00100 +00000 +00010 +00100 +01000 +00000 +01000 +00100 +00010 +00000 +01000 +00000 +, // measure 70 +01000 +00000 +00100 +01000 +00100 +00000 +01000 +00000 +01100 +00000 +00100 +10000 +00100 +00000 +01000 +00000 +, // measure 71 +00010 +00000 +00100 +00000 +00110 +00000 +01000 +00100 +10000 +00000 +00001 +10000 +00100 +01000 +00100 +10000 +, // measure 72 +00001 +00010 +00110 +00100 +01000 +00100 +10100 +10000 +, // measure 73 +00001 +00000 +00100 +00000 +00101 +00000 +00100 +00010 +00100 +00010 +01000 +00100 +10000 +00100 +01000 +00001 +, // measure 74 +10000 +01000 +01100 +00100 +00010 +00100 +00101 +00001 +, // measure 75 +10001 +00000 +10001 +00000 +10001 +00000 +10001 +00000 +00001 +10000 +00001 +10000 +00010 +01000 +00010 +01000 +, // measure 76 +00200 +00300 +20000 +30000 +00200 +00300 +00020 +00000 +00000 +00000 +00000 +00000 +00000 +00030 +00100 +01000 +, // measure 77 +00002 +00000 +00003 +00200 +00000 +00300 +00020 +00030 +02000 +00000 +00000 +00000 +00000 +00000 +00000 +00000 +, // measure 78 +00000 +00000 +00000 +03000 +00200 +00300 +02000 +03000 +00010 +01000 +00100 +10000 +01000 +10000 +00100 +02000 +, // measure 79 +00000 +00000 +00000 +03000 +00020 +00030 +00200 +00300 +00001 +10000 +00100 +00001 +00010 +00100 +01000 +10000 +, // measure 80 +00001 +00100 +00001 +00100 +00001 +01000 +00010 +00100 +00010 +00000 +10000 +00000 +10100 +00000 +00010 +10000 +, // measure 81 +00100 +00000 +01000 +00010 +00100 +00010 +00001 +00100 +10000 +00000 +00001 +00000 +00101 +00000 +01000 +00000 +, // measure 82 +00010 +00000 +00200 +00300 +01000 +00000 +00200 +00300 +00010 +01000 +00100 +10000 +00010 +00100 +01000 +10000 +, // measure 83 +00001 +00100 +00001 +00100 +00001 +00000 +10001 +00000 +00101 +00000 +00110 +00000 +01100 +00000 +10100 +00000 +, // measure 84 +10001 +00000 +00001 +00100 +00001 +10000 +00100 +01000 +00010 +00000 +00100 +00010 +00100 +00000 +00001 +00100 +, // measure 85 +00001 +00000 +10000 +00100 +10000 +00000 +00100 +00000 +01000 +00000 +00010 +00100 +00010 +00100 +00001 +10000 +, // measure 86 +00100 +01000 +00010 +00000 +00100 +00010 +01000 +00000 +00100 +01000 +00010 +00100 +00001 +00010 +00100 +01000 +, // measure 87 +00010 +00100 +00001 +10000 +00100 +01000 +00010 +00100 +00001 +10000 +00010 +01000 +00001 +10000 +00100 +01000 +, // measure 88 +00010 +00100 +00010 +00100 +00001 +00010 +00100 +01000 +00010 +00100 +00010 +01000 +00100 +01000 +00100 +00010 +, // measure 89 +00100 +01000 +00010 +00100 +00001 +10000 +00100 +01000 +00010 +00100 +00001 +00010 +00100 +01000 +00010 +00100 +, // measure 90 +01000 +00100 +00010 +01000 +00100 +10000 +00001 +00100 +10000 +01000 +00010 +00100 +00001 +10000 +00100 +00001 +, // measure 91 +00100 +10000 +00001 +00010 +00100 +01000 +10000 +01000 +00100 +00000 +10100 +00000 +10001 +00000 +00101 +00000 +, // measure 92 +10000 +00001 +00100 +00010 +00001 +00100 +10000 +00001 +00100 +10000 +01000 +00100 +10000 +00010 +00100 +00001 +, // measure 93 +00100 +00010 +01000 +00100 +10000 +00100 +01000 +00100 +10000 +00010 +00100 +00001 +00100 +00010 +00001 +00010 +, // measure 94 +00100 +01000 +00001 +00100 +10000 +00010 +01000 +00100 +01000 +00010 +00100 +00001 +10000 +00100 +01000 +00010 +, // measure 95 +10000 +00000 +00001 +00000 +10000 +00000 +00001 +00000 +01000 +00000 +00010 +00000 +01000 +00000 +00010 +00000 +00100 +00000 +00001 +00000 +00100 +00000 +00001 +00000 +10000 +00010 +00000 +00000 +00000 +00000 +00000 +00000 +, // measure 96 +02020 +00000 +00000 +00000 +, // measure 97 +00000 +00000 +00000 +00000 +00000 +03030 +00000 +00000 +; + +//---------------pump-single - Vin.il---------------- +#NOTEDATA:; +#STEPSTYPE:pump-single; +#DESCRIPTION:Vin.il; +#CHARTSTYLE:Pad; +#DIFFICULTY:Hard; +#METER:16; +#RADARVALUES:1.000,1.000,0.473,0.395,0.612,829.000,61.000,51.000,0.000,0.000,0.000,0.000,0.000,1.000,1.000,0.473,0.395,0.612,829.000,61.000,51.000,0.000,0.000,0.000,0.000,0.000; +#CREDIT:Vin.il; +#OFFSET:-0.125000; +#BPMS:0.000000=181.699997 +; +#STOPS:; +#DELAYS:; +#WARPS:; +#TIMESIGNATURES:0.000000=4=4 +; +#TICKCOUNTS:0.000000=4 +,384.000000=8 +; +#COMBOS:0.000000=1 +; +#SPEEDS:0.000000=1.000000=0.000000=0 +,46.979168=0.000000=0.000000=0 +,47.000000=1.000000=1.000000=0 +; +#SCROLLS:0.000000=1.000000 +,304.000000=0.500000 +,318.000000=1.000000 +,384.000000=0.062500 +; +#FAKES:; +#LABELS:0.000000=Song Start +; +#ATTACKS: +; +#NOTES: +// measure 0 +00000 +00000 +00000 +00000 +, // measure 1 +00000 +00000 +00000 +00000 +, // measure 2 +00000 +00000 +00000 +00000 +, // measure 3 +00000 +00000 +00000 +00000 +, // measure 4 +10000 +00100 +10100 +00000 +00001 +00100 +00010 +01000 +, // measure 5 +00001 +00100 +00101 +00000 +10000 +00100 +01000 +00010 +, // measure 6 +01000 +00100 +01100 +00000 +00010 +00100 +00001 +10000 +, // measure 7 +00010 +00100 +00000 +00100 +00010 +01000 +00200 +00300 +, // measure 8 +10000 +00001 +00101 +00000 +00001 +00100 +00010 +00100 +, // measure 9 +00001 +10000 +10100 +00000 +10000 +00100 +01000 +00100 +, // measure 10 +01000 +00010 +00110 +00000 +00010 +00100 +00001 +00100 +, // measure 11 +00110 +00000 +00010 +00000 +01010 +00000 +01000 +00000 +00100 +10000 +00100 +10000 +00002 +00000 +00003 +00000 +, // measure 12 +00001 +00100 +00001 +10000 +00000 +00100 +10000 +00010 +, // measure 13 +00100 +00000 +00001 +00000 +00000 +00000 +00001 +00100 +00001 +00000 +01000 +00000 +00010 +00000 +00100 +00000 +, // measure 14 +00010 +00100 +00010 +10000 +00000 +00100 +01000 +00001 +, // measure 15 +00100 +00010 +00000 +00010 +10000 +00100 +10000 +00000 +, // measure 16 +00001 +00100 +00001 +10000 +00100 +01000 +00010 +00100 +, // measure 17 +00001 +00000 +10000 +00000 +00000 +00000 +00100 +01000 +00100 +00000 +01000 +00000 +00001 +00000 +00100 +00000 +, // measure 18 +00010 +00100 +00010 +01000 +00100 +10000 +00001 +00100 +, // measure 19 +00010 +00000 +01000 +00000 +00100 +00000 +00010 +00000 +00001 +00100 +00001 +00000 +10000 +00100 +10000 +00000 +, // measure 20 +00010 +00000 +00100 +00010 +00100 +00000 +00001 +00000 +00100 +00000 +00001 +00000 +10000 +00000 +00100 +00000 +, // measure 21 +01000 +00000 +00010 +00000 +00000 +00000 +00100 +00000 +00001 +00000 +10000 +00000 +00100 +01000 +00100 +01000 +, // measure 22 +00001 +00000 +00100 +00001 +00100 +00000 +00010 +00000 +00100 +00000 +00010 +00000 +01000 +00000 +00100 +00000 +, // measure 23 +10000 +00000 +00001 +00000 +00000 +00000 +00100 +00000 +00010 +00000 +01000 +00000 +00100 +10000 +00100 +10000 +, // measure 24 +00001 +00000 +00100 +00001 +00100 +00000 +00010 +00000 +01000 +00000 +00100 +10000 +00100 +00000 +10000 +00000 +, // measure 25 +00001 +00000 +00100 +00000 +00000 +00000 +00010 +00100 +00010 +00000 +01000 +00000 +00100 +00000 +00100 +00000 +, // measure 26 +10000 +00000 +00100 +10000 +00100 +00000 +01000 +00000 +00010 +00000 +00100 +00001 +00100 +00000 +00010 +00000 +, // measure 27 +01000 +00100 +01000 +00000 +00010 +00100 +00010 +00000 +10000 +00001 +10000 +00001 +10000 +00000 +00000 +00000 +, // measure 28 +00100 +00000 +10000 +00000 +00100 +00000 +01000 +00000 +00001 +00000 +00100 +00000 +00010 +00000 +01000 +00100 +, // measure 29 +01000 +00000 +00000 +00100 +10000 +00000 +00001 +00000 +00100 +00000 +00001 +00000 +01000 +00010 +01000 +00010 +, // measure 30 +01000 +00000 +00100 +00000 +10000 +00100 +10000 +00000 +00010 +00100 +00001 +10000 +00010 +00000 +01000 +00000 +, // measure 31 +00100 +10000 +00010 +01000 +00001 +00001 +10000 +10000 +, // measure 32 +10001 +00000 +00001 +00100 +00010 +00000 +01000 +00000 +00100 +00000 +10000 +00000 +00001 +00000 +00100 +00010 +, // measure 33 +01000 +00000 +00000 +00100 +01000 +00000 +00010 +00000 +00100 +00000 +00001 +00000 +10000 +00010 +10000 +00010 +, // measure 34 +10000 +00000 +00000 +00000 +00100 +00000 +01000 +00000 +00001 +00100 +00001 +00100 +00001 +00000 +10000 +00000 +, // measure 35 +00100 +01000 +00010 +00000 +00100 +00010 +01000 +00000 +00100 +10000 +00100 +10000 +00001 +00100 +00001 +00100 +, // measure 36 +00010 +00100 +00010 +02000 +03000 +00100 +01000 +10000 +, // measure 37 +01000 +00100 +10000 +00001 +00100 +00001 +01001 +00000 +, // measure 38 +10010 +20000 +30000 +00002 +00003 +00200 +00300 +00100 +, // measure 39 +00010 +01000 +00010 +01000 +00100 +00000 +10000 +00000 +00001 +00000 +00100 +00000 +00010 +01000 +00010 +01000 +, // measure 40 +00001 +00100 +00001 +20000 +30000 +00100 +10000 +01000 +, // measure 41 +10000 +00100 +01000 +00010 +00100 +00010 +10010 +00000 +, // measure 42 +01001 +02000 +03000 +00020 +00030 +00200 +00300 +00100 +, // measure 43 +00001 +10000 +00001 +10000 +00010 +01000 +00010 +01000 +00100 +00000 +00000 +10000 +00000 +00100 +00000 +01000 +, // measure 44 +00001 +00000 +00100 +00000 +00001 +00000 +01001 +00000 +01000 +00000 +00010 +00000 +01010 +00000 +00010 +01000 +, // measure 45 +00100 +00000 +00000 +10000 +00100 +00000 +00100 +00000 +01001 +00000 +00001 +00000 +00100 +00010 +00100 +00010 +, // measure 46 +01000 +00000 +00000 +00000 +00100 +00000 +10000 +00000 +01000 +00100 +01000 +00100 +00010 +00000 +00100 +00000 +, // measure 47 +00001 +00001 +01001 +01000 +01010 +00010 +00110 +00100 +, // measure 48 +10001 +00000 +00001 +00100 +00001 +00000 +10000 +00000 +10010 +00000 +10000 +00100 +10000 +00000 +00001 +00100 +, // measure 49 +00001 +00000 +00000 +00100 +00010 +00000 +01000 +00000 +01010 +00000 +01000 +00000 +00100 +10000 +00100 +10000 +, // measure 50 +00001 +00000 +00000 +00000 +00100 +00000 +00001 +00000 +01000 +00010 +00100 +00000 +00001 +00000 +10000 +00000 +, // measure 51 +00010 +00100 +00010 +00100 +00010 +00100 +00010 +00000 +01000 +00100 +01000 +00100 +01000 +00100 +01000 +00000 +, // measure 52 +01010 +00010 +00110 +00010 +10010 +00010 +01010 +00010 +, // measure 53 +01010 +01000 +01100 +01000 +01001 +01000 +01010 +01000 +, // measure 54 +10001 +10000 +10100 +10000 +10010 +10000 +10001 +10000 +, // measure 55 +10001 +00001 +00101 +00001 +01001 +00001 +10001 +00001 +, // measure 56 +01001 +00000 +00001 +01000 +00001 +00000 +10000 +00000 +00001 +00000 +10000 +00010 +10000 +00000 +00010 +00000 +, // measure 57 +01000 +00000 +00001 +00100 +00001 +00000 +01000 +00000 +00010 +00000 +10000 +00100 +10000 +00000 +00010 +00000 +, // measure 58 +00100 +00000 +00001 +01000 +00100 +00000 +10000 +00000 +00010 +00000 +10000 +00010 +00100 +00000 +00001 +00000 +, // measure 59 +02000 +03000 +00002 +00003 +00200 +00300 +00002 +00003 +02000 +03000 +00200 +00300 +20000 +30000 +00020 +00030 +, // measure 60 +10000 +00000 +00100 +01000 +00100 +01000 +00100 +01000 +00100 +00000 +10000 +00001 +10000 +00001 +10000 +00001 +, // measure 61 +10000 +00000 +00010 +00100 +00010 +00100 +00010 +00100 +00010 +00000 +01000 +00001 +01000 +00001 +01000 +00001 +, // measure 62 +01000 +00000 +00010 +10000 +00010 +10000 +00010 +10000 +00010 +00000 +01000 +00010 +01000 +00010 +01000 +00010 +, // measure 63 +02000 +03000 +00002 +00003 +00200 +00300 +00020 +00030 +20000 +30000 +00200 +00300 +02000 +03000 +00002 +00003 +, // measure 64 +01000 +00000 +00100 +10000 +00100 +10000 +00100 +10000 +00100 +00000 +01000 +00010 +01000 +00010 +01000 +00010 +, // measure 65 +01000 +00000 +00001 +00100 +00001 +00100 +00001 +00100 +00001 +00000 +10000 +00010 +10000 +00010 +10000 +00010 +, // measure 66 +10000 +00000 +00001 +01000 +00001 +01000 +00001 +01000 +00001 +00000 +10000 +00001 +10000 +00001 +10000 +00001 +, // measure 67 +20000 +30000 +00020 +00030 +00200 +00300 +00002 +00003 +02000 +03000 +00200 +00300 +20000 +30000 +00020 +00030 +, // measure 68 +01000 +00000 +00100 +00000 +01100 +00000 +00100 +01000 +00001 +00000 +00100 +00000 +00001 +00000 +10000 +00000 +, // measure 69 +00100 +00000 +01000 +00000 +01000 +00000 +00010 +00100 +00001 +00000 +01000 +00000 +00100 +00000 +00100 +00000 +, // measure 70 +10000 +00000 +00100 +00000 +10100 +00000 +00100 +10000 +00010 +00000 +00100 +00000 +00001 +00000 +01000 +00000 +, // measure 71 +00001 +00000 +00100 +00000 +00100 +00000 +00010 +01000 +00100 +00000 +10000 +00000 +00001 +00000 +00001 +00000 +, // measure 72 +00100 +00000 +00010 +00000 +00110 +00000 +00010 +00100 +00001 +00000 +01000 +00000 +00100 +00000 +10000 +00000 +, // measure 73 +00100 +00000 +01000 +00000 +01000 +00000 +00010 +00100 +00001 +00000 +01000 +00100 +10000 +00000 +10000 +00000 +, // measure 74 +00010 +00000 +00100 +00000 +00101 +00000 +00001 +01000 +00100 +00000 +10000 +00000 +00100 +00000 +01000 +00000 +, // measure 75 +00010 +00000 +00110 +00000 +00100 +00000 +00110 +00000 +00010 +01000 +00100 +01000 +00010 +00100 +00010 +01000 +, // measure 76 +00100 +00000 +10000 +00000 +00100 +00000 +02000 +00000 +00000 +00000 +00000 +00000 +00000 +03000 +00000 +00001 +, // measure 77 +00100 +00000 +00000 +00100 +00000 +00000 +00010 +00000 +02000 +00000 +00000 +00000 +00000 +00000 +00000 +00000 +, // measure 78 +00000 +00000 +03000 +00000 +00100 +00000 +01000 +00000 +00010 +00100 +00010 +00100 +00001 +01000 +00100 +20000 +, // measure 79 +00000 +00000 +30000 +00000 +00010 +00000 +00100 +00000 +00001 +00100 +00001 +00100 +00010 +10000 +00010 +10000 +, // measure 80 +00100 +00000 +01000 +00000 +01001 +00000 +00001 +00000 +00100 +00000 +00010 +00000 +10010 +00000 +10000 +00100 +, // measure 81 +10000 +00000 +00001 +00100 +00001 +00000 +01000 +00000 +00020 +00000 +00000 +00030 +00100 +00000 +00000 +00000 +, // measure 82 +00002 +00000 +00000 +00003 +00100 +00000 +00010 +00000 +01000 +00100 +10000 +00000 +00010 +00000 +00200 +00000 +, // measure 83 +00000 +00300 +00001 +00001 +10100 +10000 +00101 +00001 +, // measure 84 +00100 +00000 +00001 +00000 +01001 +00000 +01000 +00000 +00100 +00000 +10000 +00000 +10010 +00000 +00010 +00100 +, // measure 85 +00010 +00000 +01000 +00100 +01000 +00000 +00001 +00000 +20000 +00000 +00000 +30000 +00100 +00000 +00000 +00000 +, // measure 86 +02000 +00000 +00000 +03000 +00100 +00000 +10000 +00000 +00001 +00100 +00010 +00000 +10000 +00000 +00100 +00000 +, // measure 87 +02000 +00000 +03000 +00000 +00010 +00000 +00100 +00000 +00010 +00000 +00000 +01001 +00000 +01000 +00001 +01000 +, // measure 88 +00001 +00000 +00100 +00010 +00100 +00000 +00001 +00000 +10000 +00000 +00100 +01000 +00100 +00000 +01000 +00000 +, // measure 89 +00010 +00000 +00100 +00001 +00100 +00000 +00010 +00000 +01000 +00000 +00100 +10000 +00100 +00000 +01000 +00000 +, // measure 90 +00002 +00100 +00000 +00100 +20003 +00100 +30020 +00100 +, // measure 91 +02030 +00100 +00000 +00100 +03020 +00100 +20030 +00100 +, // measure 92 +30001 +00001 +00101 +00100 +00110 +00010 +01010 +01000 +, // measure 93 +01100 +00100 +10100 +10000 +10010 +00010 +01010 +01000 +, // measure 94 +01001 +00000 +00001 +01000 +00001 +00000 +10000 +00010 +10000 +00000 +00010 +01000 +00010 +00000 +10000 +00001 +, // measure 95 +10000 +00010 +10000 +00010 +10000 +00010 +10000 +00010 +01000 +00001 +01000 +00001 +00100 +00000 +00000 +00000 +, // measure 96 +20002 +00000 +00000 +00000 +, // measure 97 +00000 +00000 +00000 +00000 +00000 +30003 +00000 +00000 +; diff --git a/Themes/_fallback/Scripts/03 CustomSpeedMods.lua b/Themes/_fallback/Scripts/03 CustomSpeedMods.lua index 48e23bd5ed..5d9ed9cabc 100644 --- a/Themes/_fallback/Scripts/03 CustomSpeedMods.lua +++ b/Themes/_fallback/Scripts/03 CustomSpeedMods.lua @@ -68,7 +68,7 @@ local function ParseSpeedModFile(path) return mods else -- error; write a fallback mod file and return it - local fallbackString = "0.5x,1x,1.5x,2x,3x,4x,8x,C200,C400" + local fallbackString = "0.5x,1x,1.5x,2x,3x,4x,8x,C200,C400,m550" Trace("[CustomSpeedMods]: Could not read SpeedMods; writing fallback to "..path) file:Open(path, 2) file:Write(fallbackString) @@ -148,6 +148,7 @@ end local function SpeedModSort(tab) local xMods = {} + local mMods = {} local cMods = {} --local mMods = {} @@ -159,10 +160,9 @@ local function SpeedModSort(tab) if string.find(tab[i],"C%d") then typ = cMods val = string.gsub(tab[i], "C", "") - elseif string.find(tab[i],"M%d") then - Trace("[CustomSpeedMods] OpenITG's M-Mods are not supported yet in sm-ssc.") - --typ = mMods - --val = string.gsub(tab[i], "M", "") + elseif string.find(tab[i],"m%d") then + typ = mMods + val = string.gsub(tab[i], "m", "") else typ = xMods val = string.gsub(tab[i], "x", "") @@ -175,7 +175,7 @@ local function SpeedModSort(tab) -- sort cMods cMods = AnonSort(cMods) -- sort mMods - --mMods = AnonSort(mMods) + mMods = AnonSort(mMods) local fin = {} -- convert it back to a string since that's what it expects for i=1,#xMods do @@ -184,6 +184,9 @@ local function SpeedModSort(tab) for i=1,#cMods do table.insert(fin, "C"..cMods[i]) end + for i=1,#mMods do + table.insert(fin, "m"..mMods[i]) + end --for i=1,#mMods do table.insert(fin, "M"..mMods[i]); end; return fin end diff --git a/Themes/_fallback/Scripts/04 Scoring.lua b/Themes/_fallback/Scripts/04 Scoring.lua index c918bb60d7..5d47fbd89a 100644 --- a/Themes/_fallback/Scripts/04 Scoring.lua +++ b/Themes/_fallback/Scripts/04 Scoring.lua @@ -67,7 +67,7 @@ r['DDR 4thMIX'] = function(params, pss) local capScore = 999999999; local bestPoints = scoreLookupTable['TapNoteScore_W1']; local bestCombo = bestPoints and comboBonusForThisStep or 0; - pss:SeCurMaxScore(clamp(pss:GeCurMaxScore()+bestPoints+bestCombo,0,capScore)); + pss:SetCurMaxScore(clamp(pss:GetCurMaxScore()+bestPoints+bestCombo,0,capScore)); local localPoints = scoreLookupTable[params.TapNoteScore]; local localCombo = localPoints and comboBonusForThisStep or 0; pss:SetScore(clamp(pss:GetScore()+localPoints+localCombo,0,capScore)); @@ -140,8 +140,7 @@ r['HYBRID'] = function(params, pss) }; setmetatable(multLookup, ZeroIfNotFound); local radarValues = GetDirectRadar(params.Player); - local totalItems = GetTotalItems(radarValues) - - radarValues:GetValue('RadarCategory_Lifts'); + local totalItems = GetTotalItems(radarValues); -- 1+2+3+...+totalItems の値 local sTotal = (totalItems+1)*totalItems/2; -- [en] Score for one song @@ -201,25 +200,21 @@ r['DDR SuperNOVA 2'] = function(params, pss) }; setmetatable(multLookup, ZeroIfNotFound); local radarValues = GetDirectRadar(params.Player); - local numLifts = radarValues:GetCategory('RadarCategory_Lifts') - local numFakes = radarValues:GetCategory('RadarCategory_Fakes') - local totalItems = GetTotalItems(radarValues) - (numLifts + numFakes); + local totalItems = GetTotalItems(radarValues); -- handle holds - local maxAdd = 0 + local maxAdd = 0; if params.HoldNoteScore == 'HoldNoteScore_Held' then - maxAdd = 10 + maxAdd = 10; + elseif params.HoldNoteScore == 'HoldNoteScore_LetGo' then + maxAdd = 0; else - if params.HoldNoteScore == 'HoldNoteScore_LetGo' then - maxAdd = 0 - else - maxAdd = multLookup[params.TapNoteScore] - if params.TapNoteScore == 'TapNoteScore_W2' or 'TapNoteScore_W3' then - -- [ja] 超最終手段 - pss:SetCurMaxScore( pss:GetCurMaxScore() + 1000000 ) - end - end - end + maxAdd = multLookup[params.TapNoteScore]; + if params.TapNoteScore == 'TapNoteScore_W2' or 'TapNoteScore_W3' then + -- [ja] 超最終手段 + pss:SetCurMaxScore( pss:GetCurMaxScore() + 1000000 ); + end; + end; pss:SetCurMaxScore(pss:GetCurMaxScore() + maxAdd); --[[ diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 6054b15099..f7dea506c8 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -1086,7 +1086,8 @@ CheckpointsUseTickcounts=(GAMESTATE:GetCurrentGame():GetName() == "pump") ; deprecated? CheckpointsUseTimeSignatures=false CheckpointsTapsSeparateJudgment=CheckpointsTapsSeparateJudgment() -CheckpointsFlashOnHold=false +; someone misunderstood me :x -Daisu +CheckpointsFlashOnHold=(GAMESTATE:GetCurrentGame():GetName() == "pump") ImmediateHoldLetGo=ImmediateHoldLetGo() RequireStepOnHoldHeads=HoldHeadStep() RequireStepOnMines=false @@ -1100,6 +1101,7 @@ ComboStoppedAt=50 AttackRunTimeRandom=6 AttackRunTimeMine=7 BattleRaveMirror=true +MModHighCap=600 [PlayerOptions] RandomSpeedChance=0.2 diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index c173a66e30..dc1c427c1e 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -835,7 +835,6 @@ IconChoiceEndlessOffCommand=linear,0.1175;zoomx,0 [ScreenGameInformation] [ScreenSelectMusic] -SampleMusicPreviewMode='SampleMusicPreviewMode_LastSong' UsePlayerSelectMenu=false # OptionsMenuAvailable=(getenv(sMode) ~= Oni) SelectMenuAvailable=true diff --git a/_assets/logo.psd b/_assets/logo.psd index d59c9f8de8..312e23b9ea 100644 Binary files a/_assets/logo.psd and b/_assets/logo.psd differ diff --git a/sm-ssc.nsi b/sm-ssc.nsi index b5f435412b..69ed0d3e7a 100644 --- a/sm-ssc.nsi +++ b/sm-ssc.nsi @@ -295,6 +295,7 @@ Section "Main Section" SecMain RMDir /r "$INSTDIR\NoteSkins\dance\midi" ; we may also want to remove the new ones. RMDir /r "$INSTDIR\NoteSkins\dance\midi-note" + RMDir /r "$INSTDIR\NoteSkins\dance\midi-note-3d" RMDir /r "$INSTDIR\NoteSkins\dance\midi-solo" RMDir /r "$INSTDIR\NoteSkins\dance\midi-vivid" RMDir /r "$INSTDIR\NoteSkins\dance\midi-rhythm-p1" @@ -456,6 +457,7 @@ Section "Main Section" SecMain File "Docs\Changelog_sm5.txt" File "Docs\Changelog_SSCformat.txt" File "Docs\CommandLineArgs.txt" + File "Docs\CourseFormat.txt" File /r /x CVS /x .svn "Docs\license-ext" File /r /x CVS /x .svn "Docs\Luadoc" File /r /x CVS /x .svn "Docs\Themerdocs" @@ -532,21 +534,21 @@ Function ShowAutorun IfFileExists "$R1" show_play_and_reinstall show_only_install: - GetDlgItem $1 $hwnd 1201 ; Second cutom control + GetDlgItem $1 $hwnd 1201 ; Second custom control ShowWindow $1 0 - GetDlgItem $1 $hwnd 1202 ; Third cutom control + GetDlgItem $1 $hwnd 1202 ; Third custom control ShowWindow $1 0 Goto done show_play_and_reinstall: - GetDlgItem $1 $hwnd 1200 ; First cutom control + GetDlgItem $1 $hwnd 1200 ; First custom control ShowWindow $1 0 done: ; Now show the dialog and wait for it to finish InstallOptions::show - + ; Finally fetch the InstallOptions status value (we don't care what it is though) Pop $0 @@ -574,7 +576,7 @@ Function LeaveAutorun play_error: MessageBox MB_ICONEXCLAMATION "$(TEXT_IO_COULD_NOT_EXECUTE)" abort - + proceed: GetDlgItem $1 $HWNDPARENT 1 ; Next button ShowWindow $1 1 @@ -741,6 +743,7 @@ Section "Uninstall" RMDir /r "$INSTDIR\NoteSkins\dance\default" RMDir /r "$INSTDIR\NoteSkins\dance\Delta" RMDir /r "$INSTDIR\NoteSkins\dance\midi-note" + RMDir /r "$INSTDIR\NoteSkins\dance\midi-note-3d" RMDir /r "$INSTDIR\NoteSkins\dance\midi-routine-p1" RMDir /r "$INSTDIR\NoteSkins\dance\midi-routine-p2" RMDir /r "$INSTDIR\NoteSkins\dance\midi-solo" @@ -751,8 +754,13 @@ Section "Uninstall" RMDir "$INSTDIR\NoteSkins\dance" RMDir /r "$INSTDIR\NoteSkins\pump\cmd" + RMDir /r "$INSTDIR\NoteSkins\pump\cmd-routine-p1" + RMDir /r "$INSTDIR\NoteSkins\pump\cmd-routine-p2" RMDir /r "$INSTDIR\NoteSkins\pump\complex" RMDir /r "$INSTDIR\NoteSkins\pump\default" + RMDir /r "$INSTDIR\NoteSkins\pump\frame5p" + RMDir /r "$INSTDIR\NoteSkins\pump\newextra" + RMDir /r "$INSTDIR\NoteSkins\pump\rhythm" RMDir /r "$INSTDIR\NoteSkins\pump\simple" RMDir "$INSTDIR\NoteSkins\pump" @@ -824,7 +832,7 @@ Section "Uninstall" Delete "$INSTDIR\Program\zlib1.dll" RMDir "$INSTDIR\Program" - Delete "$INSTDIR\Licenses.txt" + Delete "$INSTDIR\Docs\Licenses.txt" RMDir /r "$INSTDIR\Manual" !endif diff --git a/src/GameConstantsAndTypes.cpp b/src/GameConstantsAndTypes.cpp index f2279c6f5f..3d557fdbb8 100644 --- a/src/GameConstantsAndTypes.cpp +++ b/src/GameConstantsAndTypes.cpp @@ -360,12 +360,17 @@ float DisplayBpms::GetMin() const } float DisplayBpms::GetMax() const +{ + return this->GetMaxWithin(); +} + +float DisplayBpms::GetMaxWithin(float highest) const { float fMax = 0; FOREACH_CONST( float, vfBpms, f ) { if( *f != -1 ) - fMax = max( fMax, *f ); + fMax = clamp(max( fMax, *f ), 0, highest); } return fMax; } diff --git a/src/GameConstantsAndTypes.h b/src/GameConstantsAndTypes.h index 7242f4009d..1d86aa9b27 100644 --- a/src/GameConstantsAndTypes.h +++ b/src/GameConstantsAndTypes.h @@ -4,6 +4,7 @@ #define GAME_CONSTANTS_AND_TYPES_H #include "EnumHelper.h" +#include // need the max for default. // Note definitions /** @brief Define the mininum difficulty value allowed. */ @@ -513,6 +514,13 @@ struct DisplayBpms * @return the maximum BPM. */ float GetMax() const; + /** + * @brief Retrieve the maximum BPM of the set, + * but no higher than a certain value. + * @param highest the highest BPM to use. + * @return the maximum BPM. + */ + float GetMaxWithin(float highest = FLT_MAX) const; /** * @brief Determine if the BPM is really constant. * @return Whether the BPM is constant or not. diff --git a/src/Player.cpp b/src/Player.cpp index 98c19b8d30..9bd6c79efe 100644 --- a/src/Player.cpp +++ b/src/Player.cpp @@ -201,6 +201,12 @@ ThemeMetric COMBO_STOPPED_AT ( "Player", "ComboStoppedAt" ); ThemeMetric ATTACK_RUN_TIME_RANDOM ( "Player", "AttackRunTimeRandom" ); ThemeMetric ATTACK_RUN_TIME_MINE ( "Player", "AttackRunTimeMine" ); +/** + * @brief What is our highest cap for mMods? + * + * If set to 0 or less, assume the song takes over. */ +ThemeMetric M_MOD_HIGH_CAP("Player", "MModHighCap"); + /** @brief Will battle modes have their steps mirrored or kept the same? */ ThemeMetric BATTLE_RAVE_MIRROR ( "Player", "BattleRaveMirror" ); @@ -401,6 +407,69 @@ void Player::Init( break; } + // calculate M-mod speed here, so we can adjust properly on a per-song basis. + // XXX: can we find a better location for this? + if( m_pPlayerState->m_PlayerOptions.GetCurrent().m_fMaxScrollBPM != 0 ) + { + DisplayBpms bpms; + + if( GAMESTATE->IsCourseMode() ) + { + ASSERT( GAMESTATE->m_pCurTrail[pn] ); + GAMESTATE->m_pCurTrail[pn]->GetDisplayBpms( bpms ); + } + else + { + ASSERT( GAMESTATE->m_pCurSong ); + GAMESTATE->m_pCurSong->GetDisplayBpms( bpms ); + } + + float fMaxBPM = 0; + + /* TODO: Find a way to not go above a certain BPM range + * for getting the max BPM. Otherwise, you get songs + * like Tsuhsuixamush, M550, 0.18x speed. Even slow + * speed readers would not generally find this fun. + * -Wolfman2000 + */ + + // all BPMs are listed and available, so try them first. + // get the maximum listed value for the song or course. + // if the BPMs are < 0, reset and get the actual values. + if( !bpms.IsSecret() ) + { + fMaxBPM = (M_MOD_HIGH_CAP > 0 ? + bpms.GetMaxWithin(M_MOD_HIGH_CAP) : + bpms.GetMax()); + fMaxBPM = max( 0, fMaxBPM ); + } + + // we can't rely on the displayed BPMs, so manually calculate. + if( fMaxBPM == 0 ) + { + float fThrowAway = 0; + + if( GAMESTATE->IsCourseMode() ) + { + FOREACH_CONST( TrailEntry, GAMESTATE->m_pCurTrail[pn]->m_vEntries, e ) + { + float fMaxForEntry; + e->pSong->m_SongTiming.GetActualBPM( fThrowAway, fMaxForEntry ); + fMaxBPM = max( fMaxForEntry, fMaxBPM ); + } + } + else + { + GAMESTATE->m_pCurSong->m_SongTiming.GetActualBPM( fThrowAway, fMaxBPM ); + } + } + + ASSERT( fMaxBPM > 0 ); + + // set an X-mod equal to Mnum / fMaxBPM (e.g. M600 with 150 becomes 4x) + PO_GROUP_ASSIGN(m_pPlayerState->m_PlayerOptions, ModsLevel_Preferred, m_fScrollSpeed, + m_pPlayerState->m_PlayerOptions.GetPreferred().m_fMaxScrollBPM / fMaxBPM); + } float fBalance = GameSoundManager::GetPlayerBalance( pn ); m_soundMine.SetProperty( "Pan", fBalance ); diff --git a/src/PlayerOptions.cpp b/src/PlayerOptions.cpp index 5e4aa5666d..3f577a17d3 100644 --- a/src/PlayerOptions.cpp +++ b/src/PlayerOptions.cpp @@ -26,6 +26,7 @@ ThemeMetric RANDOM_SUDDEN_CHANCE ( "PlayerOptions", "RandomSuddenChance" void PlayerOptions::Init() { m_bSetScrollSpeed = false; + m_fMaxScrollBPM = 0; m_SpeedfMaxScrollBPM = 1.0f; m_fTimeSpacing = 0; m_SpeedfTimeSpacing = 1.0f; m_fScrollSpeed = 1.0f; m_SpeedfScrollSpeed = 1.0f; m_fScrollBPM = 200; m_SpeedfScrollBPM = 1.0f; @@ -60,6 +61,7 @@ void PlayerOptions::Approach( const PlayerOptions& other, float fDeltaSeconds ) APPROACH( fTimeSpacing ); APPROACH( fScrollSpeed ); + APPROACH( fMaxScrollBPM ); fapproach( m_fScrollBPM, other.m_fScrollBPM, fDeltaSeconds * other.m_SpeedfScrollBPM*150 ); for( int i=0; i &AddTo, bool bForceNoteSkin ) const if( !m_fTimeSpacing ) { + if( m_fMaxScrollBPM ) + { + RString s = ssprintf( "m%.0f", m_fMaxScrollBPM ); + AddTo.push_back( s ); + } if( m_bSetScrollSpeed || m_fScrollSpeed != 1 ) { /* -> 1.00 */ @@ -332,6 +339,7 @@ bool PlayerOptions::FromOneModString( const RString &sOneMod, RString &sErrorOut SET_FLOAT( fScrollSpeed ) SET_FLOAT( fTimeSpacing ) m_fTimeSpacing = 0; + m_fMaxScrollBPM = 0; } else if( sscanf( sBit, "c%f", &level ) == 1 ) { @@ -340,17 +348,18 @@ bool PlayerOptions::FromOneModString( const RString &sOneMod, RString &sErrorOut SET_FLOAT( fScrollBPM ) SET_FLOAT( fTimeSpacing ) m_fTimeSpacing = 1; + m_fMaxScrollBPM = 0; } - /* Port M-Mods from OpenITG, starting from r537 */ - // Midiman + // oITG's m-mods + // XXX: will not properly tween, I don't think. else if( sscanf( sBit, "m%f", &level ) == 1 ) { if( !isfinite(level) || level <= 0.0f ) - level = 200.0f; // Just pick some value. - SET_FLOAT( fScrollBPM ) - SET_FLOAT( fTimeSpacing ) - m_fTimeSpacing = 1; + level = 200.0f; + SET_FLOAT( fMaxScrollBPM ) + m_fTimeSpacing = 0; } + else if( sBit == "clearall" ) Init(); else if( sBit == "boost" ) SET_FLOAT( fAccels[ACCEL_BOOST] ) else if( sBit == "brake" || sBit == "land" ) SET_FLOAT( fAccels[ACCEL_BRAKE] ) @@ -650,6 +659,7 @@ bool PlayerOptions::operator==( const PlayerOptions &other ) const COMPARE(m_fTimeSpacing); COMPARE(m_fScrollSpeed); COMPARE(m_fScrollBPM); + COMPARE(m_fMaxScrollBPM); COMPARE(m_fRandomSpeed); COMPARE(m_FailType); COMPARE(m_bMuteOnError); @@ -717,6 +727,31 @@ bool PlayerOptions::IsEasierForSongAndSteps( Song* pSong, Steps* pSteps, PlayerN return true; if( m_fCover ) return true; + + // M-mods make songs with indefinite BPMs easier because + // they ensure that the song has a scrollable speed. + if( m_fMaxScrollBPM != 0 ) + { + // BPM display is obfuscated +// if( pSong->m_DisplayBPMType == DISPLAY_BPM_RANDOM ) +// return true; + + DisplayBpms bpms; + if( GAMESTATE->IsCourseMode() ) + { + Trail *pTrail = GAMESTATE->m_pCurCourse->GetTrail( GAMESTATE->GetCurrentStyle()->m_StepsType ); + pTrail->GetDisplayBpms( bpms ); + } + else + { + GAMESTATE->m_pCurSong->GetDisplayBpms( bpms ); + } + pSong->GetDisplayBpms( bpms ); + + // maximum BPM is obfuscated, so M-mods will set a playable speed. + if( bpms.GetMax() <= 0 ) + return true; + } if( m_fPlayerAutoPlay ) return true; return false; } @@ -788,6 +823,7 @@ RString PlayerOptions::GetSavedPrefsString() const SAVE( m_fTimeSpacing ); SAVE( m_fScrollSpeed ); SAVE( m_fScrollBPM ); + SAVE( m_fMaxScrollBPM ); SAVE( m_fScrolls[SCROLL_REVERSE] ); SAVE( m_fPerspectiveTilt ); SAVE( m_bTransforms[TRANSFORM_NOHOLDS] ); @@ -816,6 +852,7 @@ void PlayerOptions::ResetPrefs( ResetPrefsType type ) CPY( m_fTimeSpacing ); CPY( m_fScrollSpeed ); CPY( m_fScrollBPM ); + CPY( m_fMaxScrollBPM ); break; case saved_prefs_invalid_for_course: break; diff --git a/src/PlayerOptions.h b/src/PlayerOptions.h index 3b5caacc0f..0166af9c4e 100644 --- a/src/PlayerOptions.h +++ b/src/PlayerOptions.h @@ -157,6 +157,7 @@ public: * PlayerOptions::Approach approaches. */ bool m_bSetScrollSpeed; // true if the scroll speed was set by FromString float m_fTimeSpacing, m_SpeedfTimeSpacing; // instead of Beat spacing (CMods, mMods) + float m_fMaxScrollBPM, m_SpeedfMaxScrollBPM; float m_fScrollSpeed, m_SpeedfScrollSpeed; // used if !m_bTimeSpacing (xMods) float m_fScrollBPM, m_SpeedfScrollBPM; // used if m_bTimeSpacing (CMod) float m_fAccels[NUM_ACCELS], m_SpeedfAccels[NUM_ACCELS]; diff --git a/src/ProductInfo.h b/src/ProductInfo.h index e6cd9db7a8..26abef4c1f 100644 --- a/src/ProductInfo.h +++ b/src/ProductInfo.h @@ -35,7 +35,7 @@ * */ #ifndef PRODUCT_VER_BARE -#define PRODUCT_VER_BARE v5.0 Preview 1a +#define PRODUCT_VER_BARE v5.0 Preview 2 #endif /** @@ -54,7 +54,7 @@ #define PRODUCT_VER PRODUCT_XSTRINGIFY(PRODUCT_VER_BARE) #define PRODUCT_ID_VER PRODUCT_XSTRINGIFY(PRODUCT_ID_VER_BARE) -#define VIDEO_TROUBLESHOOTING_URL "http://www.stepmania.com/stepmania/mediawiki.php?title=Video_Driver_Troubleshooting" +#define VIDEO_TROUBLESHOOTING_URL "http://www.stepmania.com/stepmaniawiki.php?title=Video_Driver_Troubleshooting" /** @brief The URL to report bugs on the program. */ #define REPORT_BUG_URL "http://ssc.ajworld.net/sm-ssc/bugtracker/" diff --git a/src/ProductInfo.inc b/src/ProductInfo.inc index 56c9ce457d..3d2899459d 100644 --- a/src/ProductInfo.inc +++ b/src/ProductInfo.inc @@ -5,7 +5,7 @@ ; see ProductInfo.h for use descriptions !define PRODUCT_ID "StepMania" -!define PRODUCT_VER "v5.0 Preview 1a" +!define PRODUCT_VER "v5.0 Preview 2" !define PRODUCT_DISPLAY "${PRODUCT_ID} ${PRODUCT_VER}" !define PRODUCT_BITMAP "ssc" diff --git a/src/RageUtil.cpp b/src/RageUtil.cpp index 5f5b4e260a..b7eff99a24 100644 --- a/src/RageUtil.cpp +++ b/src/RageUtil.cpp @@ -1242,14 +1242,14 @@ bool GetFileContents( const RString &sPath, RString &sOut, bool bOneLine ) /* Don't warn if the file doesn't exist, but do warn if it exists and fails to open. */ if( !IsAFile(sPath) ) return false; - + RageFile file; if( !file.Open(sPath) ) { LOG->Warn( "GetFileContents(%s): %s", sPath.c_str(), file.GetError().c_str() ); return false; } - + RString sData; int iGot; if( bOneLine ) @@ -1265,7 +1265,7 @@ bool GetFileContents( const RString &sPath, RString &sOut, bool bOneLine ) if( bOneLine ) StripCrnl( sData ); - + sOut = sData; return true; } diff --git a/src/ScreenOptions.cpp b/src/ScreenOptions.cpp index e783125e00..1afe97c5ee 100644 --- a/src/ScreenOptions.cpp +++ b/src/ScreenOptions.cpp @@ -808,7 +808,17 @@ void ScreenOptions::MenuStart( const InputEventPlus &input ) void ScreenOptions::ProcessMenuStart( const InputEventPlus &input ) { PlayerNumber pn = input.pn; + int iCurRow = m_iCurrentRow[pn]; + + if( iCurRow < 0 ) + { + // this shouldn't be happening, but it is, so we need to bail out. -aj + SCREENMAN->PlayStartSound(); + this->BeginFadingOut(); + return; + } + OptionRow &row = *m_pRows[iCurRow]; if( m_OptionsNavigation == NAV_THREE_KEY_MENU && row.GetRowType() != OptionRow::RowType_Exit ) diff --git a/src/StepMania-net2008.vcproj b/src/StepMania-net2008.vcproj index 315331951d..8c558ff4f2 100644 --- a/src/StepMania-net2008.vcproj +++ b/src/StepMania-net2008.vcproj @@ -372,7 +372,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" AdditionalIncludeDirectories=".;"..\extern\lua-5.1\src";ffmpeg\modern_working\include;BaseClasses;..\extern\jsoncpp\include;"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b";..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis" - PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE,GLEW_STATIC" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINDOWS;RELEASE;GLEW_STATIC" StringPooling="true" MinimalRebuild="false" ExceptionHandling="0" diff --git a/src/TimingData.cpp b/src/TimingData.cpp index 8b9bdf9531..5e1644b5fa 100644 --- a/src/TimingData.cpp +++ b/src/TimingData.cpp @@ -1332,12 +1332,7 @@ void TimingData::ScaleRegion( float fScale, int iStartIndex, int iEndIndex, bool m_LabelSegments[i].Scale( iStartIndex, length, newLength ); for ( unsigned i = 0; i < m_SpeedSegments.size(); i++ ) - { - SpeedSegment &s = m_SpeedSegments[i]; - s.Scale( iStartIndex, length, newLength ); - if (s.GetUnit() == 0) // beats - s.SetLength(s.GetLength() * fScale); - } + m_SpeedSegments[i].Scale( iStartIndex, length, newLength ); for( unsigned i = 0; i < m_FakeSegments.size(); i++ ) m_FakeSegments[i].Scale( iStartIndex, length, newLength ); diff --git a/src/TimingSegments.cpp b/src/TimingSegments.cpp index 6a0e0eec57..0d241da25d 100644 --- a/src/TimingSegments.cpp +++ b/src/TimingSegments.cpp @@ -250,6 +250,20 @@ void SpeedSegment::SetUnit(const int i) this->unit = static_cast(i); } +void SpeedSegment::Scale( int start, int length, int newLength ) +{ + if( GetUnit() == 0 ) + { + // XXX: this function is duplicated, there should be a better way + float startBeat = GetBeat(); + float endBeat = startBeat + GetLength(); + float newStartBeat = ScalePosition( NoteRowToBeat(start), NoteRowToBeat(length), NoteRowToBeat(newLength), startBeat ); + float newEndBeat = ScalePosition( NoteRowToBeat(start), NoteRowToBeat(length), NoteRowToBeat(newLength), endBeat ); + SetLength( newEndBeat - newStartBeat ); + } + TimingSegment::Scale( start, length, newLength ); +} + bool SpeedSegment::operator<( const SpeedSegment &other ) const { LTCOMPARE(GetRow()); diff --git a/src/TimingSegments.h b/src/TimingSegments.h index 4acbe60350..e18e881886 100644 --- a/src/TimingSegments.h +++ b/src/TimingSegments.h @@ -681,6 +681,8 @@ struct SpeedSegment : public TimingSegment * @param i the unit. */ void SetUnit(const int i); + void Scale( int start, int length, int newLength ); + /** * @brief Compares two SpeedSegments to see if one is less than the other. * @param other the other SpeedSegment to compare to. diff --git a/src/archutils/Win32/StepMania.ico b/src/archutils/Win32/StepMania.ico index 95519364bc..c9363aaa34 100644 Binary files a/src/archutils/Win32/StepMania.ico and b/src/archutils/Win32/StepMania.ico differ diff --git a/src/archutils/Win32/WindowsResources.rc b/src/archutils/Win32/WindowsResources.rc index 94d881bd34..91007fdd3a 100644 --- a/src/archutils/Win32/WindowsResources.rc +++ b/src/archutils/Win32/WindowsResources.rc @@ -181,8 +181,8 @@ IDI_ICON1 ICON "smzip.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 5,0,0,2 - PRODUCTVERSION 5,0,0,2 + FILEVERSION 5,0,0,3 + PRODUCTVERSION 5,0,0,3 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -199,12 +199,12 @@ BEGIN BEGIN VALUE "CompanyName", "StepMania Team\nhttp://www.stepmania.com/" VALUE "FileDescription", "StepMania" - VALUE "FileVersion", "5, 0, 0, 2" - VALUE "InternalName", "sm-ssc" + VALUE "FileVersion", "5, 0, 0, 3" + VALUE "InternalName", "sm-ssc v1.3.1" VALUE "LegalCopyright", "Copyright 2001-2011" VALUE "OriginalFilename", "StepMania.exe" VALUE "ProductName", "StepMania" - VALUE "ProductVersion", "5, 0, 0, 2" + VALUE "ProductVersion", "5, 0, 0, 3" END END BLOCK "VarFileInfo"