Renamed PCK "Properties" to "Parameters"

there's a lot of things with this name scheme in this program so definitely possible i missed something.
This commit is contained in:
MayNL
2026-04-01 19:35:03 -04:00
parent fae251718d
commit 22d1983ee3
17 changed files with 421 additions and 422 deletions
+108 -108
View File
@@ -36,17 +36,17 @@ namespace PckStudio.Controls
this.pckFileLabel = new MetroFramework.Controls.MetroLabel(); this.pckFileLabel = new MetroFramework.Controls.MetroLabel();
this.labelImageSize = new MetroFramework.Controls.MetroLabel(); this.labelImageSize = new MetroFramework.Controls.MetroLabel();
this.fileEntryCountLabel = new MetroFramework.Controls.MetroLabel(); this.fileEntryCountLabel = new MetroFramework.Controls.MetroLabel();
this.PropertiesTabControl = new MetroFramework.Controls.MetroTabControl(); this.ParametersTabControl = new MetroFramework.Controls.MetroTabControl();
this.MetaTab = new MetroFramework.Controls.MetroTabPage(); this.MetaTab = new MetroFramework.Controls.MetroTabPage();
this.metroLabel2 = new MetroFramework.Controls.MetroLabel(); this.metroLabel2 = new MetroFramework.Controls.MetroLabel();
this.entryTypeTextBox = new MetroFramework.Controls.MetroTextBox(); this.ParameterTypeTextBox = new MetroFramework.Controls.MetroTextBox();
this.entryDataTextBox = new MetroFramework.Controls.MetroTextBox(); this.parameterValueTextBox = new MetroFramework.Controls.MetroTextBox();
this.buttonEdit = new MetroFramework.Controls.MetroButton(); this.buttonEdit = new MetroFramework.Controls.MetroButton();
this.metroLabel1 = new MetroFramework.Controls.MetroLabel(); this.metroLabel1 = new MetroFramework.Controls.MetroLabel();
this.treeMeta = new System.Windows.Forms.TreeView(); this.treeParameters = new System.Windows.Forms.TreeView();
this.contextMenuMetaTree = new System.Windows.Forms.ContextMenuStrip(this.components); this.contextMenuParameterTree = new System.Windows.Forms.ContextMenuStrip(this.components);
this.addEntryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.addParameterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.addEntryToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.addParameterToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.addBOXEntryToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.addBOXEntryToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.addANIMEntryToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.addANIMEntryToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.addMultipleEntriesToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.addMultipleEntriesToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
@@ -108,9 +108,9 @@ namespace PckStudio.Controls
this.previewPictureBox = new PckStudio.ToolboxItems.InterpolationPictureBox(); this.previewPictureBox = new PckStudio.ToolboxItems.InterpolationPictureBox();
logoPictureBox = new System.Windows.Forms.PictureBox(); logoPictureBox = new System.Windows.Forms.PictureBox();
((System.ComponentModel.ISupportInitialize)(logoPictureBox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(logoPictureBox)).BeginInit();
this.PropertiesTabControl.SuspendLayout(); this.ParametersTabControl.SuspendLayout();
this.MetaTab.SuspendLayout(); this.MetaTab.SuspendLayout();
this.contextMenuMetaTree.SuspendLayout(); this.contextMenuParameterTree.SuspendLayout();
this.contextMenuPCKEntries.SuspendLayout(); this.contextMenuPCKEntries.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.previewPictureBox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.previewPictureBox)).BeginInit();
this.SuspendLayout(); this.SuspendLayout();
@@ -140,25 +140,25 @@ namespace PckStudio.Controls
this.fileEntryCountLabel.Name = "fileEntryCountLabel"; this.fileEntryCountLabel.Name = "fileEntryCountLabel";
this.fileEntryCountLabel.Theme = MetroFramework.MetroThemeStyle.Dark; this.fileEntryCountLabel.Theme = MetroFramework.MetroThemeStyle.Dark;
// //
// PropertiesTabControl // ParametersTabControl
// //
this.PropertiesTabControl.Controls.Add(this.MetaTab); this.ParametersTabControl.Controls.Add(this.MetaTab);
resources.ApplyResources(this.PropertiesTabControl, "PropertiesTabControl"); resources.ApplyResources(this.ParametersTabControl, "ParametersTabControl");
this.PropertiesTabControl.Name = "PropertiesTabControl"; this.ParametersTabControl.Name = "ParametersTabControl";
this.PropertiesTabControl.SelectedIndex = 0; this.ParametersTabControl.SelectedIndex = 0;
this.PropertiesTabControl.Style = MetroFramework.MetroColorStyle.Silver; this.ParametersTabControl.Style = MetroFramework.MetroColorStyle.Silver;
this.PropertiesTabControl.Theme = MetroFramework.MetroThemeStyle.Dark; this.ParametersTabControl.Theme = MetroFramework.MetroThemeStyle.Dark;
this.PropertiesTabControl.UseSelectable = true; this.ParametersTabControl.UseSelectable = true;
// //
// MetaTab // MetaTab
// //
this.MetaTab.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.MetaTab.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.MetaTab.Controls.Add(this.metroLabel2); this.MetaTab.Controls.Add(this.metroLabel2);
this.MetaTab.Controls.Add(this.entryTypeTextBox); this.MetaTab.Controls.Add(this.ParameterTypeTextBox);
this.MetaTab.Controls.Add(this.entryDataTextBox); this.MetaTab.Controls.Add(this.parameterValueTextBox);
this.MetaTab.Controls.Add(this.buttonEdit); this.MetaTab.Controls.Add(this.buttonEdit);
this.MetaTab.Controls.Add(this.metroLabel1); this.MetaTab.Controls.Add(this.metroLabel1);
this.MetaTab.Controls.Add(this.treeMeta); this.MetaTab.Controls.Add(this.treeParameters);
this.MetaTab.HorizontalScrollbarBarColor = true; this.MetaTab.HorizontalScrollbarBarColor = true;
this.MetaTab.HorizontalScrollbarHighlightOnWheel = false; this.MetaTab.HorizontalScrollbarHighlightOnWheel = false;
this.MetaTab.HorizontalScrollbarSize = 10; this.MetaTab.HorizontalScrollbarSize = 10;
@@ -177,63 +177,63 @@ namespace PckStudio.Controls
// //
// entryTypeTextBox // entryTypeTextBox
// //
resources.ApplyResources(this.entryTypeTextBox, "entryTypeTextBox"); resources.ApplyResources(this.ParameterTypeTextBox, "entryTypeTextBox");
// //
// //
// //
this.entryTypeTextBox.CustomButton.Image = ((System.Drawing.Image)(resources.GetObject("resource.Image"))); this.ParameterTypeTextBox.CustomButton.Image = ((System.Drawing.Image)(resources.GetObject("resource.Image")));
this.entryTypeTextBox.CustomButton.ImeMode = ((System.Windows.Forms.ImeMode)(resources.GetObject("resource.ImeMode"))); this.ParameterTypeTextBox.CustomButton.ImeMode = ((System.Windows.Forms.ImeMode)(resources.GetObject("resource.ImeMode")));
this.entryTypeTextBox.CustomButton.Location = ((System.Drawing.Point)(resources.GetObject("resource.Location"))); this.ParameterTypeTextBox.CustomButton.Location = ((System.Drawing.Point)(resources.GetObject("resource.Location")));
this.entryTypeTextBox.CustomButton.Name = ""; this.ParameterTypeTextBox.CustomButton.Name = "";
this.entryTypeTextBox.CustomButton.Size = ((System.Drawing.Size)(resources.GetObject("resource.Size"))); this.ParameterTypeTextBox.CustomButton.Size = ((System.Drawing.Size)(resources.GetObject("resource.Size")));
this.entryTypeTextBox.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; this.ParameterTypeTextBox.CustomButton.Style = MetroFramework.MetroColorStyle.Blue;
this.entryTypeTextBox.CustomButton.TabIndex = ((int)(resources.GetObject("resource.TabIndex"))); this.ParameterTypeTextBox.CustomButton.TabIndex = ((int)(resources.GetObject("resource.TabIndex")));
this.entryTypeTextBox.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; this.ParameterTypeTextBox.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light;
this.entryTypeTextBox.CustomButton.UseSelectable = true; this.ParameterTypeTextBox.CustomButton.UseSelectable = true;
this.entryTypeTextBox.CustomButton.Visible = ((bool)(resources.GetObject("resource.Visible"))); this.ParameterTypeTextBox.CustomButton.Visible = ((bool)(resources.GetObject("resource.Visible")));
this.entryTypeTextBox.Lines = new string[0]; this.ParameterTypeTextBox.Lines = new string[0];
this.entryTypeTextBox.MaxLength = 32767; this.ParameterTypeTextBox.MaxLength = 32767;
this.entryTypeTextBox.Name = "entryTypeTextBox"; this.ParameterTypeTextBox.Name = "entryTypeTextBox";
this.entryTypeTextBox.PasswordChar = '\0'; this.ParameterTypeTextBox.PasswordChar = '\0';
this.entryTypeTextBox.ScrollBars = System.Windows.Forms.ScrollBars.None; this.ParameterTypeTextBox.ScrollBars = System.Windows.Forms.ScrollBars.None;
this.entryTypeTextBox.SelectedText = ""; this.ParameterTypeTextBox.SelectedText = "";
this.entryTypeTextBox.SelectionLength = 0; this.ParameterTypeTextBox.SelectionLength = 0;
this.entryTypeTextBox.SelectionStart = 0; this.ParameterTypeTextBox.SelectionStart = 0;
this.entryTypeTextBox.ShortcutsEnabled = true; this.ParameterTypeTextBox.ShortcutsEnabled = true;
this.entryTypeTextBox.Theme = MetroFramework.MetroThemeStyle.Dark; this.ParameterTypeTextBox.Theme = MetroFramework.MetroThemeStyle.Dark;
this.entryTypeTextBox.UseSelectable = true; this.ParameterTypeTextBox.UseSelectable = true;
this.entryTypeTextBox.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); this.ParameterTypeTextBox.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
this.entryTypeTextBox.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel); this.ParameterTypeTextBox.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel);
// //
// entryDataTextBox // entryDataTextBox
// //
resources.ApplyResources(this.entryDataTextBox, "entryDataTextBox"); resources.ApplyResources(this.parameterValueTextBox, "entryDataTextBox");
// //
// //
// //
this.entryDataTextBox.CustomButton.Image = ((System.Drawing.Image)(resources.GetObject("resource.Image1"))); this.parameterValueTextBox.CustomButton.Image = ((System.Drawing.Image)(resources.GetObject("resource.Image1")));
this.entryDataTextBox.CustomButton.ImeMode = ((System.Windows.Forms.ImeMode)(resources.GetObject("resource.ImeMode1"))); this.parameterValueTextBox.CustomButton.ImeMode = ((System.Windows.Forms.ImeMode)(resources.GetObject("resource.ImeMode1")));
this.entryDataTextBox.CustomButton.Location = ((System.Drawing.Point)(resources.GetObject("resource.Location1"))); this.parameterValueTextBox.CustomButton.Location = ((System.Drawing.Point)(resources.GetObject("resource.Location1")));
this.entryDataTextBox.CustomButton.Name = ""; this.parameterValueTextBox.CustomButton.Name = "";
this.entryDataTextBox.CustomButton.Size = ((System.Drawing.Size)(resources.GetObject("resource.Size1"))); this.parameterValueTextBox.CustomButton.Size = ((System.Drawing.Size)(resources.GetObject("resource.Size1")));
this.entryDataTextBox.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; this.parameterValueTextBox.CustomButton.Style = MetroFramework.MetroColorStyle.Blue;
this.entryDataTextBox.CustomButton.TabIndex = ((int)(resources.GetObject("resource.TabIndex1"))); this.parameterValueTextBox.CustomButton.TabIndex = ((int)(resources.GetObject("resource.TabIndex1")));
this.entryDataTextBox.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; this.parameterValueTextBox.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light;
this.entryDataTextBox.CustomButton.UseSelectable = true; this.parameterValueTextBox.CustomButton.UseSelectable = true;
this.entryDataTextBox.CustomButton.Visible = ((bool)(resources.GetObject("resource.Visible1"))); this.parameterValueTextBox.CustomButton.Visible = ((bool)(resources.GetObject("resource.Visible1")));
this.entryDataTextBox.Lines = new string[0]; this.parameterValueTextBox.Lines = new string[0];
this.entryDataTextBox.MaxLength = 32767; this.parameterValueTextBox.MaxLength = 32767;
this.entryDataTextBox.Name = "entryDataTextBox"; this.parameterValueTextBox.Name = "entryDataTextBox";
this.entryDataTextBox.PasswordChar = '\0'; this.parameterValueTextBox.PasswordChar = '\0';
this.entryDataTextBox.ScrollBars = System.Windows.Forms.ScrollBars.None; this.parameterValueTextBox.ScrollBars = System.Windows.Forms.ScrollBars.None;
this.entryDataTextBox.SelectedText = ""; this.parameterValueTextBox.SelectedText = "";
this.entryDataTextBox.SelectionLength = 0; this.parameterValueTextBox.SelectionLength = 0;
this.entryDataTextBox.SelectionStart = 0; this.parameterValueTextBox.SelectionStart = 0;
this.entryDataTextBox.ShortcutsEnabled = true; this.parameterValueTextBox.ShortcutsEnabled = true;
this.entryDataTextBox.Theme = MetroFramework.MetroThemeStyle.Dark; this.parameterValueTextBox.Theme = MetroFramework.MetroThemeStyle.Dark;
this.entryDataTextBox.UseSelectable = true; this.parameterValueTextBox.UseSelectable = true;
this.entryDataTextBox.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); this.parameterValueTextBox.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
this.entryDataTextBox.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel); this.parameterValueTextBox.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel);
// //
// buttonEdit // buttonEdit
// //
@@ -249,74 +249,74 @@ namespace PckStudio.Controls
this.metroLabel1.Name = "metroLabel1"; this.metroLabel1.Name = "metroLabel1";
this.metroLabel1.Theme = MetroFramework.MetroThemeStyle.Dark; this.metroLabel1.Theme = MetroFramework.MetroThemeStyle.Dark;
// //
// treeMeta // treeParameters
// //
this.treeMeta.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(13)))), ((int)(((byte)(13)))), ((int)(((byte)(13))))); this.treeParameters.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(13)))), ((int)(((byte)(13)))), ((int)(((byte)(13)))));
this.treeMeta.BorderStyle = System.Windows.Forms.BorderStyle.None; this.treeParameters.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.treeMeta.ContextMenuStrip = this.contextMenuMetaTree; this.treeParameters.ContextMenuStrip = this.contextMenuParameterTree;
resources.ApplyResources(this.treeMeta, "treeMeta"); resources.ApplyResources(this.treeParameters, "treeParameters");
this.treeMeta.ForeColor = System.Drawing.SystemColors.Window; this.treeParameters.ForeColor = System.Drawing.SystemColors.Window;
this.treeMeta.Name = "treeMeta"; this.treeParameters.Name = "treeParameters";
this.treeMeta.PathSeparator = "/"; this.treeParameters.PathSeparator = "/";
this.treeMeta.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeMeta_AfterSelect); this.treeParameters.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeParameter_AfterSelect);
this.treeMeta.DoubleClick += new System.EventHandler(this.treeMeta_DoubleClick); this.treeParameters.DoubleClick += new System.EventHandler(this.treeParameter_DoubleClick);
this.treeMeta.KeyDown += new System.Windows.Forms.KeyEventHandler(this.treeMeta_KeyDown); this.treeParameters.KeyDown += new System.Windows.Forms.KeyEventHandler(this.treeParameter_KeyDown);
// //
// contextMenuMetaTree // contextMenuParameterTree
// //
this.contextMenuMetaTree.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.contextMenuParameterTree.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.addEntryToolStripMenuItem, this.addParameterToolStripMenuItem,
this.addMultipleEntriesToolStripMenuItem1, this.addMultipleEntriesToolStripMenuItem1,
this.deleteEntryToolStripMenuItem, this.deleteEntryToolStripMenuItem,
this.editAllEntriesToolStripMenuItem}); this.editAllEntriesToolStripMenuItem});
this.contextMenuMetaTree.Name = "contextMenuStrip1"; this.contextMenuParameterTree.Name = "contextMenuStrip1";
resources.ApplyResources(this.contextMenuMetaTree, "contextMenuMetaTree"); resources.ApplyResources(this.contextMenuParameterTree, "contextMenuParameterTree");
// //
// addEntryToolStripMenuItem // addParameterToolStripMenuItem
// //
this.addEntryToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.addParameterToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.addEntryToolStripMenuItem1, this.addParameterToolStripMenuItem1,
this.addBOXEntryToolStripMenuItem1, this.addBOXEntryToolStripMenuItem1,
this.addANIMEntryToolStripMenuItem1}); this.addANIMEntryToolStripMenuItem1});
resources.ApplyResources(this.addEntryToolStripMenuItem, "addEntryToolStripMenuItem"); resources.ApplyResources(this.addParameterToolStripMenuItem, "addParameterToolStripMenuItem");
this.addEntryToolStripMenuItem.Name = "addEntryToolStripMenuItem"; this.addParameterToolStripMenuItem.Name = "addParameterToolStripMenuItem";
// //
// addEntryToolStripMenuItem1 // addParameterToolStripMenuItem1
// //
this.addEntryToolStripMenuItem1.Name = "addEntryToolStripMenuItem1"; this.addParameterToolStripMenuItem1.Name = "addParameterToolStripMenuItem1";
resources.ApplyResources(this.addEntryToolStripMenuItem1, "addEntryToolStripMenuItem1"); resources.ApplyResources(this.addParameterToolStripMenuItem1, "addParameterToolStripMenuItem1");
this.addEntryToolStripMenuItem1.Click += new System.EventHandler(this.addEntryToolStripMenuItem_Click); this.addParameterToolStripMenuItem1.Click += new System.EventHandler(this.addParameterToolStripMenuItem_Click);
// //
// addBOXEntryToolStripMenuItem1 // addBOXEntryToolStripMenuItem1
// //
this.addBOXEntryToolStripMenuItem1.Name = "addBOXEntryToolStripMenuItem1"; this.addBOXEntryToolStripMenuItem1.Name = "addBOXEntryToolStripMenuItem1";
resources.ApplyResources(this.addBOXEntryToolStripMenuItem1, "addBOXEntryToolStripMenuItem1"); resources.ApplyResources(this.addBOXEntryToolStripMenuItem1, "addBOXEntryToolStripMenuItem1");
this.addBOXEntryToolStripMenuItem1.Click += new System.EventHandler(this.addBOXEntryToolStripMenuItem1_Click); this.addBOXEntryToolStripMenuItem1.Click += new System.EventHandler(this.addBOXParameterToolStripMenuItem1_Click);
// //
// addANIMEntryToolStripMenuItem1 // addANIMEntryToolStripMenuItem1
// //
this.addANIMEntryToolStripMenuItem1.Name = "addANIMEntryToolStripMenuItem1"; this.addANIMEntryToolStripMenuItem1.Name = "addANIMEntryToolStripMenuItem1";
resources.ApplyResources(this.addANIMEntryToolStripMenuItem1, "addANIMEntryToolStripMenuItem1"); resources.ApplyResources(this.addANIMEntryToolStripMenuItem1, "addANIMEntryToolStripMenuItem1");
this.addANIMEntryToolStripMenuItem1.Click += new System.EventHandler(this.addANIMEntryToolStripMenuItem1_Click); this.addANIMEntryToolStripMenuItem1.Click += new System.EventHandler(this.addSkinANIMParameterToolStripMenuItem1_Click);
// //
// addMultipleEntriesToolStripMenuItem1 // addMultipleEntriesToolStripMenuItem1
// //
this.addMultipleEntriesToolStripMenuItem1.Name = "addMultipleEntriesToolStripMenuItem1"; this.addMultipleEntriesToolStripMenuItem1.Name = "addMultipleEntriesToolStripMenuItem1";
resources.ApplyResources(this.addMultipleEntriesToolStripMenuItem1, "addMultipleEntriesToolStripMenuItem1"); resources.ApplyResources(this.addMultipleEntriesToolStripMenuItem1, "addMultipleEntriesToolStripMenuItem1");
this.addMultipleEntriesToolStripMenuItem1.Click += new System.EventHandler(this.addMultipleEntriesToolStripMenuItem1_Click); this.addMultipleEntriesToolStripMenuItem1.Click += new System.EventHandler(this.addMultipleParametersToolStripMenuItem1_Click);
// //
// deleteEntryToolStripMenuItem // deleteEntryToolStripMenuItem
// //
this.deleteEntryToolStripMenuItem.Image = global::PckStudio.Properties.Resources.file_delete; this.deleteEntryToolStripMenuItem.Image = global::PckStudio.Properties.Resources.file_delete;
this.deleteEntryToolStripMenuItem.Name = "deleteEntryToolStripMenuItem"; this.deleteEntryToolStripMenuItem.Name = "deleteEntryToolStripMenuItem";
resources.ApplyResources(this.deleteEntryToolStripMenuItem, "deleteEntryToolStripMenuItem"); resources.ApplyResources(this.deleteEntryToolStripMenuItem, "deleteEntryToolStripMenuItem");
this.deleteEntryToolStripMenuItem.Click += new System.EventHandler(this.deleteEntryToolStripMenuItem_Click); this.deleteEntryToolStripMenuItem.Click += new System.EventHandler(this.deleteParameterToolStripMenuItem_Click);
// //
// editAllEntriesToolStripMenuItem // editAllEntriesToolStripMenuItem
// //
this.editAllEntriesToolStripMenuItem.Name = "editAllEntriesToolStripMenuItem"; this.editAllEntriesToolStripMenuItem.Name = "editAllEntriesToolStripMenuItem";
resources.ApplyResources(this.editAllEntriesToolStripMenuItem, "editAllEntriesToolStripMenuItem"); resources.ApplyResources(this.editAllEntriesToolStripMenuItem, "editAllEntriesToolStripMenuItem");
this.editAllEntriesToolStripMenuItem.Click += new System.EventHandler(this.editAllEntriesToolStripMenuItem_Click); this.editAllEntriesToolStripMenuItem.Click += new System.EventHandler(this.editAllParametersToolStripMenuItem_Click);
// //
// label11 // label11
// //
@@ -726,7 +726,7 @@ namespace PckStudio.Controls
this.Controls.Add(this.pckFileLabel); this.Controls.Add(this.pckFileLabel);
this.Controls.Add(this.labelImageSize); this.Controls.Add(this.labelImageSize);
this.Controls.Add(this.fileEntryCountLabel); this.Controls.Add(this.fileEntryCountLabel);
this.Controls.Add(this.PropertiesTabControl); this.Controls.Add(this.ParametersTabControl);
this.Controls.Add(this.label11); this.Controls.Add(this.label11);
this.Controls.Add(this.treeViewMain); this.Controls.Add(this.treeViewMain);
this.Controls.Add(logoPictureBox); this.Controls.Add(logoPictureBox);
@@ -734,10 +734,10 @@ namespace PckStudio.Controls
this.Name = "PckEditor"; this.Name = "PckEditor";
this.Load += new System.EventHandler(this.PckEditor_Load); this.Load += new System.EventHandler(this.PckEditor_Load);
((System.ComponentModel.ISupportInitialize)(logoPictureBox)).EndInit(); ((System.ComponentModel.ISupportInitialize)(logoPictureBox)).EndInit();
this.PropertiesTabControl.ResumeLayout(false); this.ParametersTabControl.ResumeLayout(false);
this.MetaTab.ResumeLayout(false); this.MetaTab.ResumeLayout(false);
this.MetaTab.PerformLayout(); this.MetaTab.PerformLayout();
this.contextMenuMetaTree.ResumeLayout(false); this.contextMenuParameterTree.ResumeLayout(false);
this.contextMenuPCKEntries.ResumeLayout(false); this.contextMenuPCKEntries.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.previewPictureBox)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.previewPictureBox)).EndInit();
this.ResumeLayout(false); this.ResumeLayout(false);
@@ -750,15 +750,15 @@ namespace PckStudio.Controls
private MetroFramework.Controls.MetroLabel pckFileLabel; private MetroFramework.Controls.MetroLabel pckFileLabel;
private MetroFramework.Controls.MetroLabel labelImageSize; private MetroFramework.Controls.MetroLabel labelImageSize;
private MetroFramework.Controls.MetroLabel fileEntryCountLabel; private MetroFramework.Controls.MetroLabel fileEntryCountLabel;
private MetroFramework.Controls.MetroTabControl PropertiesTabControl; private MetroFramework.Controls.MetroTabControl ParametersTabControl;
private MetroFramework.Controls.MetroTabPage MetaTab; private MetroFramework.Controls.MetroTabPage MetaTab;
private System.Windows.Forms.TreeView treeMeta; private System.Windows.Forms.TreeView treeParameters;
private MetroFramework.Controls.MetroLabel label11; private MetroFramework.Controls.MetroLabel label11;
private System.Windows.Forms.TreeView treeViewMain; private System.Windows.Forms.TreeView treeViewMain;
private PckStudio.ToolboxItems.InterpolationPictureBox previewPictureBox; private PckStudio.ToolboxItems.InterpolationPictureBox previewPictureBox;
private System.Windows.Forms.ContextMenuStrip contextMenuMetaTree; private System.Windows.Forms.ContextMenuStrip contextMenuParameterTree;
private System.Windows.Forms.ToolStripMenuItem addEntryToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem addParameterToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem addEntryToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem addParameterToolStripMenuItem1;
private System.Windows.Forms.ToolStripMenuItem addBOXEntryToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem addBOXEntryToolStripMenuItem1;
private System.Windows.Forms.ToolStripMenuItem addANIMEntryToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem addANIMEntryToolStripMenuItem1;
private System.Windows.Forms.ToolStripMenuItem addMultipleEntriesToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem addMultipleEntriesToolStripMenuItem;
@@ -806,8 +806,8 @@ namespace PckStudio.Controls
private System.Windows.Forms.ImageList imageList; private System.Windows.Forms.ImageList imageList;
private System.Windows.Forms.ToolStripMenuItem addMultipleEntriesToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem addMultipleEntriesToolStripMenuItem1;
private MetroFramework.Controls.MetroLabel metroLabel2; private MetroFramework.Controls.MetroLabel metroLabel2;
private MetroFramework.Controls.MetroTextBox entryTypeTextBox; private MetroFramework.Controls.MetroTextBox ParameterTypeTextBox;
private MetroFramework.Controls.MetroTextBox entryDataTextBox; private MetroFramework.Controls.MetroTextBox parameterValueTextBox;
private MetroFramework.Controls.MetroButton buttonEdit; private MetroFramework.Controls.MetroButton buttonEdit;
private MetroFramework.Controls.MetroLabel metroLabel1; private MetroFramework.Controls.MetroLabel metroLabel1;
private MetroFramework.Controls.MetroCheckBox LittleEndianCheckBox; private MetroFramework.Controls.MetroCheckBox LittleEndianCheckBox;
+74 -74
View File
@@ -435,9 +435,9 @@ namespace PckStudio.Controls
private void HandleSkinFile(PckAsset asset) private void HandleSkinFile(PckAsset asset)
{ {
Skin skin = asset.GetSkin(); Skin skin = asset.GetSkin();
if (asset.HasProperty("CAPEPATH")) if (asset.HasParameter("CAPEPATH"))
{ {
string capeAssetPath = asset.GetProperty("CAPEPATH"); string capeAssetPath = asset.GetParameter("CAPEPATH");
if (EditorValue.File.TryGetAsset(capeAssetPath, PckAssetType.CapeFile, out PckAsset capeAsset)) if (EditorValue.File.TryGetAsset(capeAssetPath, PckAssetType.CapeFile, out PckAsset capeAsset))
{ {
skin.CapeTexture = capeAsset.GetTexture(); skin.CapeTexture = capeAsset.GetTexture();
@@ -454,9 +454,9 @@ namespace PckStudio.Controls
using CustomSkinEditor skinEditor = new CustomSkinEditor(skin, saveContext, EditorValue.File.xmlVersion); using CustomSkinEditor skinEditor = new CustomSkinEditor(skin, saveContext, EditorValue.File.xmlVersion);
if (skinEditor.ShowDialog() == DialogResult.OK) if (skinEditor.ShowDialog() == DialogResult.OK)
{ {
entryDataTextBox.Text = entryTypeTextBox.Text = string.Empty; parameterValueTextBox.Text = ParameterTypeTextBox.Text = string.Empty;
_wasModified = true; _wasModified = true;
ReloadMetaTreeView(); ReloadParameterTreeView();
} }
} }
@@ -532,7 +532,7 @@ namespace PckStudio.Controls
{ {
if (EditorValue.File.TryGetAsset("0", PckAssetType.InfoFile, out PckAsset asset)) if (EditorValue.File.TryGetAsset("0", PckAssetType.InfoFile, out PckAsset asset))
{ {
asset.RemoveProperties("LOCK"); asset.RemoveParameters("LOCK");
} }
} }
@@ -591,7 +591,7 @@ namespace PckStudio.Controls
// In case the Rename function was just used and the selected node name no longer matches the file name // In case the Rename function was just used and the selected node name no longer matches the file name
string selectedNodeText = treeViewMain.SelectedNode is TreeNode node ? node.FullPath : string.Empty; string selectedNodeText = treeViewMain.SelectedNode is TreeNode node ? node.FullPath : string.Empty;
previewPictureBox.Image = Resources.NoImageFound; previewPictureBox.Image = Resources.NoImageFound;
treeMeta.Nodes.Clear(); treeParameters.Nodes.Clear();
treeViewMain.Nodes.Clear(); treeViewMain.Nodes.Clear();
BuildPckTreeView(treeViewMain.Nodes, EditorValue.File); BuildPckTreeView(treeViewMain.Nodes, EditorValue.File);
treeViewMain.Sort(); treeViewMain.Sort();
@@ -682,15 +682,15 @@ namespace PckStudio.Controls
return false; return false;
} }
private void ReloadMetaTreeView() private void ReloadParameterTreeView()
{ {
treeMeta.Nodes.Clear(); treeParameters.Nodes.Clear();
if (treeViewMain.SelectedNode is TreeNode node && if (treeViewMain.SelectedNode is TreeNode node &&
node.Tag is PckAsset asset) node.Tag is PckAsset asset)
{ {
foreach (KeyValuePair<string, string> property in asset.GetProperties()) foreach (KeyValuePair<string, string> parameter in asset.GetParameters())
{ {
treeMeta.Nodes.Add(CreateNode(property.Key, property)); treeParameters.Nodes.Add(CreateNode(parameter.Key, parameter));
} }
} }
} }
@@ -818,7 +818,7 @@ namespace PckStudio.Controls
{ {
} }
mfNew.AddProperty(key, value); mfNew.AddParameter(key, value);
} }
_wasModified = true; _wasModified = true;
} }
@@ -880,9 +880,9 @@ namespace PckStudio.Controls
private void treeViewMain_AfterSelect(object sender, TreeViewEventArgs e) private void treeViewMain_AfterSelect(object sender, TreeViewEventArgs e)
{ {
ReloadMetaTreeView(); ReloadParameterTreeView();
entryTypeTextBox.Text = entryDataTextBox.Text = labelImageSize.Text = string.Empty; ParameterTypeTextBox.Text = parameterValueTextBox.Text = labelImageSize.Text = string.Empty;
buttonEdit.Visible = false; buttonEdit.Visible = false;
previewPictureBox.Image = Resources.NoImageFound; previewPictureBox.Image = Resources.NoImageFound;
@@ -1178,10 +1178,10 @@ namespace PckStudio.Controls
continue; continue;
} }
PckAsset importedAsset = EditorValue.File.CreateNewAsset(assetPath, assetType, () => File.ReadAllBytes(filepath)); PckAsset importedAsset = EditorValue.File.CreateNewAsset(assetPath, assetType, () => File.ReadAllBytes(filepath));
string propertyFile = filepath + ".txt"; string parameterFile = filepath + ".txt";
if (File.Exists(propertyFile)) if (File.Exists(parameterFile))
{ {
importedAsset.DeserializeProperties(File.ReadAllLines(propertyFile)); importedAsset.DeserializeParameters(File.ReadAllLines(parameterFile));
} }
addedCount++; addedCount++;
} }
@@ -1287,7 +1287,7 @@ namespace PckStudio.Controls
PckAsset asset = EditorValue.File.CreateNewAsset(animationFilepath, PckAssetType.TextureFile); PckAsset asset = EditorValue.File.CreateNewAsset(animationFilepath, PckAssetType.TextureFile);
asset.SetSerializedData(newAnimation, AnimationSerializer.DefaultSerializer); asset.SetSerializedData(newAnimation, AnimationSerializer.DefaultSerializer);
BuildMainTreeView(); BuildMainTreeView();
ReloadMetaTreeView(); ReloadParameterTreeView();
} }
} }
@@ -1405,7 +1405,7 @@ namespace PckStudio.Controls
string[] param = property.Split(':'); string[] param = property.Split(':');
if (param.Length < 2) if (param.Length < 2)
continue; continue;
newFile.AddProperty(param[0], param[1]); newFile.AddParameter(param[0], param[1]);
//switch (param[0]) //switch (param[0])
//{ //{
// case "DISPLAYNAMEID": // case "DISPLAYNAMEID":
@@ -1525,7 +1525,7 @@ namespace PckStudio.Controls
$"Asset path: {asset.Filename}" + $"Asset path: {asset.Filename}" +
$"\nAsset type: {(int)asset.Type} ({asset.Type})" + $"\nAsset type: {(int)asset.Type} ({asset.Type})" +
$"\nAsset size: {asset.Size}" + $"\nAsset size: {asset.Size}" +
$"\nProperties count: {asset.PropertyCount}" $"\nParameter count: {asset.ParameterCount}"
, Path.GetFileName(asset.Filename) + " Asset info"); , Path.GetFileName(asset.Filename) + " Asset info");
} }
} }
@@ -1535,12 +1535,12 @@ namespace PckStudio.Controls
if (treeViewMain.SelectedNode.TryGetTagData(out PckAsset asset) && if (treeViewMain.SelectedNode.TryGetTagData(out PckAsset asset) &&
asset.Type == PckAssetType.SkinFile) asset.Type == PckAssetType.SkinFile)
{ {
foreach (KeyValuePair<string, string> p in asset.GetProperties().ToList()) foreach (KeyValuePair<string, string> p in asset.GetParameters().ToList())
{ {
if (p.Key == "BOX" || p.Key == "OFFSET") if (p.Key == "BOX" || p.Key == "OFFSET")
asset.SetProperty(asset.GetPropertyIndex(p), new KeyValuePair<string, string>(p.Key, p.Value.Replace(',', '.'))); asset.SetParameter(asset.GetParameterIndex(p), new KeyValuePair<string, string>(p.Key, p.Value.Replace(',', '.')));
} }
ReloadMetaTreeView(); ReloadParameterTreeView();
_wasModified = true; _wasModified = true;
} }
} }
@@ -1616,9 +1616,9 @@ namespace PckStudio.Controls
private void extractFile(string outFilePath, PckAsset asset) private void extractFile(string outFilePath, PckAsset asset)
{ {
File.WriteAllBytes(outFilePath, asset.Data); File.WriteAllBytes(outFilePath, asset.Data);
if (asset.PropertyCount > 0) if (asset.ParameterCount > 0)
{ {
File.WriteAllLines($"{outFilePath}.txt", asset.SerializeProperties()); File.WriteAllLines($"{outFilePath}.txt", asset.SerializeParameters());
} }
} }
@@ -1640,9 +1640,9 @@ namespace PckStudio.Controls
TreeNode newNode = new TreeNode(); TreeNode newNode = new TreeNode();
newNode.Text = Path.GetFileName(diag.NewText); newNode.Text = Path.GetFileName(diag.NewText);
var newFile = new PckAsset(diag.NewText, asset.Type); var newFile = new PckAsset(diag.NewText, asset.Type);
foreach (KeyValuePair<string, string> property in asset.GetProperties()) foreach (KeyValuePair<string, string> parameter in asset.GetParameters())
{ {
newFile.AddProperty(property); newFile.AddParameter(parameter);
} }
newFile.SetData(asset.Data); newFile.SetData(asset.Data);
newFile.Filename = diag.NewText; newFile.Filename = diag.NewText;
@@ -1768,9 +1768,9 @@ namespace PckStudio.Controls
{ {
if (TryGetLocFile(out LOCFile locFile)) if (TryGetLocFile(out LOCFile locFile))
{ {
if (asset.TryGetProperty("THEMENAMEID", out string value)) if (asset.TryGetParameter("THEMENAMEID", out string value))
locFile.RemoveLocKey(value); locFile.RemoveLocKey(value);
if (asset.TryGetProperty("DISPLAYNAMEID", out value)) if (asset.TryGetParameter("DISPLAYNAMEID", out value))
locFile.RemoveLocKey(value); locFile.RemoveLocKey(value);
TrySetLocFile(locFile); TrySetLocFile(locFile);
} }
@@ -1804,12 +1804,12 @@ namespace PckStudio.Controls
} }
} }
private void treeMeta_AfterSelect(object sender, TreeViewEventArgs e) private void treeParameter_AfterSelect(object sender, TreeViewEventArgs e)
{ {
if (e.Node is TreeNode t && t.Tag is KeyValuePair<string, string> property) if (e.Node is TreeNode t && t.Tag is KeyValuePair<string, string> parameter)
{ {
entryTypeTextBox.Text = property.Key; ParameterTypeTextBox.Text = parameter.Key;
entryDataTextBox.Text = property.Value; parameterValueTextBox.Text = parameter.Value;
} }
} }
@@ -1834,41 +1834,41 @@ namespace PckStudio.Controls
e.CancelEdit = true; e.CancelEdit = true;
} }
private void editAllEntriesToolStripMenuItem_Click(object sender, EventArgs e) private void editAllParametersToolStripMenuItem_Click(object sender, EventArgs e)
{ {
if (treeViewMain.SelectedNode.TryGetTagData(out PckAsset asset)) if (treeViewMain.SelectedNode.TryGetTagData(out PckAsset asset))
{ {
IEnumerable<string> props = asset.SerializeProperties(seperater: " "); IEnumerable<string> parameters = asset.SerializeParameters(separator: " ");
using (var input = new MultiTextPrompt(props)) using (var input = new MultiTextPrompt(parameters))
{ {
if (input.ShowDialog(this) == DialogResult.OK) if (input.ShowDialog(this) == DialogResult.OK)
{ {
asset.ClearProperties(); asset.ClearParameters();
asset.DeserializeProperties(input.TextOutput); asset.DeserializeParameters(input.TextOutput);
ReloadMetaTreeView(); ReloadParameterTreeView();
_wasModified = true; _wasModified = true;
} }
} }
} }
} }
private void treeMeta_DoubleClick(object sender, EventArgs e) private void treeParameter_DoubleClick(object sender, EventArgs e)
{ {
if (treeMeta.SelectedNode is TreeNode subnode && subnode.Tag is KeyValuePair<string, string> property && if (treeParameters.SelectedNode is TreeNode subnode && subnode.Tag is KeyValuePair<string, string> parameter &&
treeViewMain.SelectedNode is TreeNode node && node.Tag is PckAsset asset) treeViewMain.SelectedNode is TreeNode node && node.Tag is PckAsset asset)
{ {
if (asset.HasProperty(property.Key)) if (asset.HasParameter(parameter.Key))
{ {
switch (property.Key) switch (parameter.Key)
{ {
case "ANIM" when asset.Type == PckAssetType.SkinFile: case "ANIM" when asset.Type == PckAssetType.SkinFile:
try try
{ {
using ANIMEditor diag = new ANIMEditor(SkinANIM.FromString(property.Value)); using ANIMEditor diag = new ANIMEditor(SkinANIM.FromString(parameter.Value));
if (diag.ShowDialog(this) == DialogResult.OK) if (diag.ShowDialog(this) == DialogResult.OK)
{ {
asset.SetProperty(asset.GetPropertyIndex(property), new KeyValuePair<string, string>("ANIM", diag.ResultAnim.ToString())); asset.SetParameter(asset.GetParameterIndex(parameter), new KeyValuePair<string, string>("ANIM", diag.ResultAnim.ToString()));
ReloadMetaTreeView(); ReloadParameterTreeView();
_wasModified = true; _wasModified = true;
} }
return; return;
@@ -1876,7 +1876,7 @@ namespace PckStudio.Controls
catch (Exception ex) catch (Exception ex)
{ {
Debug.WriteLine(ex.Message); Debug.WriteLine(ex.Message);
Trace.WriteLine("Invalid ANIM value: " + property.Value); Trace.WriteLine("Invalid ANIM value: " + parameter.Value);
MessageBox.Show(this, "Failed to parse ANIM value, aborting to normal functionality. Please make sure the value only includes hexadecimal characters (0-9,A-F) and has no more than 8 characters."); MessageBox.Show(this, "Failed to parse ANIM value, aborting to normal functionality. Please make sure the value only includes hexadecimal characters (0-9,A-F) and has no more than 8 characters.");
} }
break; break;
@@ -1884,11 +1884,11 @@ namespace PckStudio.Controls
case "BOX" when asset.Type == PckAssetType.SkinFile: case "BOX" when asset.Type == PckAssetType.SkinFile:
try try
{ {
using BoxEditor diag = new BoxEditor(property.Value, EditorValue.File.xmlVersion); using BoxEditor diag = new BoxEditor(parameter.Value, EditorValue.File.xmlVersion);
if (diag.ShowDialog(this) == DialogResult.OK) if (diag.ShowDialog(this) == DialogResult.OK)
{ {
asset.SetProperty(asset.GetPropertyIndex(property), new KeyValuePair<string, string>("BOX", diag.Result.ToString())); asset.SetParameter(asset.GetParameterIndex(parameter), new KeyValuePair<string, string>("BOX", diag.Result.ToString()));
ReloadMetaTreeView(); ReloadParameterTreeView();
_wasModified = true; _wasModified = true;
} }
return; return;
@@ -1896,7 +1896,7 @@ namespace PckStudio.Controls
catch (Exception ex) catch (Exception ex)
{ {
Debug.WriteLine(ex.Message); Debug.WriteLine(ex.Message);
Trace.WriteLine("Invalid BOX value: " + property.Value); Trace.WriteLine("Invalid BOX value: " + parameter.Value);
MessageBox.Show(this, "Failed to parse BOX value, aborting to normal functionality."); MessageBox.Show(this, "Failed to parse BOX value, aborting to normal functionality.");
} }
break; break;
@@ -1906,12 +1906,12 @@ namespace PckStudio.Controls
} }
using (AddPropertyPrompt addProperty = new AddPropertyPrompt(property)) using (AddParameterPrompt addParameter = new AddParameterPrompt(parameter))
{ {
if (addProperty.ShowDialog(this) == DialogResult.OK) if (addParameter.ShowDialog(this) == DialogResult.OK)
{ {
asset.SetProperty(asset.GetPropertyIndex(property), addProperty.Property); asset.SetParameter(asset.GetParameterIndex(parameter), addParameter.Parameter);
ReloadMetaTreeView(); ReloadParameterTreeView();
_wasModified = true; _wasModified = true;
} }
} }
@@ -1919,77 +1919,77 @@ namespace PckStudio.Controls
} }
} }
private void treeMeta_KeyDown(object sender, KeyEventArgs e) private void treeParameter_KeyDown(object sender, KeyEventArgs e)
{ {
if (e.KeyData == Keys.Delete) if (e.KeyData == Keys.Delete)
deleteEntryToolStripMenuItem_Click(sender, e); deleteParameterToolStripMenuItem_Click(sender, e);
} }
private void addMultipleEntriesToolStripMenuItem1_Click(object sender, EventArgs e) private void addMultipleParametersToolStripMenuItem1_Click(object sender, EventArgs e)
{ {
if (treeViewMain.SelectedNode.TryGetTagData(out PckAsset asset)) if (treeViewMain.SelectedNode.TryGetTagData(out PckAsset asset))
{ {
using var input = new MultiTextPrompt(); using var input = new MultiTextPrompt();
if (input.ShowDialog(this) == DialogResult.OK) if (input.ShowDialog(this) == DialogResult.OK)
{ {
asset.DeserializeProperties(input.TextOutput); asset.DeserializeParameters(input.TextOutput);
ReloadMetaTreeView(); ReloadParameterTreeView();
_wasModified = true; _wasModified = true;
} }
} }
} }
private void addBOXEntryToolStripMenuItem1_Click(object sender, EventArgs e) private void addBOXParameterToolStripMenuItem1_Click(object sender, EventArgs e)
{ {
if (treeViewMain.SelectedNode is TreeNode t && t.Tag is PckAsset asset) if (treeViewMain.SelectedNode is TreeNode t && t.Tag is PckAsset asset)
{ {
using BoxEditor diag = new BoxEditor(SkinBOX.DefaultHead, EditorValue.File.xmlVersion); using BoxEditor diag = new BoxEditor(SkinBOX.DefaultHead, EditorValue.File.xmlVersion);
if (diag.ShowDialog(this) == DialogResult.OK) if (diag.ShowDialog(this) == DialogResult.OK)
{ {
asset.AddProperty("BOX", diag.Result); asset.AddParameter("BOX", diag.Result);
ReloadMetaTreeView(); ReloadParameterTreeView();
_wasModified = true; _wasModified = true;
} }
return; return;
} }
} }
private void addANIMEntryToolStripMenuItem1_Click(object sender, EventArgs e) private void addSkinANIMParameterToolStripMenuItem1_Click(object sender, EventArgs e)
{ {
if (treeViewMain.SelectedNode.TryGetTagData(out PckAsset asset)) if (treeViewMain.SelectedNode.TryGetTagData(out PckAsset asset))
{ {
using ANIMEditor diag = new ANIMEditor(SkinANIM.Empty); using ANIMEditor diag = new ANIMEditor(SkinANIM.Empty);
if (diag.ShowDialog(this) == DialogResult.OK) if (diag.ShowDialog(this) == DialogResult.OK)
{ {
asset.AddProperty("ANIM", diag.ResultAnim); asset.AddParameter("ANIM", diag.ResultAnim);
ReloadMetaTreeView(); ReloadParameterTreeView();
_wasModified = true; _wasModified = true;
} }
return; return;
} }
} }
private void deleteEntryToolStripMenuItem_Click(object sender, EventArgs e) private void deleteParameterToolStripMenuItem_Click(object sender, EventArgs e)
{ {
if (treeMeta.SelectedNode is TreeNode t && t.Tag is KeyValuePair<string, string> property && if (treeParameters.SelectedNode is TreeNode t && t.Tag is KeyValuePair<string, string> parameter &&
treeViewMain.SelectedNode is TreeNode main && main.Tag is PckAsset asset && treeViewMain.SelectedNode is TreeNode main && main.Tag is PckAsset asset &&
asset.RemoveProperty(property)) asset.RemoveParameter(parameter))
{ {
treeMeta.SelectedNode.Remove(); treeParameters.SelectedNode.Remove();
_wasModified = true; _wasModified = true;
} }
} }
private void addEntryToolStripMenuItem_Click(object sender, EventArgs e) private void addParameterToolStripMenuItem_Click(object sender, EventArgs e)
{ {
if (treeViewMain.SelectedNode is TreeNode t && if (treeViewMain.SelectedNode is TreeNode t &&
t.Tag is PckAsset asset) t.Tag is PckAsset asset)
{ {
using AddPropertyPrompt addProperty = new AddPropertyPrompt(); using AddParameterPrompt addParameter = new AddParameterPrompt();
if (addProperty.ShowDialog(this) == DialogResult.OK) if (addParameter.ShowDialog(this) == DialogResult.OK)
{ {
asset.AddProperty(addProperty.Property); asset.AddParameter(addParameter.Parameter);
ReloadMetaTreeView(); ReloadParameterTreeView();
_wasModified = true; _wasModified = true;
} }
} }
+176 -179
View File
@@ -861,14 +861,11 @@
<value>831, 252</value> <value>831, 252</value>
</data> </data>
<data name="labelImageSize.Size" type="System.Drawing.Size, System.Drawing"> <data name="labelImageSize.Size" type="System.Drawing.Size, System.Drawing">
<value>30, 19</value> <value>0, 0</value>
</data> </data>
<data name="labelImageSize.TabIndex" type="System.Int32, mscorlib"> <data name="labelImageSize.TabIndex" type="System.Int32, mscorlib">
<value>19</value> <value>19</value>
</data> </data>
<data name="labelImageSize.Text" xml:space="preserve">
<value></value>
</data>
<data name="&gt;&gt;labelImageSize.Name" xml:space="preserve"> <data name="&gt;&gt;labelImageSize.Name" xml:space="preserve">
<value>labelImageSize</value> <value>labelImageSize</value>
</data> </data>
@@ -915,7 +912,7 @@
<value>True</value> <value>True</value>
</data> </data>
<data name="metroLabel2.Location" type="System.Drawing.Point, System.Drawing"> <data name="metroLabel2.Location" type="System.Drawing.Point, System.Drawing">
<value>204, 135</value> <value>204, 129</value>
</data> </data>
<data name="metroLabel2.Size" type="System.Drawing.Size, System.Drawing"> <data name="metroLabel2.Size" type="System.Drawing.Size, System.Drawing">
<value>0, 0</value> <value>0, 0</value>
@@ -960,7 +957,7 @@
<value>False</value> <value>False</value>
</data> </data>
<data name="entryTypeTextBox.Location" type="System.Drawing.Point, System.Drawing"> <data name="entryTypeTextBox.Location" type="System.Drawing.Point, System.Drawing">
<value>215, 105</value> <value>215, 99</value>
</data> </data>
<data name="entryTypeTextBox.Size" type="System.Drawing.Size, System.Drawing"> <data name="entryTypeTextBox.Size" type="System.Drawing.Size, System.Drawing">
<value>146, 20</value> <value>146, 20</value>
@@ -1005,7 +1002,7 @@
<value>False</value> <value>False</value>
</data> </data>
<data name="entryDataTextBox.Location" type="System.Drawing.Point, System.Drawing"> <data name="entryDataTextBox.Location" type="System.Drawing.Point, System.Drawing">
<value>215, 137</value> <value>215, 131</value>
</data> </data>
<data name="entryDataTextBox.Size" type="System.Drawing.Size, System.Drawing"> <data name="entryDataTextBox.Size" type="System.Drawing.Size, System.Drawing">
<value>146, 20</value> <value>146, 20</value>
@@ -1029,7 +1026,7 @@
<value>Bottom, Right</value> <value>Bottom, Right</value>
</data> </data>
<data name="buttonEdit.Location" type="System.Drawing.Point, System.Drawing"> <data name="buttonEdit.Location" type="System.Drawing.Point, System.Drawing">
<value>215, 163</value> <value>215, 157</value>
</data> </data>
<data name="buttonEdit.Size" type="System.Drawing.Size, System.Drawing"> <data name="buttonEdit.Size" type="System.Drawing.Size, System.Drawing">
<value>146, 33</value> <value>146, 33</value>
@@ -1062,7 +1059,7 @@
<value>True</value> <value>True</value>
</data> </data>
<data name="metroLabel1.Location" type="System.Drawing.Point, System.Drawing"> <data name="metroLabel1.Location" type="System.Drawing.Point, System.Drawing">
<value>266, 28</value> <value>266, 22</value>
</data> </data>
<data name="metroLabel1.Size" type="System.Drawing.Size, System.Drawing"> <data name="metroLabel1.Size" type="System.Drawing.Size, System.Drawing">
<value>0, 0</value> <value>0, 0</value>
@@ -1082,90 +1079,40 @@
<data name="&gt;&gt;metroLabel1.ZOrder" xml:space="preserve"> <data name="&gt;&gt;metroLabel1.ZOrder" xml:space="preserve">
<value>6</value> <value>6</value>
</data> </data>
<metadata name="contextMenuMetaTree.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="contextMenuParameterTree.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>301, 19</value> <value>301, 19</value>
</metadata> </metadata>
<data name="addEntryToolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing"> <data name="contextMenuParameterTree.Size" type="System.Drawing.Size, System.Drawing">
<value>160, 22</value> <value>206, 92</value>
</data> </data>
<data name="addEntryToolStripMenuItem1.Text" xml:space="preserve"> <data name="&gt;&gt;contextMenuParameterTree.Name" xml:space="preserve">
<value>Add Entry</value> <value>contextMenuParameterTree</value>
</data> </data>
<data name="addBOXEntryToolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing"> <data name="&gt;&gt;contextMenuParameterTree.Type" xml:space="preserve">
<value>160, 22</value>
</data>
<data name="addBOXEntryToolStripMenuItem1.Text" xml:space="preserve">
<value>Add BOX Entry</value>
</data>
<data name="addANIMEntryToolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
<value>160, 22</value>
</data>
<data name="addANIMEntryToolStripMenuItem1.Text" xml:space="preserve">
<value>Add ANIM Entry</value>
</data>
<data name="addEntryToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMkMEa+wAAABPSURBVDhP5ZAx
DgAgCAMZ/f+HMcbYYOmg0UmHY2ibGzB3txNSgMKsHcD9ksBL5wcBPwyPCwLFJBjjVe4LFHGsgEDBAu6x
4+AxAT9MkYJdKi90axNkwjxWAAAAAElFTkSuQmCC
</value>
</data>
<data name="addEntryToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>181, 22</value>
</data>
<data name="addEntryToolStripMenuItem.Text" xml:space="preserve">
<value>Add Entry</value>
</data>
<data name="addMultipleEntriesToolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
<value>181, 22</value>
</data>
<data name="addMultipleEntriesToolStripMenuItem1.Text" xml:space="preserve">
<value>Add Multiple Entries</value>
</data>
<data name="deleteEntryToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>181, 22</value>
</data>
<data name="deleteEntryToolStripMenuItem.Text" xml:space="preserve">
<value>Delete Entry</value>
</data>
<data name="editAllEntriesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>181, 22</value>
</data>
<data name="editAllEntriesToolStripMenuItem.Text" xml:space="preserve">
<value>Edit All Entries</value>
</data>
<data name="contextMenuMetaTree.Size" type="System.Drawing.Size, System.Drawing">
<value>182, 92</value>
</data>
<data name="&gt;&gt;contextMenuMetaTree.Name" xml:space="preserve">
<value>contextMenuMetaTree</value>
</data>
<data name="&gt;&gt;contextMenuMetaTree.Type" xml:space="preserve">
<value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data> </data>
<data name="treeMeta.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <data name="treeParameters.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Left</value> <value>Left</value>
</data> </data>
<data name="treeMeta.Location" type="System.Drawing.Point, System.Drawing"> <data name="treeParameters.Location" type="System.Drawing.Point, System.Drawing">
<value>5, 5</value> <value>5, 5</value>
</data> </data>
<data name="treeMeta.Size" type="System.Drawing.Size, System.Drawing"> <data name="treeParameters.Size" type="System.Drawing.Size, System.Drawing">
<value>204, 229</value> <value>204, 229</value>
</data> </data>
<data name="treeMeta.TabIndex" type="System.Int32, mscorlib"> <data name="treeParameters.TabIndex" type="System.Int32, mscorlib">
<value>0</value> <value>0</value>
</data> </data>
<data name="&gt;&gt;treeMeta.Name" xml:space="preserve"> <data name="&gt;&gt;treeParameters.Name" xml:space="preserve">
<value>treeMeta</value> <value>treeParameters</value>
</data> </data>
<data name="&gt;&gt;treeMeta.Type" xml:space="preserve"> <data name="&gt;&gt;treeParameters.Type" xml:space="preserve">
<value>System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data> </data>
<data name="&gt;&gt;treeMeta.Parent" xml:space="preserve"> <data name="&gt;&gt;treeParameters.Parent" xml:space="preserve">
<value>MetaTab</value> <value>MetaTab</value>
</data> </data>
<data name="&gt;&gt;treeMeta.ZOrder" xml:space="preserve"> <data name="&gt;&gt;treeParameters.ZOrder" xml:space="preserve">
<value>7</value> <value>7</value>
</data> </data>
<data name="MetaTab.Location" type="System.Drawing.Point, System.Drawing"> <data name="MetaTab.Location" type="System.Drawing.Point, System.Drawing">
@@ -1181,7 +1128,7 @@
<value>0</value> <value>0</value>
</data> </data>
<data name="MetaTab.Text" xml:space="preserve"> <data name="MetaTab.Text" xml:space="preserve">
<value>Properties</value> <value>Parameters</value>
</data> </data>
<data name="&gt;&gt;MetaTab.Name" xml:space="preserve"> <data name="&gt;&gt;MetaTab.Name" xml:space="preserve">
<value>MetaTab</value> <value>MetaTab</value>
@@ -1190,35 +1137,85 @@
<value>MetroFramework.Controls.MetroTabPage, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a</value> <value>MetroFramework.Controls.MetroTabPage, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a</value>
</data> </data>
<data name="&gt;&gt;MetaTab.Parent" xml:space="preserve"> <data name="&gt;&gt;MetaTab.Parent" xml:space="preserve">
<value>PropertiesTabControl</value> <value>ParametersTabControl</value>
</data> </data>
<data name="&gt;&gt;MetaTab.ZOrder" xml:space="preserve"> <data name="&gt;&gt;MetaTab.ZOrder" xml:space="preserve">
<value>0</value> <value>0</value>
</data> </data>
<data name="PropertiesTabControl.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <data name="ParametersTabControl.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Bottom</value> <value>Bottom</value>
</data> </data>
<data name="PropertiesTabControl.Location" type="System.Drawing.Point, System.Drawing"> <data name="ParametersTabControl.Location" type="System.Drawing.Point, System.Drawing">
<value>279, 270</value> <value>279, 270</value>
</data> </data>
<data name="PropertiesTabControl.Size" type="System.Drawing.Size, System.Drawing"> <data name="ParametersTabControl.Size" type="System.Drawing.Size, System.Drawing">
<value>732, 281</value> <value>732, 281</value>
</data> </data>
<data name="PropertiesTabControl.TabIndex" type="System.Int32, mscorlib"> <data name="ParametersTabControl.TabIndex" type="System.Int32, mscorlib">
<value>11</value> <value>11</value>
</data> </data>
<data name="&gt;&gt;PropertiesTabControl.Name" xml:space="preserve"> <data name="&gt;&gt;ParametersTabControl.Name" xml:space="preserve">
<value>PropertiesTabControl</value> <value>ParametersTabControl</value>
</data> </data>
<data name="&gt;&gt;PropertiesTabControl.Type" xml:space="preserve"> <data name="&gt;&gt;ParametersTabControl.Type" xml:space="preserve">
<value>MetroFramework.Controls.MetroTabControl, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a</value> <value>MetroFramework.Controls.MetroTabControl, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a</value>
</data> </data>
<data name="&gt;&gt;PropertiesTabControl.Parent" xml:space="preserve"> <data name="&gt;&gt;ParametersTabControl.Parent" xml:space="preserve">
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;PropertiesTabControl.ZOrder" xml:space="preserve"> <data name="&gt;&gt;ParametersTabControl.ZOrder" xml:space="preserve">
<value>7</value> <value>7</value>
</data> </data>
<data name="addParameterToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMkMEa+wAAABPSURBVDhP5ZAx
DgAgCAMZ/f+HMcbYYOmg0UmHY2ibGzB3txNSgMKsHcD9ksBL5wcBPwyPCwLFJBjjVe4LFHGsgEDBAu6x
4+AxAT9MkYJdKi90axNkwjxWAAAAAElFTkSuQmCC
</value>
</data>
<data name="addParameterToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>205, 22</value>
</data>
<data name="addParameterToolStripMenuItem.Text" xml:space="preserve">
<value>Add Parameter</value>
</data>
<data name="addParameterToolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
<value>212, 22</value>
</data>
<data name="addParameterToolStripMenuItem1.Text" xml:space="preserve">
<value>Add Parameter</value>
</data>
<data name="addBOXEntryToolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
<value>212, 22</value>
</data>
<data name="addBOXEntryToolStripMenuItem1.Text" xml:space="preserve">
<value>Add BOX Parameter</value>
</data>
<data name="addANIMEntryToolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
<value>212, 22</value>
</data>
<data name="addANIMEntryToolStripMenuItem1.Text" xml:space="preserve">
<value>Add Skin ANIM Parameter</value>
</data>
<data name="addMultipleEntriesToolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
<value>205, 22</value>
</data>
<data name="addMultipleEntriesToolStripMenuItem1.Text" xml:space="preserve">
<value>Add Multiple Parameters</value>
</data>
<data name="deleteEntryToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>205, 22</value>
</data>
<data name="deleteEntryToolStripMenuItem.Text" xml:space="preserve">
<value>Delete Parameter</value>
</data>
<data name="editAllEntriesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>205, 22</value>
</data>
<data name="editAllEntriesToolStripMenuItem.Text" xml:space="preserve">
<value>Edit All Parameters</value>
</data>
<metadata name="label11.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="label11.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
@@ -1249,6 +1246,64 @@
<metadata name="contextMenuPCKEntries.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="contextMenuPCKEntries.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>22, 20</value> <value>22, 20</value>
</metadata> </metadata>
<data name="contextMenuPCKEntries.Size" type="System.Drawing.Size, System.Drawing">
<value>158, 236</value>
</data>
<data name="&gt;&gt;contextMenuPCKEntries.Name" xml:space="preserve">
<value>contextMenuPCKEntries</value>
</data>
<data name="&gt;&gt;contextMenuPCKEntries.Type" xml:space="preserve">
<value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="treeViewMain.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Left</value>
</data>
<data name="treeViewMain.ImageIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<metadata name="imageList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>204, 20</value>
</metadata>
<data name="imageList.ImageSize" type="System.Drawing.Size, System.Drawing">
<value>32, 32</value>
</data>
<data name="treeViewMain.Location" type="System.Drawing.Point, System.Drawing">
<value>5, 50</value>
</data>
<data name="treeViewMain.SelectedImageIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="treeViewMain.Size" type="System.Drawing.Size, System.Drawing">
<value>274, 501</value>
</data>
<data name="treeViewMain.TabIndex" type="System.Int32, mscorlib">
<value>20</value>
</data>
<data name="&gt;&gt;treeViewMain.Name" xml:space="preserve">
<value>treeViewMain</value>
</data>
<data name="&gt;&gt;treeViewMain.Type" xml:space="preserve">
<value>System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;treeViewMain.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;treeViewMain.ZOrder" xml:space="preserve">
<value>9</value>
</data>
<data name="createToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xOdTWsmQAAAAwSURBVDhPY/j/
/z8DJRhDAI5FGf6jYHT5UQPQDEBXTCweTgZgw1gUY8MYAqMGkI4B8bClX7FZFPQAAAAASUVORK5CYII=
</value>
</data>
<data name="createToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>157, 22</value>
</data>
<data name="createToolStripMenuItem.Text" xml:space="preserve">
<value>Create</value>
</data>
<data name="folderToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="folderToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -1337,18 +1392,19 @@
<data name="entityMaterialsbinToolStripMenuItem.Text" xml:space="preserve"> <data name="entityMaterialsbinToolStripMenuItem.Text" xml:space="preserve">
<value>EntityMaterials.bin</value> <value>EntityMaterials.bin</value>
</data> </data>
<data name="createToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="importSkinsToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xOdTWsmQAAAAwSURBVDhPY/j/ vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xOdTWsmQAAABoSURBVDhPvcxB
/z8DJRhDAI5FGf6jYHT5UQPQDEBXTCweTgZgw1gUY8MYAqMGkI4B8bClX7FZFPQAAAAASUVORK5CYII= CsAgDAVRL9GLZ+81cj2L0kA61UQoGPjgwnmlPFdrbavZn/AY+alqjjAikCKMZkCIMFoBS4SRn4h8xj4E
Zgj7FCDCfgvwCPstoF1l7DfQ3+xDwELuHECov1/xMcDPuhsgou11NRjL2QAAAABJRU5ErkJggg==
</value> </value>
</data> </data>
<data name="createToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> <data name="importSkinsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>157, 22</value> <value>157, 22</value>
</data> </data>
<data name="createToolStripMenuItem.Text" xml:space="preserve"> <data name="importSkinsToolStripMenuItem.Text" xml:space="preserve">
<value>Create</value> <value>Import</value>
</data> </data>
<data name="importSkinToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="importSkinToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
@@ -1401,19 +1457,11 @@
<data name="addFileToolStripMenuItem.Text" xml:space="preserve"> <data name="addFileToolStripMenuItem.Text" xml:space="preserve">
<value>Add File</value> <value>Add File</value>
</data> </data>
<data name="importSkinsToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="exportToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xOdTWsmQAAABoSURBVDhPvcxB
CsAgDAVRL9GLZ+81cj2L0kA61UQoGPjgwnmlPFdrbavZn/AY+alqjjAikCKMZkCIMFoBS4SRn4h8xj4E
Zgj7FCDCfgvwCPstoF1l7DfQ3+xDwELuHECov1/xMcDPuhsgou11NRjL2QAAAABJRU5ErkJggg==
</value>
</data>
<data name="importSkinsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>157, 22</value> <value>157, 22</value>
</data> </data>
<data name="importSkinsToolStripMenuItem.Text" xml:space="preserve"> <data name="exportToolStripMenuItem.Text" xml:space="preserve">
<value>Import</value> <value>Export</value>
</data> </data>
<data name="as3DSTextureFileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> <data name="as3DSTextureFileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>185, 22</value> <value>185, 22</value>
@@ -1421,11 +1469,11 @@
<data name="as3DSTextureFileToolStripMenuItem.Text" xml:space="preserve"> <data name="as3DSTextureFileToolStripMenuItem.Text" xml:space="preserve">
<value>Export as 3DS Texture</value> <value>Export as 3DS Texture</value>
</data> </data>
<data name="exportToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> <data name="setFileTypeToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>157, 22</value> <value>157, 22</value>
</data> </data>
<data name="exportToolStripMenuItem.Text" xml:space="preserve"> <data name="setFileTypeToolStripMenuItem.Text" xml:space="preserve">
<value>Export</value> <value>Set File Type</value>
</data> </data>
<data name="skinToolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing"> <data name="skinToolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
<value>222, 22</value> <value>222, 22</value>
@@ -1499,15 +1547,15 @@
<data name="entityMaterialsFileBINToolStripMenuItem.Text" xml:space="preserve"> <data name="entityMaterialsFileBINToolStripMenuItem.Text" xml:space="preserve">
<value>Entity Materials File (.BIN)</value> <value>Entity Materials File (.BIN)</value>
</data> </data>
<data name="setFileTypeToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>157, 22</value>
</data>
<data name="setFileTypeToolStripMenuItem.Text" xml:space="preserve">
<value>Set File Type</value>
</data>
<data name="toolStripSeparator5.Size" type="System.Drawing.Size, System.Drawing"> <data name="toolStripSeparator5.Size" type="System.Drawing.Size, System.Drawing">
<value>154, 6</value> <value>154, 6</value>
</data> </data>
<data name="miscFunctionsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>157, 22</value>
</data>
<data name="miscFunctionsToolStripMenuItem.Text" xml:space="preserve">
<value>Misc. Functions</value>
</data>
<data name="generateMipMapTextureToolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing"> <data name="generateMipMapTextureToolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
<value>223, 22</value> <value>223, 22</value>
</data> </data>
@@ -1526,6 +1574,12 @@
<data name="correctSkinDecimalsToolStripMenuItem.Text" xml:space="preserve"> <data name="correctSkinDecimalsToolStripMenuItem.Text" xml:space="preserve">
<value>Correct Skin Decimals</value> <value>Correct Skin Decimals</value>
</data> </data>
<data name="setSubPCKEndiannessToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>223, 22</value>
</data>
<data name="setSubPCKEndiannessToolStripMenuItem.Text" xml:space="preserve">
<value>Set Endianness</value>
</data>
<data name="bigEndianXbox360PS3WiiUToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> <data name="bigEndianXbox360PS3WiiUToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>100, 22</value> <value>100, 22</value>
</data> </data>
@@ -1538,11 +1592,11 @@
<data name="littleEndianPS4PSVitaSwitchToolStripMenuItem.Text" xml:space="preserve"> <data name="littleEndianPS4PSVitaSwitchToolStripMenuItem.Text" xml:space="preserve">
<value>Little</value> <value>Little</value>
</data> </data>
<data name="setSubPCKEndiannessToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> <data name="setModelContainerFormatToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>223, 22</value> <value>223, 22</value>
</data> </data>
<data name="setSubPCKEndiannessToolStripMenuItem.Text" xml:space="preserve"> <data name="setModelContainerFormatToolStripMenuItem.Text" xml:space="preserve">
<value>Set Endianness</value> <value>Set Model Container version</value>
</data> </data>
<data name="version1ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> <data name="version1ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>80, 22</value> <value>80, 22</value>
@@ -1562,18 +1616,6 @@
<data name="version3114ToolStripMenuItem.Text" xml:space="preserve"> <data name="version3114ToolStripMenuItem.Text" xml:space="preserve">
<value>3</value> <value>3</value>
</data> </data>
<data name="setModelContainerFormatToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>223, 22</value>
</data>
<data name="setModelContainerFormatToolStripMenuItem.Text" xml:space="preserve">
<value>Set Model Container version</value>
</data>
<data name="miscFunctionsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>157, 22</value>
</data>
<data name="miscFunctionsToolStripMenuItem.Text" xml:space="preserve">
<value>Misc. Functions</value>
</data>
<data name="extractToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="extractToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -1633,51 +1675,6 @@
<data name="deleteFileToolStripMenuItem.Text" xml:space="preserve"> <data name="deleteFileToolStripMenuItem.Text" xml:space="preserve">
<value>Delete</value> <value>Delete</value>
</data> </data>
<data name="contextMenuPCKEntries.Size" type="System.Drawing.Size, System.Drawing">
<value>158, 236</value>
</data>
<data name="&gt;&gt;contextMenuPCKEntries.Name" xml:space="preserve">
<value>contextMenuPCKEntries</value>
</data>
<data name="&gt;&gt;contextMenuPCKEntries.Type" xml:space="preserve">
<value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="treeViewMain.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Left</value>
</data>
<data name="treeViewMain.ImageIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<metadata name="imageList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>204, 20</value>
</metadata>
<data name="imageList.ImageSize" type="System.Drawing.Size, System.Drawing">
<value>32, 32</value>
</data>
<data name="treeViewMain.Location" type="System.Drawing.Point, System.Drawing">
<value>5, 50</value>
</data>
<data name="treeViewMain.SelectedImageIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="treeViewMain.Size" type="System.Drawing.Size, System.Drawing">
<value>274, 501</value>
</data>
<data name="treeViewMain.TabIndex" type="System.Int32, mscorlib">
<value>20</value>
</data>
<data name="&gt;&gt;treeViewMain.Name" xml:space="preserve">
<value>treeViewMain</value>
</data>
<data name="&gt;&gt;treeViewMain.Type" xml:space="preserve">
<value>System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;treeViewMain.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;treeViewMain.ZOrder" xml:space="preserve">
<value>9</value>
</data>
<data name="addMultipleEntriesToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="addMultipleEntriesToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -1747,7 +1744,7 @@
<value>previewPictureBox</value> <value>previewPictureBox</value>
</data> </data>
<data name="&gt;&gt;previewPictureBox.Type" xml:space="preserve"> <data name="&gt;&gt;previewPictureBox.Type" xml:space="preserve">
<value>PckStudio.ToolboxItems.InterpolationPictureBox, PCK-Studio, Version=7.0.0.2, Culture=neutral, PublicKeyToken=null</value> <value>PckStudio.ToolboxItems.InterpolationPictureBox, PCK-Studio, Version=7.0.1.2, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;previewPictureBox.Parent" xml:space="preserve"> <data name="&gt;&gt;previewPictureBox.Parent" xml:space="preserve">
<value>$this</value> <value>$this</value>
@@ -1770,16 +1767,16 @@
<data name="$this.Size" type="System.Drawing.Size, System.Drawing"> <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
<value>1016, 558</value> <value>1016, 558</value>
</data> </data>
<data name="&gt;&gt;addEntryToolStripMenuItem.Name" xml:space="preserve"> <data name="&gt;&gt;addParameterToolStripMenuItem.Name" xml:space="preserve">
<value>addEntryToolStripMenuItem</value> <value>addParameterToolStripMenuItem</value>
</data> </data>
<data name="&gt;&gt;addEntryToolStripMenuItem.Type" xml:space="preserve"> <data name="&gt;&gt;addParameterToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data> </data>
<data name="&gt;&gt;addEntryToolStripMenuItem1.Name" xml:space="preserve"> <data name="&gt;&gt;addParameterToolStripMenuItem1.Name" xml:space="preserve">
<value>addEntryToolStripMenuItem1</value> <value>addParameterToolStripMenuItem1</value>
</data> </data>
<data name="&gt;&gt;addEntryToolStripMenuItem1.Type" xml:space="preserve"> <data name="&gt;&gt;addParameterToolStripMenuItem1.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data> </data>
<data name="&gt;&gt;addBOXEntryToolStripMenuItem1.Name" xml:space="preserve"> <data name="&gt;&gt;addBOXEntryToolStripMenuItem1.Name" xml:space="preserve">
@@ -2110,6 +2107,6 @@
<value>PckEditor</value> <value>PckEditor</value>
</data> </data>
<data name="&gt;&gt;$this.Type" xml:space="preserve"> <data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>PckStudio.Controls.EditorControl`1[[PckStudio.Core.PackInfo, PckStudio.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], PCK-Studio, Version=7.0.0.2, Culture=neutral, PublicKeyToken=null</value> <value>PckStudio.Controls.EditorControl`1[[PckStudio.Core.PackInfo, PckStudio.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], PCK-Studio, Version=7.0.1.2, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
</root> </root>
@@ -1,6 +1,6 @@
namespace PckStudio.Forms.Additional_Popups namespace PckStudio.Forms.Additional_Popups
{ {
partial class AddPropertyPrompt partial class AddParameterPrompt
{ {
/// <summary> /// <summary>
/// Required designer variable. /// Required designer variable.
@@ -29,7 +29,7 @@
private void InitializeComponent() private void InitializeComponent()
{ {
System.Windows.Forms.Label label1; System.Windows.Forms.Label label1;
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AddPropertyPrompt)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AddParameterPrompt));
System.Windows.Forms.Label label2; System.Windows.Forms.Label label2;
this.keyTextBox = new System.Windows.Forms.TextBox(); this.keyTextBox = new System.Windows.Forms.TextBox();
this.valueTextBox = new System.Windows.Forms.TextBox(); this.valueTextBox = new System.Windows.Forms.TextBox();
@@ -74,10 +74,12 @@
this.saveButton.UseVisualStyleBackColor = true; this.saveButton.UseVisualStyleBackColor = true;
this.saveButton.Click += new System.EventHandler(this.saveButton_Click); this.saveButton.Click += new System.EventHandler(this.saveButton_Click);
// //
// AddPropertyPrompt // AddParameterPrompt
// //
resources.ApplyResources(this, "$this"); resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackLocation = MetroFramework.Forms.BackLocation.TopLeft;
this.BorderStyle = MetroFramework.Forms.MetroFormBorderStyle.None;
this.Controls.Add(this.saveButton); this.Controls.Add(this.saveButton);
this.Controls.Add(label2); this.Controls.Add(label2);
this.Controls.Add(label1); this.Controls.Add(label1);
@@ -85,7 +87,7 @@
this.Controls.Add(this.keyTextBox); this.Controls.Add(this.keyTextBox);
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "AddPropertyPrompt"; this.Name = "AddParameterPrompt";
this.Resizable = false; this.Resizable = false;
this.ShadowType = MetroFramework.Forms.MetroFormShadowType.DropShadow; this.ShadowType = MetroFramework.Forms.MetroFormShadowType.DropShadow;
this.Style = MetroFramework.MetroColorStyle.Black; this.Style = MetroFramework.MetroColorStyle.Black;
@@ -4,24 +4,24 @@ using System.Windows.Forms;
namespace PckStudio.Forms.Additional_Popups namespace PckStudio.Forms.Additional_Popups
{ {
public partial class AddPropertyPrompt : MetroFramework.Forms.MetroForm public partial class AddParameterPrompt : MetroFramework.Forms.MetroForm
{ {
public KeyValuePair<string, string> Property => new KeyValuePair<string, string>(keyTextBox.Text, valueTextBox.Text); public KeyValuePair<string, string> Parameter => new KeyValuePair<string, string>(keyTextBox.Text, valueTextBox.Text);
public AddPropertyPrompt(KeyValuePair<string, string> property) public AddParameterPrompt(KeyValuePair<string, string> parameter)
: this(property.Key, property.Value) : this(parameter.Key, parameter.Value)
{ {
} }
public AddPropertyPrompt(string name, string value) public AddParameterPrompt(string name, string value)
{ {
InitializeComponent(); InitializeComponent();
keyTextBox.Text = name; keyTextBox.Text = name;
valueTextBox.Text = value; valueTextBox.Text = value;
} }
public AddPropertyPrompt() public AddParameterPrompt()
{ {
InitializeComponent(); InitializeComponent();
} }
@@ -135,7 +135,7 @@
<value>2</value> <value>2</value>
</data> </data>
<data name="label1.Text" xml:space="preserve"> <data name="label1.Text" xml:space="preserve">
<value>Entry</value> <value>Type</value>
</data> </data>
<data name="&gt;&gt;label1.Name" xml:space="preserve"> <data name="&gt;&gt;label1.Name" xml:space="preserve">
<value>label1</value> <value>label1</value>
@@ -2771,7 +2771,7 @@
<value>CenterParent</value> <value>CenterParent</value>
</data> </data>
<data name="&gt;&gt;$this.Name" xml:space="preserve"> <data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>AddPropertyPrompt</value> <value>AddParameterPrompt</value>
</data> </data>
<data name="&gt;&gt;$this.Type" xml:space="preserve"> <data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>MetroFramework.Forms.MetroForm, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a</value> <value>MetroFramework.Forms.MetroForm, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a</value>
@@ -29,7 +29,7 @@ namespace PckStudio.Popups
InitializeComponent(); InitializeComponent();
_pckFile = pckFile; _pckFile = pckFile;
propertyTreeview.Nodes.Clear(); propertyTreeview.Nodes.Clear();
propertyTreeview.Nodes.AddRange(_pckFile.GetPropertyList().Select(s => new TreeNode(s)).ToArray()); propertyTreeview.Nodes.AddRange(_pckFile.GetParameterList().Select(s => new TreeNode(s)).ToArray());
} }
private void applyButton_Click(object sender, EventArgs e) private void applyButton_Click(object sender, EventArgs e)
@@ -64,7 +64,7 @@ namespace PckStudio.Popups
if (index == -1 || (Enum.IsDefined(typeof(PckAssetType), index) && (int)asset.Type == index)) if (index == -1 || (Enum.IsDefined(typeof(PckAssetType), index) && (int)asset.Type == index))
{ {
asset.AddProperty(propertyKeyTextBox.Text, propertyValueTextBox.Text); asset.AddParameter(propertyKeyTextBox.Text, propertyValueTextBox.Text);
} }
} }
+4 -4
View File
@@ -342,8 +342,8 @@ namespace PckStudio
var pack = new PckFile(3); var pack = new PckFile(3);
PckAsset zeroAsset = pack.CreateNewAsset("0", PckAssetType.InfoFile); PckAsset zeroAsset = pack.CreateNewAsset("0", PckAssetType.InfoFile);
zeroAsset.AddProperty("PACKID", packId); zeroAsset.AddParameter("PACKID", packId);
zeroAsset.AddProperty("PACKVERSION", packVersion); zeroAsset.AddParameter("PACKVERSION", packVersion);
var locFile = new LOCFile(); var locFile = new LOCFile();
locFile.InitializeDefault(packName); locFile.InitializeDefault(packName);
@@ -369,8 +369,8 @@ namespace PckStudio
comparisonAsset.SetTexture(Core.Properties.Resources.Comparison); comparisonAsset.SetTexture(Core.Properties.Resources.Comparison);
PckAsset texturepackInfoAsset = pack.CreateNewAsset($"{res}/{res}Info.pck", PckAssetType.TexturePackInfoFile); PckAsset texturepackInfoAsset = pack.CreateNewAsset($"{res}/{res}Info.pck", PckAssetType.TexturePackInfoFile);
texturepackInfoAsset.AddProperty("PACKID", "0"); texturepackInfoAsset.AddParameter("PACKID", "0");
texturepackInfoAsset.AddProperty("DATAPATH", $"{res}Data.pck"); texturepackInfoAsset.AddParameter("DATAPATH", $"{res}Data.pck");
texturepackInfoAsset.SetData(new PckFileWriter(infoPCK, OMI.ByteOrder.BigEndian)); texturepackInfoAsset.SetData(new PckFileWriter(infoPCK, OMI.ByteOrder.BigEndian));
+7 -7
View File
@@ -316,11 +316,11 @@
<Compile Include="Forms\Additional-Popups\ItemSelectionPopUp.Designer.cs"> <Compile Include="Forms\Additional-Popups\ItemSelectionPopUp.Designer.cs">
<DependentUpon>ItemSelectionPopUp.cs</DependentUpon> <DependentUpon>ItemSelectionPopUp.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="Forms\Additional-Popups\AddPropertyPrompt.cs"> <Compile Include="Forms\Additional-Popups\AddParameterPrompt.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="Forms\Additional-Popups\AddPropertyPrompt.Designer.cs"> <Compile Include="Forms\Additional-Popups\AddParameterPrompt.Designer.cs">
<DependentUpon>AddPropertyPrompt.cs</DependentUpon> <DependentUpon>AddParameterPrompt.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="Forms\Additional-Popups\AddSkinPrompt.cs"> <Compile Include="Forms\Additional-Popups\AddSkinPrompt.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
@@ -466,11 +466,11 @@
<EmbeddedResource Include="Forms\Additional-Popups\ItemSelectionPopUp.resx"> <EmbeddedResource Include="Forms\Additional-Popups\ItemSelectionPopUp.resx">
<DependentUpon>ItemSelectionPopUp.cs</DependentUpon> <DependentUpon>ItemSelectionPopUp.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Forms\Additional-Popups\AddPropertyPrompt.ja.resx"> <EmbeddedResource Include="Forms\Additional-Popups\AddParameterPrompt.ja.resx">
<DependentUpon>AddPropertyPrompt.cs</DependentUpon> <DependentUpon>AddParameterPrompt.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Forms\Additional-Popups\AddPropertyPrompt.resx"> <EmbeddedResource Include="Forms\Additional-Popups\AddParameterPrompt.resx">
<DependentUpon>AddPropertyPrompt.cs</DependentUpon> <DependentUpon>AddParameterPrompt.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Forms\Additional-Popups\AddSkinPrompt.ja.resx"> <EmbeddedResource Include="Forms\Additional-Popups\AddSkinPrompt.ja.resx">
<DependentUpon>AddSkinPrompt.cs</DependentUpon> <DependentUpon>AddSkinPrompt.cs</DependentUpon>
@@ -24,7 +24,7 @@ namespace PckStudio.Core.Deserializer
{ {
Image texture = asset.GetTexture(); Image texture = asset.GetTexture();
IEnumerable<Image> frameTextures = texture.Split(ImageLayoutDirection.Vertical); IEnumerable<Image> frameTextures = texture.Split(ImageLayoutDirection.Vertical);
string animString = asset.GetProperty("ANIM"); string animString = asset.GetParameter("ANIM");
bool animStringIsEmpty = string.IsNullOrEmpty(animString); bool animStringIsEmpty = string.IsNullOrEmpty(animString);
Animation animation = new Animation(frameTextures, animStringIsEmpty); Animation animation = new Animation(frameTextures, animStringIsEmpty);
if (!animStringIsEmpty) if (!animStringIsEmpty)
+21 -21
View File
@@ -83,11 +83,11 @@ namespace PckStudio.Core.Extensions
int skinId = asset.GetSkinId(); int skinId = asset.GetSkinId();
string name = asset.GetProperty("DISPLAYNAME"); string name = asset.GetParameter("DISPLAYNAME");
Image texture = asset.GetTexture(); Image texture = asset.GetTexture();
SkinANIM anim = asset.GetProperty("ANIM", SkinANIM.FromString); SkinANIM anim = asset.GetParameter("ANIM", SkinANIM.FromString);
IEnumerable<SkinBOX> boxes = asset.GetMultipleProperties("BOX").Select(kv => SkinBOX.FromString(kv.Value)); IEnumerable<SkinBOX> boxes = asset.GetMultipleParameters("BOX").Select(kv => SkinBOX.FromString(kv.Value));
IEnumerable<SkinPartOffset> offsets = asset.GetMultipleProperties("OFFSET").Select(kv => SkinPartOffset.FromString(kv.Value)); IEnumerable<SkinPartOffset> offsets = asset.GetMultipleParameters("OFFSET").Select(kv => SkinPartOffset.FromString(kv.Value));
return new Skin.Skin(name, skinId, texture, anim, boxes, offsets); return new Skin.Skin(name, skinId, texture, anim, boxes, offsets);
} }
@@ -103,46 +103,46 @@ namespace PckStudio.Core.Extensions
// TODO: keep filepath // TODO: keep filepath
asset.Filename = $"dlcskin{skinId}.png"; asset.Filename = $"dlcskin{skinId}.png";
asset.SetProperty("DISPLAYNAME", skin.MetaData.Name); asset.SetParameter("DISPLAYNAME", skin.MetaData.Name);
if (localizationFile is not null) if (localizationFile is not null)
{ {
string skinLocKey = $"IDS_dlcskin{skinId}_DISPLAYNAME"; string skinLocKey = $"IDS_dlcskin{skinId}_DISPLAYNAME";
asset.SetProperty("DISPLAYNAMEID", skinLocKey); asset.SetParameter("DISPLAYNAMEID", skinLocKey);
localizationFile.SetLocEntry(skinLocKey, skin.MetaData.Name); localizationFile.SetLocEntry(skinLocKey, skin.MetaData.Name);
} }
if (!string.IsNullOrEmpty(skin.MetaData.Theme)) if (!string.IsNullOrEmpty(skin.MetaData.Theme))
{ {
asset.SetProperty("THEMENAME", skin.MetaData.Theme); asset.SetParameter("THEMENAME", skin.MetaData.Theme);
if (localizationFile is not null) if (localizationFile is not null)
{ {
string skinThemeLocKey = $"IDS_dlcskin{skinId}_THEMENAME"; string skinThemeLocKey = $"IDS_dlcskin{skinId}_THEMENAME";
asset.SetProperty("THEMENAMEID", skinThemeLocKey); asset.SetParameter("THEMENAMEID", skinThemeLocKey);
localizationFile.SetLocEntry(skinThemeLocKey, skin.MetaData.Theme); localizationFile.SetLocEntry(skinThemeLocKey, skin.MetaData.Theme);
} }
} }
if (skin.HasCape) if (skin.HasCape)
{ {
asset.SetProperty("CAPEPATH", $"dlccape{skinId}.png"); asset.SetParameter("CAPEPATH", $"dlccape{skinId}.png");
} }
asset.SetProperty("ANIM", skin.Anim.ToString()); asset.SetParameter("ANIM", skin.Anim.ToString());
asset.SetProperty("GAME_FLAGS", "0x18"); asset.SetParameter("GAME_FLAGS", "0x18");
asset.SetProperty("FREE", "1"); asset.SetParameter("FREE", "1");
asset.RemoveProperties("BOX"); asset.RemoveParameters("BOX");
asset.RemoveProperties("OFFSET"); asset.RemoveParameters("OFFSET");
foreach (SkinBOX box in skin.Model.AdditionalBoxes) foreach (SkinBOX box in skin.Model.AdditionalBoxes)
{ {
asset.AddProperty(box.ToProperty()); asset.AddParameter(box.ToParameter());
} }
foreach (SkinPartOffset offset in skin.Model.PartOffsets) foreach (SkinPartOffset offset in skin.Model.PartOffsets)
{ {
asset.AddProperty(offset.ToProperty()); asset.AddParameter(offset.ToParameter());
} }
} }
@@ -205,7 +205,7 @@ namespace PckStudio.Core.Extensions
return asset.Filename.Remove(asset.Filename.Length - (MipMap.Length + 1) - ext.Length) + ext; return asset.Filename.Remove(asset.Filename.Length - (MipMap.Length + 1) - ext.Length) + ext;
} }
public static void DeserializeProperties(this PckAsset asset, IEnumerable<string> serializedData) public static void DeserializeParameters(this PckAsset asset, IEnumerable<string> serializedData)
{ {
IEnumerable<KeyValuePair<string, string>> lines = serializedData IEnumerable<KeyValuePair<string, string>> lines = serializedData
.Select(line => line.Split([' '], 2)) .Select(line => line.Split([' '], 2))
@@ -213,14 +213,14 @@ namespace PckStudio.Core.Extensions
.Select(keyValue => new KeyValuePair<string, string>(keyValue[0].Replace(":", ""), keyValue[1])); .Select(keyValue => new KeyValuePair<string, string>(keyValue[0].Replace(":", ""), keyValue[1]));
foreach (KeyValuePair<string, string> kv in lines) foreach (KeyValuePair<string, string> kv in lines)
{ {
asset.AddProperty(kv); asset.AddParameter(kv);
} }
} }
public static IEnumerable<string> SerializeProperties(this PckAsset asset, string seperater = ":") public static IEnumerable<string> SerializeParameters(this PckAsset asset, string separator = ":")
{ {
IReadOnlyList<KeyValuePair<string, string>> properties = asset.GetProperties(); IReadOnlyList<KeyValuePair<string, string>> parameters = asset.GetParameters();
return properties.Select(property => property.Key + seperater + property.Value); return parameters.Select(parameter => parameter.Key + separator + parameter.Value);
} }
} }
} }
+10 -10
View File
@@ -17,40 +17,40 @@ namespace PckStudio.Core.Extensions
string skinId = skin.Identifier.ToString("d08"); string skinId = skin.Identifier.ToString("d08");
PckAsset skinFile = new PckAsset($"dlcskin{skinId}.png", PckAssetType.SkinFile); PckAsset skinFile = new PckAsset($"dlcskin{skinId}.png", PckAssetType.SkinFile);
skinFile.AddProperty("DISPLAYNAME", skin.MetaData.Name); skinFile.AddParameter("DISPLAYNAME", skin.MetaData.Name);
if (localizationFile is not null) if (localizationFile is not null)
{ {
string skinLocKey = $"IDS_dlcskin{skinId}_DISPLAYNAME"; string skinLocKey = $"IDS_dlcskin{skinId}_DISPLAYNAME";
skinFile.AddProperty("DISPLAYNAMEID", skinLocKey); skinFile.AddParameter("DISPLAYNAMEID", skinLocKey);
localizationFile.AddLocKey(skinLocKey, skin.MetaData.Name); localizationFile.AddLocKey(skinLocKey, skin.MetaData.Name);
} }
if (!string.IsNullOrEmpty(skin.MetaData.Theme)) if (!string.IsNullOrEmpty(skin.MetaData.Theme))
{ {
skinFile.AddProperty("THEMENAME", skin.MetaData.Theme); skinFile.AddParameter("THEMENAME", skin.MetaData.Theme);
if (localizationFile is not null) if (localizationFile is not null)
{ {
skinFile.AddProperty("THEMENAMEID", $"IDS_dlcskin{skinId}_THEMENAME"); skinFile.AddParameter("THEMENAMEID", $"IDS_dlcskin{skinId}_THEMENAME");
localizationFile.AddLocKey($"IDS_dlcskin{skinId}_THEMENAME", skin.MetaData.Theme); localizationFile.AddLocKey($"IDS_dlcskin{skinId}_THEMENAME", skin.MetaData.Theme);
} }
} }
if (skin.HasCape) if (skin.HasCape)
{ {
skinFile.AddProperty("CAPEPATH", $"dlccape{skinId}.png"); skinFile.AddParameter("CAPEPATH", $"dlccape{skinId}.png");
} }
skinFile.AddProperty("ANIM", skin.Anim); skinFile.AddParameter("ANIM", skin.Anim);
skinFile.AddProperty("GAME_FLAGS", "0x18"); skinFile.AddParameter("GAME_FLAGS", "0x18");
skinFile.AddProperty("FREE", "1"); skinFile.AddParameter("FREE", "1");
foreach (SkinBOX box in skin.Model.AdditionalBoxes) foreach (SkinBOX box in skin.Model.AdditionalBoxes)
{ {
skinFile.AddProperty(box.ToProperty()); skinFile.AddParameter(box.ToParameter());
} }
foreach (SkinPartOffset offset in skin.Model.PartOffsets) foreach (SkinPartOffset offset in skin.Model.PartOffsets)
{ {
skinFile.AddProperty(offset.ToProperty()); skinFile.AddParameter(offset.ToParameter());
} }
skinFile.SetTexture(skin.Texture); skinFile.SetTexture(skin.Texture);
@@ -36,7 +36,7 @@ namespace PckStudio.Core.Serializer
public void Serialize(Animation animation, ref PckAsset asset) public void Serialize(Animation animation, ref PckAsset asset)
{ {
string anim = SerializeAnim(animation); string anim = SerializeAnim(animation);
asset.SetProperty("ANIM", anim); asset.SetParameter("ANIM", anim);
Image texture = SerializeTexture(animation); Image texture = SerializeTexture(animation);
asset.SetTexture(texture); asset.SetTexture(texture);
} }
+1 -1
View File
@@ -140,7 +140,7 @@ namespace PckStudio.Core.Skin
public static bool IsOverlayPart(string type) => OverlayTypes.Contains(type); public static bool IsOverlayPart(string type) => OverlayTypes.Contains(type);
public KeyValuePair<string, string> ToProperty() public KeyValuePair<string, string> ToParameter()
{ {
return new KeyValuePair<string, string>("BOX", ToString()); return new KeyValuePair<string, string>("BOX", ToString());
} }
+1 -1
View File
@@ -72,7 +72,7 @@ namespace PckStudio.Core.Skin
return new SkinPartOffset(type, value); return new SkinPartOffset(type, value);
} }
public KeyValuePair<string, string> ToProperty() public KeyValuePair<string, string> ToParameter()
{ {
string value = $"{Type} Y {Value}"; string value = $"{Type} Y {Value}";
return new KeyValuePair<string, string>("OFFSET", value.Replace(',', '.')); return new KeyValuePair<string, string>("OFFSET", value.Replace(',', '.'));
+1 -1