Merge pull request #19 from Cnnctr/patch-1

merge with GuraGura 1.5 16:9

Update/init.txt

@@ -0,0 +1,21 @@
+
+void main()
+{
+	SetFontId(1); //0 is MS Gothic (default japanese), 1 is MS PGothic (default english), 2 is dejavu sans, 3 is source han sans chinese simplified (for chinese)
+	SetCharSpacing(0); //use negative values to make characters appear closer together
+	SetLineSpacing(1);
+	SetFontSize(42);
+
+	//SetNameFormat("<line-h=10><size=+6>{0}\n</size></line-h>");
+	SetNameFormat("");
+
+	SetScreenAspect("0.5635");
+
+	SetWindowPos(0, 0);
+	SetWindowSize(1280, 720);
+	SetWindowMargins(60, 30, 50, 30);
+
+	SetGUIPosition( 15, 0);
+
+	CallScript( "flow" );
+}

Update/onik_000.txt

@@ -329,7 +329,7 @@
 //setwindow 31,16,22,16,26,26,0,2,20,1,1,#ffffff,0,0,639,479
 	DisableWindow();
 	DrawScene( "white", 400 );
-	DrawScene( "bg_048", 3000 );
+	DrawScene( "bg_216", 3000 );
 //setwindow 31,16,22,16,26,26,0,2,20,1,1,#999999,0,0,639,479
 //!sd
 
@@ -343,7 +343,7 @@
 	DisableWindow();
 	SetValidityOfInput( FALSE );
 //	Wait( 1000 );
-	DrawBustshotWithFiltering( 6, "cinema", "x", 1, 0, 0, FALSE, 0, 0, 0, 0, 0, 25, 1300, TRUE );
+	DrawBustshotWithFiltering( 6, "cinema", "x", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 25, 1300, TRUE );
 	DrawBustshot( 7, "Title02", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 26, 3000, TRUE );
 	Wait( 2000 );
 	DrawBustshot( 5, "black", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 3000, TRUE );

Update/onik_001.txt

@@ -2786,10 +2786,12 @@ void main()
 		   NULL, " but we were all friends.", Line_Normal);
 	ClearMessage();
 	DisableWindow();
-	DrawBustshot( 1, "sa_se_wa_a1", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 200, TRUE );
+//	DrawBustshot( 1, "sa_se_wa_a1", -160-45, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 200, TRUE );
-	DrawBustshot( 3, "re_se_wa_b1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );
+	DrawBustshot( 1, "sa_se_wa_a1", -240, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 200, TRUE );
+//	DrawBustshot( 3, "re_se_wa_b1", 160+90, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );
+	DrawBustshot( 3, "re_se_wa_b1", 240, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );
 
-//「いっただきま～す！！＠
+	//「いっただきま～す！！＠
 	PlaySE(3, "edit/combine", 256, 64);
 	OutputLine(NULL, "「いっただきま〜す！！」",
 		   NULL, "\"Let's eat!!\"", Line_WaitForInput);

Update/onik_002.txt

@@ -1118,7 +1118,7 @@ void main()
 		   NULL, "After opening up a spot for Rika-chan, I promptly turned my back on Satoko.", Line_Normal);
 	ClearMessage();
 	DisableWindow();
-	DrawBustshot( 1, "sa_si_bi_a1", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 400, TRUE );
+	DrawBustshot( 1, "sa_si_bi_a1", -240, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 400, TRUE );
 
 //「ちょーっとお待ちなさいな＠　私はどこに座ればいいんですのー？！＠
 	PlaySE(3, "s19/04/990400035", 256, 64);

Update/onik_003.txt

@@ -647,7 +647,7 @@ void main()
 //「上等でございますわーー！！！！＠
 	PlaySE(3, "s19/04/990400059", 256, 64);
 	OutputLine(NULL, "「上等でございますわーー！！！！」",
-		   NULL, "That is perfect—!!!!", Line_WaitForInput);
+		   NULL, "\"That is perfect—!!!!\"", Line_WaitForInput);
 	OutputLineAll(NULL, "\n", Line_ContinueAfterTyping);
 
 

Update/onik_004.txt

