Skip to content

Commit

Permalink
Staffrooms QA pass
Browse files Browse the repository at this point in the history
  • Loading branch information
DoctorDiablo committed Feb 19, 2024
1 parent 584614d commit 5b4b4d3
Show file tree
Hide file tree
Showing 9 changed files with 52 additions and 21 deletions.
25 changes: 21 additions & 4 deletions Update/flow.txt
Original file line number Diff line number Diff line change
Expand Up @@ -152,16 +152,33 @@ void Title()

if(titleMode == 1)
{
DrawScene("title/title3", 500);
Wait(500):
if (GetGlobalFlag(GArtStyle) == 2) {
DrawScene("title/title3", 500);
}
else {
DrawBustshot( 5, "white", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 5, 200, TRUE );
DrawSprite( 3, "title/title3scroll", NULL, -426, -900, -133, 0, 0, 0, FALSE, FALSE, 0, 0, 3, 50, TRUE );
MoveSprite( 3, -426, -600, -133, 0, 0, 0, 0, 8000, FALSE );
FadeBustshot( 5, FALSE, 0, 0, 0, 0, 4000, FALSE );
}

Wait(500):
PlayBGM( 2, "bgm1/maturi_01_Ver2", 128, 0 );
}

if(titleMode == 2)
{
DrawSprite(5, "title/ken", NULL, 0, 0, 0, 0, 0, 0, FALSE, FALSE, 0, 0, 5, 0, FALSE);
DrawScene("title/title3", 500);
if (GetGlobalFlag(GArtStyle) == 2) {
DrawSprite(5, "title/ken", NULL, 0, 0, 0, 0, 0, 0, FALSE, FALSE, 0, 0, 5, 0, FALSE);
DrawScene("title/title3", 500);
}
else {
DrawBustshot( 5, "white", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 5, 200, TRUE );
DrawSprite( 3, "title/title3scroll", NULL, -426, -550, -133, 0, 0, 0, FALSE, FALSE, 0, 0, 3, 50, TRUE );
MoveSprite( 3, -426, -250, -133, 0, 0, 0, 0, 8000, FALSE );
FadeBustshot( 5, FALSE, 0, 0, 0, 0, 4000, FALSE );
}

Wait(500):

int rnd;
Expand Down
2 changes: 1 addition & 1 deletion Update/staffroom.txt
Original file line number Diff line number Diff line change
Expand Up @@ -710,7 +710,7 @@ void main()

if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f5e6d3>竜騎士07</color>", NULL, "<color=#f5e6d3>Ryukishi07</color>", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, " やがてそこにア■スゲームの開催が一方的に告げられるのだー!!」",
NULL, "Eventually, he'll announce the a_s game out of nowhere!!\"", Line_Continue);
NULL, "Eventually, he'll announce the Al__e game out of nowhere!!\"", Line_Continue);

PlaySE( 0, "wav/daidageki", 128, 64 );
ShakeScreen( 2, 15, 100 , 5, 20, );
Expand Down
7 changes: 5 additions & 2 deletions Update/staffroom06.txt
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ void main()

if (GetGlobalFlag(GADVMode) == 0) { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }

if (GetGlobalFlag(GADVMode)) { OutputLine(NULL, "", NULL, "<size=-2>", Line_Continue); }
if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, "問.竜騎士07が突然、奇声を上げ、「知っているのか雷電!」",
NULL, "Question: If Ryukishi07 screams out and shouts, \"Did you know, Raiden?!\"", Line_ContinueAfterTyping);
Expand Down Expand Up @@ -300,7 +301,7 @@ void main()

if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, "いや、天誅系の中では一番面白いよコレ。",
NULL, "<size=-4>Man, that was one of the most fun ninja games I've played. ", GetGlobalFlag(GLinemodeSp));
NULL, "Man, that was one of the most fun ninja games I've played. ", GetGlobalFlag(GLinemodeSp));

PlaySE( 0, "wav/tataku", 70, 64 );

Expand All @@ -313,7 +314,8 @@ void main()

