Overhaul choices implementation

Update/&choicesdialog.txt

@@ -0,0 +1,28 @@
+void main()
+{
+	DrawScene("black", 1000 );
+	OutputLine(NULL, "この編には、会話の変更をもたらし、悪い結末を招く可能性のある選択が含まれます。このコンソール版に追加した選択を見たいですか？",
+		   NULL, "This arc includes choices that were added in the console version. These choices result in dialog changes and can lead to bad ends. Do you want to see these choices?", Line_Normal);
+
+	DrawBustshotWithFiltering( 6, "3choices", "left", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 25, 250, TRUE );
+
+	char ChoiceMode[3];
+
+	if (GetGlobalFlag(GLanguage) == 1) {
+		ChoiceMode[0] = "Skip additional choices. Show only content from PC version";
+		ChoiceMode[1] = "Prompt additional choices from console version";
+		ChoiceMode[2] = "Prompt choices and highlight correct answers";
+	} else {
+		ChoiceMode[0] = "追加した選択を見せません。ＰＣ版内容だけ見せます";
+		ChoiceMode[1] = "コンソール版に追加した選択を見せます";
+		ChoiceMode[2] = "選択を見せながら正解に記号をつける";
+	}
+
+	Select( 3, ChoiceMode );
+
+	SetGlobalFlag(GChoiceMode, LoadValueFromLocalWork(SelectResult));
+
+	DisableWindow();
+	DrawScene("black", 250 );
+
+}

Update/_tsum_024_1.txt

@@ -967,18 +967,23 @@ void main()
 		   NULL, "\"......I hope nothing happens at all.\"", Line_Normal);
 	ClearMessage();
 
-	DrawBustshot(5, "2choices", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 15, 300, TRUE );
-	char Choice1[2];
-
-	if (GetGlobalFlag(GLanguage) == 1) {
-		Choice1[0] = "It'll be all right";
-		Choice1[1] = "...Yeah, I guess";
-	} else {
-		Choice1[0] = "大丈夫だ";
-		Choice1[1] = "…そうだな";
+	if (GetGlobalFlag(GChoiceMode) > 0) {
+		if (GetGlobalFlag(GChoiceMode) == 2) {
+			DrawBustshot(5, "2choices_1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 15, 300, TRUE );
+		} else {
+			DrawBustshot(5, "2choices", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 15, 300, TRUE );
+		}
+		char Choice1[2];
+
+		if (GetGlobalFlag(GLanguage) == 1) {
+			Choice1[0] = "It'll be all right";
+			Choice1[1] = "...Yeah, I guess";
+		} else {
+			Choice1[0] = "大丈夫だ";
+			Choice1[1] = "…そうだな";
+		}
+
+		Select( 2, Choice1 );
+		FadeBustshot( 5, FALSE, 0, 0, 0, 0, 300, TRUE );
 	}
-
-	Select( 2, Choice1 );
-	FadeBustshot( 5, FALSE, 0, 0, 0, 0, 300, TRUE );
-
 }

Update/_tsum_026.txt

@@ -1476,19 +1476,23 @@ void main()
 		   NULL, "I turned in Satoko's direction.", Line_Normal);
 	ClearMessage();
 
-	DrawBustshot(5, "2choices", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 15, 300, TRUE );
-	char Choice2[2];
-
-
-	if (GetGlobalFlag(GLanguage) == 1) {
-		Choice2[0] = "Satoko, are you still there?! There's no time!!";
-		Choice2[1] = "Well, Satoko?! You should be able to figure it out!!";
-	} else {
-		Choice2[0] = "沙都子、まだかっ？！　もう時間がないぞ！！";
-		Choice2[1] = "沙都子、どうだっ？！　お前ならわかるはずだ！！";
+	if (GetGlobalFlag(GChoiceMode) > 0) {
+		if (GetGlobalFlag(GChoiceMode) == 2) {
+			DrawBustshot(5, "2choices_2", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 15, 300, TRUE );
+		} else {
+			DrawBustshot(5, "2choices", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 15, 300, TRUE );
+		}
+		char Choice2[2];
+
+		if (GetGlobalFlag(GLanguage) == 1) {
+			Choice2[0] = "Satoko, are you still there?! There's no time!!";
+			Choice2[1] = "Well, Satoko?! You should be able to figure it out!!";
+		} else {
+			Choice2[0] = "沙都子、まだかっ？！　もう時間がないぞ！！";
+			Choice2[1] = "沙都子、どうだっ？！　お前ならわかるはずだ！！";
+		}
+
+		Select( 2, Choice2 );
+		FadeBustshot( 5, FALSE, 0, 0, 0, 0, 300, TRUE );
 	}
-
-	Select( 2, Choice2 );
-	FadeBustshot( 5, FALSE, 0, 0, 0, 0, 300, TRUE );
-
 }

Update/_tsum_op.txt

@@ -1,5 +1,7 @@
 void main()
 {
+	CallScript( "&choicesdialog" );
+
 	DrawScene( "black", 3000 );
 	DrawScene( "text/si_tumi", 1000 );
 	Wait( 8000 );

Update/flow.txt

@@ -487,9 +487,11 @@ void Game()
 	if(LoadValueFromLocalWork(s_jump) <= 24)
 	{
 		CallScript( "_tsum_024_1");
-		if (LoadValueFromLocalWork( SelectResult ) == 1) {
-			CallScript( "tsum_badend1" );
-			JumpSection("Title");
+		if (GetGlobalFlag(GChoiceMode) > 0) {
+			if (LoadValueFromLocalWork( SelectResult ) == 1) {
+				CallScript( "tsum_badend1" );
+				JumpSection("Title");
+			}
 		}
 
 		CallScript( "_tsum_024_1a" );
@@ -506,9 +508,11 @@ void Game()
 	if(LoadValueFromLocalWork(s_jump) <= 26)
 	{
 		CallScript( "_tsum_026");
-		if (LoadValueFromLocalWork( SelectResult ) == 0) {
-			CallScript( "tsum_badend2" );
-			JumpSection("Title");
+		if (GetGlobalFlag(GChoiceMode) > 0) {
+			if (LoadValueFromLocalWork( SelectResult ) == 0) {
+				CallScript( "tsum_badend2" );
+				JumpSection("Title");
+			}
 		}
 		CallScript( "_tsum_026a");
 	}