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

1 files changed, 674 insertions, 521 deletions

diff --git a/levels/Apathetic Empathy/Medium/notes.txt b/levels/Apathetic Empathy/Medium/notes.txt
index aae53a2..7077d8a 100644
--- a/levels/Apathetic Empathy/Medium/notes.txt
+++ b/levels/Apathetic Empathy/Medium/notes.txt
@@ -1,532 +1,685 @@
-f4.3
-j4.3
-d11.9
-k12.0
-s18.9
-s19.3
-s20.2
-s21.1
-s21.7
-f23.1
-j24.2
-d25.2
-f26.2
-j27.1
-k28.1
-j29.1
-f30.1
-k31.1
-d32.1
-f33.1
-j34.0
-j35.0
-j36.2
-j37.1
-j37.5
-s39.0
-f40.0
-j41.0
-k42.0
-d43.0
-s44.0
-s45.0
+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
+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
-j47.0
-f48.0
-k49.0
-s50.5
-s51.5
-d52.1
-f53.1
-j54.0
-k55.0
-d56.0
-f56.5
-j57.0
-k57.5
-s58.2
-j59.1
+s46.3
+s47.3
+k47.3
+d47.3
+s48.4
+f48.4
+j48.4
+s49.4
+k49.4
+d49.4
+f50.4
+s51.3
+s52.4
+s53.5
+s54.5
+s55.4
+d55.4
+k55.4
+f56.4
+s57.4
+s58.4
+s59.5
 s60.5
-s61.0
-s62.0
-s63.0
-s64.0
-s64.5
-s65.1
-s65.6
-s66.1
-s66.6
-s67.1
-s67.6
-d68.1
-f69.0
-j69.6
-k70.1
-d70.7
-f71.2
-j72.1
-j73.0
-j74.1
-j75.1
-f76.0
-f77.0
-f77.5
-j79.1
-s79.9
-f81.0
-s82.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
+s71.3
+j71.4
+k71.4
+f71.4
+d71.4
+s72.4
+s73.3
+s74.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
-d84.2
-f85.1
-j86.1
-k87.0
-f88.0
-j88.1
-d90
-k90
-s92.1
-s93.1
-s93.6
+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.5
-s96.0
-s96.5
-s97.2
-s98.5
+s95.4
+f95.4
+d95.4
+s96.3
+s97.7
+j97.8
+k97.8
+j98.8
+k98.8
+s98.8
 s99.4
-f100.0
-f101.0
-j101.5
-k103
-d105
-d105.4
-f107.0
-j109.0
-j109.5
-s111.0
-s113.0
-s114.6
-s115.5
-f116.1
-j117.0
-d117.6
-k118.5
-f119.9
-d121.0
-f121.5
-j122.5
-k123
-j125
-k125.6
-f126.2
-s126.7
-s128.0
-s129.1
-s130.1
-s131.0
-f132.1
-j132.1
-k133.0
-k134.0
-k135
-k136
-k137
-k138
-k139
-k140
-d140
-j141
-j142.2
-d143.1
-k144.1
-d145.1
-s146.1
-j147.1
-s148.1
-j149.1
-f149.2
-j150.2
-j151.1
-f152.1
-j152.1
-f153.1
-j153.1
-f154.1
-j154.2
-f155.0
-j155.1
-j156.0
-j157.1
+s100.4
+s101.4
+s102.3
+s103.3
+d103.4
+k103.4
+s104.4
+s105.4
+s106.3
+s107.4
+f107.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
+s123.3
+s123.9
+s124.4
+s125.0
+s125.4
+s126.0
+s126.4
+s126.8
+s127.1
+s127.5
+s129.5
+s130.5
+s131.4
+j131.4
+s132.3
+s133.4
+s134.4
+s135.3
+d135.4
+k135.4
+f136.4
+s136.4
+j136.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
+k155.4
+j156.4
+f156.9
 j157.5
