higurashi-cs/onikakushi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into lip-sync

Browse Source
This commit is contained in:
Jáchym Toušek
2018-01-28 22:52:58 +01:00
parent 52e935748d 34796ff462
commit d32443301c
5 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Update/onik_000.txt
View File

@@ -380,10 +380,10 @@ void main()
//draw and move big background //draw and move big background
SetValidityOfInterface(FALSE); SetValidityOfInterface(FALSE);
SetValidityOfSaving(FALSE); SetValidityOfSaving(FALSE);
DrawBustshot(4, "hina1_1", 0, -230, -480, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 200, FALSE ); DrawBustshot(4, "overview/hina1_1", 0, -230, -480, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 200, FALSE );
DrawBustshot(3, "hina1_2", 0, -230, -480, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 200, FALSE ); DrawBustshot(3, "overview/hina1_2", 0, -230, -480, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 200, FALSE );
DrawBustshot(2, "hina1_3", 0, -230, -480, FALSE, 0, 0, 0, 0, 0, 0, 0, 3, 200, FALSE ); DrawBustshot(2, "overview/hina1_3", 0, -230, -480, FALSE, 0, 0, 0, 0, 0, 0, 0, 3, 200, FALSE );
DrawBustshot(1, "hina1_4", 0, -230, -480, FALSE, 0, 0, 0, 0, 0, 0, 0, 4, 200, TRUE ); DrawBustshot(1, "overview/hina1_4", 0, -230, -480, FALSE, 0, 0, 0, 0, 0, 0, 0, 4, 200, TRUE );
MoveBustshot( 1, NULL, 0, 290, -480, 1, 10000, FALSE ); MoveBustshot( 1, NULL, 0, 290, -480, 1, 10000, FALSE );
MoveBustshot( 2, NULL, 0, 280, -480, 2, 10000, FALSE ); MoveBustshot( 2, NULL, 0, 280, -480, 2, 10000, FALSE );
MoveBustshot( 3, NULL, 0, 230, -480, 3, 10000, FALSE ); MoveBustshot( 3, NULL, 0, 230, -480, 3, 10000, FALSE );

12
Update/onik_001.txt
View File

@@ -3879,25 +3879,25 @@ void main()
DrawScene("black", 100 ); DrawScene("black", 100 );
PlaySE( 4, "wa_005", 128, 64 ); PlaySE( 4, "wa_005", 128, 64 );
DrawBustshot("scene/001a", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 50, TRUE ); DrawBustshot(5, "scene/001a", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 50, TRUE );
DrawScene("black", 100 ); DrawScene("black", 100 );
PlaySE( 4, "wa_005", 128, 64 ); PlaySE( 4, "wa_005", 128, 64 );
DrawBustshot("scene/001a", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 50, TRUE ); DrawBustshot(5, "scene/001a", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 50, TRUE );
PlaySE( 4, "wa_005", 128, 64 ); PlaySE( 4, "wa_005", 128, 64 );
DrawBustshot("scene/001a", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 50, TRUE ); DrawBustshot(5, "scene/001a", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 50, TRUE );
PlaySE( 4, "wa_005", 128, 64 ); PlaySE( 4, "wa_005", 128, 64 );
DrawBustshot("scene/001b", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 50, TRUE ); DrawBustshot(5, "scene/001b", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 50, TRUE );
PlaySE( 4, "wa_005", 128, 64 ); PlaySE( 4, "wa_005", 128, 64 );
DrawBustshot("scene/001b", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 50, TRUE ); DrawBustshot(5, "scene/001b", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 50, TRUE );
PlaySE( 4, "wa_005", 128, 64 ); PlaySE( 4, "wa_005", 128, 64 );
DrawBustshot("scene/001b", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 50, TRUE ); DrawBustshot(5, "scene/001b", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 50, TRUE );
// DrawScene( "black", 100 ); // DrawScene( "black", 100 );

4
Update/onik_003.txt
View File