@@ -2434,7 +2434,7 @@ void main()
 
 
 	DisableWindow();
-	DrawSceneWithMask( "saiguden", "m1", 0, 0, 1300 );
+	DrawSceneWithMask( "js3", "m1", 0, 0, 1300 );
 	DrawBustshotWithFiltering( 2, "night/re_ta_bi_b1", "down", 1, 0, 0, FALSE, 0, 0, 0, 0, 0, 10, 1300, TRUE );
 
 //「こ、怖いよみんな！＠　圭一くんまで…！＠　怖いよぅ！！！＠
@@ -2563,7 +2563,7 @@ void main()
 	ClearMessage();
 
 	DisableWindow();
-	DrawSceneWithMask( "saiguden", "m1", 0, 0, 1300 );
+	DrawSceneWithMask( "js3", "m1", 0, 0, 1300 );
 	DrawBustshotWithFiltering( 2, "night/re_ta_bi_a1", "m1", 1, 0, 0, FALSE, 0, 0, 0, 0, 0, 10, 1300, TRUE );
 
 //「……け……圭一くんは……みんなみたいなひどいこと…しないよね？!d500…しないよね？＠

Update/onik_011.txt

@@ -2650,7 +2650,7 @@ void main()
 	FadeOutBGM( 1, 1000, TRUE );
 
 	PlaySE( 4, "wa_027", 128, 64 );
-	PlaySE(3, "S01/02/120200139A", 256, 64);
+	PlaySE(3, "s01/02/120200139a", 256, 64);
 
 //	DrawBustshot( 2, "re_se_hii_a1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );
 
@@ -2663,7 +2663,7 @@ void main()
 
 
 //「嘘だッ！！！＠
-//	PlaySE(3, "S01/02/120200139A", 256, 64);
+//	PlaySE(3, "s01/02/120200139a", 256, 64);
 //	OutputLine(NULL, "「嘘だッ！！！」",
 //		   NULL, "\"LIES!!!\"", Line_WaitForInput);
 //	OutputLineAll(NULL, "\n", Line_ContinueAfterTyping);

Update/onik_012.txt

@@ -1934,7 +1934,7 @@ void main()
 
 	DisableWindow();
 	DrawScene( "bg_165", 400 );
-	DrawBustshot( 3, "oi_si_ma_a1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );
+	DrawBustshot( 3, "oi_si_ma_a1_zoom", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );
 
 	PlaySE( 4, "wa_023", 128, 64 );
 //「被害者たちはなぜか、あなたのお友達グループに全てつながるのです。」!w2000
@@ -4585,6 +4585,10 @@ void main()
 	OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping);
 
 
+	DisableWindow();
+	DrawSceneWithMask( "bg_170b", "right", 0, 0, 300 );
+
+
 //　壁に叩きつけられ、餡が飛び散る＠
 	OutputLine(NULL, "　壁に叩きつけられ、餡が飛び散る。",
 		   NULL, "It slammed against the wall, causing the bean jam to splatter.", Line_WaitForInput);

Update/onik_015.txt

@@ -1774,7 +1774,7 @@ void main()
 	ClearMessage();
 
 	DrawScene( "bg_028", 1000 );
-	DrawBustshotWithFiltering( 2, "me_se_him_a1", "m1", 1, 0, 0, FALSE, 0, 0, 0, 0, 0, 10, 1300, TRUE );
+	DrawBustshotWithFiltering( 2, "me_se_him_a1_zoom", "m1", 1, 0, 0, FALSE, 0, 0, 0, 0, 0, 10, 1300, TRUE );
 
 
 

Update/onik_tips_17.txt

@@ -538,7 +538,7 @@ void main()
 		   NULL, "The cab sped up gradually, and soon disappeared among the sea of lights.", Line_Normal);
 	ClearMessage();
 	DisableWindow();
-	DrawBustshot( 2, "night/oi_si_de_a1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 400, TRUE );
+	DrawBustshot( 2, "night/oi_si_de_a1_zoom", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 400, TRUE );
 
 //「なっはっはっは！!w1000......まいったな＠ローン返済できるかなぁ...。＠
 	PlaySE(3, "s20/11/440700060", 128, 64);