-f158.2
-j158.6
-s159.1
-s160.0
-s161.0
-s162.5
-s163.5
-j164.9
-k166.0
-k167.1
-j168.0
-j169.1
-j170.0
-j171.1
-f172.0
-f173.1
-f174.1
-f175.1
-d176.1
-d177.1
-d178.0
-d179.0
-s179.7
-s181.0
-s183.0
-s185.1
-s185.6
-s187.1
-s189.0
-s190.6
-s192.1
-s192.6
-s193.1
-s193.3
-s193.6
-s193.9
+d157.9
+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
+s176.4
+s177.8
+s178.8
+j179.4
+f180.4
+f181.7
+f182.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
-s195.6
-s196.0
-s197.0
-s197.5
-s198.1
-s199.0
-s201.1
+f195.5
+j195.6
+s196.3
+s196.8
+s198.4
+s200.3
+k200.3
+d200.3
 s201.5
-s203.1
-s205.0
-s205.5
-s207.1
-f208.2
-j209.1
-k210.0
-d211.0
-f212.1
-j212.1
-d215.1
-k215.2
-s217.1
-s217.5
-k219.0
-d219.1
-j221.0
-f221.0
-f221.5
-j221.5
-s223.0
-k225.1
-d225.1
-d225.6
-k225.6
-s226.7
-s227.6
-j228.2
-f229.2
-k230.1
-s232.1
-j233.1
-f233.5
-k234.1
-d234.6
-k235.1
-s236.2
-j237.1
-f237.5
-k238.0
-d238.5
-j239.0
-f239.6
-k240.0
-d240.6
-j241.0
-f241.5
-d242.1
-f243.1
-s244.0
-j245.1
-k245.5
-d247.1
-f247.6
-s248.1
-j249.0
-k249.4
-d250.0
-f250.5
-s250.9
-j251.5
-k252.1
-f253.1
-f253.6
-f254.0
-f254.4
-f254.8
-f255.1
-f256.0
-f256.9
-f257.9
-f258.9
-s259.9
-s261.1
-s262.2
-s263.1
-s264.1
-s265.1
-s266.0
-f266.9
-j266.9
-d268.1
-k268.1
-s268.9
-s270.0
-s271.0
-s272.1
-s273.0
-s274.0
-s275.0
-f275.9
-j275.9
-s276.9
-s278.1
-s279.0
-d280.0
-k280.0
-s281.0
-s282.1
-s283.0
-d284.0
-j284.1
-s284.9
-s286.0
-s286.8
-f288.1
-d288.1
-j288.1
-k288.1
-s289.0
-s290.1
-s291.0
-f292.1
-d292.1
-k292.1
-j292.1
-s293.0
-s294.2
-s295.1
-k296.0
-j296.0
-f296.1
-d296.1
-s297.0
-s298.1
-s299.1
-f300.1
-j301.2
-k302.2
-d303.1
-f304.0
-j304.1
-k305.2
-k306.2
-k307.1
-f308.0
-j308.0
-k309.1
-k310.2
-k311.0
-s312.0
-d313.1
-s315.0
-d316.0
-k316.1
-f317.6
-j317.6
-k319.0
-d319.0
-f320.6
-j322.1
-k323.1
-s324.1
-s325.2
-s326.2
-s327.2
-j328.1
-f328.1
-d329.0
-k329.1
-k330.1
-d330.2
-d331.1
-k331.1
-s332.0
-j333.0
-f333.1
-j334.1
-f334.1
-d334.8
-k334.8
-k335.5
-d335.5
-s336.0
-s337.0
-s338.1
-s339.0
-j340.0
-f340.1
-k341.0
-d341.0
-k342.1
-d342.1
-d343.0
-k343.0
-s344.0
-s345.1
-s346.1
-s346.7
-s347.6
-d348.1
-d350.1
-d351.1
-f352.0
-f353.1
-f354.0
-f355.1
-j355.9
-j357.0
-d357.2
-j358.1
-j358.6
-j359.5
-s360.0
-s361.1
-s362.1
-s363.0
-f364.1
-f365.0
-f366.1
-f367.1
-j368.0
-j369.0
-j370.1
-j371.1
-s372.1
-s373.1
-s374.1
-s375.0
-f376.0
-j376.0
-s377.0
-s378.1
-s379.0
-d380.1
-f381.0
-j382.1
+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
+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
+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
+s225.9
+s226.4
+s226.9
+s227.4
+f227.5
+k227.5
+j227.5
+d227.6
+s228.3
+f228.4
+s228.9
+k230.3
+j230.3
+s230.4
+f230.4
+d230.4
+s231.4
+s232.4
+s233.4
+s234.4
+k235.4
+j235.4
+s235.4
+s236.4
+s237.3
+s238.1
+s239.3
+k239.3
+d239.3
+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
+d266.4
+j267.4
+f267.4
+s267.5
+s268.4
+s269.5
+s270.3
+s271.3
+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
+k282.4
+d282.4
+j283.5
+f283.5
+s283.6
+s284.4
+s285.3
+s286.3
+s287.3
+d287.3
+k287.3
+s288.3
+s289.3
+s290.3
+d291.4
+f294.5
+j295.4
+k296.5
+k298.4
+s299.4
+j299.5
+k302.3
+s302.3
+f303.4
+j303.4
+s311.4
+k311.4
+d311.4
+j314.4
+f314.4
+d315.4
+k315.4
+k319.7
+k320.5
+k321.4
+k322.4
+s323.5
+s324.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
+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
+d352.4
+f353.4
+j354.4
+k355.4
+j356.4
+f357.5
+d357.8
+d359.4
+f360.5
+j361.3
+k362.4
+f363.4
+d364.4
+f365.5
+j366.4
+k367.5
+s368.5
+j369.4
+s369.9
+s370.8
+j371.4
+f372.6
+d373.4
+f374.4
+j375.4
+k376.4
+j377.4
+k378.4
+s378.4
+d378.4
+f379.4
+j379.4
+s380.4
+s381.5
+k382.0
+j382.0
+s382.0
+d382.0
+s383.0
 k383.0
