Skip to content

Commit

Permalink
updating from main branch
Browse files Browse the repository at this point in the history
  • Loading branch information
@orian34
orian34 committed Sep 4, 2024
1 parent 821f535 commit 71f1d4c
Show file tree
Hide file tree
Showing 38 changed files with 609 additions and 1,436 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/deploy.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ jobs:
steps:

# Download the repository
- uses: actions/checkout@v2
- uses: actions/checkout@v3

# Setup Python
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v1
uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python-version }}

Expand Down Expand Up @@ -92,12 +92,12 @@ jobs:

# Upload the release
- name: Upload Release Asset
id: upload-release-asset
id: upload-release-asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
asset_path: ./07th-mod-french-patch-staging/built_release.7z
asset_name: Onikakushi.Patch.FR.${{ github.ref }}.7z
asset_content_type: application/x-7z-compressed
192 changes: 150 additions & 42 deletions Update/onik_001.txt
View file

Large diffs are not rendered by default.

98 changes: 73 additions & 25 deletions Update/onik_002.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1400,7 +1400,7 @@ void main()
NULL, "Il y en avait même trop pour cinq personnes, mais... Cela voulait dire qu'elle avait su pertinemment que les autres seraient là !", Line_Normal);
ClearMessage();
DisableWindow();
// DrawBustshot( 2, "sa_si_aw_a1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 400, TRUE );
if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(2, 4, "sprite/sa2a_akuwarai_a1_", "1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 400, TRUE );}
DrawScene("scene/101", 1000 );


Expand Down Expand Up @@ -1429,8 +1429,8 @@ void main()
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }


// DisableWindow();
// DrawBustshot( 2, "sa_si_bi_a1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );
if (GetGlobalFlag(GHideCG)) {DisableWindow();}
if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(2, 4, "sprite/sa2a_odoroki_a1_", "1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );}

//「襟首を掴むのも反則でございますー！！！￥
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#fcdb77>沙都子</color>", NULL, "<color=#fcdb77>Satoko</color>", NULL, Line_ContinueAfterTyping); }
Expand All @@ -1440,7 +1440,6 @@ void main()
ClearMessage();

DisableWindow();
// FadeBustshot( 2, FALSE, 0, 0, 0, 0, 200, TRUE );
DrawScene("background/jt1", 1000 );

//　激しい戦いは、豊富な運動量と肘によるブロックで序盤、沙都子が優位に立つかに見えたが、箸さばきの致命的な差が形勢を一気にひっくり返す＠
Expand All @@ -1457,7 +1456,7 @@ void main()

//「あぁぁー！　最後のミートボールぅうぅううぅ！！！＠
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#fcdb77>沙都子</color>", NULL, "<color=#fcdb77>Satoko</color>", NULL, Line_ContinueAfterTyping); }
ModPlayVoiceLS(3, 4, "ps2/04/990400040", 540, TRUE);
ModPlayVoiceLS(3, 4, "org/satoko0002", 256, TRUE);
OutputLine(NULL, "「あぁぁー！　最後のミートボールぅうぅううぅ！！！」",
NULL, "— Nooon ! Pas la dernière boulette de viande !", GetGlobalFlag(GLinemodeSp));
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
Expand Down Expand Up @@ -3288,10 +3287,14 @@ void main()
NULL, "Si je le savais...", Line_Normal);
ClearMessage();