if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, " いや、重要書類運搬の行列を、後から全員サイレントキルで決めるのも凄まじいものが!",
NULL, "Man, silent killing everyone from behind for a whole procession in charge of delivering important papers was intense!", Line_WaitForInput);
NULL, "Man, silent killing everyone from behind for a whole procession in charge of delivering important papers was intense!", GetGlobalFlag(GLinemodeSp));
if (GetGlobalFlag(GADVMode)) { ClearMessage(); }

PlaySE( 0, "wav/kyupirn", 70, 64 );
Wait( 200 );
Expand All @@ -323,6 +325,7 @@ void main()
Wait( 200 );
PlaySE( 0, "wav/kyupirn", 70, 64 );

if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, " 護衛含めて7人が、誰にも気付かれずわずか10秒足らずで全員沈黙っすよ?!",
NULL, " I had to silence all seven in under ten seconds without anyone noticing, including the guards!", Line_ContinueAfterTyping);

Expand Down
2 changes: 2 additions & 0 deletions Update/staffroom08.txt
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,14 @@ void main()
OutputLine(NULL, "夏休み中はオールナイト麻雀大会をやろうとか、",
NULL, " \"Let's have an all-night mahjong tournament this summer break,\"", Line_ContinueAfterTyping);
Wait( 800 );
if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_Normal); }

PlaySE( 0, "wav/nageru", 70, 64 );
Wait( 200 );
PlaySE( 0, "wav/nageru", 70, 64 );
Wait( 200 );

if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, "おのれ奈■さん、次回こそは07thの総力を挙げて叩き潰す、",
NULL, " \"Curse you, Na**-san! Next time I'll crush you with all of 07th!\"", Line_ContinueAfterTyping);

Expand Down
4 changes: 2 additions & 2 deletions Update/staffroom11.txt
Original file line number Diff line number Diff line change
Expand Up @@ -443,12 +443,12 @@ void main()
if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, "          平成14年12月28日",
NULL, "          December 28th, 2002", Line_ContinueAfterTyping);
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
if (GetGlobalFlag(GADVMode)) { OutputLineAll(NULL, "", Line_Normal); ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }

if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, "              午前3時25分",
NULL, "               3:25 AM", Line_ContinueAfterTyping);
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
if (GetGlobalFlag(GADVMode)) { OutputLineAll(NULL, "", Line_Normal); ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }

if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, "                 竜騎士07",
Expand Down
4 changes: 2 additions & 2 deletions Update/staffroom12.txt
Original file line number Diff line number Diff line change
Expand Up @@ -734,12 +734,12 @@ void main()
if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, "            平成15年8月11日",
NULL, "            August 11th, 2003", Line_ContinueAfterTyping);
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
if (GetGlobalFlag(GADVMode)) { OutputLineAll(NULL, "", Line_Normal); ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }

if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, "        07th Expansion",
NULL, "        07th Expansion", Line_ContinueAfterTyping);
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
if (GetGlobalFlag(GADVMode)) { OutputLineAll(NULL, "", Line_Normal); ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }

if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, "             竜騎士07・八咫桜",
Expand Down
4 changes: 2 additions & 2 deletions Update/staffroom13.txt
Original file line number Diff line number Diff line change
Expand Up @@ -977,7 +977,7 @@ void main()
if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, "            平成16年7月30日",
NULL, "            July 30th, 2004", Line_ContinueAfterTyping);
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
if (GetGlobalFlag(GADVMode)) { OutputLineAll(NULL, "", Line_Normal); ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }

if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, "             竜騎士07・八咫桜",
Expand All @@ -993,7 +993,7 @@ void main()
PlaySE( 0, "wav/kyupirn", 70, 64 );

OutputLine(NULL, " 竜宮レナって言う小悪魔帽かぶったBSがエルニウムを私より1Kも安く売ってやがったんです!!",
NULL, " There was a Blacksmith in a Deviruchi Hat named Ryuugu Rena selling Elunium 1K cheaper than I was!!", Line_WaitForInput);
NULL, " There was a Blacksmith in a Deviruchi Hat named Rena Ryuugu selling Elunium 1K cheaper than I was!!", Line_WaitForInput);

PlaySE( 0, "wav/furu", 70, 64 );

Expand Down
2 changes: 1 addition & 1 deletion Update/staffroom14.txt
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ void main()

