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 5, 2024
1 parent 7e771b3 commit a72e574
Show file tree
Hide file tree
Showing 62 changed files with 1,408 additions and 2,727 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: Watanagashi.Patch.FR.${{ github.ref }}.7z
asset_content_type: application/x-7z-compressed
2 changes: 2 additions & 0 deletions Update/omake_02.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,10 +203,12 @@ void main()
DrawScene("white", 200 );

DrawBustshot(5, "scene/001a", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 50, TRUE );
if (GetGlobalFlag(GHideCG)) {DrawBustshot(5, "background/furiker_a", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 50, TRUE );}
ShakeScreen( 1, 50, 20, 3, 0, );
PlaySE( 3, "wa_005", 56, 64 );
Wait( 100 );
DrawBustshot(5, "scene/001b", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 50, TRUE );
if (GetGlobalFlag(GHideCG)) {DrawBustshot(5, "background/furiker_b", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 50, TRUE );}
PlaySE( 3, "wa_005", 56, 64 );
Wait( 100 );
PlaySE( 3, "wa_005", 56, 64 );
Expand Down
34 changes: 27 additions & 7 deletions Update/wata_001.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3064,10 +3064,10 @@ void main()
NULL, "— Vous êtes prêts ? Je lis :", Line_WaitForInput);
ModPlayVoiceLS(4, 0, "ps3/s19/00/mas99002", 256, TRUE);
OutputLine(NULL, "…「犬も歩けばくたびれる」〜。」",
NULL, " “Un chien qui court cinq-cents courses cesse de courir pour claudiquer cahin-cahan.”", Line_Continue);
NULL, " “Un chien qui court cinq-cents courses cesse de courir pour claudiquer cahin-cahan.”", Line_ContinueAfterTyping);

// (backup) SetValidityOfInput( FALSE );
Wait( 1500 );
Wait( 500 );
// (backup) SetValidityOfInput( TRUE );
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_Continue); }

Expand Down Expand Up @@ -4561,18 +4561,37 @@ void main()
PlaySE( 3, "wa_007", 56, 64 );

//そんな時間を過ごして欲しくないんだよッ！！！！＠
ModPlayVoiceLS(4, 1, "ps3/s19/01/hr_kei09900_02", 256, TRUE);
ModPlayVoiceLS(4, 1, "org/keiichi1003", 256, TRUE);
OutputLine(NULL, "そんな時間を過ごして欲しくないんだよッ！！！！！",
NULL, " J'ai pas envie de vous voir finir comme moi !", GetGlobalFlag(GLinemodeSp));
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }


//　自分に素直になれッ！！＠夢を追え！＠そしてかなえろ！！＠俺がかなえてやるッ！！＠俺がだぁああぁあぁあッ！！！！」/

//VoiceMatching
if(GetGlobalFlag(GCensor) >= 2){ModCallScriptSection("zwata_001_vm0x_n01","dialog003");}
if(GetGlobalFlag(GCensor) <= 1){ModCallScriptSection("zwata_001_vm00_n01","dialog003");}
//VoiceMatchingEnd
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#956f6e>圭一</color>", NULL, "<color=#956f6e>Keiichi</color>", NULL, Line_ContinueAfterTyping); }
ModPlayVoiceLS(4, 1, "org/keiichi1004", 256, TRUE);
OutputLine(NULL, "　自分に素直になれッ！！！",
NULL, "Soyez honnête avec vous-même !!", Line_WaitForInput);
ModPlayVoiceLS(4, 1, "org/keiichi1005", 256, TRUE);
OutputLine(NULL, "夢を追え！！",
NULL, " Alors n'ayez pas peur de poursuivre vos rêves !", Line_WaitForInput);
ModPlayVoiceLS(4, 1, "org/keiichi1006", 256, TRUE);
OutputLine(NULL, "そしてかなえろ！！！",
NULL, " Et faites en sorte de les réaliser !", Line_WaitForInput);
ModPlayVoiceLS(4, 1, "org/keiichi1007", 256, TRUE);
OutputLine(NULL, "俺がかなえてやるッ！！！",
NULL, " Je peux vous aider à le faire !", Line_WaitForInput);
ModPlayVoiceLS(4, 1, "org/keiichi1008", 256, TRUE);
OutputLine(NULL, "俺がだぁああぁあぁあッ！！！！」",
NULL, " Ici et aujourd'hui !", Line_ContinueAfterTyping);

PlaySE( 3, "wa_006", 56, 64 );
ShakeScreen( 1, 50, 20, 4, 0, );

OutputLineAll(NULL, "", GetGlobalFlag(GLinemodeSp));

if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }

//　......男たちが世代を超えて価値観を共有した...瞬間だった￥
if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
Expand Down Expand Up @@ -5691,6 +5710,7 @@ void main()
ClearMessage();
DisableWindow();
DrawSceneWithMask("scene/006", "m1", 0, 0, 300 );
if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(1, 2, "sprite/re2a_warai_a1_", "2", -240, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 300, TRUE );}

