Merge master

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

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); }