diff --git a/data/renpy/script.rpy b/data/renpy/script.rpy index f3d7fb6..9b8933c 100644 --- a/data/renpy/script.rpy +++ b/data/renpy/script.rpy @@ -923,7 +923,7 @@ label start: scene bgcastle1 e "..." - pause 62 + pause 73.5 #scene bgcastle2 @@ -951,10 +951,10 @@ label start: #pause 3 scene bgwhite - #with Dissolve(13.0) - pause 36 - scene bgwhite - with Dissolve(3.0) + with Dissolve(14.0) + #pause 0.25 + #scene bgwhite + #with Dissolve(3.0) voice "nara/n11.ogg" n "In the end, Leona managed to stay out of the dungeon" diff --git a/src/poem/birdsong.cpp b/src/poem/birdsong.cpp index dc299fe..87521fb 100644 --- a/src/poem/birdsong.cpp +++ b/src/poem/birdsong.cpp @@ -40,8 +40,8 @@ namespace poem { { 9.65, 0 }, // La { 10.59, 1 }, // drevo { 11.675, 2 }, // se - { 12.475, 3 }, // la - { 12.82, 4 }, // la + { 12.000, 3 }, // la + { 12.85, 4 }, // la { 13.125, 5 }, // se { 13.955, 6 }, // esmiral { 14.795, 7 }, // as @@ -58,8 +58,8 @@ namespace poem { { 22.94, 17 }, // de { 23.31, 18 }, // sma { 24.075, 19 }, // ve - { 24.20, 20 }, // la - { 25.12, 21 }, // ve + { 24.30, 20 }, // la + { 25.05, 21 }, // ve { 25.63, 22 }, // la { 26.175, 23 }, // lu { 26.755, 24 }, // de diff --git a/src/renpy/script.cpp b/src/renpy/script.cpp index 30a0fae..0156981 100644 --- a/src/renpy/script.cpp +++ b/src/renpy/script.cpp @@ -573,7 +573,7 @@ const language::dissolve dissolves[] = { { .duration = 1.3, .first_statement = 347, .count = 3 }, { .duration = 3.0, .first_statement = 428, .count = 1 }, { .duration = 2.0, .first_statement = 437, .count = 2 }, - { .duration = 3.0, .first_statement = 550, .count = 1 }, + { .duration = 14.0, .first_statement = 548, .count = 1 }, }; const int dissolves_length = (sizeof (dissolves)) / (sizeof (dissolves[0])); @@ -1126,21 +1126,19 @@ const language::statement statements[] = { { .type = type::play, .play = { .audioIndex = 231 } }, // 544 poem/BirdSong.ogg { .type = type::scene, .scene = { .imageIndex = 5 } }, // 545 bgcastle1 { .type = type::say, .say = { .characterIndex = 3, .stringIndex = 31 } }, // 546 e "..." - { .type = type::pause, .pause = { .duration = 62 } }, // 547 + { .type = type::pause, .pause = { .duration = 73.5 } }, // 547 { .type = type::scene_color, .scene_color = { .color = 0xffffff } }, // 548 bgwhite - { .type = type::pause, .pause = { .duration = 36 } }, // 549 - { .type = type::scene_color, .scene_color = { .color = 0xffffff } }, // 550 bgwhite - { .type = type::voice, .voice = { .audioIndex = 232 } }, // 551 nara/n11.ogg - { .type = type::say, .say = { .characterIndex = 5, .stringIndex = 217 } }, // 552 n "In the end, Leona managed to stay out of the dungeon" - { .type = type::voice, .voice = { .audioIndex = 233 } }, // 553 nara/n12.ogg - { .type = type::say, .say = { .characterIndex = 5, .stringIndex = 218 } }, // 554 n "Eily and Alice both stayed in service of the queen for 7 harvests" - { .type = type::voice, .voice = { .audioIndex = 234 } }, // 555 nara/n13.ogg - { .type = type::say, .say = { .characterIndex = 5, .stringIndex = 219 } }, // 556 n "before returning to their small nameless town, near the Keep of Musia" - { .type = type::scene_color, .scene_color = { .color = 0xffffff } }, // 557 bgwhite - { .type = type::show, .show = { .imageIndex = 9, .transformIndex = transform::center, } }, // 558 bgend - { .type = type::pause, .pause = { .duration = 1.0 } }, // 559 - { .type = type::jump, .jump = { .statementIndex = 559 } }, // 560 end - { .type = type::_return }, // 561 + { .type = type::voice, .voice = { .audioIndex = 232 } }, // 549 nara/n11.ogg + { .type = type::say, .say = { .characterIndex = 5, .stringIndex = 217 } }, // 550 n "In the end, Leona managed to stay out of the dungeon" + { .type = type::voice, .voice = { .audioIndex = 233 } }, // 551 nara/n12.ogg + { .type = type::say, .say = { .characterIndex = 5, .stringIndex = 218 } }, // 552 n "Eily and Alice both stayed in service of the queen for 7 harvests" + { .type = type::voice, .voice = { .audioIndex = 234 } }, // 553 nara/n13.ogg + { .type = type::say, .say = { .characterIndex = 5, .stringIndex = 219 } }, // 554 n "before returning to their small nameless town, near the Keep of Musia" + { .type = type::scene_color, .scene_color = { .color = 0xffffff } }, // 555 bgwhite + { .type = type::show, .show = { .imageIndex = 9, .transformIndex = transform::center, } }, // 556 bgend + { .type = type::pause, .pause = { .duration = 1.0 } }, // 557 + { .type = type::jump, .jump = { .statementIndex = 557 } }, // 558 end + { .type = type::_return }, // 559 }; const int statements_length = (sizeof (statements)) / (sizeof (statements[0]));