Merge remote-tracking branch 'origin/master' into lip-sync

# Conflicts:
#	Update/onik_001.txt
#	Update/onik_009.txt
#	Update/onik_009_02.txt
This commit is contained in:
Jáchym Toušek
2018-03-18 20:31:07 +01:00
12 changed files with 24 additions and 26 deletions

View File

@@ -2189,35 +2189,35 @@ void main()
NULL, " Loli!", Line_Continue);
PlaySE( 4, "wa_010", 128, 64 );
OutputLineAll(NULL, "\n", Line_WaitForInput);
if (GetGlobalFlag(GADVMode)) { OutputLineAll(NULL, "", Line_WaitForInput); } else { OutputLineAll(NULL, "\n", Line_WaitForInput); }
//巫女!/
ModPlayVoiceLS(3, 1, "s19/01/hr_kei33830_02", 256, TRUE);
OutputLine(NULL, "巫女!",
NULL, " Shrine maiden!", Line_Continue);
PlaySE( 4, "wa_029", 128, 64 );
OutputLineAll(NULL, "\n", Line_WaitForInput);
if (GetGlobalFlag(GADVMode)) { OutputLineAll(NULL, "", Line_WaitForInput); } else { OutputLineAll(NULL, "\n", Line_WaitForInput); }
//半涙!/
ModPlayVoiceLS(3, 1, "s19/01/hr_kei33830_03", 256, TRUE);
OutputLine(NULL, "半涙!",
NULL, " Brink of crying!", Line_Continue);
PlaySE( 4, "wa_012", 128, 64 );
OutputLineAll(NULL, "\n", Line_WaitForInput);
if (GetGlobalFlag(GADVMode)) { OutputLineAll(NULL, "", Line_WaitForInput); } else { OutputLineAll(NULL, "\n", Line_WaitForInput); }
//みぃ!/
ModPlayVoiceLS(3, 1, "s19/01/hr_kei33830_04", 256, TRUE);
OutputLine(NULL, "みぃ!",
NULL, " Mew!", Line_Continue);
PlaySE( 4, "wa_016", 128, 64 );
OutputLineAll(NULL, "\n", Line_WaitForInput);
if (GetGlobalFlag(GADVMode)) { OutputLineAll(NULL, "", Line_WaitForInput); } else { OutputLineAll(NULL, "\n", Line_WaitForInput); }
//完璧だッ!!/
ModPlayVoiceLS(3, 1, "s19/01/hr_kei33830_05", 256, TRUE);
OutputLine(NULL, "完璧だッ!!",
NULL, " It was perfect!!", Line_Continue);
PlaySE( 4, "wa_007", 128, 64 );
OutputLineAll(NULL, "\n", Line_WaitForInput);
if (GetGlobalFlag(GADVMode)) { OutputLineAll(NULL, "", Line_WaitForInput); } else { OutputLineAll(NULL, "\n", Line_WaitForInput); }
//ただのコケを萌えにまで昇華した…!w500これぞまさに芸術と呼ぶに相応しいッ
ModPlayVoiceLS(3, 1, "s19/01/hr_kei33830_06", 256, TRUE);
@@ -4289,9 +4289,6 @@ void main()
DisableWindow();
ModDrawCharacterWithFiltering(3, 8, "sprite/normal/tomi1_warai_", "1", "right", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 300, TRUE );
//「沙都子ちゃんがんばれ~ッ!!@
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f0953d>レナ</color>", NULL, "<color=#f0953d>Rena</color>", NULL, Line_ContinueAfterTyping); }
ModPlayVoiceLS(3, 2, "s19/02/500200864", 256, TRUE);