From d999c874855b5a588dc347604713809cf36435b7 Mon Sep 17 00:00:00 2001 From: Joshua Sigona Date: Wed, 20 Oct 2021 01:27:57 +0900 Subject: [PATCH] TITLE IDOL initial chart and bpm averaging formula improvements --- LLSIG/music/01-TITLE-IDOL.sig | 1258 +++++++++++++++++++++++++ LLSIG/src/main/java/LLSIG/Canvas.java | 2 +- LLSIG/src/main/java/LLSIG/LLSIG.java | 52 +- 3 files changed, 1299 insertions(+), 13 deletions(-) create mode 100644 LLSIG/music/01-TITLE-IDOL.sig diff --git a/LLSIG/music/01-TITLE-IDOL.sig b/LLSIG/music/01-TITLE-IDOL.sig new file mode 100644 index 0000000..c98c57a --- /dev/null +++ b/LLSIG/music/01-TITLE-IDOL.sig @@ -0,0 +1,1258 @@ +B,430.0,145 +1,NORMAL,32.75,-1.0 +1,NORMAL,33.25,-1.0 +1,NORMAL,49.5,-1.0 +1,NORMAL,50.25,-1.0 +1,NORMAL,50.75,-1.0 +1,NORMAL,70.75,-1.0 +1,NORMAL,105.25,-1.0 +1,NORMAL,106.25,-1.0 +1,NORMAL,106.5,-1.0 +1,NORMAL,121.25,-1.0 +1,NORMAL,122.25,-1.0 +1,NORMAL,123.0,-1.0 +1,NORMAL,124.25,-1.0 +1,NORMAL,144.0,-1.0 +1,NORMAL,146.0,-1.0 +1,NORMAL,150.75,-1.0 +1,NORMAL,151.0,-1.0 +1,NORMAL,157.0,-1.0 +1,NORMAL,193.25,-1.0 +1,NORMAL,225.25,-1.0 +1,NORMAL,244.5,-1.0 +1,NORMAL,245.75,-1.0 +1,NORMAL,246.0,-1.0 +1,NORMAL,277.0,-1.0 +1,NORMAL,279.0,-1.0 +1,NORMAL,315.25,-1.0 +1,NORMAL,352.0,-1.0 +1,NORMAL,354.25,-1.0 +1,NORMAL,361.25,-1.0 +1,NORMAL,362.25,-1.0 +1,NORMAL,382.75,-1.0 +1,NORMAL,388.0,-1.0 +1,NORMAL,411.75,-1.0 +1,NORMAL,412.25,-1.0 +1,NORMAL,413.5,-1.0 +1,NORMAL,414.0,-1.0 +1,NORMAL,432.0,-1.0 +1,NORMAL,445.5,-1.0 +1,NORMAL,459.5,-1.0 +1,NORMAL,460.5,-1.0 +1,NORMAL,473.25,-1.0 +1,NORMAL,507.0,-1.0 +1,NORMAL,508.25,-1.0 +1,NORMAL,508.5,-1.0 +1,NORMAL,508.75,-1.0 +1,NORMAL,509.0,-1.0 +1,NORMAL,533.75,-1.0 +1,NORMAL,535.5,-1.0 +1,NORMAL,569.0,-1.0 +1,NORMAL,580.0,-1.0 +1,NORMAL,583.0,-1.0 +1,NORMAL,612.75,-1.0 +1,NORMAL,625.25,-1.0 +1,NORMAL,626.5,-1.0 +1,NORMAL,626.75,-1.0 +1,NORMAL,627.0,-1.0 +1,NORMAL,627.25,-1.0 +1,NORMAL,627.5,-1.0 +1,NORMAL,627.75,-1.0 +1,NORMAL,628.0,-1.0 +1,NORMAL,628.25,-1.0 +1,NORMAL,628.5,-1.0 +1,NORMAL,628.75,-1.0 +1,NORMAL,629.0,-1.0 +1,NORMAL,629.25,-1.0 +1,NORMAL,629.5,-1.0 +1,NORMAL,629.75,-1.0 +1,NORMAL,630.0,-1.0 +1,NORMAL,630.25,-1.0 +1,NORMAL,630.5,-1.0 +1,NORMAL,630.75,-1.0 +1,NORMAL,631.0,-1.0 +1,NORMAL,631.25,-1.0 +2,NORMAL,27.5,-1.0 +2,NORMAL,33.25,-1.0 +2,NORMAL,34.75,-1.0 +2,NORMAL,40.0,-1.0 +2,NORMAL,46.5,-1.0 +2,NORMAL,49.75,-1.0 +2,NORMAL,56.0,-1.0 +2,NORMAL,68.0,-1.0 +2,NORMAL,69.25,-1.0 +2,NORMAL,70.5,-1.0 +2,NORMAL,71.0,-1.0 +2,NORMAL,76.25,-1.0 +2,NORMAL,78.25,-1.0 +2,NORMAL,79.25,-1.0 +2,NORMAL,80.0,-1.0 +2,NORMAL,88.0,-1.0 +2,NORMAL,88.5,-1.0 +2,NORMAL,89.5,-1.0 +2,NORMAL,90.0,-1.0 +2,NORMAL,91.0,-1.0 +2,NORMAL,104.25,-1.0 +2,NORMAL,109.0,-1.0 +2,NORMAL,109.5,-1.0 +2,NORMAL,114.25,-1.0 +2,NORMAL,116.0,-1.0 +2,NORMAL,118.0,-1.0 +2,NORMAL,120.0,-1.0 +2,NORMAL,121.0,-1.0 +2,NORMAL,122.25,-1.0 +2,NORMAL,123.0,-1.0 +2,NORMAL,124.0,-1.0 +2,NORMAL,125.0,-1.0 +2,NORMAL,128.25,-1.0 +2,NORMAL,130.25,-1.0 +2,NORMAL,132.0,-1.0 +2,NORMAL,134.0,-1.0 +2,NORMAL,143.5,-1.0 +2,NORMAL,145.25,-1.0 +2,NORMAL,150.75,-1.0 +2,NORMAL,151.25,-1.0 +2,NORMAL,154.5,-1.0 +2,NORMAL,154.75,-1.0 +2,NORMAL,157.0,-1.0 +2,NORMAL,167.25,-1.0 +2,NORMAL,172.75,-1.0 +2,NORMAL,186.25,-1.0 +2,NORMAL,188.5,-1.0 +2,NORMAL,193.25,-1.0 +2,NORMAL,194.5,-1.0 +2,NORMAL,196.0,-1.0 +2,NORMAL,201.0,-1.0 +2,NORMAL,212.25,-1.0 +2,NORMAL,217.25,-1.0 +2,NORMAL,233.75,-1.0 +2,NORMAL,241.75,-1.0 +2,NORMAL,242.75,-1.0 +2,NORMAL,244.0,-1.0 +2,NORMAL,248.25,-1.0 +2,NORMAL,257.75,-1.0 +2,NORMAL,259.5,-1.0 +2,NORMAL,264.25,-1.0 +2,NORMAL,278.75,-1.0 +2,NORMAL,282.0,-1.0 +2,NORMAL,284.25,-1.0 +2,NORMAL,286.25,-1.0 +2,NORMAL,288.0,-1.0 +2,NORMAL,294.25,-1.0 +2,NORMAL,297.0,-1.0 +2,NORMAL,297.75,-1.0 +2,NORMAL,299.0,-1.0 +2,NORMAL,314.5,-1.0 +2,NORMAL,315.0,-1.0 +2,NORMAL,322.25,-1.0 +2,NORMAL,329.75,-1.0 +2,NORMAL,333.0,-1.0 +2,NORMAL,341.5,-1.0 +2,NORMAL,342.5,-1.0 +2,NORMAL,344.0,-1.0 +2,NORMAL,346.75,-1.0 +2,NORMAL,350.5,-1.0 +2,NORMAL,352.0,-1.0 +2,NORMAL,354.0,-1.0 +2,NORMAL,356.0,-1.0 +2,NORMAL,360.75,-1.0 +2,NORMAL,363.0,-1.0 +2,NORMAL,374.5,-1.0 +2,NORMAL,377.0,-1.0 +2,NORMAL,381.75,-1.0 +2,NORMAL,382.75,-1.0 +2,NORMAL,388.0,-1.0 +2,NORMAL,390.0,-1.0 +2,NORMAL,392.0,-1.0 +2,NORMAL,401.0,-1.0 +2,NORMAL,410.75,-1.0 +2,NORMAL,412.25,-1.0 +2,NORMAL,413.5,-1.0 +2,NORMAL,415.0,-1.0 +2,NORMAL,419.5,-1.0 +2,NORMAL,422.75,-1.0 +2,NORMAL,423.25,-1.0 +2,NORMAL,425.0,-1.0 +2,NORMAL,426.5,-1.0 +2,NORMAL,433.25,-1.0 +2,NORMAL,434.5,-1.0 +2,NORMAL,434.75,-1.0 +2,NORMAL,435.0,-1.0 +2,NORMAL,435.25,-1.0 +2,NORMAL,435.5,-1.0 +2,NORMAL,435.75,-1.0 +2,NORMAL,436.0,-1.0 +2,NORMAL,444.25,-1.0 +2,NORMAL,449.25,-1.0 +2,NORMAL,455.0,-1.0 +2,NORMAL,469.0,-1.0 +2,NORMAL,474.5,-1.0 +2,NORMAL,476.25,-1.0 +2,NORMAL,477.5,-1.0 +2,NORMAL,482.0,-1.0 +2,NORMAL,490.5,-1.0 +2,NORMAL,490.75,-1.0 +2,NORMAL,493.5,-1.0 +2,NORMAL,494.5,-1.0 +2,NORMAL,495.5,-1.0 +2,NORMAL,501.0,-1.0 +2,NORMAL,503.5,-1.0 +2,NORMAL,505.25,-1.0 +2,NORMAL,506.5,-1.0 +2,NORMAL,506.75,-1.0 +2,NORMAL,507.0,-1.0 +2,NORMAL,517.25,-1.0 +2,NORMAL,518.75,-1.0 +2,NORMAL,529.0,-1.0 +2,NORMAL,532.5,-1.0 +2,NORMAL,533.75,-1.0 +2,NORMAL,535.5,-1.0 +2,NORMAL,538.0,-1.0 +2,NORMAL,547.0,-1.0 +2,NORMAL,549.0,-1.0 +2,NORMAL,550.5,-1.0 +2,NORMAL,553.25,-1.0 +2,NORMAL,567.0,-1.0 +2,NORMAL,568.0,-1.0 +2,NORMAL,568.5,-1.0 +2,NORMAL,569.0,-1.0 +2,NORMAL,570.75,-1.0 +2,NORMAL,577.0,-1.0 +2,NORMAL,578.5,-1.0 +2,NORMAL,583.0,-1.0 +2,NORMAL,585.25,-1.0 +2,NORMAL,586.5,-1.0 +2,NORMAL,586.75,-1.0 +2,NORMAL,587.0,-1.0 +2,NORMAL,587.25,-1.0 +2,NORMAL,587.5,-1.0 +2,NORMAL,587.75,-1.0 +2,NORMAL,588.0,-1.0 +2,NORMAL,588.25,-1.0 +2,NORMAL,588.5,-1.0 +2,NORMAL,588.75,-1.0 +2,NORMAL,589.0,-1.0 +2,NORMAL,589.25,-1.0 +2,NORMAL,589.5,-1.0 +2,NORMAL,589.75,-1.0 +2,NORMAL,611.0,-1.0 +2,NORMAL,615.25,-1.0 +2,NORMAL,617.25,-1.0 +2,NORMAL,618.75,-1.0 +2,NORMAL,624.0,-1.0 +2,NORMAL,625.0,-1.0 +3,NORMAL,27.25,-1.0 +3,NORMAL,27.75,-1.0 +3,NORMAL,28.5,-1.0 +3,NORMAL,34.5,-1.0 +3,NORMAL,36.0,-1.0 +3,NORMAL,39.0,-1.0 +3,NORMAL,40.0,-1.0 +3,NORMAL,47.25,-1.0 +3,NORMAL,60.75,-1.0 +3,NORMAL,61.5,-1.0 +3,NORMAL,67.5,-1.0 +3,NORMAL,72.0,-1.0 +3,NORMAL,74.25,-1.0 +3,NORMAL,75.75,-1.0 +3,NORMAL,76.25,-1.0 +3,NORMAL,77.75,-1.0 +3,NORMAL,78.25,-1.0 +3,NORMAL,80.0,-1.0 +3,NORMAL,89.0,-1.0 +3,NORMAL,101.0,-1.0 +3,NORMAL,102.75,-1.0 +3,NORMAL,107.25,-1.0 +3,NORMAL,108.0,-1.0 +3,NORMAL,111.5,-1.0 +3,NORMAL,112.0,-1.0 +3,NORMAL,114.25,-1.0 +3,NORMAL,116.0,-1.0 +3,NORMAL,118.0,-1.0 +3,NORMAL,120.0,-1.0 +3,NORMAL,125.0,-1.0 +3,NORMAL,125.5,-1.0 +3,NORMAL,126.0,-1.0 +3,NORMAL,128.25,-1.0 +3,NORMAL,130.25,-1.0 +3,NORMAL,132.25,-1.0 +3,NORMAL,134.0,-1.0 +3,NORMAL,136.25,-1.0 +3,NORMAL,142.5,-1.0 +3,NORMAL,151.75,-1.0 +3,NORMAL,153.0,-1.0 +3,NORMAL,154.0,-1.0 +3,NORMAL,156.0,-1.0 +3,NORMAL,157.0,-1.0 +3,NORMAL,166.25,-1.0 +3,NORMAL,168.25,-1.0 +3,NORMAL,169.0,-1.0 +3,NORMAL,170.75,-1.0 +3,NORMAL,173.75,-1.0 +3,NORMAL,175.75,-1.0 +3,NORMAL,178.0,-1.0 +3,NORMAL,180.0,-1.0 +3,NORMAL,182.25,-1.0 +3,NORMAL,183.0,-1.0 +3,NORMAL,184.75,-1.0 +3,NORMAL,187.0,-1.0 +3,NORMAL,190.5,-1.0 +3,NORMAL,194.5,-1.0 +3,NORMAL,196.0,-1.0 +3,NORMAL,200.0,-1.0 +3,NORMAL,201.0,-1.0 +3,NORMAL,202.5,-1.0 +3,NORMAL,210.75,-1.0 +3,NORMAL,212.0,-1.0 +3,NORMAL,217.0,-1.0 +3,NORMAL,232.5,-1.0 +3,NORMAL,234.5,-1.0 +3,NORMAL,241.25,-1.0 +3,NORMAL,242.25,-1.0 +3,NORMAL,243.5,-1.0 +3,NORMAL,257.5,-1.0 +3,NORMAL,258.25,-1.0 +3,NORMAL,258.75,-1.0 +3,NORMAL,269.0,-1.0 +3,NORMAL,275.5,-1.0 +3,NORMAL,282.0,-1.0 +3,NORMAL,284.25,-1.0 +3,NORMAL,286.25,-1.0 +3,NORMAL,288.0,-1.0 +3,NORMAL,290.0,-1.0 +3,NORMAL,292.75,-1.0 +3,NORMAL,296.0,-1.0 +3,NORMAL,296.5,-1.0 +3,NORMAL,297.0,-1.0 +3,NORMAL,298.25,-1.0 +3,NORMAL,309.0,-1.0 +3,NORMAL,318.5,-1.0 +3,NORMAL,320.25,-1.0 +3,NORMAL,322.25,-1.0 +3,NORMAL,324.0,-1.0 +3,NORMAL,326.0,-1.0 +3,NORMAL,328.0,-1.0 +3,NORMAL,329.75,-1.0 +3,NORMAL,330.25,-1.0 +3,NORMAL,332.0,-1.0 +3,NORMAL,333.5,-1.0 +3,NORMAL,338.0,-1.0 +3,NORMAL,339.0,-1.0 +3,NORMAL,340.75,-1.0 +3,NORMAL,341.25,-1.0 +3,NORMAL,342.0,-1.0 +3,NORMAL,343.0,-1.0 +3,NORMAL,344.5,-1.0 +3,NORMAL,346.0,-1.0 +3,NORMAL,347.25,-1.0 +3,NORMAL,349.0,-1.0 +3,NORMAL,356.0,-1.0 +3,NORMAL,360.0,-1.0 +3,NORMAL,364.5,-1.0 +3,NORMAL,372.5,-1.0 +3,NORMAL,375.0,-1.0 +3,NORMAL,377.0,-1.0 +3,NORMAL,378.5,-1.0 +3,NORMAL,380.75,-1.0 +3,NORMAL,381.5,-1.0 +3,NORMAL,388.25,-1.0 +3,NORMAL,389.0,-1.0 +3,NORMAL,390.0,-1.0 +3,NORMAL,391.25,-1.0 +3,NORMAL,392.0,-1.0 +3,NORMAL,394.0,-1.0 +3,NORMAL,396.5,-1.0 +3,NORMAL,401.0,-1.0 +3,NORMAL,403.75,-1.0 +3,NORMAL,404.25,-1.0 +3,NORMAL,409.25,-1.0 +3,NORMAL,410.25,-1.0 +3,NORMAL,410.75,-1.0 +3,NORMAL,416.0,-1.0 +3,NORMAL,418.5,-1.0 +3,NORMAL,420.0,-1.0 +3,NORMAL,425.0,-1.0 +3,NORMAL,426.5,-1.0 +3,NORMAL,433.0,-1.0 +3,NORMAL,440.5,-1.0 +3,NORMAL,443.75,-1.0 +3,NORMAL,447.75,-1.0 +3,NORMAL,450.5,-1.0 +3,NORMAL,452.5,-1.0 +3,NORMAL,456.25,-1.0 +3,NORMAL,467.25,-1.0 +3,NORMAL,471.0,-1.0 +3,NORMAL,478.5,-1.0 +3,NORMAL,482.5,-1.0 +3,NORMAL,484.0,-1.0 +3,NORMAL,486.25,-1.0 +3,NORMAL,489.5,-1.0 +3,NORMAL,493.5,-1.0 +3,NORMAL,494.75,-1.0 +3,NORMAL,495.5,-1.0 +3,NORMAL,500.0,-1.0 +3,NORMAL,501.0,-1.0 +3,NORMAL,502.5,-1.0 +3,NORMAL,503.5,-1.0 +3,NORMAL,514.5,-1.0 +3,NORMAL,517.25,-1.0 +3,NORMAL,519.75,-1.0 +3,NORMAL,525.0,-1.0 +3,NORMAL,530.5,-1.0 +3,NORMAL,532.25,-1.0 +3,NORMAL,532.5,-1.0 +3,NORMAL,540.0,-1.0 +3,NORMAL,541.0,-1.0 +3,NORMAL,543.0,-1.0 +3,NORMAL,546.0,-1.0 +3,NORMAL,548.5,-1.0 +3,NORMAL,549.0,-1.0 +3,NORMAL,550.5,-1.0 +3,NORMAL,553.25,-1.0 +3,NORMAL,554.75,-1.0 +3,NORMAL,556.0,-1.0 +3,NORMAL,558.75,-1.0 +3,NORMAL,565.5,-1.0 +3,NORMAL,566.0,-1.0 +3,NORMAL,570.75,-1.0 +3,NORMAL,572.0,-1.0 +3,NORMAL,577.0,-1.0 +3,NORMAL,585.0,-1.0 +3,NORMAL,593.0,-1.0 +3,NORMAL,594.25,-1.0 +3,NORMAL,594.5,-1.0 +3,NORMAL,594.75,-1.0 +3,NORMAL,595.0,-1.0 +3,NORMAL,595.25,-1.0 +3,NORMAL,595.5,-1.0 +3,NORMAL,595.75,-1.0 +3,NORMAL,596.0,-1.0 +3,NORMAL,596.25,-1.0 +3,NORMAL,596.5,-1.0 +3,NORMAL,596.75,-1.0 +3,NORMAL,597.0,-1.0 +3,NORMAL,597.25,-1.0 +3,NORMAL,597.5,-1.0 +3,NORMAL,611.25,-1.0 +3,NORMAL,612.0,-1.0 +3,NORMAL,615.5,-1.0 +3,NORMAL,616.75,-1.0 +3,NORMAL,618.75,-1.0 +3,NORMAL,622.5,-1.0 +3,NORMAL,623.0,-1.0 +3,NORMAL,624.0,-1.0 +3,NORMAL,632.0,-1.0 +3,NORMAL,632.5,-1.0 +4,NORMAL,36.25,-1.0 +4,NORMAL,39.0,-1.0 +4,NORMAL,61.25,-1.0 +4,NORMAL,62.25,-1.0 +4,NORMAL,64.25,-1.0 +4,NORMAL,74.25,-1.0 +4,NORMAL,100.0,-1.0 +4,NORMAL,100.75,-1.0 +4,NORMAL,102.5,-1.0 +4,NORMAL,110.75,-1.0 +4,NORMAL,111.5,-1.0 +4,NORMAL,112.0,-1.0 +4,NORMAL,125.5,-1.0 +4,NORMAL,126.0,-1.0 +4,NORMAL,126.25,-1.0 +4,NORMAL,126.5,-1.0 +4,NORMAL,128.25,-1.0 +4,NORMAL,136.25,-1.0 +4,NORMAL,141.25,-1.0 +4,NORMAL,152.5,-1.0 +4,NORMAL,157.0,-1.0 +4,NORMAL,159.0,-1.0 +4,NORMAL,160.5,-1.0 +4,NORMAL,165.25,-1.0 +4,NORMAL,166.0,-1.0 +4,NORMAL,167.75,-1.0 +4,NORMAL,169.0,-1.0 +4,NORMAL,170.25,-1.0 +4,NORMAL,170.75,-1.0 +4,NORMAL,175.5,-1.0 +4,NORMAL,178.0,-1.0 +4,NORMAL,180.0,-1.0 +4,NORMAL,181.25,-1.0 +4,NORMAL,182.0,-1.0 +4,NORMAL,185.25,-1.0 +4,NORMAL,199.0,-1.0 +4,NORMAL,202.5,-1.0 +4,NORMAL,204.25,-1.0 +4,NORMAL,209.25,-1.0 +4,NORMAL,210.75,-1.0 +4,NORMAL,260.75,-1.0 +4,NORMAL,268.5,-1.0 +4,NORMAL,269.5,-1.0 +4,NORMAL,270.0,-1.0 +4,NORMAL,273.5,-1.0 +4,NORMAL,274.0,-1.0 +4,NORMAL,290.0,-1.0 +4,NORMAL,291.5,-1.0 +4,NORMAL,303.75,-1.0 +4,NORMAL,308.0,-1.0 +4,NORMAL,309.0,-1.0 +4,NORMAL,310.25,-1.0 +4,NORMAL,310.5,-1.0 +4,NORMAL,317.5,-1.0 +4,NORMAL,319.75,-1.0 +4,NORMAL,324.0,-1.0 +4,NORMAL,326.0,-1.0 +4,NORMAL,328.0,-1.0 +4,NORMAL,331.25,-1.0 +4,NORMAL,334.0,-1.0 +4,NORMAL,337.0,-1.0 +4,NORMAL,340.0,-1.0 +4,NORMAL,347.75,-1.0 +4,NORMAL,348.25,-1.0 +4,NORMAL,359.25,-1.0 +4,NORMAL,371.0,-1.0 +4,NORMAL,373.25,-1.0 +4,NORMAL,378.5,-1.0 +4,NORMAL,380.0,-1.0 +4,NORMAL,380.75,-1.0 +4,NORMAL,388.25,-1.0 +4,NORMAL,388.5,-1.0 +4,NORMAL,394.0,-1.0 +4,NORMAL,395.0,-1.0 +4,NORMAL,403.75,-1.0 +4,NORMAL,404.25,-1.0 +4,NORMAL,408.75,-1.0 +4,NORMAL,418.0,-1.0 +4,NORMAL,438.5,-1.0 +4,NORMAL,442.25,-1.0 +4,NORMAL,466.75,-1.0 +4,NORMAL,484.0,-1.0 +4,NORMAL,486.25,-1.0 +4,NORMAL,499.0,-1.0 +4,NORMAL,502.5,-1.0 +4,NORMAL,524.5,-1.0 +4,NORMAL,542.0,-1.0 +4,NORMAL,544.0,-1.0 +4,NORMAL,550.5,-1.0 +4,NORMAL,554.75,-1.0 +4,NORMAL,556.0,-1.0 +4,NORMAL,557.75,-1.0 +4,NORMAL,564.25,-1.0 +4,NORMAL,567.5,-1.0 +4,NORMAL,570.0,-1.0 +4,NORMAL,572.0,-1.0 +4,NORMAL,600.5,-1.0 +4,NORMAL,621.25,-1.0 +4,NORMAL,623.0,-1.0 +4,NORMAL,632.0,-1.0 +4,NORMAL,632.5,-1.0 +5,NORMAL,37.0,-1.0 +5,NORMAL,38.0,-1.0 +5,NORMAL,38.5,-1.0 +5,NORMAL,62.75,-1.0 +5,NORMAL,63.75,-1.0 +5,NORMAL,97.5,-1.0 +5,NORMAL,98.0,-1.0 +5,NORMAL,98.5,-1.0 +5,NORMAL,99.5,-1.0 +5,NORMAL,126.0,-1.0 +5,NORMAL,126.5,-1.0 +5,NORMAL,159.0,-1.0 +5,NORMAL,163.25,-1.0 +5,NORMAL,164.0,-1.0 +5,NORMAL,166.0,-1.0 +5,NORMAL,166.75,-1.0 +5,NORMAL,169.0,-1.0 +5,NORMAL,170.5,-1.0 +5,NORMAL,183.75,-1.0 +5,NORMAL,186.75,-1.0 +5,NORMAL,204.25,-1.0 +5,NORMAL,209.25,-1.0 +5,NORMAL,212.25,-1.0 +5,NORMAL,262.0,-1.0 +5,NORMAL,270.5,-1.0 +5,NORMAL,271.5,-1.0 +5,NORMAL,305.75,-1.0 +5,NORMAL,306.25,-1.0 +5,NORMAL,334.5,-1.0 +5,NORMAL,382.75,-1.0 +5,NORMAL,383.5,-1.0 +5,NORMAL,387.25,-1.0 +5,NORMAL,388.25,-1.0 +5,NORMAL,408.25,-1.0 +5,NORMAL,417.25,-1.0 +5,NORMAL,419.5,-1.0 +5,NORMAL,485.25,-1.0 +5,NORMAL,559.75,-1.0 +5,NORMAL,562.75,-1.0 +5,NORMAL,564.25,-1.0 +5,NORMAL,565.75,-1.0 +5,NORMAL,566.5,-1.0 +5,NORMAL,570.75,-1.0 +5,NORMAL,591.0,-1.0 +5,NORMAL,592.25,-1.0 +5,NORMAL,592.5,-1.0 +5,NORMAL,601.0,-1.0 +5,NORMAL,602.25,-1.0 +5,NORMAL,602.5,-1.0 +5,NORMAL,602.75,-1.0 +5,NORMAL,603.0,-1.0 +5,NORMAL,603.25,-1.0 +5,NORMAL,603.5,-1.0 +5,NORMAL,603.75,-1.0 +5,NORMAL,604.0,-1.0 +5,NORMAL,604.25,-1.0 +5,NORMAL,604.5,-1.0 +5,NORMAL,604.75,-1.0 +5,NORMAL,605.0,-1.0 +5,NORMAL,605.25,-1.0 +5,NORMAL,605.5,-1.0 +5,NORMAL,605.75,-1.0 +5,NORMAL,606.0,-1.0 +5,NORMAL,606.25,-1.0 +5,NORMAL,606.5,-1.0 +5,NORMAL,606.75,-1.0 +5,NORMAL,607.0,-1.0 +5,NORMAL,607.25,-1.0 +5,NORMAL,607.5,-1.0 +5,NORMAL,607.75,-1.0 +5,NORMAL,608.0,-1.0 +5,NORMAL,608.25,-1.0 +5,NORMAL,608.5,-1.0 +5,NORMAL,608.75,-1.0 +5,NORMAL,609.0,-1.0 +6,NORMAL,25.75,-1.0 +6,NORMAL,36.25,-1.0 +6,NORMAL,37.0,-1.0 +6,NORMAL,37.75,-1.0 +6,NORMAL,38.5,-1.0 +6,NORMAL,60.25,-1.0 +6,NORMAL,96.25,-1.0 +6,NORMAL,97.75,-1.0 +6,NORMAL,100.5,-1.0 +6,NORMAL,102.5,-1.0 +6,NORMAL,110.0,-1.0 +6,NORMAL,111.5,-1.0 +6,NORMAL,112.0,-1.0 +6,NORMAL,121.75,-1.0 +6,NORMAL,122.0,-1.0 +6,NORMAL,122.75,-1.0 +6,NORMAL,123.5,-1.0 +6,NORMAL,125.0,-1.0 +6,NORMAL,131.0,-1.0 +6,NORMAL,132.25,-1.0 +6,NORMAL,133.25,-1.0 +6,NORMAL,134.25,-1.0 +6,NORMAL,138.75,-1.0 +6,NORMAL,139.5,-1.0 +6,NORMAL,141.0,-1.0 +6,NORMAL,156.5,-1.0 +6,NORMAL,158.5,-1.0 +6,NORMAL,159.0,-1.0 +6,NORMAL,162.0,-1.0 +6,NORMAL,163.25,-1.0 +6,NORMAL,164.5,-1.0 +6,NORMAL,166.0,-1.0 +6,NORMAL,169.0,-1.0 +6,NORMAL,169.75,-1.0 +6,NORMAL,170.75,-1.0 +6,NORMAL,171.25,-1.0 +6,NORMAL,173.75,-1.0 +6,NORMAL,174.5,-1.0 +6,NORMAL,182.25,-1.0 +6,NORMAL,182.5,-1.0 +6,NORMAL,183.75,-1.0 +6,NORMAL,188.0,-1.0 +6,NORMAL,190.25,-1.0 +6,NORMAL,200.5,-1.0 +6,NORMAL,202.0,-1.0 +6,NORMAL,207.25,-1.0 +6,NORMAL,210.75,-1.0 +6,NORMAL,211.75,-1.0 +6,NORMAL,212.25,-1.0 +6,NORMAL,214.5,-1.0 +6,NORMAL,215.0,-1.0 +6,NORMAL,235.5,-1.0 +6,NORMAL,236.5,-1.0 +6,NORMAL,255.25,-1.0 +6,NORMAL,261.5,-1.0 +6,NORMAL,272.0,-1.0 +6,NORMAL,273.75,-1.0 +6,NORMAL,274.75,-1.0 +6,NORMAL,290.0,-1.0 +6,NORMAL,290.5,-1.0 +6,NORMAL,293.75,-1.0 +6,NORMAL,300.0,-1.0 +6,NORMAL,300.5,-1.0 +6,NORMAL,302.75,-1.0 +6,NORMAL,304.0,-1.0 +6,NORMAL,305.75,-1.0 +6,NORMAL,308.5,-1.0 +6,NORMAL,318.0,-1.0 +6,NORMAL,319.75,-1.0 +6,NORMAL,321.25,-1.0 +6,NORMAL,321.75,-1.0 +6,NORMAL,322.25,-1.0 +6,NORMAL,322.75,-1.0 +6,NORMAL,330.0,-1.0 +6,NORMAL,330.75,-1.0 +6,NORMAL,334.0,-1.0 +6,NORMAL,337.5,-1.0 +6,NORMAL,339.75,-1.0 +6,NORMAL,343.75,-1.0 +6,NORMAL,347.5,-1.0 +6,NORMAL,348.0,-1.0 +6,NORMAL,358.75,-1.0 +6,NORMAL,362.75,-1.0 +6,NORMAL,370.5,-1.0 +6,NORMAL,378.0,-1.0 +6,NORMAL,381.5,-1.0 +6,NORMAL,382.75,-1.0 +6,NORMAL,385.25,-1.0 +6,NORMAL,386.25,-1.0 +6,NORMAL,387.25,-1.0 +6,NORMAL,394.0,-1.0 +6,NORMAL,396.0,-1.0 +6,NORMAL,399.75,-1.0 +6,NORMAL,402.0,-1.0 +6,NORMAL,405.75,-1.0 +6,NORMAL,406.0,-1.0 +6,NORMAL,406.5,-1.0 +6,NORMAL,407.75,-1.0 +6,NORMAL,418.5,-1.0 +6,NORMAL,420.0,-1.0 +6,NORMAL,439.5,-1.0 +6,NORMAL,442.75,-1.0 +6,NORMAL,462.5,-1.0 +6,NORMAL,465.0,-1.0 +6,NORMAL,466.5,-1.0 +6,NORMAL,466.75,-1.0 +6,NORMAL,490.0,-1.0 +6,NORMAL,501.0,-1.0 +6,NORMAL,523.0,-1.0 +6,NORMAL,527.0,-1.0 +6,NORMAL,542.0,-1.0 +6,NORMAL,542.5,-1.0 +6,NORMAL,545.0,-1.0 +6,NORMAL,550.75,-1.0 +6,NORMAL,562.75,-1.0 +6,NORMAL,564.25,-1.0 +6,NORMAL,571.5,-1.0 +6,NORMAL,572.25,-1.0 +6,NORMAL,610.0,-1.0 +6,NORMAL,614.25,-1.0 +6,NORMAL,621.25,-1.0 +6,NORMAL,623.0,-1.0 +6,NORMAL,632.0,-1.0 +6,NORMAL,632.5,-1.0 +7,NORMAL,25.5,-1.0 +7,NORMAL,26.0,-1.0 +7,NORMAL,29.75,-1.0 +7,NORMAL,34.75,-1.0 +7,NORMAL,36.0,-1.0 +7,NORMAL,40.0,-1.0 +7,NORMAL,42.75,-1.0 +7,NORMAL,43.25,-1.0 +7,NORMAL,44.75,-1.0 +7,NORMAL,57.25,-1.0 +7,NORMAL,58.25,-1.0 +7,NORMAL,59.25,-1.0 +7,NORMAL,65.75,-1.0 +7,NORMAL,66.25,-1.0 +7,NORMAL,66.75,-1.0 +7,NORMAL,73.25,-1.0 +7,NORMAL,73.75,-1.0 +7,NORMAL,74.25,-1.0 +7,NORMAL,74.75,-1.0 +7,NORMAL,75.25,-1.0 +7,NORMAL,76.25,-1.0 +7,NORMAL,76.75,-1.0 +7,NORMAL,77.25,-1.0 +7,NORMAL,78.25,-1.0 +7,NORMAL,78.75,-1.0 +7,NORMAL,81.5,-1.0 +7,NORMAL,82.0,-1.0 +7,NORMAL,84.5,-1.0 +7,NORMAL,85.5,-1.0 +7,NORMAL,87.0,-1.0 +7,NORMAL,92.0,-1.0 +7,NORMAL,94.0,-1.0 +7,NORMAL,94.75,-1.0 +7,NORMAL,95.75,-1.0 +7,NORMAL,101.0,-1.0 +7,NORMAL,102.75,-1.0 +7,NORMAL,103.25,-1.0 +7,NORMAL,109.0,-1.0 +7,NORMAL,109.5,-1.0 +7,NORMAL,111.5,-1.0 +7,NORMAL,112.0,-1.0 +7,NORMAL,113.0,-1.0 +7,NORMAL,113.5,-1.0 +7,NORMAL,114.25,-1.0 +7,NORMAL,114.75,-1.0 +7,NORMAL,120.75,-1.0 +7,NORMAL,121.75,-1.0 +7,NORMAL,123.5,-1.0 +7,NORMAL,125.0,-1.0 +7,NORMAL,125.5,-1.0 +7,NORMAL,129.25,-1.0 +7,NORMAL,129.75,-1.0 +7,NORMAL,130.25,-1.0 +7,NORMAL,130.5,-1.0 +7,NORMAL,131.75,-1.0 +7,NORMAL,132.25,-1.0 +7,NORMAL,132.75,-1.0 +7,NORMAL,133.75,-1.0 +7,NORMAL,134.25,-1.0 +7,NORMAL,134.75,-1.0 +7,NORMAL,135.75,-1.0 +7,NORMAL,136.25,-1.0 +7,NORMAL,136.75,-1.0 +7,NORMAL,137.75,-1.0 +7,NORMAL,138.25,-1.0 +7,NORMAL,139.0,-1.0 +7,NORMAL,140.0,-1.0 +7,NORMAL,140.5,-1.0 +7,NORMAL,142.5,-1.0 +7,NORMAL,149.0,-1.0 +7,NORMAL,155.25,-1.0 +7,NORMAL,158.75,-1.0 +7,NORMAL,162.0,-1.0 +7,NORMAL,164.0,-1.0 +7,NORMAL,171.75,-1.0 +7,NORMAL,172.25,-1.0 +7,NORMAL,172.75,-1.0 +7,NORMAL,175.5,-1.0 +7,NORMAL,177.0,-1.0 +7,NORMAL,178.0,-1.0 +7,NORMAL,180.25,-1.0 +7,NORMAL,180.5,-1.0 +7,NORMAL,182.0,-1.0 +7,NORMAL,189.0,-1.0 +7,NORMAL,191.5,-1.0 +7,NORMAL,194.0,-1.0 +7,NORMAL,194.5,-1.0 +7,NORMAL,197.75,-1.0 +7,NORMAL,199.5,-1.0 +7,NORMAL,202.75,-1.0 +7,NORMAL,203.5,-1.0 +7,NORMAL,205.75,-1.0 +7,NORMAL,209.25,-1.0 +7,NORMAL,210.25,-1.0 +7,NORMAL,210.75,-1.0 +7,NORMAL,215.0,-1.0 +7,NORMAL,216.25,-1.0 +7,NORMAL,217.0,-1.0 +7,NORMAL,218.75,-1.0 +7,NORMAL,228.0,-1.0 +7,NORMAL,230.75,-1.0 +7,NORMAL,233.0,-1.0 +7,NORMAL,234.25,-1.0 +7,NORMAL,236.0,-1.0 +7,NORMAL,238.25,-1.0 +7,NORMAL,252.75,-1.0 +7,NORMAL,253.25,-1.0 +7,NORMAL,254.5,-1.0 +7,NORMAL,260.0,-1.0 +7,NORMAL,262.5,-1.0 +7,NORMAL,264.5,-1.0 +7,NORMAL,265.5,-1.0 +7,NORMAL,268.0,-1.0 +7,NORMAL,276.0,-1.0 +7,NORMAL,281.25,-1.0 +7,NORMAL,283.25,-1.0 +7,NORMAL,284.25,-1.0 +7,NORMAL,285.0,-1.0 +7,NORMAL,285.75,-1.0 +7,NORMAL,286.25,-1.0 +7,NORMAL,287.0,-1.0 +7,NORMAL,287.75,-1.0 +7,NORMAL,288.0,-1.0 +7,NORMAL,289.0,-1.0 +7,NORMAL,289.75,-1.0 +7,NORMAL,292.0,-1.0 +7,NORMAL,294.75,-1.0 +7,NORMAL,301.0,-1.0 +7,NORMAL,302.25,-1.0 +7,NORMAL,306.0,-1.0 +7,NORMAL,307.5,-1.0 +7,NORMAL,310.5,-1.0 +7,NORMAL,311.0,-1.0 +7,NORMAL,313.25,-1.0 +7,NORMAL,314.0,-1.0 +7,NORMAL,317.0,-1.0 +7,NORMAL,320.25,-1.0 +7,NORMAL,323.0,-1.0 +7,NORMAL,323.75,-1.0 +7,NORMAL,324.0,-1.0 +7,NORMAL,324.75,-1.0 +7,NORMAL,325.75,-1.0 +7,NORMAL,326.75,-1.0 +7,NORMAL,327.5,-1.0 +7,NORMAL,328.5,-1.0 +7,NORMAL,329.0,-1.0 +7,NORMAL,330.0,-1.0 +7,NORMAL,331.5,-1.0 +7,NORMAL,333.5,-1.0 +7,NORMAL,335.5,-1.0 +7,NORMAL,336.0,-1.0 +7,NORMAL,338.5,-1.0 +7,NORMAL,342.0,-1.0 +7,NORMAL,345.5,-1.0 +7,NORMAL,347.0,-1.0 +7,NORMAL,349.0,-1.0 +7,NORMAL,350.25,-1.0 +7,NORMAL,350.5,-1.0 +7,NORMAL,356.0,-1.0 +7,NORMAL,357.25,-1.0 +7,NORMAL,358.5,-1.0 +7,NORMAL,365.0,-1.0 +7,NORMAL,366.5,-1.0 +7,NORMAL,367.0,-1.0 +7,NORMAL,369.0,-1.0 +7,NORMAL,377.5,-1.0 +7,NORMAL,378.75,-1.0 +7,NORMAL,379.5,-1.0 +7,NORMAL,380.75,-1.0 +7,NORMAL,381.5,-1.0 +7,NORMAL,386.25,-1.0 +7,NORMAL,390.0,-1.0 +7,NORMAL,392.0,-1.0 +7,NORMAL,393.0,-1.0 +7,NORMAL,394.0,-1.0 +7,NORMAL,394.5,-1.0 +7,NORMAL,396.5,-1.0 +7,NORMAL,398.75,-1.0 +7,NORMAL,402.5,-1.0 +7,NORMAL,405.75,-1.0 +7,NORMAL,407.0,-1.0 +7,NORMAL,418.0,-1.0 +7,NORMAL,424.0,-1.0 +7,NORMAL,425.0,-1.0 +7,NORMAL,426.5,-1.0 +7,NORMAL,428.0,-1.0 +7,NORMAL,431.25,-1.0 +7,NORMAL,436.25,-1.0 +7,NORMAL,436.75,-1.0 +7,NORMAL,438.0,-1.0 +7,NORMAL,438.25,-1.0 +7,NORMAL,441.0,-1.0 +7,NORMAL,451.5,-1.0 +7,NORMAL,457.0,-1.0 +7,NORMAL,458.5,-1.0 +7,NORMAL,461.75,-1.0 +7,NORMAL,463.5,-1.0 +7,NORMAL,467.25,-1.0 +7,NORMAL,472.0,-1.0 +7,NORMAL,474.0,-1.0 +7,NORMAL,478.0,-1.0 +7,NORMAL,486.25,-1.0 +7,NORMAL,490.5,-1.0 +7,NORMAL,492.75,-1.0 +7,NORMAL,494.25,-1.0 +7,NORMAL,498.75,-1.0 +7,NORMAL,500.5,-1.0 +7,NORMAL,501.0,-1.0 +7,NORMAL,502.5,-1.0 +7,NORMAL,514.25,-1.0 +7,NORMAL,515.0,-1.0 +7,NORMAL,516.25,-1.0 +7,NORMAL,517.25,-1.0 +7,NORMAL,520.5,-1.0 +7,NORMAL,521.0,-1.0 +7,NORMAL,522.5,-1.0 +7,NORMAL,526.5,-1.0 +7,NORMAL,530.5,-1.0 +7,NORMAL,531.5,-1.0 +7,NORMAL,532.5,-1.0 +7,NORMAL,539.0,-1.0 +7,NORMAL,540.0,-1.0 +7,NORMAL,540.5,-1.0 +7,NORMAL,544.0,-1.0 +7,NORMAL,546.5,-1.0 +7,NORMAL,549.0,-1.0 +7,NORMAL,550.25,-1.0 +7,NORMAL,550.75,-1.0 +7,NORMAL,551.5,-1.0 +7,NORMAL,554.5,-1.0 +7,NORMAL,555.5,-1.0 +7,NORMAL,556.0,-1.0 +7,NORMAL,557.75,-1.0 +7,NORMAL,562.75,-1.0 +7,NORMAL,563.75,-1.0 +7,NORMAL,564.0,-1.0 +7,NORMAL,574.5,-1.0 +7,NORMAL,575.0,-1.0 +7,NORMAL,576.0,-1.0 +7,NORMAL,577.0,-1.0 +7,NORMAL,579.5,-1.0 +7,NORMAL,585.0,-1.0 +7,NORMAL,592.5,-1.0 +7,NORMAL,599.0,-1.0 +7,NORMAL,609.75,-1.0 +7,NORMAL,614.0,-1.0 +7,NORMAL,614.25,-1.0 +7,NORMAL,615.5,-1.0 +7,NORMAL,616.0,-1.0 +7,NORMAL,620.25,-1.0 +7,NORMAL,621.75,-1.0 +7,NORMAL,623.0,-1.0 +7,NORMAL,624.0,-1.0 +7,NORMAL,632.0,-1.0 +7,NORMAL,632.5,-1.0 +8,NORMAL,29.5,-1.0 +8,NORMAL,30.0,-1.0 +8,NORMAL,31.25,-1.0 +8,NORMAL,33.25,-1.0 +8,NORMAL,34.75,-1.0 +8,NORMAL,40.0,-1.0 +8,NORMAL,41.25,-1.0 +8,NORMAL,42.5,-1.0 +8,NORMAL,42.75,-1.0 +8,NORMAL,43.5,-1.0 +8,NORMAL,45.25,-1.0 +8,NORMAL,51.5,-1.0 +8,NORMAL,52.25,-1.0 +8,NORMAL,54.5,-1.0 +8,NORMAL,56.5,-1.0 +8,NORMAL,57.5,-1.0 +8,NORMAL,66.0,-1.0 +8,NORMAL,69.25,-1.0 +8,NORMAL,70.5,-1.0 +8,NORMAL,71.0,-1.0 +8,NORMAL,71.75,-1.0 +8,NORMAL,79.75,-1.0 +8,NORMAL,81.75,-1.0 +8,NORMAL,82.5,-1.0 +8,NORMAL,83.5,-1.0 +8,NORMAL,84.0,-1.0 +8,NORMAL,86.25,-1.0 +8,NORMAL,92.5,-1.0 +8,NORMAL,93.25,-1.0 +8,NORMAL,93.75,-1.0 +8,NORMAL,104.5,-1.0 +8,NORMAL,107.25,-1.0 +8,NORMAL,108.0,-1.0 +8,NORMAL,115.0,-1.0 +8,NORMAL,115.75,-1.0 +8,NORMAL,116.0,-1.0 +8,NORMAL,116.75,-1.0 +8,NORMAL,117.5,-1.0 +8,NORMAL,118.5,-1.0 +8,NORMAL,119.75,-1.0 +8,NORMAL,120.25,-1.0 +8,NORMAL,125.5,-1.0 +8,NORMAL,126.25,-1.0 +8,NORMAL,126.75,-1.0 +8,NORMAL,127.75,-1.0 +8,NORMAL,128.5,-1.0 +8,NORMAL,135.25,-1.0 +8,NORMAL,136.25,-1.0 +8,NORMAL,136.75,-1.0 +8,NORMAL,137.25,-1.0 +8,NORMAL,138.25,-1.0 +8,NORMAL,143.5,-1.0 +8,NORMAL,145.25,-1.0 +8,NORMAL,148.0,-1.0 +8,NORMAL,149.25,-1.0 +8,NORMAL,150.5,-1.0 +8,NORMAL,150.75,-1.0 +8,NORMAL,159.75,-1.0 +8,NORMAL,161.0,-1.0 +8,NORMAL,162.5,-1.0 +8,NORMAL,178.0,-1.0 +8,NORMAL,179.0,-1.0 +8,NORMAL,180.0,-1.0 +8,NORMAL,194.5,-1.0 +8,NORMAL,195.5,-1.0 +8,NORMAL,196.0,-1.0 +8,NORMAL,197.5,-1.0 +8,NORMAL,204.25,-1.0 +8,NORMAL,204.25,-1.0 +8,NORMAL,204.25,-1.0 +8,NORMAL,205.5,-1.0 +8,NORMAL,206.0,-1.0 +8,NORMAL,206.75,-1.0 +8,NORMAL,208.25,-1.0 +8,NORMAL,209.25,-1.0 +8,NORMAL,217.25,-1.0 +8,NORMAL,218.25,-1.0 +8,NORMAL,219.5,-1.0 +8,NORMAL,221.0,-1.0 +8,NORMAL,222.25,-1.0 +8,NORMAL,222.5,-1.0 +8,NORMAL,224.0,-1.0 +8,NORMAL,231.75,-1.0 +8,NORMAL,237.5,-1.0 +8,NORMAL,239.0,-1.0 +8,NORMAL,246.75,-1.0 +8,NORMAL,250.5,-1.0 +8,NORMAL,251.25,-1.0 +8,NORMAL,265.0,-1.0 +8,NORMAL,266.25,-1.0 +8,NORMAL,267.0,-1.0 +8,NORMAL,276.5,-1.0 +8,NORMAL,278.5,-1.0 +8,NORMAL,279.25,-1.0 +8,NORMAL,279.75,-1.0 +8,NORMAL,281.5,-1.0 +8,NORMAL,282.75,-1.0 +8,NORMAL,283.75,-1.0 +8,NORMAL,284.25,-1.0 +8,NORMAL,284.75,-1.0 +8,NORMAL,286.0,-1.0 +8,NORMAL,286.75,-1.0 +8,NORMAL,288.0,-1.0 +8,NORMAL,301.5,-1.0 +8,NORMAL,310.75,-1.0 +8,NORMAL,312.75,-1.0 +8,NORMAL,316.0,-1.0 +8,NORMAL,325.25,-1.0 +8,NORMAL,326.0,-1.0 +8,NORMAL,327.25,-1.0 +8,NORMAL,328.0,-1.0 +8,NORMAL,333.0,-1.0 +8,NORMAL,346.5,-1.0 +8,NORMAL,350.5,-1.0 +8,NORMAL,352.0,-1.0 +8,NORMAL,353.0,-1.0 +8,NORMAL,354.25,-1.0 +8,NORMAL,355.0,-1.0 +8,NORMAL,356.0,-1.0 +8,NORMAL,364.0,-1.0 +8,NORMAL,366.75,-1.0 +8,NORMAL,368.5,-1.0 +8,NORMAL,378.5,-1.0 +8,NORMAL,380.5,-1.0 +8,NORMAL,386.0,-1.0 +8,NORMAL,390.0,-1.0 +8,NORMAL,390.5,-1.0 +8,NORMAL,392.0,-1.0 +8,NORMAL,397.25,-1.0 +8,NORMAL,398.0,-1.0 +8,NORMAL,398.75,-1.0 +8,NORMAL,402.5,-1.0 +8,NORMAL,414.5,-1.0 +8,NORMAL,416.75,-1.0 +8,NORMAL,417.25,-1.0 +8,NORMAL,422.75,-1.0 +8,NORMAL,423.25,-1.0 +8,NORMAL,425.0,-1.0 +8,NORMAL,426.0,-1.0 +8,NORMAL,427.5,-1.0 +8,NORMAL,428.0,-1.0 +8,NORMAL,432.0,-1.0 +8,NORMAL,444.75,-1.0 +8,NORMAL,450.0,-1.0 +8,NORMAL,453.5,-1.0 +8,NORMAL,457.75,-1.0 +8,NORMAL,460.0,-1.0 +8,NORMAL,460.5,-1.0 +8,NORMAL,468.5,-1.0 +8,NORMAL,469.25,-1.0 +8,NORMAL,470.5,-1.0 +8,NORMAL,475.5,-1.0 +8,NORMAL,476.5,-1.0 +8,NORMAL,479.5,-1.0 +8,NORMAL,480.0,-1.0 +8,NORMAL,483.0,-1.0 +8,NORMAL,484.5,-1.0 +8,NORMAL,486.75,-1.0 +8,NORMAL,487.0,-1.0 +8,NORMAL,490.5,-1.0 +8,NORMAL,492.75,-1.0 +8,NORMAL,494.25,-1.0 +8,NORMAL,495.75,-1.0 +8,NORMAL,498.0,-1.0 +8,NORMAL,499.5,-1.0 +8,NORMAL,502.5,-1.0 +8,NORMAL,503.5,-1.0 +8,NORMAL,510.5,-1.0 +8,NORMAL,511.25,-1.0 +8,NORMAL,516.75,-1.0 +8,NORMAL,517.25,-1.0 +8,NORMAL,518.5,-1.0 +8,NORMAL,519.0,-1.0 +8,NORMAL,529.0,-1.0 +8,NORMAL,529.5,-1.0 +8,NORMAL,530.0,-1.0 +8,NORMAL,532.5,-1.0 +8,NORMAL,533.5,-1.0 +8,NORMAL,534.5,-1.0 +8,NORMAL,535.5,-1.0 +8,NORMAL,537.0,-1.0 +8,NORMAL,538.0,-1.0 +8,NORMAL,548.0,-1.0 +8,NORMAL,549.0,-1.0 +8,NORMAL,554.0,-1.0 +8,NORMAL,554.5,-1.0 +8,NORMAL,556.0,-1.0 +8,NORMAL,557.5,-1.0 +8,NORMAL,558.25,-1.0 +8,NORMAL,561.0,-1.0 +8,NORMAL,562.25,-1.0 +8,NORMAL,562.75,-1.0 +8,NORMAL,577.0,-1.0 +8,NORMAL,577.75,-1.0 +8,NORMAL,578.0,-1.0 +8,NORMAL,584.0,-1.0 +8,NORMAL,585.0,-1.0 +8,NORMAL,599.0,-1.0 +8,NORMAL,600.25,-1.0 +8,NORMAL,600.5,-1.0 +8,NORMAL,609.5,-1.0 +8,NORMAL,613.75,-1.0 +8,NORMAL,617.25,-1.0 +8,NORMAL,618.5,-1.0 +8,NORMAL,618.75,-1.0 +8,NORMAL,624.0,-1.0 +8,NORMAL,625.0,-1.0 +9,NORMAL,31.0,-1.0 +9,NORMAL,31.75,-1.0 +9,NORMAL,33.25,-1.0 +9,NORMAL,52.75,-1.0 +9,NORMAL,53.75,-1.0 +9,NORMAL,54.0,-1.0 +9,NORMAL,70.75,-1.0 +9,NORMAL,106.25,-1.0 +9,NORMAL,106.75,-1.0 +9,NORMAL,117.0,-1.0 +9,NORMAL,118.25,-1.0 +9,NORMAL,119.25,-1.0 +9,NORMAL,126.25,-1.0 +9,NORMAL,126.75,-1.0 +9,NORMAL,127.75,-1.0 +9,NORMAL,144.0,-1.0 +9,NORMAL,146.0,-1.0 +9,NORMAL,147.25,-1.0 +9,NORMAL,148.0,-1.0 +9,NORMAL,161.0,-1.0 +9,NORMAL,196.0,-1.0 +9,NORMAL,207.75,-1.0 +9,NORMAL,220.0,-1.0 +9,NORMAL,221.0,-1.0 +9,NORMAL,223.25,-1.0 +9,NORMAL,249.0,-1.0 +9,NORMAL,277.0,-1.0 +9,NORMAL,278.75,-1.0 +9,NORMAL,312.25,-1.0 +9,NORMAL,352.0,-1.0 +9,NORMAL,354.25,-1.0 +9,NORMAL,367.75,-1.0 +9,NORMAL,386.0,-1.0 +9,NORMAL,397.25,-1.0 +9,NORMAL,415.5,-1.0 +9,NORMAL,446.5,-1.0 +9,NORMAL,459.5,-1.0 +9,NORMAL,469.25,-1.0 +9,NORMAL,481.0,-1.0 +9,NORMAL,494.75,-1.0 +9,NORMAL,495.75,-1.0 +9,NORMAL,503.5,-1.0 +9,NORMAL,509.0,-1.0 +9,NORMAL,510.25,-1.0 +9,NORMAL,510.5,-1.0 +9,NORMAL,533.75,-1.0 +9,NORMAL,535.5,-1.0 +9,NORMAL,559.25,-1.0 +9,NORMAL,560.25,-1.0 +9,NORMAL,584.0,-1.0 +9,NORMAL,625.0,-1.0 diff --git a/LLSIG/src/main/java/LLSIG/Canvas.java b/LLSIG/src/main/java/LLSIG/Canvas.java index 9daf495..094a16e 100644 --- a/LLSIG/src/main/java/LLSIG/Canvas.java +++ b/LLSIG/src/main/java/LLSIG/Canvas.java @@ -103,7 +103,7 @@ public class Canvas extends JPanel implements AudioSpectrumListener{ g.drawString("Average BPM: "+LLSIG.approximateBPM(),MIDDLE_X-128,MIDDLE_Y+64); } else if (LLSIG.game.METRONOME) { - g.drawString("Offset: "+LLSIG.testOffset,MIDDLE_X-128,MIDDLE_Y+64); + g.drawString("Offset: "+LLSIG.offset,MIDDLE_X-128,MIDDLE_Y+64); } else { g.setColor(LLSIG.game.musicPlayer.getPlayPosition()-LLSIG.LAST_PERFECT<500?Color.WHITE:Color.DARK_GRAY);g.drawString("PERFECT: "+LLSIG.PERFECT_COUNT,MIDDLE_X-128,MIDDLE_Y-96); g.setColor(LLSIG.game.musicPlayer.getPlayPosition()-LLSIG.LAST_EXCELLENT<500?Color.WHITE:Color.DARK_GRAY);g.drawString("EXCELLENT: "+LLSIG.EXCELLENT_COUNT,MIDDLE_X-128,MIDDLE_Y-64); diff --git a/LLSIG/src/main/java/LLSIG/LLSIG.java b/LLSIG/src/main/java/LLSIG/LLSIG.java index 549aa19..d5b51b9 100644 --- a/LLSIG/src/main/java/LLSIG/LLSIG.java +++ b/LLSIG/src/main/java/LLSIG/LLSIG.java @@ -37,7 +37,6 @@ public class LLSIG implements KeyListener,MouseWheelListener{ public static Font gameFont = new Font("Century Gothic",Font.BOLD,32); public static int bpm = 120; public static double offset = 0; - public static double testOffset = 0; public static double beatDelay = ((1/((double)bpm/60))*1000); public static boolean lastHold = false; //A toggle. Decides primary/secondary color marking. @@ -47,15 +46,15 @@ public class LLSIG implements KeyListener,MouseWheelListener{ List lanes = new ArrayList(); List timings = new ArrayList(); - String song = "MiChi-ONE"; + String song = "02-ワクワクmeetsトリップ"; final static Dimension WINDOW_SIZE = new Dimension(1280,1050); public boolean EDITMODE = false; public boolean METRONOME = false; - public boolean BPM_MEASURE = false; + public boolean BPM_MEASURE = true; public boolean PLAYING = true; //Whether or not a song is loaded and playing. - public boolean EDITOR = true; //Whether or not we are in beatmap editing mode. + public boolean EDITOR = false; //Whether or not we are in beatmap editing mode. public boolean HOLDING_CTRL_KEY = false; public static double EDITOR_CURSOR_BEAT = 0; @@ -120,7 +119,7 @@ public class LLSIG implements KeyListener,MouseWheelListener{ e.printStackTrace(); } - for (int i=0;i<9;i++) { + for (int i=0;i<9;i++) {; lanes.add(new Lane(new ArrayList())); } @@ -131,7 +130,7 @@ public class LLSIG implements KeyListener,MouseWheelListener{ musicPlayer.play(); } - //musicPlayer.jlpp.setVolume(0); + musicPlayer.jlpp.setVolume(1); LoadSongData(song,lanes); } Canvas canvas = new Canvas(f.getSize()); @@ -305,12 +304,33 @@ public class LLSIG implements KeyListener,MouseWheelListener{ } public static double approximateBPM() { + long MAX_BEAT = Long.MIN_VALUE; + long MIN_BEAT = Long.MAX_VALUE; long totalDiff = 0; + int beatCount=0; if (beats.size()>=2) { for (int i=1;idiff) { + MIN_BEAT=diff; + continue; + } else { + totalDiff+=diff; + beatCount++; + long averageDiff = totalDiff/(beatCount); + MAX_BEAT = MAX_BEAT - (MAX_BEAT - averageDiff)/10; + MIN_BEAT = MIN_BEAT + (averageDiff - MIN_BEAT)/10; + //System.out.println("MAX: "+MAX_BEAT+"/MIN: "+MIN_BEAT); + } + } + long averageDiff = 0; + if (beatCount>=1) { + averageDiff=totalDiff/(beatCount); } - long averageDiff = totalDiff/(beats.size()-1); return (1/((double)averageDiff/1000000000l)*60); } else { return 0; @@ -375,16 +395,24 @@ public class LLSIG implements KeyListener,MouseWheelListener{ }break; case KeyEvent.VK_BACK_SLASH:{ if (METRONOME) { - testOffset=musicPlayer.getPlayPosition(); - beatNumber=Math.max(0,beatNumber-12); + offset=musicPlayer.getPlayPosition(); } + beatNumber=Math.max(0,beatNumber-12); musicPlayer.seek((long)(Math.floor(musicPlayer.getPlayPosition()-(beatDelay*12)))); LLSIG.game.lanes.forEach((l)->{ l.noteChart.forEach((note)->{if (note.start>musicPlayer.getPlayPosition()) {note.markForDeletion();System.out.println("Marked "+note);}}); }); }break; - case KeyEvent.VK_S:{lane=1;}break; - case KeyEvent.VK_D:{lane=2;}break; + case KeyEvent.VK_S:{ + if (METRONOME) { + offset-=10; + } + lane=1;}break; + case KeyEvent.VK_D:{ + if (METRONOME) { + offset+=10; + } + lane=2;}break; case KeyEvent.VK_F:{lane=3;}break; case KeyEvent.VK_SPACE:{lane=4;}break; case KeyEvent.VK_J:{lane=5;}break;