From ac022b377ea7b90ff3b1524b9cdf9d58b428611f Mon Sep 17 00:00:00 2001 From: Asayu233 <76391894+Asayu233@users.noreply.github.com> Date: Sat, 2 Jul 2022 13:41:53 +0800 Subject: [PATCH] Update FormMain.cs --- Source/GrasscutterTools/Forms/FormMain.cs | 29 +++++++---------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/Source/GrasscutterTools/Forms/FormMain.cs b/Source/GrasscutterTools/Forms/FormMain.cs index 5bedc25..a169ba9 100644 --- a/Source/GrasscutterTools/Forms/FormMain.cs +++ b/Source/GrasscutterTools/Forms/FormMain.cs @@ -720,16 +720,21 @@ namespace GrasscutterTools.Forms AvatarInputChanged(); } + private void NUDAvatarConstellation_ValueChanged(object sender, EventArgs e) + { + AvatarInputChanged(); + } + private void AvatarInputChanged() { if (CmbAvatar.SelectedIndex >= 0) - GenAvatar(GameData.Avatars.Ids[CmbAvatar.SelectedIndex], (int)NUDAvatarLevel.Value); + GenAvatar(GameData.Avatars.Ids[CmbAvatar.SelectedIndex], (int)NUDAvatarLevel.Value, (int)NUDAvatarConstellation.Value); } - private void GenAvatar(int avatarId, int level) + private void GenAvatar(int avatarId, int level, int constellation) { if (ChkNewCommand.Checked) - SetCommand("/give", $"{avatarId} lv{level}"); + SetCommand("/give", $"{avatarId} lv{level} c{constellation}"); else SetCommand("/givechar", $"{avatarId} {level}"); } @@ -942,24 +947,6 @@ namespace GrasscutterTools.Forms LblStatPercent.Visible = stat.Percent; LblStatTip.Text = stat.Tip; - if (CmbStat.SelectedIndex == 3 && CmbLanguage.SelectedIndex != 0) - { - GrpSetStats.Left = 19; - GrpSetStats.Width = 560; - CmbStat.Left = 160; - NUDStat.Left = 324; - LblStatTip.Left = 0; - - } - else - { - GrpSetStats.Left = 135; - GrpSetStats.Width = 332; - CmbStat.Left = 43; - NUDStat.Left = 207; - LblStatTip.Left = 40; - } - SetCommand("/setstats", $"{stat.ArgName} {NUDStat.Value}{(stat.Percent ? "%" : "")}"); }