@@ -4647,7 +4647,7 @@ void main()
//draw big CG //draw big CG
SetValidityOfInterface(FALSE); SetValidityOfInterface(FALSE);
SetValidityOfSaving(FALSE); SetValidityOfSaving(FALSE);
ModDrawCharacter(1, 0, "scene/004b", "0", 0, -230, -480, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 200, TRUE ); DrawBustshot(1, "scene/004b", 0, -230, -480, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 200, TRUE );
ShakeScreen( 1, 50, 20, 3, 5); ShakeScreen( 1, 50, 20, 3, 5);
//nega 0 //nega 0
@@ -4674,7 +4674,7 @@ void main()
ModDrawCharacter(2, 2, "sprite/sunset/re1a_bikkuri_a1_", "2", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 300, TRUE ); ModDrawCharacter(2, 2, "sprite/sunset/re1a_bikkuri_a1_", "2", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 300, TRUE );
DrawBustshot( 1, "", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 0, TRUE ); DrawBustshot( 1, "", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 0, TRUE );
SetValidityOfInterface(TRUE); SetValidityOfInterface(TRUE);
SetValidityOfSaving(FALSE); SetValidityOfSaving(TRUE);
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); } if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }

4
Update/onik_011.txt
View File

@@ -2944,7 +2944,7 @@ void main()
// DrawBustshot( 2, "re_se_hii_a1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE ); // DrawBustshot( 2, "re_se_hii_a1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );
DrawBG("scene/002b", 0, FALSE); DrawBG("scene/002b", 0, FALSE);
ModDrawCharacter(1, 0, "text/oni_usoda", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 0, FALSE ); DrawBustshot(1, "text/oni_usoda", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 0, FALSE );
StartShakingOfAllObjects( 1, 50, 10, 4, 20, FALSE); StartShakingOfAllObjects( 1, 50, 10, 4, 20, FALSE);
Negative( 0, TRUE ); Negative( 0, TRUE );
FadeFilm( 400, FALSE ); FadeFilm( 400, FALSE );
@@ -5121,7 +5121,7 @@ void main()
//draw big CG and add negative and shake and adjust SE location //draw big CG and add negative and shake and adjust SE location
SetValidityOfInterface(FALSE); SetValidityOfInterface(FALSE);
SetValidityOfSaving(FALSE); SetValidityOfSaving(FALSE);
ModDrawCharacter(1, 0, "scene/031", "0", 200, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 1000, TRUE ); DrawBustshot(1, "scene/031", 200, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 1000, TRUE );
MoveBustshot( 1, NULL, -200, 0, 0, 0, 2500, TRUE ); MoveBustshot( 1, NULL, -200, 0, 0, 0, 2500, TRUE );
Negative( 100, FALSE ); Negative( 100, FALSE );
ShakeScreen( 1, 50, 20, 3, 5); ShakeScreen( 1, 50, 20, 3, 5);

16
Update/onik_015.txt
View File

