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

@@ -13,8 +13,8 @@ void main()
DisableWindow();
DrawScene("white", 400 );
PlayBGM( 1, "msys01", 128, 0 );
ModDrawCharacterWithFiltering(1, 3, "sprite/normal/me1a_wink_a1_", "1", "left", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, FALSE );
DrawScene("background/gk1", 3000 );
ModDrawCharacterWithFiltering(1, 3, "sprite/normal/me1a_wink_a1_", "1", "left", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 0, 1300, TRUE );
//「あははは! どうだった圭ちゃん!@
ClearMessage();
@@ -314,8 +314,8 @@ void main()
DisableWindow();
ModDrawCharacterWithFiltering(3, 4, "sprite/normal/sa1a_odoroki_a1_", "1", "left", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 0, FALSE );
DrawSceneWithMask("background/gk3", "left", 0, 0, 800 );
ModDrawCharacterWithFiltering(3, 4, "sprite/normal/sa1a_odoroki_a1_", "1", "left", 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); }
@@ -501,7 +501,7 @@ void main()
DisableWindow();
ModDrawCharacterWithFiltering(1, 2, "sprite/normal/re1b_kaii_b1_", "2", "up", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 0, 300, TRUE );
ModDrawCharacterWithFiltering(2, 2, "sprite/normal/re1b_kaii_b1_", "2", "up", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 10, 300, TRUE );
// レナがこんなカオだよ、といって再現してくれる@
if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
@@ -516,8 +516,8 @@ void main()
ClearMessage();
DisableWindow();
ModDrawCharacterWithFiltering(1, 3, "sprite/normal/me1a_warai_a1_", "2", "right", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, FALSE );
DrawSceneWithMask("background/gk1", "left", 0, 0, 1300 );
ModDrawCharacterWithFiltering(1, 3, "sprite/normal/me1a_warai_a1_", "2", "right", 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); }
@@ -559,7 +559,7 @@ void main()
DisableWindow();
DrawSceneWithMask("background/gk1", "down", 0, 0, 300 );
ModDrawCharacter(2, 3, "sprite/normal/me1a_wink_a1_", "2", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 400, TRUE );
ModDrawCharacter(2, 3, "sprite/normal/me1a_wink_a1_", "2", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );
//「退屈どころか@ 今年もやるぜッ!!@
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#5ec69a>魅音</color>", NULL, "<color=#5ec69a>Mion</color>", NULL, Line_ContinueAfterTyping); }
@@ -783,8 +783,8 @@ void main()
DisableWindow();
DrawScene("black", 1000 );
ModDrawCharacterWithFiltering(2, 3, "sprite/normal/me1a_wink_a1_", "2", "m1", 1, 0, 0, FALSE, 0, 0, 0, 0, 0, 10, 0, FALSE );
DrawScene("background/gk1", 1000 );
ModDrawCharacterWithFiltering(2, 3, "sprite/normal/me1a_wink_a1_", "2", "m1", 1, 0, 0, FALSE, 0, 0, 0, 0, 0, 10, 300, TRUE );
//「じゃ、それはそれとして@今日も始めようかね、部活動! 異議はぁ?!@
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#5ec69a>魅音</color>", NULL, "<color=#5ec69a>Mion</color>", NULL, Line_ContinueAfterTyping); }
@@ -1187,8 +1187,8 @@ void main()
ClearMessage();
DisableWindow();
ModDrawCharacterWithFiltering(3, 5, "sprite/normal/ri1_def_a1_", "0", "m1", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 0, FALSE );
DrawSceneWithMask("background/gk3", "right", 0, 0, 1300 );
ModDrawCharacterWithFiltering(3, 5, "sprite/normal/ri1_def_a1_", "0", "m1", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 300, TRUE );
//「…何もなし、!d300て書くのは禁じ手にしましょうです。
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#6972c1>梨花</color>", NULL, "<color=#6972c1>Rika</color>", NULL, Line_ContinueAfterTyping); }
@@ -1329,8 +1329,8 @@ void main()
ClearMessage();
DisableWindow();
ModDrawCharacter(1, 4, "sprite/normal/sa1a_akireru_a1_", "0", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 0, FALSE );
DrawSceneWithMask("background/gk1", "right", 0, 0, 1300 );
ModDrawCharacter(1, 4, "sprite/normal/sa1a_akireru_a1_", "0", -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); }
@@ -1602,8 +1602,8 @@ void main()
ClearMessage();
DisableWindow();
ModDrawCharacterWithFiltering(1, 3, "sprite/normal/me1a_odoroki_a1_", "1", "m1", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, FALSE );
DrawSceneWithMask("background/gk1", "left", 0, 0, 300 );
ModDrawCharacterWithFiltering(1, 3, "sprite/normal/me1a_odoroki_a1_", "1", "m1", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 0, 300, TRUE );
//「……だッ?!!w400 誰これ 書いたヤツだれぇえぇえ
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#5ec69a>魅音</color>", NULL, "<color=#5ec69a>Mion</color>", NULL, Line_ContinueAfterTyping); }
@@ -2192,8 +2192,8 @@ void main()
ClearMessage();
DisableWindow();
ModDrawCharacterWithFiltering(3, 2, "sprite/normal/re1b_bikkuri_b1_", "2", "right", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 0, FALSE );
DrawScene("background/gk3", 400 );
ModDrawCharacterWithFiltering(3, 2, "sprite/normal/re1b_bikkuri_b1_", "2", "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); }
@@ -2310,8 +2310,8 @@ void main()
DisableWindow();
DrawSceneWithMask("black", "down", 0, 0, 300 );
ModDrawCharacterWithFiltering(1, 3, "sprite/normal/me1a_wink_a1_", "2", "left", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, FALSE );
DrawSceneWithMask("background/gk1", "m1", 0, 0, 300 );
ModDrawCharacterWithFiltering(1, 3, "sprite/normal/me1a_wink_a1_", "2", "left", 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); }
@@ -2524,6 +2524,7 @@ void main()
NULL, " I looked around, thinking someone else would probably stop her. Of course, I wasn't exactly trying to stop her either!!", Line_Normal);
ClearMessage();
DisableWindow();
DrawSceneWithMask("black", "down", 0, 0, 1300 );
//gosub *Ch_re_Ta
@@ -2631,8 +2632,8 @@ void main()
ClearMessage();
DisableWindow();
ModDrawCharacterWithFiltering(3, 3, "sprite/normal/me1a_tokui_a1_", "2", "left", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 0, FALSE );
DrawSceneWithMask("background/gk3", "right", 0, 0, 300 );
ModDrawCharacterWithFiltering(3, 3, "sprite/normal/me1a_tokui_a1_", "2", "left", 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); }
@@ -3103,7 +3104,7 @@ void main()
DisableWindow();
FadeBustshot( 1, FALSE, 0, 0, 0, 0, 200, TRUE );
ModDrawCharacter(3, 5, "sprite/normal/ri1_def_a1_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 400, TRUE );
ModDrawCharacter(2, 5, "sprite/normal/ri1_def_a1_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 400, TRUE );
//「…どうしましたですか圭一。@
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#6972c1>梨花</color>", NULL, "<color=#6972c1>Rika</color>", NULL, Line_ContinueAfterTyping); }
@@ -3189,7 +3190,7 @@ void main()
ClearMessage();
DisableWindow();
ModDrawCharacter(3, 5, "sprite/normal/ri1_niko_a1_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );
ModDrawCharacter(2, 5, "sprite/normal/ri1_niko_a1_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );
//「…死んでもいい、ですね@…かなえて差し上げますですよ。@
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#6972c1>梨花</color>", NULL, "<color=#6972c1>Rika</color>", NULL, Line_ContinueAfterTyping); }
@@ -3215,8 +3216,8 @@ void main()
NULL, "...This was undoubtedly... a declaration of war...!", Line_Normal);
ClearMessage();
DisableWindow();
ModDrawCharacterWithFiltering(3, 3, "sprite/normal/me4_akuwarai_a1_", "1", "left", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 0, FALSE );
DrawSceneWithMask("background/gk3", "m1", 0, 0, 300 );
ModDrawCharacterWithFiltering(3, 3, "sprite/normal/me4_akuwarai_a1_", "1", "left", 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); }
@@ -3240,8 +3241,8 @@ void main()
DisableWindow();
ModDrawCharacter(2, 5, "sprite/normal/ri1_def_a1_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 0, FALSE );
DrawSceneWithMask("background/gk3", "m1", 0, 0, 300 );
ModDrawCharacter(2, 5, "sprite/normal/ri1_def_a1_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 400, TRUE );
//「…ボクでは勝てないかも知れませんですが、…やっつけますですよ。¥
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#6972c1>梨花</color>", NULL, "<color=#6972c1>Rika</color>", NULL, Line_ContinueAfterTyping); }
@@ -3485,12 +3486,11 @@ void main()
if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, " 俺までレナ化した気分だ…! こりゃあ確かに…か、かぁいい……♪♪♪",
NULL, "It felt like I had become Rena...! This was definitely... ky-kyute...♪♪♪", GetGlobalFlag(GLinemodeSp));
DisableWindow();
DrawSceneWithMask("background/gk1", "right", 0, 0, 300 );
ModDrawCharacterWithFiltering(1, 2, "sprite/normal/re3b_kaii_b1_", "2", "m1", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 0, 300, TRUE );
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
DisableWindow();
ModDrawCharacterWithFiltering(1, 2, "sprite/normal/re3b_kaii_b1_", "2", "m1", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, FALSE );
DrawSceneWithMask("background/gk1", "right", 0, 0, 300 );
//「かぁいいよねぇ?? ねぇ?@ ……はぅ……お持ち帰り……☆@
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f0953d>レナ</color>", NULL, "<color=#f0953d>Rena</color>", NULL, Line_ContinueAfterTyping); }
@@ -3548,8 +3548,8 @@ void main()
DisableWindow();
ModDrawCharacterWithFiltering(2, 3, "sprite/normal/me4_akuwarai_a1_", "1", "m1", 1, 0, 0, FALSE, 0, 0, 0, 0, 0, 10, 0, FALSE );
DrawSceneWithMask("background/gk3", "right", 0, 0, 200 );
ModDrawCharacterWithFiltering(2, 3, "sprite/normal/me4_akuwarai_a1_", "1", "m1", 1, 0, 0, FALSE, 0, 0, 0, 0, 0, 10, 300, TRUE );
//「そ…そうか…その手が残ってたか…ッ!!@
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#5ec69a>魅音</color>", NULL, "<color=#5ec69a>Mion</color>", NULL, Line_ContinueAfterTyping); }
@@ -3567,8 +3567,8 @@ void main()
ClearMessage();
DisableWindow();
ModDrawCharacterWithFiltering(3, 5, "sprite/normal/ri4_komaru_a1_", "0", "down", 7, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 0, FALSE );
DrawSceneWithMask("background/gk1", "right", 0, 0, 200 );
ModDrawCharacterWithFiltering(3, 5, "sprite/normal/ri4_komaru_a1_", "0", "down", 7, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 200, TRUE );
//「…レナがどうしてもって言うなら……ボクはお持ち帰りされちゃうです。@
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#6972c1>梨花</color>", NULL, "<color=#6972c1>Rika</color>", NULL, Line_ContinueAfterTyping); }
@@ -3956,8 +3956,8 @@ void main()
//mov %Satoko_isyou,1
DisableWindow();
ModDrawCharacter(3, 3, "sprite/normal/me4_wink_a1_", "2", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 0, FALSE );
DrawSceneWithMask("background/gk3", "left", 0, 0, 300 );
ModDrawCharacter(3, 3, "sprite/normal/me4_wink_a1_", "2", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );
//「次はおじさんだねぇ@ まずはの~んびりと団扇で扇いでもらおうかなぁ?!@
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#5ec69a>魅音</color>", NULL, "<color=#5ec69a>Mion</color>", NULL, Line_ContinueAfterTyping); }
@@ -4109,8 +4109,8 @@ void main()
//VoiceMatchingEnd
DisableWindow();
ModDrawCharacterWithFiltering(2, 2, "sprite/normal/re3b_warai_b1_", "2", "right", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 10, 0, FALSE );
DrawSceneWithMask("background/gk1", "down", 0, 0, 1300 );
ModDrawCharacterWithFiltering(1, 2, "sprite/normal/re3b_warai_b1_", "2", "right", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 0, 300, TRUE );
//VoiceMatching
if(GetGlobalFlag(GCensor) >= 4){ModCallScriptSection("zonik_005_vm0x_n01","dialog003");}
@@ -4132,8 +4132,8 @@ void main()
DisableWindow();
ModDrawCharacterWithFiltering(1, 3, "sprite/normal/me1b_akuwarai_a1_", "1", "left", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, FALSE );
DrawSceneWithMask("background/gk3", "right", 0, 0, 300 );
ModDrawCharacterWithFiltering(1, 3, "sprite/normal/me1b_akuwarai_a1_", "1", "left", 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); }
@@ -4520,8 +4520,8 @@ void main()
DisableWindow();
PlayBGM( 1, "msys05", 128, 0 );
ModDrawCharacterWithFiltering(1, 8, "sprite/normal/tomi1_def_", "0", "right", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, FALSE );
DrawSceneWithMask("background/m_hi3", "left", 0, 0, 300 );
ModDrawCharacterWithFiltering(1, 8, "sprite/normal/tomi1_def_", "0", "right", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 0, 1300, TRUE );
//「おや、また会ったね。圭一くん。@
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#945c44>富竹</color>", NULL, "<color=#945c44>Tomitake</color>", NULL, Line_ContinueAfterTyping); }