Merge branch 'adv-mode-auto' into adv-mode

This commit is contained in:
Jáchym Toušek
2017-07-13 23:21:41 +02:00
10 changed files with 20 additions and 52 deletions

View File

@@ -1386,7 +1386,6 @@ void main()
Wait( 300 );
PlaySE(3, "s19/02/500200521", 256, 64);
OutputLine(NULL, "…かな!」",
NULL, " ...I guess!\"", Line_ModeSpecific);
if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
@@ -2153,11 +2152,7 @@ void main()
PlaySE(3, "s19/04/990400008", 256, 64);
if (AdvMode) { OutputLine("<color=#fcdb77>沙都子</color>", NULL, "<color=#fcdb77>Satoko</color>", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, "「ぼぅ、暴力反対ですのー!!",
NULL, "\"I-I'm against violence!!", Line_ContinueAfterTyping);
SetValidityOfInput( FALSE );
Wait( 600 );
SetValidityOfInput( TRUE );
NULL, "\"I-I'm against violence!!", Line_WaitForInput);;
PlaySE(3, "s19/04/990400009", 256, 64);
OutputLine(NULL, " 証拠もないのにぃ〜!!」",
@@ -2344,11 +2339,7 @@ void main()
PlaySE(3, "s19/02/990200033", 256, 64);
if (AdvMode) { OutputLine("<color=#f0953d>レナ</color>", NULL, "<color=#f0953d>Rena</color>", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, "「…ひぅ!",
NULL, "\"...Huu!", Line_ContinueAfterTyping);
SetValidityOfInput( FALSE );
Wait( 500 );
SetValidityOfInput( TRUE );
NULL, "\"...Huu!", Line_WaitForInput);
PlaySE(3, "s19/02/990200034", 256, 64);
OutputLine(NULL, " …だってだって…こんなにかぁいいよぅ?」",

View File

@@ -1433,13 +1433,12 @@ void main()
//「げはッ!!!d400 肘は反則だろ沙都子
PlaySE(3, "s19/01/hr_kei01540", 256, 64);
PlaySE(3, "s19/01/hr_kei01550", 256, 64);
if (AdvMode) { OutputLine("<color=#956f6e>圭一</color>", NULL, "<color=#956f6e>Keiichi</color>", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, "「げはッ!!",
NULL, "\"Hurk!!", Line_ContinueAfterTyping);
Wait( 400 );
PlaySE(3, "s19/01/hr_kei01550", 256, 64);
OutputLine(NULL, " 肘は反則だろ沙都子!!」",
NULL, " Using your elbow is against the rules, Satoko!!\"", Line_ModeSpecific);
if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
@@ -2012,13 +2011,11 @@ void main()
PlaySE(3, "s19/03/990300123", 256, 64);
if (AdvMode) { OutputLine("<color=#5ec69a>魅音</color>", NULL, "<color=#5ec69a>Mion</color>", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, "「やるのは圭ちゃん。」",
NULL, "\"Kei-chan is going to be the one who does it.\"", Line_ContinueAfterTyping);
SetValidityOfInput( FALSE );
Wait( 500 );
SetValidityOfInput( TRUE );
NULL, "\"Kei-chan is going to be the one who does it.\"", Line_ModeSpecific);
if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
PlaySE(3, "s19/01/hr_kei01630", 256, 64);
if (AdvMode) { OutputLine("<color=#956f6e>圭一</color>", NULL, "<color=#956f6e>Keiichi</color>", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, "「はあッ?!」",
NULL, " \"Whaa!?\"", Line_ModeSpecific);
if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
@@ -3361,8 +3358,6 @@ void main()
NULL, " You were waiting a while, I guess?", Line_ContinueAfterTyping);
Wait( 300 );
PlaySE(3, "s19/02/500200695", 256, 64);
OutputLine(NULL, "……かな?」",
NULL, " ...I guess?\"", Line_ModeSpecific);
if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }

View File

@@ -2079,7 +2079,6 @@ void main()
Wait( 500 );
SetValidityOfInput( TRUE );
PlaySE(3, "s19/02/500200184", 256, 64);
OutputLine(NULL, " え?",
NULL, " Huh?", Line_WaitForInput);
PlaySE(3, "s19/04/990400073", 256, 64);

View File

@@ -807,6 +807,9 @@ void main()
if (AdvMode) { OutputLine("<color=#fcdb77>沙都子</color>", NULL, "<color=#fcdb77>Satoko</color>", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, "「知ってるもん…!!",
NULL, "\"I do know...!!", Line_WaitForInput);
PlaySE(3, "s19/04/990400088", 256, 64);
OutputLine(NULL, "知ってるもん!!",
NULL, " I do know!!", Line_WaitForInput);
PlaySE(3, "s19/04/990400089", 256, 64);
OutputLine(NULL, " 知ってるもん!!!…",
NULL, " I do know!!!...", Line_ContinueAfterTyping);
@@ -819,9 +822,7 @@ void main()
Wait( 300 );
OutputLine(NULL, "セッ、」",
NULL, "Se...\"", Line_ContinueAfterTyping);
Wait( 600 );
NULL, "Se...\"", Line_ModeSpecific);
if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }

View File

@@ -1638,10 +1638,9 @@ void main()
PlaySE(3, "s19/02/990200331", 256, 64);
if (AdvMode) { OutputLine("<color=#f0953d>レナ</color>", NULL, "<color=#f0953d>Rena</color>", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, "「…えぇと、どんなの?",
NULL, "\"...Um, what is it?", Line_ContinueAfterTyping);
NULL, "\"...Um, what is it?", Line_WaitForInput);
//!s200
Wait( 200 );
PlaySE(3, "s19/02/990200332", 256, 64);
OutputLine(NULL, " どんなの?",
NULL, " What is it?", Line_ContinueAfterTyping);

View File

@@ -2197,45 +2197,35 @@ void main()
NULL, " Loli!", Line_ContinueAfterTyping);
PlaySE( 4, "wa_010", 128, 64 );
SetValidityOfInput( FALSE );
Wait( 1000 );
SetValidityOfInput( TRUE );
OutputLineAll(NULL, "\n", Line_WaitForInput);
//巫女!/
PlaySE(3, "s19/01/hr_kei33830_02", 256, 64);
OutputLine(NULL, "巫女!",
NULL, " Shrine maiden!", Line_ContinueAfterTyping);
PlaySE( 4, "wa_029", 128, 64 );
SetValidityOfInput( FALSE );
Wait( 1000 );
SetValidityOfInput( TRUE );
OutputLineAll(NULL, "\n", Line_WaitForInput);
//半涙!/
PlaySE(3, "s19/01/hr_kei33830_03", 256, 64);
OutputLine(NULL, "半涙!",
NULL, " Brink of crying!", Line_ContinueAfterTyping);
PlaySE( 4, "wa_012", 128, 64 );
SetValidityOfInput( FALSE );
Wait( 1000 );
SetValidityOfInput( TRUE );
OutputLineAll(NULL, "\n", Line_WaitForInput);
//みぃ!/
PlaySE(3, "s19/01/hr_kei33830_04", 256, 64);
OutputLine(NULL, "みぃ!",
NULL, " Mew!", Line_ContinueAfterTyping);
PlaySE( 4, "wa_016", 128, 64 );
SetValidityOfInput( FALSE );
Wait( 1000 );
SetValidityOfInput( TRUE );
OutputLineAll(NULL, "\n", Line_WaitForInput);
//完璧だッ!!/
PlaySE(3, "s19/01/hr_kei33830_05", 256, 64);
OutputLine(NULL, "完璧だッ!!",
NULL, " It was perfect!!", Line_ContinueAfterTyping);
PlaySE( 4, "wa_007", 128, 64 );
SetValidityOfInput( FALSE );
Wait( 1100 );
SetValidityOfInput( TRUE );
OutputLineAll(NULL, "\n", Line_WaitForInput);
//ただのコケを萌えにまで昇華した…!w500これぞまさに芸術と呼ぶに相応しいッ
PlaySE(3, "s19/01/hr_kei33830_06", 256, 64);
@@ -2982,6 +2972,7 @@ void main()
PlaySE( 4, "wa_005", 128, 64 );
ShakeScreen( 1, 50, 20, 5, 0, );
OutputLineAll(NULL, "", Line_WaitForInput);
//ぐぉをぅッ?!?!@
PlaySE(3, "s19/01/hr_kei33900", 256, 64);
@@ -4892,11 +4883,8 @@ void main()
PlaySE(3, "s19/01/hr_kei34110", 256, 64);
if (AdvMode) { OutputLine("<color=#956f6e>圭一</color>", NULL, "<color=#956f6e>Keiichi</color>", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, "「よっしゃ! そんなら俺が、」",
NULL, "\"All right! Then I'll...\"", Line_ContinueAfterTyping);
NULL, "\"All right! Then I'll...\"", Line_WaitForInput);
SetValidityOfInput( FALSE );
Wait( 500 );
SetValidityOfInput( TRUE );
DisableWindow();
DrawBustshotWithFiltering( 3, "tm_si_de_a1", "right", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 300, TRUE );