@@ -2555,7 +2555,7 @@ void main()
//set big CG //set big CG
SetValidityOfInterface(FALSE); SetValidityOfInterface(FALSE);
SetValidityOfSaving(FALSE); SetValidityOfSaving(FALSE);
ModDrawCharacter(6, 0, "scene/004", "0", 0, 230, -480, FALSE, 0, 0, 0, 0, 0, 0, 0, 26, 300, TRUE ); DrawBustshot(6, "scene/004", 0, 230, -480, FALSE, 0, 0, 0, 0, 0, 0, 0, 26, 300, TRUE );
//　......それは想像を裏切らず、レナだった￥ //　......それは想像を裏切らず、レナだった￥
@@ -3273,7 +3273,7 @@ void main()
//「嘘だッ！！！！！！！￥ //「嘘だッ！！！！！！！￥
ModPlayVoiceLS(3, 2, "s01/02/120200367", 256, TRUE); ModPlayVoiceLS(3, 2, "s01/02/120200367", 256, TRUE);
ModDrawCharacter(2, 0, "text/oni_usoda", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 0, FALSE ); DrawBustshot(2, "text/oni_usoda", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 0, FALSE );
StartShakingOfAllObjects( 1, 50, 10, 4, 20, FALSE); StartShakingOfAllObjects( 1, 50, 10, 4, 20, FALSE);
@@ -4459,7 +4459,7 @@ void main()
//■回想 //■回想
DisableWindow(); DisableWindow();
DrawFilm( 2, 153, 153, 102, 255, 0, 0, FALSE ); DrawFilm( 2, 153, 153, 102, 255, 0, 0, FALSE );
ModDrawCharacter(1, 0, "append/waku", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 1000, FALSE ); DrawBustshot(1, "append/waku_b", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 1000, FALSE );
DrawScene("background/ma_j3_01", 1000 ); DrawScene("background/ma_j3_01", 1000 );
FadeOutBGM( 1, 1000, TRUE ); FadeOutBGM( 1, 1000, TRUE );
FadeOutBGM( 2, 1000, TRUE ); FadeOutBGM( 2, 1000, TRUE );
@@ -4843,7 +4843,7 @@ void main()
SetValidityOfInput( FALSE ); SetValidityOfInput( FALSE );
PlaySE( 4, "wa_008", 128, 64 ); PlaySE( 4, "wa_008", 128, 64 );
DrawFilm( 2, 153, 153, 102, 255, 0, 200, FALSE ); DrawFilm( 2, 153, 153, 102, 255, 0, 200, FALSE );
ModDrawCharacter(1, 0, "append/waku", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 200, FALSE ); DrawBustshot(1, "append/waku_b", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 200, FALSE );
DrawScene("scene/102", 200); DrawScene("scene/102", 200);
WaitToFinishSEPlaying(4); WaitToFinishSEPlaying(4);
PlaySE( 4, "wa_009", 128, 64 ); PlaySE( 4, "wa_009", 128, 64 );
@@ -4880,7 +4880,7 @@ void main()
//print 6 //print 6
DisableWindow(); DisableWindow();
DrawSceneWithMask("black", "up", 0, 0, 1300 ); DrawSceneWithMask("black", "up", 0, 0, 1300 );
ModDrawCharacter(1, 0, "append/waku", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 1300, FALSE ); DrawBustshot(1, "append/waku_b", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 1300, FALSE );
DrawSceneWithMask("background/ma_j3", "down", 0, 0, 1300 ); DrawSceneWithMask("background/ma_j3", "down", 0, 0, 1300 );
StopSE( 4 ); StopSE( 4 );
@@ -5621,7 +5621,7 @@ void main()
ClearMessage(); ClearMessage();
DisableWindow(); DisableWindow();
ModDrawCharacter(1, 0, "append/waku", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 1300, FALSE ); DrawBustshot(1, "append/waku_b", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 1300, FALSE );
DrawSceneWithMask("background/ma_j3", "up", 0, 0, 1300 ); DrawSceneWithMask("background/ma_j3", "up", 0, 0, 1300 );
//「オヤシロさまが...か......。＠ //「オヤシロさまが...か......。＠
@@ -5746,7 +5746,7 @@ void main()
NULL, "Long ago, Hinamizawa was feared and respected as the village of ogres.", Line_Normal); NULL, "Long ago, Hinamizawa was feared and respected as the village of ogres.", Line_Normal);
ClearMessage(); ClearMessage();
DisableWindow(); DisableWindow();
ModDrawCharacter(1, 0, "append/waku", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 1000, FALSE ); DrawBustshot(1, "append/waku_b", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 1000, FALSE );
DrawScene("background/oni1", 1000 ); DrawScene("background/oni1", 1000 );
//「ふもとの村人たちは鬼たちを崇めていました＠で、鬼ヶ淵は神聖な土地なので絶対に不可侵＠むやみに立ち入るとオヤシロさまの祟りがある、とされてきたんです。＠ //「ふもとの村人たちは鬼たちを崇めていました＠で、鬼ヶ淵は神聖な土地なので絶対に不可侵＠むやみに立ち入るとオヤシロさまの祟りがある、とされてきたんです。＠
@@ -5820,7 +5820,7 @@ void main()
ClearMessage(); ClearMessage();
DisableWindow(); DisableWindow();
ModDrawCharacter(1, 0, "append/waku", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 1000, FALSE ); DrawBustshot(1, "append/waku_b", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 1000, FALSE );
DrawScene("background/ma_j3_01", 1000 ); DrawScene("background/ma_j3_01", 1000 );
//「つまり......オヤシロさまってのは、守り神ってよりも...監視者なんですね＠　この地を外界から隔離しようとする。＠ //「つまり......オヤシロさまってのは、守り神ってよりも...監視者なんですね＠　この地を外界から隔離しようとする。＠