From 0f9bfcf105c5f8417cc75fa982c30054fcd4c9ea Mon Sep 17 00:00:00 2001 From: Calyx Hikari Date: Sun, 7 Apr 2024 08:49:06 +0800 Subject: [PATCH] Attempt to add Gender selection --- .../UI/AvatarCodeForm.Designer.cs | 12 ++--- WzComparerR2.Avatar/UI/AvatarForm.Designer.cs | 33 +++++++++--- WzComparerR2.Avatar/UI/AvatarForm.cs | 52 +++++++++++++++++-- .../UI/AvatarPartButtonItem.Designer.cs | 20 +++---- .../UI/AvatarPartButtonItem.cs | 4 +- 5 files changed, 92 insertions(+), 29 deletions(-) diff --git a/WzComparerR2.Avatar/UI/AvatarCodeForm.Designer.cs b/WzComparerR2.Avatar/UI/AvatarCodeForm.Designer.cs index eca30f4b..77a43ccf 100644 --- a/WzComparerR2.Avatar/UI/AvatarCodeForm.Designer.cs +++ b/WzComparerR2.Avatar/UI/AvatarCodeForm.Designer.cs @@ -47,7 +47,7 @@ private void InitializeComponent() this.buttonX1.Size = new System.Drawing.Size(75, 23); this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.buttonX1.TabIndex = 0; - this.buttonX1.Text = "확인"; + this.buttonX1.Text = "OK"; // // buttonX2 // @@ -60,7 +60,7 @@ private void InitializeComponent() this.buttonX2.Size = new System.Drawing.Size(75, 23); this.buttonX2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.buttonX2.TabIndex = 1; - this.buttonX2.Text = "취소"; + this.buttonX2.Text = "キャンセル"; // // textBoxX1 // @@ -97,7 +97,7 @@ private void InitializeComponent() this.checkBoxX1.Size = new System.Drawing.Size(51, 18); this.checkBoxX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.checkBoxX1.TabIndex = 3; - this.checkBoxX1.Text = "덮기"; + this.checkBoxX1.Text = "覆う"; // // checkBoxX2 // @@ -112,7 +112,7 @@ private void InitializeComponent() this.checkBoxX2.Size = new System.Drawing.Size(51, 18); this.checkBoxX2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.checkBoxX2.TabIndex = 4; - this.checkBoxX2.Text = "추가"; + this.checkBoxX2.Text = "追加"; // // labelX1 // @@ -125,7 +125,7 @@ private void InitializeComponent() this.labelX1.Name = "labelX1"; this.labelX1.Size = new System.Drawing.Size(56, 18); this.labelX1.TabIndex = 5; - this.labelX1.Text = "적용방식 :"; + this.labelX1.Text = "適用方式 :"; // // AvatarCodeForm // @@ -142,7 +142,7 @@ private void InitializeComponent() this.MinimizeBox = false; this.Name = "AvatarCodeForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "아이템 코드 입력"; + this.Text = "アイテムコード入力"; this.ResumeLayout(false); this.PerformLayout(); diff --git a/WzComparerR2.Avatar/UI/AvatarForm.Designer.cs b/WzComparerR2.Avatar/UI/AvatarForm.Designer.cs index b4004199..27e8cf2a 100644 --- a/WzComparerR2.Avatar/UI/AvatarForm.Designer.cs +++ b/WzComparerR2.Avatar/UI/AvatarForm.Designer.cs @@ -66,7 +66,9 @@ private void InitializeComponent() this.btnCharac = new DevComponents.DotNetBar.ButtonItem(); this.btnMale = new DevComponents.DotNetBar.ButtonItem(); this.btnFemale = new DevComponents.DotNetBar.ButtonItem(); - this.btnLaraF = new DevComponents.DotNetBar.ButtonItem(); + this.btnZero = new DevComponents.DotNetBar.ButtonItem(); + this.btnPathfinder = new DevComponents.DotNetBar.ButtonItem(); + this.btnLara = new DevComponents.DotNetBar.ButtonItem(); this.btnReset = new DevComponents.DotNetBar.ButtonItem(); this.btnLock = new DevComponents.DotNetBar.ButtonItem(); this.btnSaveAsGif = new DevComponents.DotNetBar.ButtonItem(); @@ -616,7 +618,9 @@ private void InitializeComponent() this.btnCharac.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btnMale, this.btnFemale, - this.btnLaraF}); + this.btnZero, + this.btnPathfinder, + this.btnLara}); this.btnCharac.Tooltip = "初期化"; // // btnMale @@ -631,11 +635,24 @@ private void InitializeComponent() this.btnFemale.Text = "女性キャラ"; this.btnFemale.Click += new System.EventHandler(this.btnFemale_Click); // - // btnLaraF + // btnZero // - this.btnLaraF.Name = "btnLaraF"; - this.btnLaraF.Text = "女性ララ"; - this.btnLaraF.Click += new System.EventHandler(this.btnLaraF_Click); + this.btnZero.Name = "btnZero"; + this.btnZero.Text = "ゼロ"; + this.btnZero.Click += new System.EventHandler(this.btnZero_Click); + // + // btnPathfinder + // + this.btnPathfinder.Name = "btnPathfinder"; + this.btnPathfinder.Text = "パスファインダー"; + this.btnPathfinder.Click += new System.EventHandler(this.btnPathfinder_Click); + // + // + // btnLara + // + this.btnLara.Name = "btnLara"; + this.btnLara.Text = "ララ"; + this.btnLara.Click += new System.EventHandler(this.btnLara_Click); // // btnReset // @@ -793,7 +810,9 @@ private void InitializeComponent() private DevComponents.DotNetBar.ButtonItem btnLock; private DevComponents.DotNetBar.ButtonItem btnMale; private DevComponents.DotNetBar.ButtonItem btnFemale; - private DevComponents.DotNetBar.ButtonItem btnLaraF; + private DevComponents.DotNetBar.ButtonItem btnZero; + private DevComponents.DotNetBar.ButtonItem btnPathfinder; + private DevComponents.DotNetBar.ButtonItem btnLara; private DevComponents.DotNetBar.ButtonItem btnSaveAsGif; private DevComponents.DotNetBar.Controls.ComboBoxEx cmbEar; private DevComponents.DotNetBar.LabelX labelX5; diff --git a/WzComparerR2.Avatar/UI/AvatarForm.cs b/WzComparerR2.Avatar/UI/AvatarForm.cs index 5a6a4c47..b4305d64 100644 --- a/WzComparerR2.Avatar/UI/AvatarForm.cs +++ b/WzComparerR2.Avatar/UI/AvatarForm.cs @@ -1184,12 +1184,56 @@ private void btnFemale_Click(object sender, EventArgs e) } } - private void btnLaraF_Click(object sender, EventArgs e) + private void btnLara_Click(object sender, EventArgs e) { - if (this.avatar.Parts.All(part => part == null) - || MessageBoxEx.Show("基本女ララを呼びますか？", "確認") == DialogResult.OK) + switch (MessageBoxEx.Show("基本ララを呼びますか？\r\n\r\nYes - 女\r\nNo - 男", "確認", MessageBoxButtons.YesNoCancel)) + { + case DialogResult.Yes: + LoadCode("2003,12003,51484,61183,1051667,1073551,1372243", 0); + return; + + case DialogResult.No: + LoadCode("2003,12003,50469,60193,1050593,1073551,1372243", 0); + return; + + case DialogResult.Cancel: + default: + return; + } + } + private void btnZero_Click(object sender, EventArgs e) + { + switch (MessageBoxEx.Show("基本ゼロを呼びますか？\r\n\r\nYes - アルファ\r\nNo - ベター", "確認", MessageBoxButtons.YesNoCancel)) + { + case DialogResult.Yes: + LoadCode("2000,12000,20294,36633,1052606,1072814,1082521,1102552,1572001", 0); + return; + + case DialogResult.No: + LoadCode("2000,12000,21290,37623,1052607,1072814,1082521,1102552,1562001", 0); + return; + + case DialogResult.Cancel: + default: + return; + } + } + + private void btnPathfinder_Click(object sender, EventArgs e) + { + switch (MessageBoxEx.Show("基本パスファインダーを呼びますか？\r\n\r\nYes - 女\r\nNo - 男", "確認", MessageBoxButtons.YesNoCancel)) { - LoadCode("2003,12003,51484,61183,1051667,1073551,1372243", 0); + case DialogResult.Yes: + LoadCode("2000,12000,28141,47525,1005313,1053402,1073334,1592000", 0); + return; + + case DialogResult.No: + LoadCode("2000,12000,27135,46025,1005313,1053402,1073334,1592000", 0); + return; + + case DialogResult.Cancel: + default: + return; } } diff --git a/WzComparerR2.Avatar/UI/AvatarPartButtonItem.Designer.cs b/WzComparerR2.Avatar/UI/AvatarPartButtonItem.Designer.cs index cd810346..9c946c1e 100644 --- a/WzComparerR2.Avatar/UI/AvatarPartButtonItem.Designer.cs +++ b/WzComparerR2.Avatar/UI/AvatarPartButtonItem.Designer.cs @@ -43,66 +43,66 @@ private void InitializeComponent() // btnItemShow // this.btnItemShow.Name = "btnItemShow"; - this.btnItemShow.Text = "보이기/감추기"; + this.btnItemShow.Text = "表示/隠す"; // // btnItemDel // this.btnItemDel.Name = "btnItemDel"; - this.btnItemDel.Text = "삭제"; + this.btnItemDel.Text = "削除"; // // rdoMixColor0 // this.rdoMixColor0.Name = "rdoMixColor0"; - this.rdoMixColor0.Text = "믹스 컬러: "; + this.rdoMixColor0.Text = "ミックスカラー: "; this.rdoMixColor0.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.rdoMixColor0.AutoCollapseOnClick = false; // // rdoMixColor1 // this.rdoMixColor1.Name = "rdoMixColor1"; - this.rdoMixColor1.Text = "믹스 컬러: "; + this.rdoMixColor1.Text = "ミックスカラー: "; this.rdoMixColor1.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.rdoMixColor1.AutoCollapseOnClick = false; // // rdoMixColor2 // this.rdoMixColor2.Name = "rdoMixColor2"; - this.rdoMixColor2.Text = "믹스 컬러: "; + this.rdoMixColor2.Text = "ミックスカラー: "; this.rdoMixColor2.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.rdoMixColor2.AutoCollapseOnClick = false; // // rdoMixColor3 // this.rdoMixColor3.Name = "rdoMixColor3"; - this.rdoMixColor3.Text = "믹스 컬러: "; + this.rdoMixColor3.Text = "ミックスカラー: "; this.rdoMixColor3.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.rdoMixColor3.AutoCollapseOnClick = false; // // rdoMixColor4 // this.rdoMixColor4.Name = "rdoMixColor4"; - this.rdoMixColor4.Text = "믹스 컬러: "; + this.rdoMixColor4.Text = "ミックスカラー: "; this.rdoMixColor4.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.rdoMixColor4.AutoCollapseOnClick = false; // // rdoMixColor5 // this.rdoMixColor5.Name = "rdoMixColor5"; - this.rdoMixColor5.Text = "믹스 컬러: "; + this.rdoMixColor5.Text = "ミックスカラー: "; this.rdoMixColor5.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.rdoMixColor5.AutoCollapseOnClick = false; // // rdoMixColor6 // this.rdoMixColor6.Name = "rdoMixColor6"; - this.rdoMixColor6.Text = "믹스 컬러: "; + this.rdoMixColor6.Text = "ミックスカラー: "; this.rdoMixColor6.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.rdoMixColor6.AutoCollapseOnClick = false; // // rdoMixColor7 // this.rdoMixColor7.Name = "rdoMixColor7"; - this.rdoMixColor7.Text = "믹스 컬러: "; + this.rdoMixColor7.Text = "ミックスカラー: "; this.rdoMixColor7.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.rdoMixColor7.AutoCollapseOnClick = false; // diff --git a/WzComparerR2.Avatar/UI/AvatarPartButtonItem.cs b/WzComparerR2.Avatar/UI/AvatarPartButtonItem.cs index 5e333e8b..ceb0dbdf 100644 --- a/WzComparerR2.Avatar/UI/AvatarPartButtonItem.cs +++ b/WzComparerR2.Avatar/UI/AvatarPartButtonItem.cs @@ -58,8 +58,8 @@ public AvatarPartButtonItem(int ID, int? mixColor, int? mixOpacity) } } - public static readonly string[] HairColors = new[] { "검은색", "빨간색", "주황색", "노란색", "초록색", "파란색", "보라색", "갈색" }; - public static readonly string[] LensColors = new[] { "검은색", "파란색", "빨간색", "초록색", "갈색", "에메랄드", "보라색", "자수정색" }; + public static readonly string[] HairColors = new[] { "黒", "赤", "オレンジ", "黄", "緑", "青", "紫", "茶" }; + public static readonly string[] LensColors = new[] { "黒", "青", "赤", "緑", "茶", "エメラルド", "紫", "アメジスト" }; public void SetIcon(Bitmap icon) {