//VoiceMatching
if(GetGlobalFlag(GCensor) >= 5){ModCallScriptSection("zonik_002_vm0x_n01","dialog000");}
if(GetGlobalFlag(GCensor) <= 4){ModCallScriptSection("zonik_002_vm00_n01","dialog000");}
//VoiceMatchingEnd
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#956f6e>圭一</color>", NULL, "<color=#956f6e>Keiichi</color>", NULL, Line_ContinueAfterTyping); }
ModPlayVoiceLS(3, 1, "org/keiichi0007", 256, TRUE);
OutputLine(NULL, "「さぁねぇ。",
NULL, "— Aucune idée.", Line_WaitForInput);
ModPlayVoiceLS(3, 1, "org/keiichi0008", 256, TRUE);
OutputLine(NULL, "昔、殺して埋めたバラバラ死体でも確認してるんじゃないすか？」",
NULL, " Elle est peut-etre à la recherche du corps démembré d'une vieille affaire de meurtre ?", GetGlobalFlag(GLinemodeSp));
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }



Expand All @@ -3314,10 +3317,11 @@ void main()
ModSetLayerFilter(1, 256, "sunset");
ModDrawCharacter(1, 8, "sprite/tomi1_def_", "0", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 200, TRUE );

//VoiceMatching
if(GetGlobalFlag(GCensor) >= 5){ModCallScriptSection("zonik_002_vm0x_n01","dialog003");}
if(GetGlobalFlag(GCensor) <= 4){ModCallScriptSection("zonik_002_vm00_n01","dialog003");}
//VoiceMatchingEnd
//「……嫌な事件だったね。…腕が一本、まだ見つかってないんだろ？」 !w5000
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#945c44>富竹</color>", NULL, "<color=#945c44>Tomitake</color>", NULL, Line_ContinueAfterTyping); }
ModPlayVoiceLS(3, 8, "org/tomitake0000", 256, TRUE);
OutputLine(NULL, "「……嫌な事件だったね。…腕が一本、まだ見つかってないんだろ？」",
NULL, "— C'était vraiment une sale histoire... La police n'a jamais retrouvé le deuxième bras, c'est bien ça ?", Line_Continue);

// (backup) SetValidityOfInput( FALSE );
Wait( 5000 );
Expand Down Expand Up @@ -3417,10 +3421,48 @@ void main()
DisableWindow();
ModDrawCharacter(3, 2, "sprite/re2a_warai_a1_", "2", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );

//VoiceMatching
if(GetGlobalFlag(GCensor) >= 2){ModCallScriptSection("zonik_002_vm0x_n01","dialog001");}
if(GetGlobalFlag(GCensor) <= 1){ModCallScriptSection("zonik_002_vm00_n01","dialog001");}
//VoiceMatchingEnd
//「うん聞いて聞いて＠　あ、…あのね＠　あったの＠　ランディーくん人形ッ♪！！＠
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f0953d>レナ</color>", NULL, "<color=#f0953d>Rena</color>", NULL, Line_ContinueAfterTyping); }
ModPlayVoiceLS(3, 2, "org/rena0000", 256, TRUE);
OutputLine(NULL, "「うん聞いて聞いて！",
NULL, "— Oui ! Écoute ça et tiens-toi bien :", Line_WaitForInput);
ModPlayVoiceLS(3, 2, "org/rena0001", 256, TRUE);
OutputLine(NULL, "　あ、…あのね！",
NULL, " Ah ...um, tu vois !", Line_WaitForInput);
ModPlayVoiceLS(3, 2, "org/rena0002", 256, TRUE);
OutputLine(NULL, "　あったの！",
NULL, " je l'ai trouvée !", Line_WaitForInput);
ModPlayVoiceLS(3, 2, "org/rena0003", 256, TRUE);
OutputLine(NULL, "　ケンタくん人形ッ♪！！」",
NULL, " J'ai trouvé un Colonel Sanders !", GetGlobalFlag(GLinemodeSp));
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }



