Merge branch 'main' of https://gitlab.sowgro.net/guitarheros/guitarhero

1 files changed, 603 insertions, 628 deletions

diff --git a/levels/Apathetic Empathy/Medium/notes.txt b/levels/Apathetic Empathy/Medium/notes.txt
index 7077d8a..64255a9 100644
--- a/levels/Apathetic Empathy/Medium/notes.txt
+++ b/levels/Apathetic Empathy/Medium/notes.txt
@@ -1,685 +1,660 @@
-s3.4
-k3.4
-d3.4
-j11.2
-f11.2
-s11.2
-s17.5
-s18.1
-s19.4
-s20.4
-s21.0
-s22.4
-s23.6
-s24.5
-s25.5
-s26.5
-s27.4
-d27.4
-k27.4
-s28.4
-s29.5
-s30.4
-s31.3
-s32.3
-f32.3
-j32.3
+s3.2
+d3.2
+k3.3
+d11.3
+j11.3
+s17.8
+s18.3
+d19.4
+k19.4
+f20.4
+j20.4
+k21.5
+j22.5
+d23.4
+k24.5
+j25.4
+f26.3
+k27.3
+d28.5
+j29.4
+f30.4
+k31.4
+d32.4
+j32.4
 s33.8
 s34.8
-s35.4
-k35.4
-d35.5
-s36.5
-s37.4
-s38.3
-s39.4
-s40.4
-s41.4
-s42.3
-s43.3
-j43.3
-f43.3
-s44.5
-f44.5
-s45.5
-s46.3
-s47.3
-k47.3
-d47.3
-s48.4
-f48.4
-j48.4
-s49.4
+j35.3
+d36.3
+k37.3
+f38.4
+j38.4
+d39.3
+k39.3
+f40.4
+j40.4
+k41.4
+k42.3
+d43.4
+k44.3
+k45.4
+d46.4
+k46.4
+j47.4
+f47.5
+k48.4
+d48.4
 k49.4
-d49.4
-f50.4
-s51.3
-s52.4
-s53.5
-s54.5
+k50.4
+d51.4
+f52.4
+j53.4
+k54.4
 s55.4
-d55.4
-k55.4
-f56.4
-s57.4
-s58.4
-s59.5
-s60.5
-s61.4
-s62.3
-s63.4
-s64.3
-s65.3
-s65.8
-s66.3
-s66.9
-s67.4
-j67.4
-s68.3
-s68.8
-s70.3
+k56.4
+j57.5
+f58.4
+j59.4
+k60.4
+d61.3
+f62.3
+s63.3
+j64.3
+k65.1
+d65.3
+j65.8
+f66.3
+k66.8
+s67.3
+j68.3
+d68.9
+k69.4
+j70.4
 s71.3
-j71.4
-k71.4
-f71.4
-d71.4
-s72.4
-s73.3
-s74.4
+k72.3
+k72.8
+s74.3
+k74.3
+d74.4
 s75.4
-k75.4
 j75.4
 f75.4
-d75.5
-s76.3
-s76.9
-s77.5
-s78.4
-d79.3
-k79.3
-s80.3
-s81.8
-j81.8
-f81.8
-f82.8
-s82.8
-j82.8
-s83.5
-s84.4
-s84.9
-s86.1
-s86.7
-s87.3
-d87.3
-k87.4
-s88.3
-s89.4
-s90.4
-s91.4
-j91.4
-k91.4
-s92.3
-s93.4
-s94.3
-s95.4
-f95.4
-d95.4
-s96.3
-s97.7
-j97.8
-k97.8
-j98.8
-k98.8
-s98.8
-s99.4
-s100.4
-s101.4
-s102.3
-s103.3
+d77.2
+k77.2
+s77.2
+s79.3
+j79.3
+f79.3
+s81.6
+k81.6
+d81.7
+s82.7
+f82.7
+j82.7
+k83.4
+d83.4
+f84.4
+j84.4
+j84.8
+f84.8
+d86.4
+k86.4
+k88.4
+j88.4
+k88.9
+j88.9
+d90.3
+f90.4
+j92.3
+f92.9
+k93.4
+d94.3
+j95.3
+f96.3
+k97.4
+d98.4
+d99.4
+j99.5
+d100.4
+j100.5
+d100.8
+j100.9
+f102.2
+k102.3
 d103.4
