Upgraded scenes

aaaaaaahh
This commit is contained in:
Aurian
2018-05-20 14:33:41 +02:00
committed by GitHub
parent 3405fb4f4e
commit d1f97f7f9d

View File

@@ -1102,12 +1102,6 @@ void main()
NULL, " Dismissing all of them as coincidence would then defy logic.", Line_Normal); NULL, " Dismissing all of them as coincidence would then defy logic.", Line_Normal);
ClearMessage(); ClearMessage();
DisableWindow();
DrawScene("background/y_kawa3", 3000 );
ModDrawCharacter(1, 9, "sprite/night/ta1_def_", "0", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 0, TRUE );
FadeBustshotWithFiltering( 5, "down", 0, FALSE, 0, 0, 1300, TRUE );
PlayBGM( 2, "lsys19", 128, 0 );
// 祟りなんか、信じない@…だけど……毎年、綿流しの日に何かが起こるという「意思」だけは確実に、!w300……ある¥ // 祟りなんか、信じない@…だけど……毎年、綿流しの日に何かが起こるという「意思」だけは確実に、!w300……ある¥
if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); } if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
@@ -1147,7 +1141,12 @@ void main()
NULL, "I felt embarrassed at being read so easily. I pressed Tomitake-san to continue, a bit of impatience and irritation in my tone.", Line_Normal); NULL, "I felt embarrassed at being read so easily. I pressed Tomitake-san to continue, a bit of impatience and irritation in my tone.", Line_Normal);
ClearMessage(); ClearMessage();
DisableWindow();
DrawScene("background/y_kawa3", 3000 );
ModDrawCharacter(1, 9, "sprite/night/ta1_def_", "0", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 300, FALSE );
ModDrawCharacter(3, 8, "sprite/night/tomi1_def_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 300, TRUE );
PlayBGM( 2, "lsys19", 128, 0 );
FadeOutBGM( 1, 1000, TRUE ); FadeOutBGM( 1, 1000, TRUE );
//「で@ その翌年の綿流しの晩にもまた人が死ぬわけですよね…@ 今度は誰です?@ //「で@ その翌年の綿流しの晩にもまた人が死ぬわけですよね…@ 今度は誰です?@
@@ -1382,7 +1381,6 @@ void main()
DisableWindow(); DisableWindow();
DrawBustshotWithFiltering(5, "black", "down", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 25, 1300, TRUE ); DrawBustshotWithFiltering(5, "black", "down", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 25, 1300, TRUE );
FadeBustshot( 1, FALSE, 0, 0, 0, 0, 0, TRUE );
StopSE( 4 ); StopSE( 4 );
@@ -1489,7 +1487,7 @@ void main()
ClearMessage(); ClearMessage();
DisableWindow(); DisableWindow();
ModDrawCharacter(3, 9, "sprite/night/ta1_def_", "1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 0, TRUE ); ModDrawCharacter(1, 9, "sprite/night/ta1_def_", "1", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 100, TRUE );
FadeBustshotWithFiltering( 5, "down", 0, FALSE, 0, 0, 1300, TRUE ); FadeBustshotWithFiltering( 5, "down", 0, FALSE, 0, 0, 1300, TRUE );
PlayBGM( 2, "lsys19", 128, 0 ); PlayBGM( 2, "lsys19", 128, 0 );
@@ -1550,7 +1548,7 @@ void main()
ClearMessage(); ClearMessage();
DisableWindow(); DisableWindow();
ModDrawCharacterWithFiltering(1, 8, "sprite/night/tomi1_warai_", "1", "right", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 0, 300, TRUE ); ModDrawCharacter(3, 8, "sprite/night/tomi1_warai_", "1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 300, TRUE );
//「まさか圭一くん、祟りなんて信じてるわけじゃないだろ?@ //「まさか圭一くん、祟りなんて信じてるわけじゃないだろ?@
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#945c44>富竹</color>", NULL, "<color=#945c44>Tomitake</color>", NULL, Line_ContinueAfterTyping); } if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#945c44>富竹</color>", NULL, "<color=#945c44>Tomitake</color>", NULL, Line_ContinueAfterTyping); }
@@ -1605,7 +1603,7 @@ void main()
ClearMessage(); ClearMessage();
DisableWindow(); DisableWindow();
ModDrawCharacter(1, 8, "sprite/night/tomi1_def_", "0", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 200, TRUE ); ModDrawCharacter(3, 8, "sprite/night/tomi1_def_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 200, TRUE );
//「……例えば、一番最初のバラバラ殺人@言ったよね@ 犯人は1人を残して全員逮捕されてる@残った1人だって時間の問題さ@動機だって、酒の上での口論からと判明してる@祟りなんかじゃない@……だろ?@ //「……例えば、一番最初のバラバラ殺人@言ったよね@ 犯人は1人を残して全員逮捕されてる@残った1人だって時間の問題さ@動機だって、酒の上での口論からと判明してる@祟りなんかじゃない@……だろ?@
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#945c44>富竹</color>", NULL, "<color=#945c44>Tomitake</color>", NULL, Line_ContinueAfterTyping); } if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#945c44>富竹</color>", NULL, "<color=#945c44>Tomitake</color>", NULL, Line_ContinueAfterTyping); }
@@ -1668,7 +1666,7 @@ void main()
ClearMessage(); ClearMessage();
DisableWindow(); DisableWindow();
ModDrawCharacter(1, 8, "sprite/night/tomi1_warai_", "1", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 200, TRUE ); ModDrawCharacter(3, 8, "sprite/night/tomi1_warai_", "1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 200, TRUE );
//「ははは@考えてもみなよ圭一くん@…雛見沢に敵が多かった彼が、地元のお祭りにおちおち参加できると思うかい@ //「ははは@考えてもみなよ圭一くん@…雛見沢に敵が多かった彼が、地元のお祭りにおちおち参加できると思うかい@
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#945c44>富竹</color>", NULL, "<color=#945c44>Tomitake</color>", NULL, Line_ContinueAfterTyping); } if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#945c44>富竹</color>", NULL, "<color=#945c44>Tomitake</color>", NULL, Line_ContinueAfterTyping); }
@@ -1730,7 +1728,7 @@ void main()
ClearMessage(); ClearMessage();
DisableWindow(); DisableWindow();
ModDrawCharacter(1, 8, "sprite/night/tomi1_def_", "0", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 200, TRUE ); ModDrawCharacter(3, 8, "sprite/night/tomi1_def_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 200, TRUE );
//「神主さんはもっと説明が付き易いよ@綿流しのお祭りは神主さんにとっては年に一度の大行事。過労に体調不良が重なったんだろうね@あるいは元々持病持ちだったのかもしれない。@ //「神主さんはもっと説明が付き易いよ@綿流しのお祭りは神主さんにとっては年に一度の大行事。過労に体調不良が重なったんだろうね@あるいは元々持病持ちだったのかもしれない。@
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#945c44>富竹</color>", NULL, "<color=#945c44>Tomitake</color>", NULL, Line_ContinueAfterTyping); } if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#945c44>富竹</color>", NULL, "<color=#945c44>Tomitake</color>", NULL, Line_ContinueAfterTyping); }
@@ -1888,7 +1886,7 @@ void main()
DisableWindow(); DisableWindow();
ModDrawCharacter(1, 8, "sprite/night/tomi1_warai_", "1", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 200, TRUE ); ModDrawCharacter(3, 8, "sprite/night/tomi1_warai_", "1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 200, TRUE );
// 富竹さんが明るく笑う¥ // 富竹さんが明るく笑う¥
@@ -2051,7 +2049,7 @@ void main()
DisableWindow(); DisableWindow();
ModDrawCharacter(3, 9, "sprite/night/ta1_warai_", "1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE ); ModDrawCharacter(1, 9, "sprite/night/ta1_warai_", "1", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );
//「じゃあね、おやすみなさい圭一くん@…ジロウさんもね。また後ほど。@ //「じゃあね、おやすみなさい圭一くん@…ジロウさんもね。また後ほど。@
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f5e6d3>女性</color>", NULL, "<color=#f5e6d3>Woman</color>", NULL, Line_ContinueAfterTyping); } if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f5e6d3>女性</color>", NULL, "<color=#f5e6d3>Woman</color>", NULL, Line_ContinueAfterTyping); }
@@ -2072,7 +2070,7 @@ void main()
ClearMessage(); ClearMessage();
FadeBustshotWithFiltering( 3, "left", 1, FALSE, 0, 0, 700, TRUE ); FadeBustshotWithFiltering( 1, "left", 1, FALSE, 0, 0, 700, TRUE );
// 女の人はお尻の埃を払うと、まだ撤収で賑わう境内の方へ去っていった¥ // 女の人はお尻の埃を払うと、まだ撤収で賑わう境内の方へ去っていった¥
if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); } if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
@@ -2098,7 +2096,7 @@ void main()
DisableWindow(); DisableWindow();
ModDrawCharacterWithFiltering(3, 2, "sprite/night/re2a_komaru_a1_", "0", "right", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 1300, TRUE ); ModDrawCharacterWithFiltering(3, 2, "sprite/night/re2a_komaru_a1_", "0", "right", 1, 240, 0, FALSE, 0, 0, 0, 0, 0, 20, 1300, TRUE );
// 入れ替わりでレナが駆けて来るのが見えた@ // 入れ替わりでレナが駆けて来るのが見えた@
@@ -2124,7 +2122,7 @@ void main()
ClearMessage(); ClearMessage();
DisableWindow(); DisableWindow();
ModDrawCharacterWithFiltering(1, 3, "sprite/night/me2_wink_a1_", "1", "left", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 0, 1300, TRUE ); ModDrawCharacterWithFiltering(1, 3, "sprite/night/me2_wink_a1_", "1", "left", 1, -240, 0, FALSE, 0, 0, 0, 0, 0, 0, 1300, TRUE );
//「悪ぃ悪ぃ圭ちゃん…@ すっかり話しこんじゃっててさ!@ //「悪ぃ悪ぃ圭ちゃん…@ すっかり話しこんじゃっててさ!@
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#5ec69a>魅音</color>", NULL, "<color=#5ec69a>Mion</color>", NULL, Line_ContinueAfterTyping); } if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#5ec69a>魅音</color>", NULL, "<color=#5ec69a>Mion</color>", NULL, Line_ContinueAfterTyping); }
@@ -2148,7 +2146,7 @@ void main()
DisableWindow(); DisableWindow();
FadeBustshotWithFiltering( 3, "left", 1, FALSE, 0, 0, 300, TRUE ); FadeBustshotWithFiltering( 3, "left", 1, FALSE, 0, 0, 300, TRUE );
ModDrawCharacterWithFiltering(3, 4, "sprite/night/sa2a_akuwarai_a1_", "1", "right", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 1300, TRUE ); ModDrawCharacterWithFiltering(3, 4, "sprite/night/sa2a_akuwarai_a1_", "1", "right", 1, 240, 0, FALSE, 0, 0, 0, 0, 0, 20, 1300, TRUE );
//「あぁら、富竹さんもご一緒でございましたの@ 丁度よかったですわぁ~!!@ //「あぁら、富竹さんもご一緒でございましたの@ 丁度よかったですわぁ~!!@
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#fcdb77>沙都子</color>", NULL, "<color=#fcdb77>Satoko</color>", NULL, Line_ContinueAfterTyping); } if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#fcdb77>沙都子</color>", NULL, "<color=#fcdb77>Satoko</color>", NULL, Line_ContinueAfterTyping); }
@@ -2286,7 +2284,7 @@ void main()
DisableWindow(); DisableWindow();
DrawSceneWithMask("background/y_kawa3", "m1", 0, 0, 300 ); DrawSceneWithMask("background/y_kawa3", "m1", 0, 0, 300 );
ModDrawCharacterWithFiltering(3, 3, "sprite/night/me2_tokui_a1_", "2", "right", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 300, TRUE ); ModDrawCharacterWithFiltering(3, 3, "sprite/night/me2_tokui_a1_", "2", "left", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 20, 300, TRUE );
//「じゃ~富竹さん、覚悟はいいかなぁ? 罰ゲーム!!@ //「じゃ~富竹さん、覚悟はいいかなぁ? 罰ゲーム!!@
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#5ec69a>魅音</color>", NULL, "<color=#5ec69a>Mion</color>", NULL, Line_ContinueAfterTyping); } if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#5ec69a>魅音</color>", NULL, "<color=#5ec69a>Mion</color>", NULL, Line_ContinueAfterTyping); }
@@ -2297,7 +2295,7 @@ void main()
DisableWindow(); DisableWindow();
ModDrawCharacter(1, 8, "sprite/night/tomi1_komaru_", "1", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 400, TRUE ); ModDrawCharacter(1, 8, "sprite/night/tomi1_komaru_", "1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 400, TRUE );
//「え? あ、……忘れてた!!@ //「え? あ、……忘れてた!!@
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#945c44>富竹</color>", NULL, "<color=#945c44>Tomitake</color>", NULL, Line_ContinueAfterTyping); } if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#945c44>富竹</color>", NULL, "<color=#945c44>Tomitake</color>", NULL, Line_ContinueAfterTyping); }
@@ -2340,7 +2338,7 @@ void main()
DisableWindow(); DisableWindow();
ModDrawCharacter(3, 3, "sprite/night/me2_wink_a1_", "1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE ); ModDrawCharacter(3, 3, "sprite/night/me2_wink_a1_", "1", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );
//「あはは、油性じゃないとだめだよ@お洗濯したら落ちちゃうじゃない。@ //「あはは、油性じゃないとだめだよ@お洗濯したら落ちちゃうじゃない。@
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#5ec69a>魅音</color>", NULL, "<color=#5ec69a>Mion</color>", NULL, Line_ContinueAfterTyping); } if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#5ec69a>魅音</color>", NULL, "<color=#5ec69a>Mion</color>", NULL, Line_ContinueAfterTyping); }
@@ -2388,7 +2386,8 @@ void main()
DisableWindow(); DisableWindow();
DrawBustshot(5, "black", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 1000, TRUE ); DrawBustshot(5, "black", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 1000, TRUE );
FadeBustshot( 3, FALSE, 0, 0, 0, 0, 0, TRUE ); FadeBustshot( 3, FALSE, 0, 0, 0, 0, 0, FALSE );
FadeBustshot( 1, FALSE, 0, 0, 0, 0, 0, TRUE );
@@ -2413,8 +2412,9 @@ void main()
ClearMessage(); ClearMessage();
DisableWindow(); DisableWindow();
ModDrawCharacter(1, 8, "sprite/night/tomi1_komaru_", "1", -240, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 400, TRUE );
ModDrawCharacterWithFiltering(3, 4, "sprite/night/sa2a_akuwarai_a1_", "1", "right", 1, 240, 0, FALSE, 0, 0, 0, 0, 0, 20, 300, TRUE );
FadeBustshotWithFiltering( 5, "down", 0, FALSE, 0, 0, 1300, TRUE ); FadeBustshotWithFiltering( 5, "down", 0, FALSE, 0, 0, 1300, TRUE );
ModDrawCharacterWithFiltering(3, 4, "sprite/night/sa2a_akuwarai_a1_", "1", "right", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 300, TRUE );
//「はは、これじゃあ罰ゲームってより、寄せ書きじゃないか。@ //「はは、これじゃあ罰ゲームってより、寄せ書きじゃないか。@
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#945c44>富竹</color>", NULL, "<color=#945c44>Tomitake</color>", NULL, Line_ContinueAfterTyping); } if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#945c44>富竹</color>", NULL, "<color=#945c44>Tomitake</color>", NULL, Line_ContinueAfterTyping); }
@@ -2437,8 +2437,6 @@ void main()
DisableWindow(); DisableWindow();
DrawBustshot(5, "black", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 1000, TRUE ); DrawBustshot(5, "black", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 1000, TRUE );
FadeBustshot( 3, FALSE, 0, 0, 0, 0, 0, TRUE );
ModDrawCharacter(3, 4, "sprite/night/sa2a_akuwarai_a1_", "1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 0, TRUE );
//"やーいビリ! 沙都子"@ //"やーいビリ! 沙都子"@
if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); } if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
@@ -2454,6 +2452,7 @@ void main()
ClearMessage(); ClearMessage();
DisableWindow(); DisableWindow();
ModDrawCharacter(2, 5, "sprite/night/ri5_def_a1_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 200, TRUE );
FadeBustshotWithFiltering( 5, "down", 0, FALSE, 0, 0, 1300, TRUE ); FadeBustshotWithFiltering( 5, "down", 0, FALSE, 0, 0, 1300, TRUE );
//「圭一さんもどうぞです。¥ //「圭一さんもどうぞです。¥
@@ -2465,6 +2464,7 @@ void main()
FadeAllBustshots( 400, TRUE ); FadeAllBustshots( 400, TRUE );
ModDrawCharacter(3, 8, "sprite/night/tomi1_komaru_", "1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 400, TRUE );
// なんて書いていいか戸惑ったが、この罰ゲームを考えれば……これが一番妥当だろう¥ // なんて書いていいか戸惑ったが、この罰ゲームを考えれば……これが一番妥当だろう¥
if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); } if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
@@ -2495,7 +2495,7 @@ void main()
ClearMessage(); ClearMessage();
DisableWindow(); DisableWindow();
ModDrawCharacterWithFiltering(3, 8, "sprite/night/tomi1_def_", "0", "right", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 300, TRUE ); ModDrawCharacter(3, 8, "sprite/night/tomi1_def_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 300, TRUE );
//「これを来たまま帰京するのも…罰ゲームの内に入るのかな?@ //「これを来たまま帰京するのも…罰ゲームの内に入るのかな?@
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#945c44>富竹</color>", NULL, "<color=#945c44>Tomitake</color>", NULL, Line_ContinueAfterTyping); } if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#945c44>富竹</color>", NULL, "<color=#945c44>Tomitake</color>", NULL, Line_ContinueAfterTyping); }