if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, " 何もお約束できないのが心苦しいです。",
NULL, "It pains me that can't promise anything about it.", GetGlobalFlag(GLinemodeSp));
NULL, "It pains me that I can't promise anything about it.", GetGlobalFlag(GLinemodeSp));
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }

if (GetGlobalFlag(GADVMode) == 0) { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
Expand Down
23 changes: 16 additions & 7 deletions Update/staffroom15.txt
Original file line number Diff line number Diff line change
Expand Up @@ -758,27 +758,36 @@ void main()
FadeBustshot( 5, FALSE, 0, 0, 0, 0, 100, TRUE );
ModDrawCharacterWithFiltering(3, 1, "sprite/kei2_nayamu_", "2", "effect/left", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 2, 100, TRUE );
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#956f6e>圭一</color>", NULL, "<color=#956f6e>Keiichi</color>", NULL, Line_ContinueAfterTyping); }
if (GetGlobalFlag(GADVMode)) { OutputLine(NULL, "", NULL, "<size=-2>", Line_Continue); }
OutputLine(NULL, "「まず結婚の定義をはっきりさせよう。婚姻届けを出して受理されれば結婚なのか? だとしたら結婚など血の通っていないお役所の行政用語だってことになっちまう! それでいいのか?",
NULL, "\"First, let's start by defining marriage. Are two people married after submitting their marriage registration? If so, then marriage is reduced to an administrative term used by cold-blooded officials! Is that acceptable?", GetGlobalFlag(GLinemodeSp));
NULL, "\"First, let's start by defining marriage. Are two people married after submitting their marriage registration? If so, then marriage is reduced to an administrative term used by cold-blooded officials! Is that acceptable? ", GetGlobalFlag(GLinemodeSp));
DisableWindow();
ModDrawCharacter(3, 1, "sprite/kei2_hig2_", "2", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 200, TRUE );
OutputLine(NULL, " いいや違うッ!! 結婚ってのは、魂と魂が惹かれ合って、共に生涯を添い遂げようという話のはずなんだッ。愛が全て、愛がなければ始まらないッ!! だが結婚は、愛し合う二人の全てに門戸が開かれているのかッ?! いいや、開かれてはいない!! 愛が全てなら、国籍も年齢も宗教も、果てには性別さえも不問にするべきだろう?!",
NULL, " No, it is not!!! Marriage should be defined as when two souls are drawn to each other and vow to spend their lives together! Love is everything! Without love, there can be no marriage!!! Yet are the gates of marriage open to any two people who love each other?! No, it is not open to all!!! If love is everything, then age, nationality, religion, and even gender should mean nothing in the end!", Line_Normal);
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#956f6e>圭一</color>", NULL, "<color=#956f6e>Keiichi</color>", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, " いいや違うッ!! 結婚ってのは、魂と魂が惹かれ合って、共に生涯を添い遂げようという話のはずなんだッ。愛が全て、愛がなければ始まらないッ!! だが結婚は、愛し合う二人の全てに門戸が開かれているのかッ?!",
NULL, "No, it is not!!! Marriage should be defined as when two souls are drawn to each other and vow to spend their lives together! Love is everything! Without love, there can be no marriage!!! Yet are the gates of marriage open to any two people who love each other?! ", GetGlobalFlag(GLinemodeSp));
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#956f6e>圭一</color>", NULL, "<color=#956f6e>Keiichi</color>", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, " いいや、開かれてはいない!! 愛が全てなら、国籍も年齢も宗教も、果てには性別さえも不問にするべきだろう?!",
NULL, "No, it is not open to all!!! If love is everything, then age, nationality, religion, and even gender should mean nothing in the end!", Line_Normal);
ClearMessage();
DisableWindow();
ModDrawCharacter(3, 1, "sprite/kei2_nayamu_", "2", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 200, TRUE );
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#956f6e>圭一</color>", NULL, "<color=#956f6e>Keiichi</color>", NULL, Line_ContinueAfterTyping); }
if (GetGlobalFlag(GADVMode)) { OutputLine(NULL, "", NULL, "<size=-2>", Line_Continue); }
OutputLine(NULL, " それを許さない時点で、俺は日本語のいう結婚という言葉を、俺自身が信じる結婚という言葉とは別のものであると断言するのであるッ!! いやいや、究極的には互いが人間であるかさえ問うことは愚かしいッ! 人間と動物だって、果てには、人間と無機物だって結婚できていいはずなんだ! 当人たちが愛し合い、それを確信しているというのなら、もうそれで二人の絆は永遠なんだ!! それが結婚じゃないのか?! 違うのかッ?! ではここで当初の疑問に立ち返ろう!! 俺、前原圭一が『結婚するならどんな人がいい?』ッ?! この時点ですでに勘違いッ、ミステイクッ、オーマイガー!!",
NULL, "Since Japan does not allow that, then I can firmly declare that the Japanese definition of marriage is not the same marriage I believe in!!! No, in fact, even asking both parties to be human is foolish! Humans and animals, or even humans and inorganic creatures should be able to marry! If both parties love each other and they're certain of that, then the bond between those two is already eternal!!! How is that not marriage?! How is it not?! Now, to return to the question at hand!!! 'What kind of person would I, Maebara Keiichi, want to marry?' The very question itself is flawed! It's mistaken! Oh my god!!!", Line_Normal);
OutputLine(NULL, " それを許さない時点で、俺は日本語のいう結婚という言葉を、俺自身が信じる結婚という言葉とは別のものであると断言するのであるッ!! いやいや、究極的には互いが人間であるかさえ問うことは愚かしいッ! 人間と動物だって、果てには、人間と無機物だって結婚できていいはずなんだ!",
NULL, "Since Japan does not allow that, then I can firmly declare that the Japanese definition of marriage is not the same marriage I believe in!!! No, in fact, even asking both parties to be human is foolish! Humans and animals, or even humans and inorganic creatures should be able to marry! ", GetGlobalFlag(GLinemodeSp));
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#956f6e>圭一</color>", NULL, "<color=#956f6e>Keiichi</color>", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, " 当人たちが愛し合い、それを確信しているというのなら、もうそれで二人の絆は永遠なんだ!! それが結婚じゃないのか?! 違うのかッ?!",
NULL, "If both parties love each other and they're certain of that, then the bond between those two is already eternal!!! How is that not marriage?! How is it not?! ", GetGlobalFlag(GLinemodeSp));
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#956f6e>圭一</color>", NULL, "<color=#956f6e>Keiichi</color>", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, " ではここで当初の疑問に立ち返ろう!! 俺、前原圭一が『結婚するならどんな人がいい?』ッ?! この時点ですでに勘違いッ、ミステイクッ、オーマイガー!!",
NULL, "Now, to return to the question at hand!!! 'What kind of person would I, Keiichi Maebara, want to marry?' The very question itself is flawed! It's mistaken! Oh my god!!!", Line_Normal);
ClearMessage();
DisableWindow();
ModDrawCharacter(3, 1, "sprite/kei2_hig2_", "2", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 200, TRUE );
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#956f6e>圭一</color>", NULL, "<color=#956f6e>Keiichi</color>", NULL, Line_ContinueAfterTyping); }
if (GetGlobalFlag(GADVMode)) { OutputLine(NULL, "", NULL, "<size=-2>", Line_Continue); }
OutputLine(NULL, " 人に限定する時点で視野が狭いッ、わかってないッ!! つまり現時点で、前原圭一にはすでに、百をゆうに超える嫁たちがいるッ!! もちろん、それらは人ではないッ、生物でさえないッ!! まず、俺が最初に嫁にしたのはシリコーン製のボギャッ?!?!」",
NULL, "You're already being too narrow-minded by limiting it to people! You don't get it!!! At this point, Maebara Keiichi has already married over a hundred wives!!! Of course, they are not people, nor are they animals!!! The one that I first married was a silicone bgyaah?!\"", Line_Normal);
NULL, "You're already being too narrow-minded by limiting it to people! You don't get it!!! At this point, Keiichi Maebara has already married over a hundred wives!!! Of course, they are not people, nor are they animals!!! The one that I first married was a silicone bgyaah?!\"", Line_Normal);
ClearMessage();
DisableWindow();
StopAllSound();
Expand Down

0 comments on commit 5b4b4d3

Please sign in to comment.