-k103.4
-s104.4
-s105.4
-s106.3
-s107.4
-f107.4
+j103.4
+f104.4
+k104.4
+f104.8
+k104.9
+d106.3
+k106.4
 j107.4
-s108.3
-s109.3
-s110.3
-s111.4
-k111.4
-d111.4
-s112.4
-s113.3
-s114.3
-s115.4
-k115.4
-j115.4
-s116.3
-s117.4
-s118.4
-k119.4
-j119.4
-s119.4
-s120.4
-s121.4
-s122.4
+f107.5
+k108.4
+d109.3
+k110.3
+j111.4
+f111.4
+d112.3
+k112.4
+j113.8
+j114.8
+f115.3
+j116.4
+d117.4
+k118.3
+d119.3
+j120.4
+f121.4
+k122.4
 s123.3
-s123.9
-s124.4
-s125.0
+s124.3
 s125.4
-s126.0
-s126.4
-s126.8
-s127.1
-s127.5
-s129.5
-s130.5
-s131.4
+d126.4
+f127.4
+j128.4
+k129.5
+d130.4
+k130.4
+d131.4
 j131.4
-s132.3
-s133.4
-s134.4
-s135.3
-d135.4
-k135.4
-f136.4
-s136.4
-j136.4
+k132.4
+f132.4
+d133.4
+j133.4
+k134.5
+d134.5
+f135.4
+j135.4
+k136.4
+d136.4
+f137.4
 s137.4
-s138.3
-j139.5
-f140.5
-k141.5
-d142.0
-j142.4
-d143.4
-k144.0
-f144.5
-j144.9
-d145.5
-k145.9
-f146.5
-j147.0
-d147.5
-s148.6
-s149.6
-s150.6
-s151.5
-s152.5
-s153.5
-s154.4
+j137.4
+d138.4
+k138.4
+j139.4
+f139.5
+d140.4
+k140.4
+j141.4
+f141.5
+d142.4
+k142.4
+f143.4
+k143.4
+d144.4
+j144.4
+k145.4
+f145.4
+j146.4
+d146.9
+k147.5
+f148.5
+j149.4
+d150.4
+k151.4
+d152.4
+j153.4
+f154.4
 k155.4
-j156.4
-f156.9
-j157.5
-d157.9
+d156.5
+j157.4
 k158.4
-f159.1
-j159.5
-d160.4
-k161.0
-f161.5
-j161.9
-d162.3
-k162.8
-f163.4
-s164.5
-s166.4
-s168.4
-s169.9
-s170.9
-s172.5
-s174.5
+s159.4
+j160.4
+s161.8
+s162.8
+j163.3
+f164.3
+k165.3
+s166.5
+j167.4
+k168.4
+d169.4
+f170.4
+s171.5
+k172.4
+j173.5
+k174.5
+j175.4
 s176.4
-s177.8
-s178.8
-j179.4
-f180.4
-f181.7
-f182.4
+j177.4
+s178.2
+s178.9
+j180.4
+f181.4
+k182.4
 d183.4
-f184.4
-j185.4
-k186.3
-s187.5
-k187.6
-d187.6
-j188.4
-s188.4
-f188.4
-s189.4
-k189.4
-d189.4
-j190.4
-s190.4
-f190.4
-s191.4
-s192.4
-s192.9
-s193.4
-s194.0
-s194.5
-s195.0
-f195.5
-j195.6
-s196.3
-s196.8
-s198.4
-s200.3
-k200.3
+j184.5
+f185.3
+k186.4
+d187.2
+k187.5
+k188.4
+d188.4
+s189.3
+s190.3
+f190.3
+j190.3
+s191.3
+d191.3
+k191.3
+j192.3
+f192.3
+k193.4
+d193.4
+k193.9
+d193.9
+j194.4
+f194.5
+s195.3
+k195.3
+j196.3
+d196.3
+d196.8
+j196.8
+f198.4
+k198.4
 d200.3
