From 8e333b62e7043eeaae0887c7d0bed17bc5b616bf Mon Sep 17 00:00:00 2001 From: MattNL Date: Fri, 3 Mar 2023 05:10:28 -0500 Subject: [PATCH] Changed Rename tool to Change tool in BehaviourEditor --- .../Forms/Editor/BehaviourEditor.Designer.cs | 12 ++++---- PCK-Studio/Forms/Editor/BehaviourEditor.cs | 30 +++++++++++++++---- 2 files changed, 31 insertions(+), 11 deletions(-) diff --git a/PCK-Studio/Forms/Editor/BehaviourEditor.Designer.cs b/PCK-Studio/Forms/Editor/BehaviourEditor.Designer.cs index df241105..102b60ce 100644 --- a/PCK-Studio/Forms/Editor/BehaviourEditor.Designer.cs +++ b/PCK-Studio/Forms/Editor/BehaviourEditor.Designer.cs @@ -80,7 +80,7 @@ this.renameToolStripMenuItem, this.removeToolStripMenuItem}); this.metroContextMenu1.Name = "metroContextMenu1"; - this.metroContextMenu1.Size = new System.Drawing.Size(118, 70); + this.metroContextMenu1.Size = new System.Drawing.Size(181, 92); // // addToolStripMenuItem // @@ -88,7 +88,7 @@ this.addNewEntryToolStripMenuItem, this.addNewPositionOverrideToolStripMenuItem}); this.addToolStripMenuItem.Name = "addToolStripMenuItem"; - this.addToolStripMenuItem.Size = new System.Drawing.Size(117, 22); + this.addToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.addToolStripMenuItem.Text = "Add"; // // addNewEntryToolStripMenuItem @@ -108,14 +108,14 @@ // renameToolStripMenuItem // this.renameToolStripMenuItem.Name = "renameToolStripMenuItem"; - this.renameToolStripMenuItem.Size = new System.Drawing.Size(117, 22); - this.renameToolStripMenuItem.Text = "Rename"; - this.renameToolStripMenuItem.Click += new System.EventHandler(this.renameToolStripMenuItem_Click); + this.renameToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.renameToolStripMenuItem.Text = "Change"; + this.renameToolStripMenuItem.Click += new System.EventHandler(this.changeToolStripMenuItem_Click); // // removeToolStripMenuItem // this.removeToolStripMenuItem.Name = "removeToolStripMenuItem"; - this.removeToolStripMenuItem.Size = new System.Drawing.Size(117, 22); + this.removeToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.removeToolStripMenuItem.Text = "Remove"; this.removeToolStripMenuItem.Click += new System.EventHandler(this.removeToolStripMenuItem_Click); // diff --git a/PCK-Studio/Forms/Editor/BehaviourEditor.cs b/PCK-Studio/Forms/Editor/BehaviourEditor.cs index d2223490..81bc984e 100644 --- a/PCK-Studio/Forms/Editor/BehaviourEditor.cs +++ b/PCK-Studio/Forms/Editor/BehaviourEditor.cs @@ -147,16 +147,36 @@ namespace PckStudio.Forms.Editor } } - private void renameToolStripMenuItem_Click(object sender, EventArgs e) + private void changeToolStripMenuItem_Click(object sender, EventArgs e) { if (!(treeView1.SelectedNode.Tag is BehaviourFile.RiderPositionOverride entry)) return; - using RenamePrompt diag = new RenamePrompt(entry.name); - if (diag.ShowDialog(this) == DialogResult.OK) + var diag = new Additional_Popups.Behaviours.AddBehaviour(); + diag.acceptBtn.Text = "Save"; + + if (diag.ShowDialog() == DialogResult.OK) { - entry.name = diag.NewText; + if (String.IsNullOrEmpty(diag.SelectedEntity)) return; + if (behaviourFile.entries.FindAll(behaviour => behaviour.name == diag.SelectedEntity).Count() > 0) + { + MessageBox.Show(this, "You cannot have two entries for one entity. Please use the \"Add New Position Override\" tool to add multiple overrides for entities", "Error", MessageBoxButtons.OK); + return; + } + + entry.name = diag.SelectedEntity; treeView1.SelectedNode.Tag = entry; - treeView1.SelectedNode.Text = diag.NewText; + + foreach (JObject content in Utilities.BehaviourUtil.entityData["entities"].Children()) + { + var prop = content.Properties().FirstOrDefault(prop => prop.Name == entry.name); + if (prop is JProperty) + { + treeView1.SelectedNode.Text = (string)prop.Value; + treeView1.SelectedNode.ImageIndex = Utilities.BehaviourUtil.entityData["entities"].Children().ToList().IndexOf(content); + treeView1.SelectedNode.SelectedImageIndex = treeView1.SelectedNode.ImageIndex; + break; + } + } } }