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

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