-s201.5
-s202.4
-k203.4
-s203.4
-j203.4
-f203.4
-d203.4
-s204.3
-s204.9
-s205.4
-s206.1
-s206.5
-s207.4
-d207.4
-k207.5
-s208.3
-s209.9
+j200.3
+j200.8
+d200.8
+k202.3
+s202.3
+f202.3
+d204.3
+k204.3
+d204.8
+k204.8
+f206.4
+j206.4
+k208.4
+s208.4
+d208.4
+s210.0
+j210.0
+f210.0
+j210.9
+f210.9
 s210.9
-s211.4
-j211.4
-d211.4
-s212.4
-s212.9
-s214.3
-k215.4
-s215.4
-f215.5
-j215.6
-s216.3
-s216.9
+k212.3
+d212.4
+d212.9
+k212.9
+k214.3
+d214.4
+f216.3
+j216.3
+j216.8
+f216.8
+d218.4
+j218.4
+k218.4
 s218.4
-s219.4
-d219.5
-k219.5
-j219.5
-s220.4
-s220.8
-s222.4
-s223.3
-f223.3
-d223.4
-k223.4
-j223.4
-s224.3
-s224.8
+j220.4
+f220.4
+f220.9
+j220.9
+k222.4
+d222.4
+k224.4
+d224.4
+k224.9
+d224.9
+k225.8
+f225.9
+j225.9
+d225.9
 s225.9
+k226.4
+d226.4
+j226.4
+f226.4
 s226.4
-s226.9
+k226.9
+j226.9
+s227.0
+f227.0
+d227.0
+d227.4
+j227.4
+k227.4
+f227.4
 s227.4
-f227.5
-k227.5
-j227.5
-d227.6
-s228.3
-f228.4
-s228.9
+j228.4
+f228.9
 k230.3
-j230.3
-s230.4
-f230.4
-d230.4
-s231.4
+d230.3
+k232.4
+j232.4
 s232.4
-s233.4
+d232.4
+d232.9
+k232.9
+j232.9
+s232.9
+k234.4
+f234.4
 s234.4
-k235.4
-j235.4
-s235.4
-s236.4
-s237.3
-s238.1
-s239.3
-k239.3
-d239.3
+j236.3
+d236.3
+j236.8
+d236.8
+f238.3
+k238.4
 s240.3
-s241.5
-s242.4
-s243.4
-f243.4
-j243.5
-s244.3
-s245.3
-s246.3
-s247.3
-k247.4
-d247.4
-s248.3
-s249.4
-s250.4
-s251.4
-j251.4
-d251.4
-s252.3
-s252.7
-s253.1
-s253.4
-s253.7
-s254.0
-s254.3
-s254.6
-s255.0
-s255.3
-s256.4
-s257.3
-s258.3
-s259.3
-s260.4
-s261.5
-s262.4
-s263.5
-s264.4
-s265.3
-k266.3
-s266.3
+d240.3
+k240.4
+f241.9
+j241.9
+j242.8
+f242.9
+k244.3
+d244.3
+d244.8
+k244.8
+j246.3
+f246.3
+d248.3
+j248.3
+d248.8
+j248.8
+f250.5
+j250.5
+k251.5
+d251.7
+k252.1
+d252.4
+k252.7
+d253.0
+k253.4
+d253.7
+k254.0
+d254.3
+k254.6
+d254.9
+k255.3
+j259.5
+j260.5
+d261.5
+f262.5
+k263.4
+d264.4
+j265.4
 d266.4
-j267.4
-f267.4
-s267.5
-s268.4
-s269.5
-s270.3
-s271.3
+j267.5
+d268.4
+f269.4
+k270.4
+d271.4
 s272.4
 s273.4