//「えッ？！？＠　くれるの？＠　レナに？＠　ありがと～～～！！！！！＠
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f0953d>レナ</color>", NULL, "<color=#f0953d>Rena</color>", NULL, Line_ContinueAfterTyping); }
Expand Down
99 changes: 71 additions & 28 deletions Update/wata_002.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1378,10 +1378,10 @@ void main()

//「そこは抜かりないよ～＠　圭ちゃん用にちゃんとＸＬサイズも用意してあるもんねー！＠
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#5ec69a>魅音</color>", NULL, "<color=#5ec69a>Mion</color>", NULL, Line_ContinueAfterTyping); }
ModPlayVoiceLS(4, 3, "ps3/s19/03/990300548", 256, TRUE);
ModPlayVoiceLS(4, 3, "org/mion1004", 256, TRUE);
OutputLine(NULL, "「そこは抜かりないよ〜！",
NULL, "— Ah, mais j'ai pensé à tout, il n'y coupera pas !", Line_WaitForInput);
ModPlayVoiceLS(4, 3, "ps3/s19/03/990300549", 256, TRUE);
ModPlayVoiceLS(4, 3, "org/mion1005", 256, TRUE);
OutputLine(NULL, "　圭ちゃん用にちゃんとＸＬサイズも用意してあるもんねー！！",
NULL, " J'ai pensé à en ramener un en taille XL, rien que pour lui !", GetGlobalFlag(GLinemodeSp));
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
Expand All @@ -1391,10 +1391,10 @@ void main()

//　さぁ圭ちゃん、覚悟はいい？＠　メイドコスさせて外をねり歩かせてあげるよ～！！＠
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#5ec69a>魅音</color>", NULL, "<color=#5ec69a>Mion</color>", NULL, Line_ContinueAfterTyping); }
ModPlayVoiceLS(4, 3, "ps3/s19/03/990300550", 256, TRUE);
ModPlayVoiceLS(4, 3, "org/mion1006", 256, TRUE);
OutputLine(NULL, "　さぁ圭ちゃん、覚悟はいい？！",
NULL, "Alors, p'tit gars, tu es prêt ?", Line_WaitForInput);
ModPlayVoiceLS(4, 3, "ps3/s19/03/990300551", 256, TRUE);
ModPlayVoiceLS(4, 3, "org/mion1007", 256, TRUE);
OutputLine(NULL, "　メイドコスさせて外をねり歩かせてあげるよ〜！！！",
NULL, " Je veillerai personnellement à ce que tu perdes pour te faire faire marcher dehors dans cet accoutrement !", GetGlobalFlag(GLinemodeSp));
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
Expand All @@ -1404,10 +1404,13 @@ void main()

//　カチューシャからガーターベルトにショーツまで...ぜ～んぶ揃ってるんだからねぇ！！＠

//VoiceMatching
if(GetGlobalFlag(GCensor) >= 4){ModCallScriptSection("zwata_002_vm0x_n02","dialog001");}
if(GetGlobalFlag(GCensor) <= 3){ModCallScriptSection("zwata_002_vm00_n02","dialog001");}
//VoiceMatchingEnd
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#5ec69a>魅音</color>", NULL, "<color=#5ec69a>Mion</color>", NULL, Line_ContinueAfterTyping); }

ModPlayVoiceLS(4, 3, "org/mion1008", 256, TRUE);
OutputLine(NULL, "　カチューシャからガーターベルトにショーツまで…ぜ〜んぶ揃ってるんだからねぇ！！」",
NULL, "J'ai tout ce qu'il faut, la coiffe avec serre-tête, le porte-jarretelles, les dessous en soie fine... absolument tout !", GetGlobalFlag(GLinemodeSp));

if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }


//「ぜぜ、絶対ヘンだ！！　なんでそんなものがサイズ毎に全部ロッカーに入ってるんだよ！！￥
Expand Down Expand Up @@ -2987,10 +2990,13 @@ void main()

//「......メイドさん衣装、カチューシャ、ガーターベルト付きで１位の人の荷物を運ぶのですよ。＠

//VoiceMatching
if(GetGlobalFlag(GCensor) >= 4){ModCallScriptSection("zwata_002_vm0x_n02","dialog002");}
if(GetGlobalFlag(GCensor) <= 3){ModCallScriptSection("zwata_002_vm00_n02","dialog002");}
//VoiceMatchingEnd
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#6972c1>梨花</color>", NULL, "<color=#6972c1>Rika</color>", NULL, Line_ContinueAfterTyping); }