//「ランディーくん人形？＠　…ってあれか、ランディーくんフライドチキンの店の前に必ず置いてある… !d600あの等身大人形の？＠
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#956f6e>圭一</color>", NULL, "<color=#956f6e>Keiichi</color>", NULL, Line_ContinueAfterTyping); }
ModPlayVoiceLS(3, 1, "org/keiichi0009", 256, TRUE);
OutputLine(NULL, "「ケンタくん人形？！",
NULL, "— Un Colonel Sanders ?", Line_WaitForInput);
ModPlayVoiceLS(3, 1, "org/keiichi0010", 256, TRUE);
OutputLine(NULL, "　…ってあれか、ケンタくんフライドチキンの店の前に必ず置いてある…",
NULL, " ... Oh, tu veux parler du Colonel Sanders Fried euh Trucmuche ? La même que celle qui est devant leurs restaurants ?", Line_WaitForInput);
ModPlayVoiceLS(3, 1, "org/keiichi0011", 256, TRUE);
OutputLine(NULL, "あの等身大人形の？」",
NULL, " Tu as trouvé une statue grandeur nature ?", GetGlobalFlag(GLinemodeSp));
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }



//「…そう！　ランディーくん＠　……はぅ……かぁいい……お持ち帰りしたいぃ…☆＠
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f0953d>レナ</color>", NULL, "<color=#f0953d>Rena</color>", NULL, Line_ContinueAfterTyping); }
ModPlayVoiceLS(3, 2, "org/rena0004", 256, TRUE);
OutputLine(NULL, "「…そう！　ケンタくん☆",
NULL, "— Exactement ! Aaah, Colonel Sanders...", Line_WaitForInput);
ModPlayVoiceLS(3, 2, "org/rena0005", 256, TRUE);
OutputLine(NULL, "　……はぅ……かぁいい……お持ち帰りしたいぃ…☆」",
NULL, " il est tellement mimi... Je veux le ramener chez moi...", GetGlobalFlag(GLinemodeSp));
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }



Expand Down Expand Up @@ -3495,10 +3537,15 @@ void main()
NULL, "Les oiseaux rentraient au nid : il était donc grand temps que nous rentrions nous aussi.", Line_Normal);
ClearMessage();

//VoiceMatching
if(GetGlobalFlag(GCensor) >= 2){ModCallScriptSection("zonik_002_vm0x_n01","dialog002");}
if(GetGlobalFlag(GCensor) <= 1){ModCallScriptSection("zonik_002_vm00_n01","dialog002");}
//VoiceMatchingEnd
//「圭一くんが手伝ってくれる☆ !d300…ランディーくんをお持ち帰りできる……はぅ…。＠
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f0953d>レナ</color>", NULL, "<color=#f0953d>Rena</color>", NULL, Line_ContinueAfterTyping); }
ModPlayVoiceLS(3, 2, "org/rena0006", 256, TRUE);
OutputLine(NULL, "「圭一くんが手伝ってくれる☆",
NULL, "— Keiichiiii va m'aider,", Line_WaitForInput);
ModPlayVoiceLS(3, 2, "org/rena0007", 256, TRUE);
OutputLine(NULL, "…ケンタくんをお持ち帰りできる……はぅ…。」",
NULL, " j'vais ramener Colonel Sanders chez moi ! Hauu !", GetGlobalFlag(GLinemodeSp));
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }



Expand Down Expand Up @@ -3650,10 +3697,11 @@ void main()
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }


//VoiceMatching
if(GetGlobalFlag(GCensor) >= 5){ModCallScriptSection("zonik_002_vm0x_n01","dialog004");}
if(GetGlobalFlag(GCensor) <= 4){ModCallScriptSection("zonik_002_vm00_n01","dialog004");}
//VoiceMatchingEnd
//"... …嫌な事件だったね。…腕が一本、まだ見つかってないんだろ？"@\
if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, "“……嫌な事件だったね。…腕が一本、まだ見つかってないんだろ？”",
NULL, "C'était vraiment une sale histoire... La police n'a jamais retrouvé le deuxième bras, c'est bien ça ?", GetGlobalFlag(GLinemodeSp));
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }


//　富竹さんの言った事がそのままなら＠
Expand Down
Loading

0 comments on commit 71f1d4c

Please sign in to comment.