-s274.3
-s275.4
-d275.4
-k275.4
-s276.4
-s277.3
-s278.4
-s279.3
-j279.3
-f279.3
-s280.4
-s281.4
-s282.3
+k274.4
+d275.3
+s276.3
+d276.4
+k277.4
+j278.4
+f279.4
+d280.4
+k280.4
+f281.5
+j281.5
 k282.4
-d282.4
-j283.5
-f283.5
-s283.6
-s284.4
+d283.4
+j283.4
+f284.3
+k284.4
 s285.3
-s286.3
-s287.3
-d287.3
+k285.3
+j286.3
+d286.3
 k287.3
-s288.3
-s289.3
-s290.3
-d291.4
-f294.5
-j295.4
-k296.5
+d287.3
+j288.4
+f288.4
+k289.4
+j290.4
+d291.3
+j292.4
+f293.0
+k293.5
+d294.0
+j294.5
+f295.4
+k296.4
+d296.9
+j297.4
+f297.9
 k298.4
-s299.4
+d299.0
 j299.5
-k302.3
-s302.3
-f303.4
+f300.5
+k301.5
+d302.5
 j303.4
-s311.4
-k311.4
-d311.4
-j314.4
-f314.4
+k304.4
+s305.5
+k306.4
+j307.4
+s308.4
+k309.5
+j310.4
+d311.0
+f311.5
+j312.4
+s313.5
+k314.5
 d315.4
-k315.4
-k319.7
-k320.5
-k321.4
-k322.4
-s323.5
-s324.5
+j315.4
+f316.5
+k316.6
+s317.4
+j318.4
+d319.4
+j320.4
+f321.4
+k321.9
+s322.4
+j322.9
+d323.5
+f324.5
 s325.6
-s326.4
-d326.4
 j326.4
-f327.4
-k327.5
-s327.5
-s328.5
-s329.5
-s330.5
-s331.4
-s332.4
+d327.4
+s328.4
+f329.5
+j330.4
+d331.4
+k332.4
 s333.4
-s334.0
-j334.0
-k334.0
-d334.0
-f334.0
-s334.9
-d334.9
-f334.9
-k334.9
-j334.9
-s335.6
-s336.6
-s337.5
-s338.4
-k338.4
-f339.5
-j339.5
-s339.5
-s340.4
-s341.5
-s342.5
-j343.3
-j344.4
-j345.5
-f346.0
-f346.9
-s347.5
-s348.5
-s349.4
-s350.4
-k351.3
+s333.9
+s334.8
+k335.4
+d336.5
+j337.5
+f338.5
+k339.3
+d340.4
+j341.4
+f342.3
+k343.3
+s344.4
+d345.4
+s345.9
+s346.8
+j347.4
+f348.4
+k349.5
+d350.4
+j351.3
+k352.4
 d352.4
 f353.4
-j354.4
+j353.4
+k354.4
 k355.4
-j356.4
-f357.5
-d357.8
-d359.4
-f360.5
-j361.3
+s355.5
+d356.5
+d357.9
+d358.8
+k359.4
+s360.4
+d361.4
+j361.4
+f362.4
 k362.4
-f363.4
+d363.4
 d364.4
 f365.5
-j366.4
-k367.5
-s368.5
+f366.4
+j367.4
+k368.4
 j369.4
 s369.9
-s370.8
-j371.4
-f372.6
-d373.4
-f374.4
-j375.4
-k376.4
-j377.4
-k378.4
-s378.4
+k370.8
+s371.4
+s372.5
+s373.5
+s374.4
+d375.3
+k375.4
+j376.4
+f376.4
+k377.4
 d378.4
-f379.4
-j379.4
-s380.4
-s381.5
-k382.0
-j382.0
-s382.0
-d382.0
-s383.0
-k383.0
-j383.0
-s384.5
-s385.5
-s386.4
-s387.5
-s388.4
-s389.4
-d390.1
-f390.5
-j391.4
-s392.3
-k393.5
-j394.5
-f395.6
+j378.4
+k379.4
+j380.4
+f381.4
+s381.9
+s382.8
+k383.4
+d384.4
+j385.4
+k386.4
+j387.4
+f388.4
+d389.4
+f390.4
+k391.3
+j392.4
+s393.4
+s393.9
+s394.9
+k395.4
 d396.5