View File

@@ -3515,11 +3515,8 @@ void main()
SetValidityOfInput( TRUE );
OutputLine(NULL, "あのね!",
NULL, " well...", Line_ContinueAfterTyping);
NULL, " well...", Line_WaitForInput);
SetValidityOfInput( FALSE );
Wait( 200 );
SetValidityOfInput( TRUE );
PlaySE(3, "s01/02/120200221", 256, 64);
OutputLine(NULL, " ど、どうしてバットなんか持ってるのかな。",
NULL, " Wh-Why do you have a bat, I wonder...", Line_ContinueAfterTyping);

View File

@@ -5439,7 +5439,6 @@ void main()
Wait( 500 );
SetValidityOfInput( TRUE );
PlaySE(3, "s01/02/120200338", 256, 64);
OutputLine(NULL, "ごめんなさい、」",
NULL, " I'm sorry.\"", Line_ModeSpecific);
if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }

View File

@@ -419,8 +419,7 @@ void main()
NULL, "\"Wh-What is this, what is this!?", Line_ContinueAfterTyping);
Wait (2000)
OutputLine(NULL, " 圭一くんと魅ぃちゃんが悪代官だよ?",
NULL, " Keiichi-kun and Mii-chan are an evil bailiff and...?", Line_ContinueAfterTyping);
Wait (800)
NULL, " Keiichi-kun and Mii-chan are an evil bailiff and...?", Line_WaitForInput);
PlaySE(3, "s20/02/440200037", 128, 64);
OutputLine(NULL, " 越後屋だよ?!」",
NULL, " a con man!?\"", Line_Normal);