ModPlayVoiceLS(4, 5, "org/rika1000", 256, TRUE);
OutputLine(NULL, "「……メイドさん衣装、カチューシャ、ガーターベルト付きで１位の人の荷物を運ぶのですよ。」",
NULL, "— Le perdant doit porter les affaires du grand gagnant jusque chez lui, habillé en soubrette, avec la coiffe, le porte-jarretelles et tout le toutim.", GetGlobalFlag(GLinemodeSp));

if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }


//「のわあああぁあぁあぁああぁああッ！！！」/
Expand Down Expand Up @@ -3210,11 +3216,13 @@ void main()
PlayBGM( 1, "msys03", 56, 0 );

//「男がガーターベルトのつけ方を習って、人生のどこで役に立つってーんだよぉおおぉ！！！＠
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#956f6e>圭一</color>", NULL, "<color=#956f6e>Keiichi</color>", NULL, Line_ContinueAfterTyping); }

//VoiceMatching
if(GetGlobalFlag(GCensor) >= 4){ModCallScriptSection("zwata_002_vm0x_n02","dialog003");}
if(GetGlobalFlag(GCensor) <= 3){ModCallScriptSection("zwata_002_vm00_n02","dialog003");}
//VoiceMatchingEnd
ModPlayVoiceLS(4, 1, "ps3/s19/01/hr_kei11480", 256, TRUE);
OutputLine(NULL, "「男がガーターベルトのつけ方を習って、人生のどこで役に立つってーんだよぉおおぉ！！！」",
NULL, "— À quoi ça peut servir à un homme de savoir comment on met un porte-jarretelles, hein ?", GetGlobalFlag(GLinemodeSp));

if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }


DisableWindow();
Expand All @@ -3240,11 +3248,33 @@ void main()
ModDrawCharacterWithFiltering(1, 2, "sprite/re1a_hau_a1_", "1", "left", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 0, 300, TRUE );

//「そ、そうだよ...＠大騒ぎしたら......!w800そ、その!w1000......ぱ、ぱんつまで女の子のだって...バ、バレちゃうよ？＠
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f0953d>レナ</color>", NULL, "<color=#f0953d>Rena</color>", NULL, Line_ContinueAfterTyping); }
ModPlayVoiceLS(4, 2, "ps3/s19/02/990200506", 256, TRUE);
OutputLine(NULL, "「そ、そうだよ…。",
NULL, "— Elle a raison, tu sais ?", Line_WaitForInput);

//VoiceMatching
if(GetGlobalFlag(GCensor) >= 4){ModCallScriptSection("zwata_002_vm0x_n02","dialog004");}
if(GetGlobalFlag(GCensor) <= 3){ModCallScriptSection("zwata_002_vm00_n02","dialog004");}
//VoiceMatchingEnd
ModPlayVoiceLS(4, 2, "ps3/s19/02/990200507", 256, TRUE);
OutputLine(NULL, "大騒ぎしたら……",
NULL, " Si jamais tu attires trop l'attention,", Line_Continue);

// (backup) SetValidityOfInput( FALSE );
Wait( 800 );
// (backup) SetValidityOfInput( TRUE );

OutputLine(NULL, "そ、その",
NULL, " les gens finiront même par savoir que tu portes…", Line_Continue);

// (backup) SetValidityOfInput( FALSE );
Wait( 1000 );
// (backup) SetValidityOfInput( TRUE );

OutputLine(NULL, "……ぱ、ぱんつまで女の子のだって…バ、バレちゃうよ？」",
NULL, " que tu portes un... un tanga en dentelle !", GetGlobalFlag(GLinemodeSp));



//　!s200ぅごあぁあぁあああああぁああぁあぁああぁッ！！!sd@
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }

//!s200
SetSpeedOfMessage( TRUE, 100, );
Expand Down Expand Up @@ -3340,11 +3370,19 @@ void main()
ModDrawCharacter(1, 3, "sprite/me1b_akuwarai_a1_", "2", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 200, TRUE );

//「そうそう＠男の人ってガーターベルトとかって好きなんだよねぇ～＠どうよ、それを自分で身に付けてみた感想は☆＠
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#5ec69a>魅音</color>", NULL, "<color=#5ec69a>Mion</color>", NULL, Line_ContinueAfterTyping); }
ModPlayVoiceLS(4, 3, "ps3/s19/03/990300622", 256, TRUE);
OutputLine(NULL, "「そうそう。",
NULL, "— Tiens au fait, dis voir un truc.", Line_WaitForInput);

//VoiceMatching
if(GetGlobalFlag(GCensor) >= 4){ModCallScriptSection("zwata_002_vm0x_n02","dialog005");}
if(GetGlobalFlag(GCensor) <= 3){ModCallScriptSection("zwata_002_vm00_n02","dialog005");}
//VoiceMatchingEnd
ModPlayVoiceLS(4, 3, "ps3/s19/03/990300623", 256, TRUE);
OutputLine(NULL, "男の人ってガーターベルトとかって好きなんだよねぇ〜。",
NULL, " Les mecs, ils adorent les porte-jarretelles, non ?", Line_WaitForInput);