-f397.4
-j398.5
-k399.4
-s400.4
-d400.4
-k400.4
-f401.4
-j401.4
-s401.4
-d402.4
-s402.4
-k402.4
-s403.4
+j397.4
+f398.5
+j399.3
+f400.4
+f401.5
+j402.4
 f403.4
-j403.4
-k404.4
-j404.4
-s405.9
-s406.9
-k407.6
-j407.6
-d407.6
-f407.7
-s408.5
-s409.4
-d410.5
+d404.4
+k405.4
+d406.4
+s407.5
+k408.5
+d409.5
+j410.4
 f411.4
-j412.4
-k413.5
-d414.4
-k414.4
-j414.4
+k412.3
+d413.4
 f414.4
-s415.3
-d416.4
-k416.4
-j416.4
-f416.4
-d417.4
-f417.5
+k415.4
+s416.5
+j417.4
 f418.5
-j419.5
-k419.5
-s420.5
-s421.5
-s422.4
-j423.4
-s423.4
-s424.2
-s425.4
-s426.4
-k427.3
-s427.4
-s428.3
-s429.5
-s430.4
-d431.4
-j431.5
-k431.5
-f431.5
-s432.3
-s433.4
-k434.3
-f434.3
-d434.3
-j434.3
-s434.3
-s435.4
-s436.4
-s437.4
-s438.4
-s439.4
-s440.4
-s441.4
-s442.4
-f443.5
-d444.6
-f445.6
-j446.4
-k447.6
-d448.9
-f450.3
-j451.8
-s453.4
-j454.3
-d455.4
-s455.4
-k455.4
-s456.9
-f456.9
-j456.9
-k458.4
-d458.4
-f459.3
-j459.3
-s460.8
-s462.3
-k462.3
+d419.5
+f420.5
+s421.4
+j422.4
+k423.4
+d424.4
+f425.5
+j426.4
+k427.4
+d428.4
+f429.4
+s429.9
+s430.8
+k431.4
+d432.4
+f433.5
+j434.4
+d435.5
+f436.5
+k437.4
+d438.4
+j439.2
+f440.5
+k441.4
+d442.4
+d443.5
+k443.5
+s443.5
+j444.8
+f444.8
+d446.3
+k446.3
+j447.5
+f447.5
+j448.9
+k448.9
+f450.5
+d450.5
+k451.9
+j451.9
+s453.3
+d453.3
+k453.3
+j454.4
+f454.4
+k455.6
+d455.8
+f457.0
+k457.1
+j457.1
+k458.3
+d458.3
+f459.5
+j459.5
+f460.9
+k460.9
 d462.3
-f463.9
-d463.9
-j463.9
+j462.4
+f463.8
 k463.9
-s465.4
-f466.4
-k466.4
-j466.4
-d466.4
-s467.4
-f469.0
-k469.0
-j469.0
-s470.4
-d471.4
-s471.4
-k471.4
-f473.0
-s473.0
-j473.1
-k474.5
-d474.5
-s474.5
-s475.8
-f475.8
-j475.8
-k477.6
-s477.6
-d477.6
-f478.5
-j478.5
-s478.5
-j479.5
-f480.8
-d482.4
-f483.3
-j484.8
-d486.3
-s487.7
+s465.3
+d465.3
+k465.4
+j466.3
+f466.3
+d467.3
+k467.4
+d468.9
+k468.9
+s468.9
+f470.2
+k470.3
+s470.3
+j470.3
+d470.3
+f471.2
+j471.2
+d473.0
+k473.0
+j474.6
+f475.9
+d477.5
+k478.5
+j479.4
+s480.8
+s482.5
+j483.4
+f484.7
+d486.5
+k486.5