From 7deb76eca84c10ce0885c29dfb9e034020953ff6 Mon Sep 17 00:00:00 2001 From: Zack Buhman Date: Sun, 31 May 2026 00:01:11 -0500 Subject: [PATCH] disable bgcastle color changes --- data/renpy/script.rpy | 71 ++++++++++++++++++------------------------- src/renpy/script.cpp | 60 ++++++++++++------------------------ 2 files changed, 48 insertions(+), 83 deletions(-) diff --git a/data/renpy/script.rpy b/data/renpy/script.rpy index dd7277b..f3d7fb6 100644 --- a/data/renpy/script.rpy +++ b/data/renpy/script.rpy @@ -919,55 +919,42 @@ label start: voice "bird/b20.ogg" b "You are most welcome to proceed with your little song" - e "..." play music "poem/BirdSong.ogg" noloop - - - scene bgcastle2 - e "..." - #with Dissolve(7.0) - pause 7.0 - - scene bgcastle3 - e "..." - #with Dissolve(7.0) - pause 7.0 - - scene bgcastle4 - e "..." - #with Dissolve(7.0) - pause 7.0 - - scene bgcastle3 - e "..." - #with Dissolve(7.0) - pause 7.0 - - scene bgcastle2 - e "..." - #with Dissolve(7.0) - pause 7.0 - - scene bgcastle3 - e "..." - #with Dissolve(7.0) - pause 7.0 - - scene bgcastle2 - e "..." - #with Dissolve(7.0) - pause 7.0 - scene bgcastle1 e "..." + + pause 62 + + + #scene bgcastle2 + + #with Dissolve(7.0) + + #scene bgcastle3 + #with Dissolve(7.0) + + #scene bgcastle4 + #with Dissolve(7.0) + + #scene bgcastle3 + #with Dissolve(7.0) + + #scene bgcastle2 + #with Dissolve(7.0) + #scene bgcastle3 + #with Dissolve(7.0) + #scene bgcastle2 + #with Dissolve(7.0) + #scene bgcastle1 #with Dissolve(10.0) - pause 10.0 - pause 3 + #pause 3 scene bgwhite - with Dissolve(13.0) - pause 33 + #with Dissolve(13.0) + pause 36 + 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/renpy/script.cpp b/src/renpy/script.cpp index fee558d..30a0fae 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 = 13.0, .first_statement = 571, .count = 1 }, + { .duration = 3.0, .first_statement = 550, .count = 1 }, }; const int dissolves_length = (sizeof (dissolves)) / (sizeof (dissolves[0])); @@ -1123,46 +1123,24 @@ const language::statement statements[] = { { .type = type::stop, .stop = { .audioIndex = 0, .fadeout = 4.2 } }, // 541 MistAmbience { .type = type::voice, .voice = { .audioIndex = 230 } }, // 542 bird/b20.ogg { .type = type::say, .say = { .characterIndex = 1, .stringIndex = 216 } }, // 543 b "You are most welcome to proceed with your little song" - { .type = type::say, .say = { .characterIndex = 3, .stringIndex = 31 } }, // 544 e "..." - { .type = type::play, .play = { .audioIndex = 231 } }, // 545 poem/BirdSong.ogg - { .type = type::scene, .scene = { .imageIndex = 6 } }, // 546 bgcastle2 - { .type = type::say, .say = { .characterIndex = 3, .stringIndex = 31 } }, // 547 e "..." - { .type = type::pause, .pause = { .duration = 7.0 } }, // 548 - { .type = type::scene, .scene = { .imageIndex = 7 } }, // 549 bgcastle3 - { .type = type::say, .say = { .characterIndex = 3, .stringIndex = 31 } }, // 550 e "..." - { .type = type::pause, .pause = { .duration = 7.0 } }, // 551 - { .type = type::scene, .scene = { .imageIndex = 8 } }, // 552 bgcastle4 - { .type = type::say, .say = { .characterIndex = 3, .stringIndex = 31 } }, // 553 e "..." - { .type = type::pause, .pause = { .duration = 7.0 } }, // 554 - { .type = type::scene, .scene = { .imageIndex = 7 } }, // 555 bgcastle3 - { .type = type::say, .say = { .characterIndex = 3, .stringIndex = 31 } }, // 556 e "..." - { .type = type::pause, .pause = { .duration = 7.0 } }, // 557 - { .type = type::scene, .scene = { .imageIndex = 6 } }, // 558 bgcastle2 - { .type = type::say, .say = { .characterIndex = 3, .stringIndex = 31 } }, // 559 e "..." - { .type = type::pause, .pause = { .duration = 7.0 } }, // 560 - { .type = type::scene, .scene = { .imageIndex = 7 } }, // 561 bgcastle3 - { .type = type::say, .say = { .characterIndex = 3, .stringIndex = 31 } }, // 562 e "..." - { .type = type::pause, .pause = { .duration = 7.0 } }, // 563 - { .type = type::scene, .scene = { .imageIndex = 6 } }, // 564 bgcastle2 - { .type = type::say, .say = { .characterIndex = 3, .stringIndex = 31 } }, // 565 e "..." - { .type = type::pause, .pause = { .duration = 7.0 } }, // 566 - { .type = type::scene, .scene = { .imageIndex = 5 } }, // 567 bgcastle1 - { .type = type::say, .say = { .characterIndex = 3, .stringIndex = 31 } }, // 568 e "..." - { .type = type::pause, .pause = { .duration = 10.0 } }, // 569 - { .type = type::pause, .pause = { .duration = 3 } }, // 570 - { .type = type::scene_color, .scene_color = { .color = 0xffffff } }, // 571 bgwhite - { .type = type::pause, .pause = { .duration = 33 } }, // 572 - { .type = type::voice, .voice = { .audioIndex = 232 } }, // 573 nara/n11.ogg - { .type = type::say, .say = { .characterIndex = 5, .stringIndex = 217 } }, // 574 n "In the end, Leona managed to stay out of the dungeon" - { .type = type::voice, .voice = { .audioIndex = 233 } }, // 575 nara/n12.ogg - { .type = type::say, .say = { .characterIndex = 5, .stringIndex = 218 } }, // 576 n "Eily and Alice both stayed in service of the queen for 7 harvests" - { .type = type::voice, .voice = { .audioIndex = 234 } }, // 577 nara/n13.ogg - { .type = type::say, .say = { .characterIndex = 5, .stringIndex = 219 } }, // 578 n "before returning to their small nameless town, near the Keep of Musia" - { .type = type::scene_color, .scene_color = { .color = 0xffffff } }, // 579 bgwhite - { .type = type::show, .show = { .imageIndex = 9, .transformIndex = transform::center, } }, // 580 bgend - { .type = type::pause, .pause = { .duration = 1.0 } }, // 581 - { .type = type::jump, .jump = { .statementIndex = 581 } }, // 582 end - { .type = type::_return }, // 583 + { .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::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 }; const int statements_length = (sizeof (statements)) / (sizeof (statements[0]));