-d384.0
-f385.0
-j386.1
-s387.1
-k388.1
-d389.1
-f390.0
-j391.0
-s392.0
-s393.0
-s394.1
-s395.1
-d396.2
-d399.0
-f399.9
-j401.0
-k402.0
-s403.0
-d404.0
-f405.0
-s406.8
-s407.5
-d408.2
-f409.1
-j410.1
-k411.0
-d412.0
-f413.0
-j414.1
-k415.0
-s416.0
-d417.0
-f418.0
-j418.5
+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
+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
+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
+f411.4
+j412.4
+k413.5
+d414.4
+k414.4
+j414.4
+f414.4
+s415.3
+d416.4
+k416.4
+j416.4
+f416.4
+d417.4
+f417.5
+f418.5
+j419.5
 k419.5
-f420.1
-s421.1
-s422.1
-s423.1
-d424.0
-f424.9
-j426.0
-k427.0
-d428.0
-f429.1
-j430.1
-s430.5
-s431.5
-f432.2
-d433.2
-f434.1
-j435.1
-k436.1
-d437.0
-f438.1
-j439.0
-k440.1
-f441.1
-s442.1
-s442.5
-s443.0
-s443.6
-d444.1
-f445.1
-f446.2
-j447.1
-k448.1
-d449.1
-f450.1
-j451.1
-d452.5
-f454.0
-j455.1
-k456.1
-d457.5
-f458.9
-s460.6
-j461.6
-k463.0
-f464.4
-d466.0
-j467.1
-k468.1
-d469.6
-f471.0
-j471.9
-k473.5
-d475.0
-f476.5
-s477.8
-j478.8
-k480.1
-f481.4
-d483.0
-s484.0
-f485.4
-j487.0
-k488.2
+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
+d462.3
+f463.9
+d463.9
+j463.9
+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