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

# Conflicts:
#	Update/onik_015_03.txt
This commit is contained in:
Jáchym Toušek
2017-12-30 23:38:02 +01:00

View File

@@ -54,7 +54,7 @@ void main()
// DrawSceneWithMask( "black", "left", 0, 0, 1300 );
// DrawSceneWithMask( "bg_112", "left", 0, 0, 1300 );
ModDrawCharacterWithFiltering(3, 19, "character/normal/Kuma_Def_", "0", "right", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 300, TRUE );
ModDrawCharacterWithFiltering(3, 19, "character/normal/kuma_Def_", "0", "right", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 300, TRUE );
//「……うーん、どうしてこれが五萬切りなんすか@ 待ちが狭くなっちゃうっすよ?@
@@ -98,7 +98,7 @@ void main()
// DrawBustshot( 2, "oi_si_wa_a1", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );
ModDrawCharacterWithFiltering(2, 11, "character/normal/oisi1_2_", "0", "right", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 20, 300, TRUE );
// DrawBustshot( 1, "Kuma_def", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );
// DrawBustshot( 1, "kuma_def", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );
//「熊ちゃん、河を見て下さい@五萬は全員切ってますから安牌なんですよ@終盤で形テンに走った誰かがダマで待ってたら嫌でしょ。¥
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#a59da9>大石</color>", NULL, "<color=#a59da9>Ooishi</color>", NULL, Line_ContinueAfterTyping); }
@@ -120,8 +120,8 @@ void main()
ClearMessage();
DisableWindow();
// DrawBustshot( 3, "Kuma_ikari", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );
ModDrawCharacterWithFiltering(3, 19, "character/normal/Kuma_Ikari_", "0", "right", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 300, TRUE );
// DrawBustshot( 3, "kuma_ikari", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );
ModDrawCharacterWithFiltering(3, 19, "character/normal/kuma_Ikari_", "0", "right", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 300, TRUE );
//「…納得いかないっすねぇ…@わざわざ自分で当たり牌減らすなんて。@
@@ -610,7 +610,7 @@ void main()
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
DisableWindow();
ModDrawCharacterWithFiltering(1, 19, "character/normal/Kuma_Def_", "0", "right", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 300, TRUE );
ModDrawCharacterWithFiltering(1, 19, "character/normal/kuma_Def_", "0", "right", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 300, TRUE );
//「了解っす!!!¥
@@ -1234,7 +1234,7 @@ void main()
ClearMessage();
DrawScene( "bg_192", 1000 );
ModDrawCharacter(3, 19, "character/normal/Kuma_Def_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );
ModDrawCharacter(3, 19, "character/normal/kuma_Def_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );
//「大石さん、車はOKっす!!@ 大石さん…?!¥