ModPlayVoiceLS(4, 3, "ps3/s19/03/990300624", 256, TRUE);
OutputLine(NULL, "どうよ、それを自分で身に付けてみた感想は☆」",
NULL, " Ça te fait quoi d'en porter un ?", GetGlobalFlag(GLinemodeSp));
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }


//「かか、感想なんて別に、そ、そんな......ッ＠　バカやめろ＠　めくるなー！！＠
Expand All @@ -3362,11 +3400,16 @@ void main()


//「きゅっとするでしょ＠歩く度に肌を擦るの...ちゃんと感じてる～？＠
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#5ec69a>魅音</color>", NULL, "<color=#5ec69a>Mion</color>", NULL, Line_ContinueAfterTyping); }

//VoiceMatching
if(GetGlobalFlag(GCensor) >= 4){ModCallScriptSection("zwata_002_vm0x_n02","dialog006");}
if(GetGlobalFlag(GCensor) <= 3){ModCallScriptSection("zwata_002_vm00_n02","dialog006");}
//VoiceMatchingEnd
ModPlayVoiceLS(4, 3, "ps3/s19/03/990300625", 256, TRUE);
OutputLine(NULL, "「きゅっとするでしょ。",
NULL, "— Ça tire un peu, non ?", Line_WaitForInput);
ModPlayVoiceLS(4, 3, "ps3/s19/03/990300626", 256, TRUE);
OutputLine(NULL, "歩く度に肌を擦るの…ちゃんと感じてる〜？」",
NULL, " Et chaque fois que tu fais un pas, ça frotte légèrement contre la peau entre tes cuisses... tu le sens ?", GetGlobalFlag(GLinemodeSp));

if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }


//　や、やめろ～...＠　そんなヘンなことを耳元で言わないでくれ～！＠
Expand Down
15 changes: 7 additions & 8 deletions Update/wata_003.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,16 +159,15 @@ void main()

//「普段は温厚ないい先生なんだけどねぇ＠...どういうわけかカレーにだけはうるさいんだよ＠　偏執的なくらいに！！＠
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#5ec69a>魅音</color>", NULL, "<color=#5ec69a>Mion</color>", NULL, Line_ContinueAfterTyping); }
ModPlayVoiceLS(4, 3, "ps3/s19/03/500300001", 256, TRUE);
ModPlayVoiceLS(4, 3, "org/mion1009", 256, TRUE);
OutputLine(NULL, "「普段は温厚ないい先生なんだけどねぇ。",
NULL, "— Eh bien, d'habitude, elle est très gentille et très indulgente.", Line_WaitForInput);
ModPlayVoiceLS(4, 3, "ps3/s19/03/500300002", 256, TRUE);
ModPlayVoiceLS(4, 3, "org/mion1010", 256, TRUE);
OutputLine(NULL, "…どういうわけかカレーにだけはうるさいんだよ！",
NULL, " On ne sait pas trop pourquoi, mais dès qu'on parle de curry, alors là, elle n'arrête plus !", Line_WaitForInput);
//VoiceMatching
if(GetGlobalFlag(GCensor) >= 2){ModCallScriptSection("zwata_003_vm0x_n01","dialog001");}
if(GetGlobalFlag(GCensor) <= 1){ModCallScriptSection("zwata_003_vm00_n01","dialog001");}
//VoiceMatchingEnd
ModPlayVoiceLS(4, 3, "org/mion1011", 256, TRUE);
OutputLine(NULL, "　偏執的なくらいに！！」",
NULL, " Faut croire qu'elle en rafolle.", GetGlobalFlag(GLinemodeSp));
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }


Expand Down Expand Up @@ -4207,7 +4206,7 @@ void main()
NULL, " des plats nés de notre consommation du riz !", Line_Continue);
DisableWindow();
DrawScene("white", 10 );
DrawBustshot(5, "background/furiker_b", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 50, TRUE );
DrawBustshot(5, "background/furiker_b", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 5, 50, TRUE );
PlaySE( 3, "wa_007", 56, 64 );
ShakeScreen( 1, 50, 20, 3, 0, );
ModDrawCharacter(2, 22, "sprite/tie_2_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 0, FALSE );
Expand Down Expand Up @@ -5910,7 +5909,7 @@ void main()


DisableWindow();
// DrawBustshot( 2, "si_si_wa_b1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );
if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(2, 6, "sprite/si1b_warai_b1_", "2", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );}
DrawScene("scene/105a", 1000 );

//「ありゃ...、!w800......図星を突かれちゃって何だかがっかりですけど、これ。＠
Expand Down
Loading

0 comments on commit a72e574

Please sign in to comment.