Transitions improved

Woooo! Better flow, finally here. I did that cause my internet died and couldn't work on Wata.
I don't think I can do much more for Oni at this point...
This commit is contained in:
Aurian
2018-05-31 18:59:18 +02:00
committed by GitHub
parent 5558d685d2
commit 14db72fd70
25 changed files with 239 additions and 239 deletions

View File

@@ -927,8 +927,8 @@ void main()
DisableWindow();
DrawSceneWithMask("black", "left", 0, 0, 1300 );
PlayBGM( 1, "msys02", 128, 0 );
ModDrawCharacterWithFiltering(1, 2, "sprite/normal/re1a_def_a1_", "0", "c", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, FALSE );
DrawSceneWithMask("background/ie1", "left", 0, 0, 3000 );
ModDrawCharacterWithFiltering(1, 2, "sprite/normal/re1a_def_a1_", "0", "c", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 0, 300, TRUE );
//「魅ぃちゃ~ん! おっはよ~ぅ!@
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f0953d>レナ</color>", NULL, "<color=#f0953d>Rena</color>", NULL, Line_ContinueAfterTyping); }
@@ -1055,8 +1055,8 @@ void main()
ClearMessage();
DisableWindow();
DrawSceneWithMask("black", "left", 0, 0, 1300 );
ModDrawCharacterWithFiltering(1, 3, "sprite/normal/me1a_def_a1_", "0", "m1", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, FALSE );
DrawSceneWithMask("background/m_hi1", "left", 0, 0, 300 );
ModDrawCharacterWithFiltering(1, 3, "sprite/normal/me1a_def_a1_", "0", "m1", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 0, 300, TRUE );
//「どうだった@ 久しぶりの都会はさ。@
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#5ec69a>魅音</color>", NULL, "<color=#5ec69a>Mion</color>", NULL, Line_ContinueAfterTyping); }
@@ -1812,8 +1812,8 @@ void main()
ClearMessage();
DisableWindow();
ModDrawCharacterWithFiltering(1, 5, "sprite/normal/ri1_def_a1_", "0", "m1", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, FALSE );
DrawSceneWithMask("background/gk1", "left", 0, 0, 1300 );
ModDrawCharacterWithFiltering(1, 5, "sprite/normal/ri1_def_a1_", "0", "m1", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 0, 1300, TRUE );
// す、と俺の頭を小さな手が撫でた@
if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
@@ -2064,8 +2064,8 @@ void main()
NULL, "A small hand tugged on the back of my shirt.", Line_Normal);
ClearMessage();
DisableWindow();
ModDrawCharacterWithFiltering(1, 5, "sprite/normal/ri1_def_a1_", "0", "m1", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, FALSE );
DrawSceneWithMask("background/gk1", "right", 0, 0, 1300 );
ModDrawCharacterWithFiltering(1, 5, "sprite/normal/ri1_def_a1_", "0", "m1", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 0, 300, TRUE );
//「...圭一が2日間もお休みしたから寂しかったのです。@
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#6972c1>梨花</color>", NULL, "<color=#6972c1>Rika</color>", NULL, Line_ContinueAfterTyping); }
@@ -2095,8 +2095,8 @@ void main()
NULL, "I gently released my grip on Satoko, who at this point was on the verge of tears. She still had her eyes clamped shut as she braced herself for the forehead flick.", Line_Normal);
ClearMessage();
DisableWindow();
ModDrawCharacterWithFiltering(3, 4, "sprite/normal/sa1a_naku_a1_", "1", "right", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 0, FALSE );
DrawSceneWithMask("background/gk3", "right", 0, 0, 1300 );
ModDrawCharacterWithFiltering(3, 4, "sprite/normal/sa1a_naku_a1_", "1", "right", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 300, TRUE );
//「...ふ、ふわぁあぁあぁあ...ん!@ 悔しくなんかないもん!@ ふわぁあぁああん!@
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#fcdb77>沙都子</color>", NULL, "<color=#fcdb77>Satoko</color>", NULL, Line_ContinueAfterTyping); }
@@ -2167,8 +2167,8 @@ void main()
NULL, "...Waiiit a minute...", Line_Normal);
ClearMessage();
DisableWindow();
ModDrawCharacterWithFiltering(2, 2, "sprite/normal/re1a_kaii_a1_", "2", "left", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 10, 0, FALSE );
DrawSceneWithMask("background/gk1", "right", 0, 0, 300 );
ModDrawCharacterWithFiltering(3, 2, "sprite/normal/re1a_kaii_a1_", "2", "left", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 300, TRUE );
// その光景を見て、レナが恍惚の表情でうっとりとしていた@
if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
@@ -2201,7 +2201,7 @@ void main()
DisableWindow();
ModDrawCharacter(3, 2, "sprite/normal/re1a_hau_a1_", "1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );
ModDrawCharacter(2, 2, "sprite/normal/re1a_hau_a1_", "1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );
//「...ひぅ!!w500 ...だってだって...こんなにかぁいいよぅ?@
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f0953d>レナ</color>", NULL, "<color=#f0953d>Rena</color>", NULL, Line_ContinueAfterTyping); }
@@ -2281,7 +2281,9 @@ void main()
NULL, "Rena swooned over Satoko's crying form.", Line_Normal);
ClearMessage();
DisableWindow();
FadeAllBustshots( 400, TRUE );
// もしもこの雛見沢で幼女誘拐事件が起こったら、俺はレナのことを通報しなければならないだろう@
if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, " もしもこの雛見沢で幼女誘拐事件が起こったら、俺はレナのことを通報しなければならないだろう。",
@@ -2355,8 +2357,8 @@ void main()
NULL, "By the time the teacher entered the room, the bedlam from before had been neatly tidied up.", Line_Normal);
ClearMessage();
DisableWindow();
ModDrawCharacterWithFiltering(3, 3, "sprite/normal/me1b_warai_a1_", "1", "m1", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 0, FALSE );
DrawScene("background/gk3", 400 );
ModDrawCharacterWithFiltering(3, 3, "sprite/normal/me1b_warai_a1_", "1", "m1", 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); }
@@ -3074,7 +3076,6 @@ void main()
NULL, "As the fruit of my efforts(?), I can now reach over and take sides from anybody's lunch.", Line_Normal);
ClearMessage();
DisableWindow();
// DrawBustshot( 3, "sa_se_de_a1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 400, TRUE ); DrawBustshot( 3, "sa_se_de_a1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 400, TRUE );
//「あらあら、圭一さんのお弁当は今日は大奮発ではございませんことぉ?@
@@ -3375,8 +3376,8 @@ void main()
NULL, "But Rena seemed rather satisfied as she looked on.", Line_Normal);
ClearMessage();
DisableWindow();
ModDrawCharacter(1, 4, "sprite/normal/sa1b_warai_b1_", "1", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 0, FALSE );
DrawSceneWithMask("background/gk3", "left", 0, 0, 300 );
ModDrawCharacter(1, 4, "sprite/normal/sa1b_warai_b1_", "1", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 400, TRUE );
//「いかがかしら。レナさんもとてもお料理が上手ですことよ@ 圭一さんとは大違いですの!@
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#fcdb77>沙都子</color>", NULL, "<color=#fcdb77>Satoko</color>", NULL, Line_ContinueAfterTyping); }
@@ -3452,8 +3453,8 @@ void main()
NULL, "It's really hard for her to lie.", Line_Normal);
ClearMessage();
DisableWindow();
ModDrawCharacterWithFiltering(2, 2, "sprite/normal/re1b_bikkuri_b1_", "2", "m1", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 10, 0, FALSE );
DrawSceneWithMask("background/gk1", "m1", 0, 0, 1000 );
ModDrawCharacterWithFiltering(3, 2, "sprite/normal/re1b_bikkuri_b1_", "2", "m1", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 300, TRUE );
//「圭一くん、ど、どっちでも茹でてマヨネーズかけるとおいしいじゃない@ いじめちゃかわいそうだよ...。!w800魅ぃちゃんも
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f0953d>レナ</color>", NULL, "<color=#f0953d>Rena</color>", NULL, Line_ContinueAfterTyping); }
@@ -3480,8 +3481,8 @@ void main()
NULL, "Rena hurriedly tried to follow up, but Mion laughed haughtily as she drew closer to Satoko.", Line_Normal);
ClearMessage();
DisableWindow();
ModDrawCharacterWithFiltering(3, 3, "sprite/normal/me1a_wink_a1_", "1", "right", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 0, FALSE );
DrawSceneWithMask("background/gk3", "m1", 0, 0, 1000 );
ModDrawCharacterWithFiltering(3, 3, "sprite/normal/me1a_wink_a1_", "1", "right", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 300, TRUE );
//「まぁまぁ家庭科の授業ってことで。!d600...んじゃ沙都子、!w1000これはぁ
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#5ec69a>魅音</color>", NULL, "<color=#5ec69a>Mion</color>", NULL, Line_ContinueAfterTyping); }
@@ -3671,8 +3672,8 @@ void main()
NULL, "When she acts like this, she actually starts to seem her age.", Line_Normal);
ClearMessage();
DisableWindow();
ModDrawCharacterWithFiltering(2, 2, "sprite/normal/re1b_kaii_b1_", "2", "m1", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 10, 0, FALSE );
DrawSceneWithMask("background/gk1", "right", 0, 0, 1300 );
ModDrawCharacterWithFiltering(3, 2, "sprite/normal/re1b_kaii_b1_", "2", "m1", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 300, TRUE );
//「...は、!w800はぅ...か、かぁいぃよぅ...。@
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f0953d>レナ</color>", NULL, "<color=#f0953d>Rena</color>", NULL, Line_ContinueAfterTyping); }
@@ -3877,8 +3878,8 @@ void main()
NULL, "From now on, I'll be careful when I'm within striking distance of Rena...", Line_Normal);
ClearMessage();
DisableWindow();
ModDrawCharacterWithFiltering(3, 2, "sprite/normal/re1b_kaii_b1_", "2", "m1", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 0, FALSE );
DrawSceneWithMask("background/gk1", "down", 0, 0, 3000 );
ModDrawCharacterWithFiltering(3, 2, "sprite/normal/re1b_kaii_b1_", "2", "m1", 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); }
@@ -4557,8 +4558,8 @@ void main()
DrawScene("black", 100 );
ModDrawCharacter(3, 2, "sprite/normal/re1b_warai_b1_", "2", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 0, FALSE );
DrawSceneWithMask("background/m_hi3", "left", 0, 0, 1300 );
ModDrawCharacter(3, 2, "sprite/normal/re1b_warai_b1_", "2", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );
//「じゃあじゃあ! レナ、今日は早く帰ってお弁当の準備するね...@ 明日が楽しみ~!じゃあね、圭一くんに魅ぃちゃん!さよぅならぁ!@
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f0953d>レナ</color>", NULL, "<color=#f0953d>Rena</color>", NULL, Line_ContinueAfterTyping); }