diff --git a/pop/loner/bin/halo3.py b/pop/loner/bin/halo3.py index 075e37668..a9c128f0e 100644 --- a/pop/loner/bin/halo3.py +++ b/pop/loner/bin/halo3.py @@ -225,7 +225,7 @@ CHART = { # on 20 — so OF starts the instant think ends # ("of should start sooner, right after # 'think' ends") with no rest needed at all. - "durs": { 0: 2.0, 1: 2.0, 2: 2.5, 3: 1.5, + "durs": { 0: 2.0, 1: 2.0, 2: 2.5, 3: 2.5, 4: 2.0, 5: 2.0, 6: 2.0, # think 1 (1.17×, her own speed — at 2 # it was a 2.3× held tone), so OF keeps diff --git a/pop/loner/c/loner-chart.h b/pop/loner/c/loner-chart.h index 58b38137f..e6a2b9229 100644 --- a/pop/loner/c/loner-chart.h +++ b/pop/loner/c/loner-chart.h @@ -16,26 +16,26 @@ static const ChartNote w_whole_line_notes[] = { { 0.00, 2.00, 7 }, { 2.00, 2.00, 5 }, { 4.00, 2.50, 3 }, - { 6.50, 1.50, 2 }, - { 8.00, 2.00, 0 }, - { 10.00, 2.00, 5 }, - { 12.00, 2.00, 2 }, - { 14.00, 2.00, -2 }, - { 16.00, 2.00, -5 }, - { 18.00, 4.00, 12 }, - { 22.00, 3.00, 10 }, - { 25.00, 3.00, 5 }, - { 28.00, 4.00, 2 }, - { 32.00, 4.00, 3 }, - { 36.00, 2.00, 0 }, - { 38.00, 2.00, -2 }, - { 40.00, 4.00, 7 }, - { 44.00, 1.50, 5 }, - { 45.50, 1.50, 3 }, - { 47.00, 2.00, 5 }, - { 49.00, 4.50, 7 }, - { 53.50, 4.00, 3 }, - { 57.50, 3.00, 3 }, + { 6.50, 2.50, 2 }, + { 9.00, 2.00, 0 }, + { 11.00, 2.00, 5 }, + { 13.00, 2.00, 2 }, + { 15.00, 2.00, -2 }, + { 17.00, 2.00, -5 }, + { 19.00, 4.00, 12 }, + { 23.00, 3.00, 10 }, + { 26.00, 3.00, 5 }, + { 29.00, 4.00, 2 }, + { 33.00, 4.00, 3 }, + { 37.00, 2.00, 0 }, + { 39.00, 2.00, -2 }, + { 41.00, 4.00, 7 }, + { 45.00, 1.50, 5 }, + { 46.50, 1.50, 3 }, + { 48.00, 2.00, 5 }, + { 50.00, 4.50, 7 }, + { 54.50, 4.00, 3 }, + { 58.50, 3.00, 3 }, }; static const ChartNote w_sitting_curled_notes[] = { { 0.00, 3.00, 6 }, @@ -92,7 +92,7 @@ static const ChartNote w_n_for_time_to_pass_notes[] = { }; static const ChartPhrase CHART[] = { - { "w-whole-line", 0.490, 60.50, 23, w_whole_line_notes }, + { "w-whole-line", 0.490, 61.50, 23, w_whole_line_notes }, { "w-sitting-curled", 0.020, 11.00, 5, w_sitting_curled_notes }, { "w-i-think", 0.020, 3.50, 2, w_i_think_notes }, { "w-of-a-stone", 0.000, 8.00, 3, w_of_a_stone_notes }, diff --git a/pop/loner/vox4/.chart.json b/pop/loner/vox4/.chart.json index bbb33e082..327b28b23 100644 --- a/pop/loner/vox4/.chart.json +++ b/pop/loner/vox4/.chart.json @@ -1,43 +1,43 @@ { "w-whole-line": { "leadIn": 0.49, - "beats": 60.5, + "beats": 61.5, "voiced": [ [ 0.0, - 11.895 + 12.9015 ], [ - 11.9967, - 17.7612 + 13.0032, + 18.7575 ], [ - 17.995, - 24.6542 + 19.0015, + 25.6505 ], [ - 24.9998, - 31.6997 + 25.9962, + 32.696 ], [ - 32.0047, - 43.8997 + 33.001, + 44.896 ], [ - 44.0013, - 46.9395 + 44.9977, + 47.9358 ], [ - 47.0005, - 48.9017 + 47.9968, + 49.898 ], [ - 49.0033, - 57.0655 + 49.9997, + 58.0618 ], [ - 57.2587, - 61.3152 + 58.255, + 62.3115 ] ], "notes": [ @@ -64,139 +64,139 @@ }, { "beat": 6.5, - "dur": 1.5, + "dur": 2.5, "st": 2, "t": "up", "lead": 0.0 }, { - "beat": 8.0, + "beat": 9.0, "dur": 2.0, "st": 0, "t": "in", "lead": 0.0 }, { - "beat": 10.0, + "beat": 11.0, "dur": 2.0, "st": 5, "t": "myself\u00b7a", "lead": 0.0 }, { - "beat": 12.0, + "beat": 13.0, "dur": 2.0, "st": 2, "t": "myself\u00b7b", "lead": 0.1017 }, { - "beat": 14.0, + "beat": 15.0, "dur": 2.0, "st": -2, "t": "i", "lead": 0.0 }, { - "beat": 16.0, + "beat": 17.0, "dur": 2.0, "st": -5, "t": "think", "lead": 0.0 }, { - "beat": 18.0, + "beat": 19.0, "dur": 4.0, "st": 12, "t": "of", "lead": 0.2033 }, { - "beat": 22.0, + "beat": 23.0, "dur": 3.0, "st": 10, "t": "a", "lead": 0.0 }, { - "beat": 25.0, + "beat": 26.0, "dur": 3.0, "st": 5, "t": "stone", "lead": 0.0508 }, { - "beat": 28.0, + "beat": 29.0, "dur": 4.0, "st": 2, "t": "just", "lead": 0.0 }, { - "beat": 32.0, + "beat": 33.0, "dur": 4.0, "st": 3, "t": "waiting", "lead": 0.244 }, { - "beat": 36.0, + "beat": 37.0, "dur": 2.0, "st": 0, "t": "ve", "lead": 0.0 }, { - "beat": 38.0, + "beat": 39.0, "dur": 2.0, "st": -2, "t": "ry", "lead": 0.0 }, { - "beat": 40.0, + "beat": 41.0, "dur": 4.0, "st": 7, "t": "pa", "lead": 0.0 }, { - "beat": 44.0, + "beat": 45.0, "dur": 1.5, "st": 5, "t": "tient", "lead": 0.0915 }, { - "beat": 45.5, + "beat": 46.5, "dur": 1.5, "st": 3, "t": "ly", "lead": 0.0 }, { - "beat": 47.0, + "beat": 48.0, "dur": 2.0, "st": 5, "t": "for", "lead": 0.0508 }, { - "beat": 49.0, + "beat": 50.0, "dur": 4.5, "st": 7, "t": "time", "lead": 0.0712 }, { - "beat": 53.5, + "beat": 54.5, "dur": 4.0, "st": 3, "t": "to", "lead": 0.0 }, { - "beat": 57.5, + "beat": 58.5, "dur": 3.0, "st": 3, "t": "pass", diff --git a/pop/loner/vox4/.manifest.json b/pop/loner/vox4/.manifest.json index 0a1e4dc78..db138a5e9 100644 --- a/pop/loner/vox4/.manifest.json +++ b/pop/loner/vox4/.manifest.json @@ -2,13 +2,13 @@ "w-whole-line": { "slice": "f-whole-line", "lead_in": 0.49, - "beats": 60.5, + "beats": 61.5, "renders": { - "lead": 30.645, - "8ve-a": 30.645, - "8ve-b": 30.645, - "low3": 30.645, - "low5": 30.645 + "lead": 31.135, + "8ve-a": 31.135, + "8ve-b": 31.135, + "low3": 31.135, + "low5": 31.135 }, "snaps": [ "curled +65ms",