Skip to content

Commit 71f1d4c

Browse files
orian34orian34
committed
updating from main branch
1 parent 821f535 commit 71f1d4c

38 files changed

+609
-1436
lines changed

‎.github/workflows/deploy.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ jobs:
2525
steps:
2626

2727
# Download the repository
28-
- uses: actions/checkout@v2
28+
- uses: actions/checkout@v3
2929

3030
# Setup Python
3131
- name: Set up Python ${{ matrix.python-version }}
32-
uses: actions/setup-python@v1
32+
uses: actions/setup-python@v3
3333
with:
3434
python-version: ${{ matrix.python-version }}
3535

@@ -92,12 +92,12 @@ jobs:
9292

9393
# Upload the release
9494
- name: Upload Release Asset
95-
id: upload-release-asset
95+
id: upload-release-asset
9696
uses: actions/upload-release-asset@v1
9797
env:
9898
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
9999
with:
100-
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
100+
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
101101
asset_path: ./07th-mod-french-patch-staging/built_release.7z
102102
asset_name: Onikakushi.Patch.FR.${{ github.ref }}.7z
103103
asset_content_type: application/x-7z-compressed

‎Update/onik_001.txt

+150-42
Large diffs are not rendered by default.

‎Update/onik_002.txt

+73-25
Original file line numberDiff line numberDiff line change
@@ -1400,7 +1400,7 @@ void main()
14001400
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);
14011401
ClearMessage();
14021402
DisableWindow();
1403-
// DrawBustshot( 2, "sa_si_aw_a1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 400, TRUE );
1403+
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 );}
14041404
DrawScene("scene/101", 1000 );
14051405

14061406

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

14311431

1432-
// DisableWindow();
1433-
// DrawBustshot( 2, "sa_si_bi_a1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );
1432+
if (GetGlobalFlag(GHideCG)) {DisableWindow();}
1433+
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 );}
14341434

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

14421442
DisableWindow();
1443-
// FadeBustshot( 2, FALSE, 0, 0, 0, 0, 200, TRUE );
14441443
DrawScene("background/jt1", 1000 );
14451444

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

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

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

32963299

32973300

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

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

33223326
// (backup) SetValidityOfInput( FALSE );
33233327
Wait( 5000 );
@@ -3417,10 +3421,48 @@ void main()
34173421
DisableWindow();
34183422
ModDrawCharacter(3, 2, "sprite/re2a_warai_a1_", "2", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );
34193423

3420-
//VoiceMatching
3421-
if(GetGlobalFlag(GCensor) >= 2){ModCallScriptSection("zonik_002_vm0x_n01","dialog001");}
3422-
if(GetGlobalFlag(GCensor) <= 1){ModCallScriptSection("zonik_002_vm00_n01","dialog001");}
3423-
//VoiceMatchingEnd
3424+
//「うん聞いて聞いて＠　あ、…あのね＠　あったの＠　ランディーくん人形ッ♪！！＠
3425+
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f0953d>レナ</color>", NULL, "<color=#f0953d>Rena</color>", NULL, Line_ContinueAfterTyping); }
3426+
ModPlayVoiceLS(3, 2, "org/rena0000", 256, TRUE);
3427+
OutputLine(NULL, "「うん聞いて聞いて！",
3428+
NULL, "— Oui ! Écoute ça et tiens-toi bien :", Line_WaitForInput);
3429+
ModPlayVoiceLS(3, 2, "org/rena0001", 256, TRUE);
3430+
OutputLine(NULL, "　あ、…あのね！",
3431+
NULL, " Ah ...um, tu vois !", Line_WaitForInput);
3432+
ModPlayVoiceLS(3, 2, "org/rena0002", 256, TRUE);
3433+
OutputLine(NULL, "　あったの！",
3434+
NULL, " je l'ai trouvée !", Line_WaitForInput);
3435+
ModPlayVoiceLS(3, 2, "org/rena0003", 256, TRUE);
3436+
OutputLine(NULL, "　ケンタくん人形ッ♪！！」",
3437+
NULL, " J'ai trouvé un Colonel Sanders !", GetGlobalFlag(GLinemodeSp));
3438+
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
3439+
3440+
3441+
3442+
//「ランディーくん人形？＠　…ってあれか、ランディーくんフライドチキンの店の前に必ず置いてある… !d600あの等身大人形の？＠
3443+
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#956f6e>圭一</color>", NULL, "<color=#956f6e>Keiichi</color>", NULL, Line_ContinueAfterTyping); }
3444+
ModPlayVoiceLS(3, 1, "org/keiichi0009", 256, TRUE);
3445+
OutputLine(NULL, "「ケンタくん人形？！",
3446+
NULL, "— Un Colonel Sanders ?", Line_WaitForInput);
3447+
ModPlayVoiceLS(3, 1, "org/keiichi0010", 256, TRUE);
3448+
OutputLine(NULL, "　…ってあれか、ケンタくんフライドチキンの店の前に必ず置いてある…",
3449+
NULL, " ... Oh, tu veux parler du Colonel Sanders Fried euh Trucmuche ? La même que celle qui est devant leurs restaurants ?", Line_WaitForInput);
3450+
ModPlayVoiceLS(3, 1, "org/keiichi0011", 256, TRUE);
3451+
OutputLine(NULL, "あの等身大人形の？」",
3452+
NULL, " Tu as trouvé une statue grandeur nature ?", GetGlobalFlag(GLinemodeSp));
3453+
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
3454+
3455+
3456+
3457+
//「…そう！　ランディーくん＠　……はぅ……かぁいい……お持ち帰りしたいぃ…☆＠
3458+
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f0953d>レナ</color>", NULL, "<color=#f0953d>Rena</color>", NULL, Line_ContinueAfterTyping); }
3459+
ModPlayVoiceLS(3, 2, "org/rena0004", 256, TRUE);
3460+
OutputLine(NULL, "「…そう！　ケンタくん☆",
3461+
NULL, "— Exactement ! Aaah, Colonel Sanders...", Line_WaitForInput);
3462+
ModPlayVoiceLS(3, 2, "org/rena0005", 256, TRUE);
3463+
OutputLine(NULL, "　……はぅ……かぁいい……お持ち帰りしたいぃ…☆」",
3464+
NULL, " il est tellement mimi... Je veux le ramener chez moi...", GetGlobalFlag(GLinemodeSp));
3465+
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
34243466

34253467

34263468

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

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

35033550

35043551

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

36523699

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

36583706

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

0 commit comments

Comments
 (0)