Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/jClient #1289

Open
wants to merge 19 commits into
base: main
Choose a base branch
from
Open

Feature/jClient #1289

wants to merge 19 commits into from

Conversation

schwKatz
Copy link
Contributor

新役職「クライアント」追加
 ジャッカル陣営のマッドスニッチ

※ロールベース利用に修正

設定
・ベントを使用できる
・ベントクールダウン
・ベント内での最大時間
・クライアントのタスク数
・インポスターと同じ視界を持つ
・タスクが終わるとジャッカルからも視認できる
・ジャッカル死亡後のモード
 なし、後追い

README-EN.md Outdated
Team : Neutral(Jackal)<br>
Basis : Crewmate or Engineer<br>

The Client belong to team Jackal, like Inposter's Madmates.<br>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

採用可否に関わらず)
Inpost"o"rですね

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

誤字です
(説明の流用元の誤りをそのまま引き継いでしまいました)
修正します

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Impostorでは......?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nもだわ

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

すみません。
翻訳全般見直しします。
(コピペしたところ色々バグってます・・・)

Copy link
Collaborator

@Hyz-sui Hyz-sui left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

採用可否がまだなので大雑把な指摘にとどめておきます

README-EN.md Show resolved Hide resolved
README-EN.md Outdated
Team : Neutral(Jackal)<br>
Basis : Crewmate or Engineer<br>

The Client belong to team Jackal, like Inpostor's Madmates.<br>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

文脈的にここのインポスターは複数だと思うのでImpostors' Madmatesが正しいと思いますが,別にインポスターがマッドメイトを所有しているわけではないのでMadmates for Impostors(インポスターにとってのマッドメイトのように,...)あたりが適切に思います

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

翻訳系は全般的に見直します

README-EN.md Outdated
Comment on lines 792 to 798
| Client Can Use Vent |
| Client Vent Cooldown |
| Client Max Time In Vents (s) |
| Client Tasks |
| Client Have Impostor Vision |
| Can see task finished Client from Jackal |
| After Jackal Dead Mode |
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

全角スペースが混ざっているのと,翻訳とオプション名がズレているのをなんとかしてほしいです

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

修正します

README.md Show resolved Hide resolved
README.md Outdated
Comment on lines 768 to 769
ジャッカル陣営に属しますが、クライアントとジャッカルはお互い誰かはわかりません。<br>
タスクを全て完了させるとジャッカルを認識できるようになります。<br>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

日英のreadmeで情報量にかなり差があるようですが,何かそうした理由はありますか?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

翻訳系は全般的に見直します

Comment on lines 81 to 82
"JClientAfterJackalDeadMode.None",
"JClientAfterJackalDeadMode.Following"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

インデントに違和感がありますが,なにか理由はありますか?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

不備です。インデント揃えます。

Comment on lines 86 to 87
AURoleOptions.EngineerCooldown = JClient.VentCooldown;
AURoleOptions.EngineerInVentMaxTime = JClient.VentMaxTime;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

JClient.が冗長です

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

修正します。

{
seen ??= seer;
if (!CanAlsoBeExposedToJackal ||
!seer.Is(CustomRoles.Jackal) || seen.GetRoleClass() is not JClient jclient ||
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

特別な事情がなければキャメルケースで命名してほしいです

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jclient ⇒ jClient の指摘でよかったでしょうか?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

そんな感じです
それかシンプルにclientでもいいと思います

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

clientで統一したいと思います

//ジャッカル死亡時のクライアント状態変化
if (AfterJackalDead == AfterJackalDeadMode.None) return;

var jackal = Main.AllPlayerControls.ToArray().Where(pc => pc.Is(CustomRoles.Jackal)).FirstOrDefault();
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ToArrayはないほうがいいと思います

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

処理冗長ですね。修正します。

Comment on lines 120 to 125
if (jackal != null && !jackal.Data.IsDead &&
!Main.AfterMeetingDeathPlayers.ContainsKey(jackal.PlayerId)) return;

Logger.Info($"jackal:dead, mode:{AfterJackalDead}", "JClient.AfterMeetingTasks");

if (Player.Data.IsDead || !MyTaskState.IsTaskFinished) return;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IsAliveではなくIsDeadを使っている理由はありますか?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

旧処理の修正漏れです。IsAlive使用します。

(JClient)
(.ToArray())
.IsAlive()を使用
 JClientInfoLong
 設定名の変更
 一部翻訳言語の追記
 カウント、勝利条件の追記
 役職説明の修正
 設定名のゲーム内設定名との統合
 英語翻訳の見直し
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants