diff --git a/SoG_SGreader.Test/IntegrationTests.cs b/SoG_SGreader.Test/IntegrationTests.cs index e861d21..30923e8 100644 --- a/SoG_SGreader.Test/IntegrationTests.cs +++ b/SoG_SGreader.Test/IntegrationTests.cs @@ -136,7 +136,7 @@ public void TestPatchOutput() string output = process.StandardOutput.ReadToEnd(); process.WaitForExit(); - Assert.Contains(FrmMain.CurrentPatch, output); + Assert.Contains(FrmMain.SupportedPatch, output); } } } \ No newline at end of file diff --git a/SoG_SGreader.Test/SoG_SGreader.Test.csproj b/SoG_SGreader.Test/SoG_SGreader.Test.csproj index 8556da7..a2b8a41 100644 --- a/SoG_SGreader.Test/SoG_SGreader.Test.csproj +++ b/SoG_SGreader.Test/SoG_SGreader.Test.csproj @@ -1,103 +1,120 @@  - - - Debug - AnyCPU - {1D81F599-E306-4A55-9A88-EEE9F3636546} - {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Library - Properties - SoG_SGreader.Test - SoG_SGreader.Test - v4.5.2 - 512 - 8 - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll - - - ..\packages\Moq.4.17.2\lib\net45\Moq.dll - - - - - - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll - - - ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll - - - - - ..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll - - - ..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll - - - ..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll - - - ..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll - - - - - - - - - - {da45322a-6a3c-4652-b5f4-d2dc917fc93a} - SoG_SGreader - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/SoG_SGreader.sln b/SoG_SGreader.sln index a91ed66..2d2fc6c 100644 --- a/SoG_SGreader.sln +++ b/SoG_SGreader.sln @@ -3,24 +3,34 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.30711.63 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sog_SGreader", "SoG_SGreader\SoG_SGreader.csproj", "{DA45322A-6A3C-4652-B5F4-D2DC917FC93A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SoG_SGreader", "SoG_SGreader\SoG_SGreader.csproj", "{DA45322A-6A3C-4652-B5F4-D2DC917FC93A}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SoG_SGreader.Test", "SoG_SGreader.Test\SoG_SGreader.Test.csproj", "{1D81F599-E306-4A55-9A88-EEE9F3636546}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {DA45322A-6A3C-4652-B5F4-D2DC917FC93A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DA45322A-6A3C-4652-B5F4-D2DC917FC93A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DA45322A-6A3C-4652-B5F4-D2DC917FC93A}.Debug|x86.ActiveCfg = Debug|x86 + {DA45322A-6A3C-4652-B5F4-D2DC917FC93A}.Debug|x86.Build.0 = Debug|x86 {DA45322A-6A3C-4652-B5F4-D2DC917FC93A}.Release|Any CPU.ActiveCfg = Release|Any CPU {DA45322A-6A3C-4652-B5F4-D2DC917FC93A}.Release|Any CPU.Build.0 = Release|Any CPU + {DA45322A-6A3C-4652-B5F4-D2DC917FC93A}.Release|x86.ActiveCfg = Release|x86 + {DA45322A-6A3C-4652-B5F4-D2DC917FC93A}.Release|x86.Build.0 = Release|x86 {1D81F599-E306-4A55-9A88-EEE9F3636546}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1D81F599-E306-4A55-9A88-EEE9F3636546}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1D81F599-E306-4A55-9A88-EEE9F3636546}.Debug|x86.ActiveCfg = Debug|x86 + {1D81F599-E306-4A55-9A88-EEE9F3636546}.Debug|x86.Build.0 = Debug|x86 {1D81F599-E306-4A55-9A88-EEE9F3636546}.Release|Any CPU.ActiveCfg = Release|Any CPU {1D81F599-E306-4A55-9A88-EEE9F3636546}.Release|Any CPU.Build.0 = Release|Any CPU + {1D81F599-E306-4A55-9A88-EEE9F3636546}.Release|x86.ActiveCfg = Release|x86 + {1D81F599-E306-4A55-9A88-EEE9F3636546}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/SoG_SGreader/DataReader.cs b/SoG_SGreader/DataReader.cs index bdf13d0..952b273 100644 --- a/SoG_SGreader/DataReader.cs +++ b/SoG_SGreader/DataReader.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.IO; -using System.Windows.Forms; namespace SoG_SGreader { diff --git a/SoG_SGreader/Forms/FrmAbout.Designer.cs b/SoG_SGreader/Forms/FrmAbout.Designer.cs index f7db42f..7522b0e 100644 --- a/SoG_SGreader/Forms/FrmAbout.Designer.cs +++ b/SoG_SGreader/Forms/FrmAbout.Designer.cs @@ -29,29 +29,36 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmAbout)); - this.label1 = new System.Windows.Forms.Label(); + this.lblVersion = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.linkLabel1 = new System.Windows.Forms.LinkLabel(); this.label3 = new System.Windows.Forms.Label(); this.lblBuild = new System.Windows.Forms.Label(); + this.panel1 = new System.Windows.Forms.Panel(); + this.lblYourPatch = new System.Windows.Forms.Label(); + this.lblCurrentPatch = new System.Windows.Forms.Label(); + this.txtConsole = new System.Windows.Forms.TextBox(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // - // label1 + // lblVersion // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(101, 21); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(156, 13); - this.label1.TabIndex = 0; - this.label1.Text = "SoG: Savegame Reader v0.5.0"; + this.lblVersion.AutoSize = true; + this.lblVersion.BackColor = System.Drawing.Color.Transparent; + this.lblVersion.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblVersion.Location = new System.Drawing.Point(98, 15); + this.lblVersion.Name = "lblVersion"; + this.lblVersion.Size = new System.Drawing.Size(210, 16); + this.lblVersion.TabIndex = 0; + this.lblVersion.Text = "SoG: Savegame Editor v0.0.0"; + this.lblVersion.Click += new System.EventHandler(this.lblVersion_Click); // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(9, 79); + this.label2.Location = new System.Drawing.Point(3, 61); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(41, 13); this.label2.TabIndex = 1; @@ -60,56 +67,111 @@ private void InitializeComponent() // linkLabel1 // this.linkLabel1.AutoSize = true; - this.linkLabel1.Location = new System.Drawing.Point(56, 79); + this.linkLabel1.CausesValidation = false; + this.linkLabel1.Location = new System.Drawing.Point(43, 61); this.linkLabel1.Name = "linkLabel1"; - this.linkLabel1.Size = new System.Drawing.Size(214, 13); + this.linkLabel1.Size = new System.Drawing.Size(217, 17); this.linkLabel1.TabIndex = 2; this.linkLabel1.TabStop = true; this.linkLabel1.Text = "https://github.com/tolik518/SoG_SGreader"; + this.linkLabel1.UseCompatibleTextRendering = true; this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.LinkLabel1_LinkClicked); // // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(101, 35); + this.label3.Location = new System.Drawing.Point(101, 31); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(62, 13); + this.label3.Size = new System.Drawing.Size(58, 13); this.label3.TabIndex = 4; this.label3.Text = "by tolik518"; // // lblBuild // this.lblBuild.AutoSize = true; - this.lblBuild.Location = new System.Drawing.Point(101, 59); + this.lblBuild.Location = new System.Drawing.Point(3, 10); this.lblBuild.Name = "lblBuild"; - this.lblBuild.Size = new System.Drawing.Size(96, 13); + this.lblBuild.Size = new System.Drawing.Size(134, 13); this.lblBuild.TabIndex = 5; - this.lblBuild.Text = "Build: 0.0.000.000"; + this.lblBuild.Text = "Build Version: 0.0.000.000"; + // + // panel1 + // + this.panel1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.panel1.Controls.Add(this.lblYourPatch); + this.panel1.Controls.Add(this.lblCurrentPatch); + this.panel1.Controls.Add(this.lblBuild); + this.panel1.Controls.Add(this.label2); + this.panel1.Controls.Add(this.linkLabel1); + this.panel1.Location = new System.Drawing.Point(5, 61); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(312, 87); + this.panel1.TabIndex = 6; + // + // lblYourPatch + // + this.lblYourPatch.AutoSize = true; + this.lblYourPatch.Location = new System.Drawing.Point(3, 44); + this.lblYourPatch.Name = "lblYourPatch"; + this.lblYourPatch.Size = new System.Drawing.Size(133, 13); + this.lblYourPatch.TabIndex = 7; + this.lblYourPatch.Text = "Your Game Patch: 0.000a"; + // + // lblCurrentPatch + // + this.lblCurrentPatch.AutoSize = true; + this.lblCurrentPatch.Location = new System.Drawing.Point(3, 27); + this.lblCurrentPatch.Name = "lblCurrentPatch"; + this.lblCurrentPatch.Size = new System.Drawing.Size(160, 13); + this.lblCurrentPatch.TabIndex = 6; + this.lblCurrentPatch.Text = "Supported Game Patch: 0.000a"; + // + // txtConsole + // + this.txtConsole.BackColor = System.Drawing.Color.Black; + this.txtConsole.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txtConsole.Dock = System.Windows.Forms.DockStyle.Bottom; + this.txtConsole.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); + this.txtConsole.ForeColor = System.Drawing.Color.LimeGreen; + this.txtConsole.Location = new System.Drawing.Point(0, 153); + this.txtConsole.Multiline = true; + this.txtConsole.Name = "txtConsole"; + this.txtConsole.ReadOnly = true; + this.txtConsole.Size = new System.Drawing.Size(320, 109); + this.txtConsole.TabIndex = 29; + this.txtConsole.TabStop = false; + this.txtConsole.Text = "Special Thanks to\r\n -------------------\r\nChaos944\r\n\r\nThe SoG Discord community, e" + + "specially:\r\nMiseris\r\nEiroth\r\nMarioalexsan"; + this.txtConsole.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // pictureBox1 // - this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); - this.pictureBox1.InitialImage = null; - this.pictureBox1.Location = new System.Drawing.Point(12, 12); + this.pictureBox1.BackColor = System.Drawing.Color.Transparent; + this.pictureBox1.Image = global::SoG_SGreader.Properties.Resources.icon; + this.pictureBox1.InitialImage = global::SoG_SGreader.Properties.Resources.icon; + this.pictureBox1.Location = new System.Drawing.Point(5, 1); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(83, 64); - this.pictureBox1.TabIndex = 3; + this.pictureBox1.Size = new System.Drawing.Size(91, 54); + this.pictureBox1.TabIndex = 30; this.pictureBox1.TabStop = false; // // FrmAbout // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(274, 98); - this.Controls.Add(this.lblBuild); + this.ClientSize = new System.Drawing.Size(320, 262); + this.Controls.Add(this.txtConsole); + this.Controls.Add(this.panel1); this.Controls.Add(this.label3); this.Controls.Add(this.pictureBox1); - this.Controls.Add(this.linkLabel1); - this.Controls.Add(this.label2); - this.Controls.Add(this.label1); + this.Controls.Add(this.lblVersion); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.Name = "FrmAbout"; this.Text = "About"; + this.Load += new System.EventHandler(this.FrmAbout_Load); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -118,11 +180,15 @@ private void InitializeComponent() #endregion - private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label lblVersion; private System.Windows.Forms.Label label2; private System.Windows.Forms.LinkLabel linkLabel1; - private System.Windows.Forms.PictureBox pictureBox1; private System.Windows.Forms.Label label3; private System.Windows.Forms.Label lblBuild; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Label lblCurrentPatch; + private System.Windows.Forms.TextBox txtConsole; + private System.Windows.Forms.Label lblYourPatch; + private System.Windows.Forms.PictureBox pictureBox1; } } \ No newline at end of file diff --git a/SoG_SGreader/Forms/FrmAbout.cs b/SoG_SGreader/Forms/FrmAbout.cs index 2263fa8..55068c3 100644 --- a/SoG_SGreader/Forms/FrmAbout.cs +++ b/SoG_SGreader/Forms/FrmAbout.cs @@ -1,4 +1,8 @@ -using System.Windows.Forms; +using SoG_SGreader.Wrapper; +using System; +using System.Diagnostics; +using System.Reflection; +using System.Windows.Forms; namespace SoG_SGreader { @@ -7,12 +11,36 @@ public partial class FrmAbout : Form public FrmAbout() { InitializeComponent(); - lblBuild.Text = "Build: " + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version; + lblBuild.Text = lblBuild.Text.Replace("0.0.000.000",FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location).FileVersion); //AssemblyFileVersion + lblVersion.Text = lblVersion.Text.Replace("0.0.0", Application.ProductVersion); + lblCurrentPatch.Text = lblCurrentPatch.Text.Replace("0.000a", FrmMain.SupportedPatch); } private void LinkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { - System.Diagnostics.Process.Start("https://github.com/tolik518/SoG_SGreader"); + Process.Start("https://github.com/tolik518/SoG_SGreader"); + } + + private void lblVersion_Click(object sender, System.EventArgs e) + { + + } + + private async void FrmAbout_Load(object sender, System.EventArgs e) + { + ITextBoxWrapper txtConsoleWrapped = new FakeTextBox(); + + try + { + var patchVersion = await GamePatchReader.GetCurrentGamePatchAsync(txtConsoleWrapped); + lblYourPatch.Text = lblYourPatch.Text.Replace("0.000a", patchVersion); + } + catch (Exception ex) + { + // Handle any exceptions that might occur + lblYourPatch.Text = "Error fetching patch version."; + MessageBox.Show($"An error occurred: {ex.Message}", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } } } diff --git a/SoG_SGreader/Forms/FrmAbout.resx b/SoG_SGreader/Forms/FrmAbout.resx index 5194f7f..1af7de1 100644 --- a/SoG_SGreader/Forms/FrmAbout.resx +++ b/SoG_SGreader/Forms/FrmAbout.resx @@ -117,52 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - iVBORw0KGgoAAAANSUhEUgAAAEoAAAA3CAYAAACrbNxuAAAABGdBTUEAALGPC/xhBQAACZxJREFUeF7t - m91zVdUZhxmlQhKSmOQkIXAIkA8SDiGFUATzQTSAxVCoFhnws9TRaKVMqbVOp72Q6Uwv2gu9dByn02nV - O2/6H/S6/0j/i+7u583+bd+99jrJIeccIsqaeWav773e56y1Tgxxx0OYkuz5KG2QksXVuWTkcP8jWZuk - R6IaSd19HSbqkaxN0sBIT3J8fjy5cG1+Q1EHRvqS5dqhhKcYGx3M8fUiG/rdSF5UKMsH/f6leeOT11aN - P1w9VxClevUDPz6b8uFNHD1EvXjruYIsgjs9N568vTxXEPS3Oy8Z5KcnRnLULiSLPPNsuywWEYPF9/Z0 - sDjP3Qyf1rws8JK0I+C58aEC/n1hmx+37bK0SL8oT3fX7lCUJxcmUW/cfcHG+Xm1Q7SL/vnBzRz1A1+v - MSKcM3vtg0mnxkbtpXDn3IzBonjyiaou7Vqid/cTYd1/dVcpqNvnT+eBkvdloeCBO0uo3R9Z9X+goiRJ - QvxiJEp5lbMFFpjdP2jPTNz/Ht/5WEHUq2dnooKEJP14vhZtD3mgongReCGesF5lnhqbTlPA7zDaCQhJ - 4OceGug1yHMUr56btb4fvrCc90Hsn69fSHfT06XxD1wUQUsAL98MiWNMOkWyv7erAHVCosKdhBgk/efW - reQf798wNP9bl87k/bzMbTt6vES7Q4vUy+vh+0ku9SeqQ1FhGhM7cpLwu9UFE+fnljxEbqcovqHsJX4X - UQbtMC1IOwjUR2MkKpQk1FfjgDEx6Dd34kg+L0imyn4ezbseUmvTyRSTBMjgItcLWUgoKRRFmxbMOMZT - R1lyVo4eLoiiz5UfThiaP0Rr8sT6efQllPZtecolKQBJ4sUS5SVBTBRPxkkWecnx6D2hqNfP1pJfLs0k - N04ftfXcvjQbfar/u4vH7OnnaZcok8Q3EigAnlqMBBB8PXw/8PMghrvK31dqnxvbX5IlWNfXX35eenLk - bi8dS35x9qj10/h2i7IFCF4CfhfFxNTD7y7NVU/U9Vo1JyYsXJvnV1kfL0lj2ypKAegljeyiejCO8do1 - mhv0PuR8/Ou3k3999akhWV4YO0f9Q7wcjeG9bRVFAAvj+5Pa3gF7iQIlr+BVL1iIL4d9JZq8F/Ts1EEr - e0liqWrB5eibLTx+ErQ8fTiZPbTPkCh9OK0WZXKAxfOUAAWul0qIiNWBH0c5W7AJQgRIlJdFnjb6wbUf - 1QzG+oscOYI6wXugHZJIJudibawkKgxWIjzaNSGSRZ6xknT38rLhRQnajx8cTk5PVq3/zL5KLo11wtSB - 4WRxbF9eXknbfnpiylBdWySx4BBeRKBCwcekbCRKMB/zIoidE5MlSUKCPKx3vK8rSv+T67Ra0pWM/MgJ - 6iTq2fSHQx98PSlh/atPTRv1ROmYCdVxmSMpCzYXhIjnJ4dzXp6bMMirzZcRlo5vaSoIgjOHRgqiFLSX - 4suq82XauVi9qMqejlyWBFGOyUKO7iaJeLKnM/nLrZ8ZH15eMjG0hXVtkeUlIei1p2dLoghYskCiQiRL - ZYniTpEoyRLcQTzrydpI0ny1v1Dn5TEGWr2zTM70cJ89oVrpyWURsAcJF48eKpQlyksCSfKiBJJETBZB - 1pMU1oX1lMnfl6wG/qExFyRhIFE86RMjlEVfiTqZfjNJlB/DJ14PggJEVfr2JLXBbhOwVUnMyTzpe+Np - Zaqafm0WyZrClB83CaIu5Jkjozmrs5PJm+dOGbSdcT9FL6XHheeRA4MmSf/gwBgWrSMBBAcKSHUqI2xv - urMJdKrak7y3OGv19Aklqd6PZxzj93TuYg3lND3Um/z9o/eStZVTyYtzkwb5UFZWLuwkypIABCj4JRn/ - IOBl/fHqMwbjAEHQ390ZlaRPnbl8kH6H+GAlS8KoW0jvJknVeJ6jHO+0jwRpDKTrKCdEIQdZf/r5FYMy - T7/DkJd2z3cSvzWQAElQHujLMfa7y/eFXU/sTAZ6ulJJ9ilan1DSU9MT1gaNXsiUq6mI2viI4aUAZbXR - T/WSPlzp5n3lFJOFGMkiH4oa7e8piKJNeViYPGiQv3HmeGFniQ9WF5Pf/2Q5F0GQXpJEvbKyYMQkxe4a - 5hEIQMhiGp+gLDmM0TwS1dUROX7aMchChpclaKc+7Z7vJgWu4GmDcGdp95BHWCgLEHbn4tn1oIILWfNK - lCRxHGOS2E3MQ50EXEy/Yb08yhLjoQ5J+T0lOYAIBDUiS7sKdJwkS/XnTx4rSPCiPLrDVGYOFqi7Qhey - 5tXcEqC7BrwgxjMPAkFCJFhjqKddZdD7TRQBhyIQAORDWaoHxqYLXmPREiVZc+OjpaC8mBD6cIdJNPhg - JYw6Py8BSdJGF7LESIigTgLJ82HQX5KgJEpChIQ1IKsQIPhgQmKi/B0GXKDsDO0O0IXMHFu5kJkDIZQl - DkmXj+y1I6YxzOEl9fWl3+hegpcDtEG6sDXfz/cBZNUGBktITKxtIxDFwgmIwPRpN3shS4D6eainPZR0 - c2Y0qVQqxPGNBJAcCcogFWR5CO6zj/+avHlh2fjozrsNof6e81MTNl9n+gXhJQkJ2MqFPHagUhLsRdPu - RTIWyZ2dnSaKZBICORLkU0Eq8GNEWm8BelkgGaGgGH4cc+mOkCh/r0iIlycptKsMmocnRw8B2jkeidEx - 13yhKFI9OWHKpTq5JVkxGaA2SfF5xgsF6IOUGAkREkk9+XoXsoKXDA/1XrD6dnU19xsEv+vAgtMTWc3C - cfKB6lNXUFu5kL1Mj6/3kiZGh5LeXtsILUv2204vS2i3iN/cvFYi7MM4ROky97IkQEI8YR9Aki7kzUQh - iHdKFGPTeO4RYDOpkj2VCrKaxYvS8SDwZi5kzReKAuoRynsk3YlqThZ/bMpP01mRlMtqdDcJ34+xLJz/ - 0veBSRiBaOd4JEb9tDMkSvI2wu/ENBZJanpXxf4w3mS1AoL0okDBS4aHeto91HEhEzgCJDW2GyWIMen7 - vaSmRa117Nn1eZYPU3jh3zcsmgvVy2riQr7HfLFdBLQB/SK0PIX3VimxA0PS6l0On+7pB8+YEM8mF/K/ - mWuLtDZxX/E34FmxlCSFfvyNOFx/5/n8/z7IhPlkCyVQjgRBc7y2eCEjaiuyWpt0qdcThQSkqE8I9bQH - svIFSxaERyaG+gZH6X5EtScRbBbkF+s136TeSpftGieydBd5YU5WYfEELWHbdSG3IinoWMpFkF+vKqWC - sPUqS2Gg36oLuR1pbefjj/02y2+UYsJjQd8vD0/a/YOdQ1l2KykWfKN8L1NMRD1amHbs+D9xdl5p/ASY - rAAAAABJRU5ErkJggg== - - \ No newline at end of file diff --git a/SoG_SGreader/Forms/FrmLoadSaveGame.Designer.cs b/SoG_SGreader/Forms/FrmLoadSaveGame.Designer.cs index 32a816f..a2ab804 100644 --- a/SoG_SGreader/Forms/FrmLoadSaveGame.Designer.cs +++ b/SoG_SGreader/Forms/FrmLoadSaveGame.Designer.cs @@ -1,4 +1,6 @@  +using System.Windows.Forms; + namespace SoG_SGreader { partial class FrmLoadSaveGame @@ -161,7 +163,7 @@ private void InitializeComponent() this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "FrmLoadSaveGame"; - this.Text = "SoG: Savegame Reader v0.5.0 by tolik518"; + this.Text = "SoG: Savegame Editor v" + Application.ProductVersion + " by tolik518"; ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/SoG_SGreader/Forms/FrmMain.Designer.cs b/SoG_SGreader/Forms/FrmMain.Designer.cs index 0013a53..6878690 100644 --- a/SoG_SGreader/Forms/FrmMain.Designer.cs +++ b/SoG_SGreader/Forms/FrmMain.Designer.cs @@ -1,4 +1,6 @@ -namespace SoG_SGreader +using System.Windows.Forms; + +namespace SoG_SGreader { partial class FrmMain { @@ -33,9 +35,13 @@ private void InitializeComponent() this.tabContainer = new System.Windows.Forms.TabControl(); this.tabChar = new System.Windows.Forms.TabPage(); this.groupBox9 = new System.Windows.Forms.GroupBox(); + this.lblGamePatch = new System.Windows.Forms.Label(); this.label55 = new System.Windows.Forms.Label(); this.numID = new System.Windows.Forms.NumericUpDown(); this.groupBox8 = new System.Windows.Forms.GroupBox(); + this.rbFemale = new System.Windows.Forms.RadioButton(); + this.lblGender = new System.Windows.Forms.Label(); + this.rbMale = new System.Windows.Forms.RadioButton(); this.label51 = new System.Windows.Forms.Label(); this.label54 = new System.Windows.Forms.Label(); this.txtNickname = new System.Windows.Forms.TextBox(); @@ -246,16 +252,12 @@ private void InitializeComponent() this.importToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.exportAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.jSONToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.xMLToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.txtConsole = new System.Windows.Forms.TextBox(); this.Tooltips = new System.Windows.Forms.ToolTip(this.components); this.pictureBox3 = new System.Windows.Forms.PictureBox(); - this.lblGender = new System.Windows.Forms.Label(); - this.rbMale = new System.Windows.Forms.RadioButton(); - this.rbFemale = new System.Windows.Forms.RadioButton(); this.tabContainer.SuspendLayout(); this.tabChar.SuspendLayout(); this.groupBox9.SuspendLayout(); @@ -375,8 +377,8 @@ private void InitializeComponent() // // tabContainer // - this.tabContainer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) + this.tabContainer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.tabContainer.Controls.Add(this.tabChar); this.tabContainer.Controls.Add(this.tabInventory); @@ -387,11 +389,10 @@ private void InitializeComponent() this.tabContainer.Controls.Add(this.tabCards); this.tabContainer.Controls.Add(this.tabTreasureMaps); this.tabContainer.Controls.Add(this.tabPage1); - this.tabContainer.Location = new System.Drawing.Point(0, 30); - this.tabContainer.Margin = new System.Windows.Forms.Padding(4); + this.tabContainer.Location = new System.Drawing.Point(0, 24); this.tabContainer.Name = "tabContainer"; this.tabContainer.SelectedIndex = 0; - this.tabContainer.Size = new System.Drawing.Size(756, 577); + this.tabContainer.Size = new System.Drawing.Size(567, 422); this.tabContainer.TabIndex = 0; // // tabChar @@ -405,11 +406,10 @@ private void InitializeComponent() this.tabChar.Controls.Add(this.groupBox6); this.tabChar.Controls.Add(this.groupBox5); this.tabChar.Controls.Add(this.gbColors); - this.tabChar.Location = new System.Drawing.Point(4, 25); - this.tabChar.Margin = new System.Windows.Forms.Padding(4); + this.tabChar.Location = new System.Drawing.Point(4, 22); this.tabChar.Name = "tabChar"; - this.tabChar.Padding = new System.Windows.Forms.Padding(4); - this.tabChar.Size = new System.Drawing.Size(748, 548); + this.tabChar.Padding = new System.Windows.Forms.Padding(3); + this.tabChar.Size = new System.Drawing.Size(559, 396); this.tabChar.TabIndex = 3; this.tabChar.Text = "Character / Equip"; this.tabChar.UseVisualStyleBackColor = true; @@ -417,36 +417,42 @@ private void InitializeComponent() // groupBox9 // this.groupBox9.BackColor = System.Drawing.Color.Transparent; + this.groupBox9.Controls.Add(this.lblGamePatch); this.groupBox9.Controls.Add(this.label55); - this.groupBox9.Location = new System.Drawing.Point(227, 194); - this.groupBox9.Margin = new System.Windows.Forms.Padding(4); + this.groupBox9.Location = new System.Drawing.Point(169, 158); this.groupBox9.Name = "groupBox9"; - this.groupBox9.Padding = new System.Windows.Forms.Padding(4); - this.groupBox9.Size = new System.Drawing.Size(135, 271); + this.groupBox9.Size = new System.Drawing.Size(105, 230); this.groupBox9.TabIndex = 54; this.groupBox9.TabStop = false; // + // lblGamePatch + // + this.lblGamePatch.AutoSize = true; + this.lblGamePatch.Location = new System.Drawing.Point(13, 116); + this.lblGamePatch.Name = "lblGamePatch"; + this.lblGamePatch.Size = new System.Drawing.Size(77, 13); + this.lblGamePatch.TabIndex = 1; + this.lblGamePatch.Text = "[Game 0.000a]"; + // // label55 // this.label55.AutoSize = true; - this.label55.Location = new System.Drawing.Point(17, 122); - this.label55.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label55.Location = new System.Drawing.Point(13, 99); this.label55.Name = "label55"; - this.label55.Size = new System.Drawing.Size(91, 16); + this.label55.Size = new System.Drawing.Size(77, 13); this.label55.TabIndex = 0; - this.label55.Text = "[" + FrmMain.CurrentPatch +"]"; + this.label55.Text = "[Patch 0.949a]"; // // numID // - this.numID.Location = new System.Drawing.Point(97, 60); - this.numID.Margin = new System.Windows.Forms.Padding(4); + this.numID.Location = new System.Drawing.Point(79, 49); this.numID.Maximum = new decimal(new int[] { -2, 0, 0, 0}); this.numID.Name = "numID"; - this.numID.Size = new System.Drawing.Size(108, 22); + this.numID.Size = new System.Drawing.Size(75, 20); this.numID.TabIndex = 53; // // groupBox8 @@ -462,22 +468,53 @@ private void InitializeComponent() this.groupBox8.Controls.Add(this.numBirtdayMonth); this.groupBox8.Controls.Add(this.numBirthdayDay); this.groupBox8.Controls.Add(this.txtTimePlayed); - this.groupBox8.Location = new System.Drawing.Point(8, 5); - this.groupBox8.Margin = new System.Windows.Forms.Padding(4); + this.groupBox8.Location = new System.Drawing.Point(6, 4); this.groupBox8.Name = "groupBox8"; - this.groupBox8.Padding = new System.Windows.Forms.Padding(4); - this.groupBox8.Size = new System.Drawing.Size(209, 218); + this.groupBox8.Size = new System.Drawing.Size(157, 148); this.groupBox8.TabIndex = 52; this.groupBox8.TabStop = false; this.groupBox8.Text = "General"; // + // rbFemale + // + this.rbFemale.AutoSize = true; + this.rbFemale.Location = new System.Drawing.Point(108, 127); + this.rbFemale.Margin = new System.Windows.Forms.Padding(2); + this.rbFemale.Name = "rbFemale"; + this.rbFemale.Size = new System.Drawing.Size(34, 17); + this.rbFemale.TabIndex = 2; + this.rbFemale.TabStop = true; + this.rbFemale.Text = "♀"; + this.rbFemale.UseVisualStyleBackColor = true; + // + // lblGender + // + this.lblGender.AutoSize = true; + this.lblGender.Location = new System.Drawing.Point(5, 126); + this.lblGender.Name = "lblGender"; + this.lblGender.Size = new System.Drawing.Size(45, 13); + this.lblGender.TabIndex = 52; + this.lblGender.Text = "Gender:"; + this.Tooltips.SetToolTip(this.lblGender, "Day / Month"); + // + // rbMale + // + this.rbMale.AutoSize = true; + this.rbMale.Location = new System.Drawing.Point(73, 127); + this.rbMale.Margin = new System.Windows.Forms.Padding(2); + this.rbMale.Name = "rbMale"; + this.rbMale.Size = new System.Drawing.Size(35, 17); + this.rbMale.TabIndex = 1; + this.rbMale.TabStop = true; + this.rbMale.Text = "♂"; + this.rbMale.UseVisualStyleBackColor = true; + // // label51 // this.label51.AutoSize = true; - this.label51.Location = new System.Drawing.Point(7, 92); - this.label51.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label51.Location = new System.Drawing.Point(5, 75); this.label51.Name = "label51"; - this.label51.Size = new System.Drawing.Size(86, 16); + this.label51.Size = new System.Drawing.Size(67, 13); this.label51.TabIndex = 44; this.label51.Text = "Time played:"; this.Tooltips.SetToolTip(this.label51, "D:HH:MM:SS"); @@ -485,54 +522,49 @@ private void InitializeComponent() // label54 // this.label54.AutoSize = true; - this.label54.Location = new System.Drawing.Point(7, 59); - this.label54.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label54.Location = new System.Drawing.Point(5, 48); this.label54.Name = "label54"; - this.label54.Size = new System.Drawing.Size(79, 16); + this.label54.Size = new System.Drawing.Size(65, 13); this.label54.TabIndex = 51; this.label54.Text = "Collector ID:"; // // txtNickname // - this.txtNickname.Location = new System.Drawing.Point(63, 23); - this.txtNickname.Margin = new System.Windows.Forms.Padding(4); + this.txtNickname.Location = new System.Drawing.Point(47, 19); this.txtNickname.Name = "txtNickname"; - this.txtNickname.Size = new System.Drawing.Size(133, 22); + this.txtNickname.Size = new System.Drawing.Size(101, 20); this.txtNickname.TabIndex = 34; this.txtNickname.Text = "tolik518"; // // label29 // this.label29.AutoSize = true; - this.label29.Location = new System.Drawing.Point(4, 27); - this.label29.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label29.Location = new System.Drawing.Point(5, 22); this.label29.Name = "label29"; - this.label29.Size = new System.Drawing.Size(47, 16); + this.label29.Size = new System.Drawing.Size(38, 13); this.label29.TabIndex = 35; this.label29.Text = "Name:"; // // label53 // this.label53.AutoSize = true; - this.label53.Location = new System.Drawing.Point(7, 123); - this.label53.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label53.Location = new System.Drawing.Point(5, 100); this.label53.Name = "label53"; - this.label53.Size = new System.Drawing.Size(59, 16); + this.label53.Size = new System.Drawing.Size(48, 13); this.label53.TabIndex = 49; this.label53.Text = "Birthday:"; this.Tooltips.SetToolTip(this.label53, "Day / Month"); // // numBirtdayMonth // - this.numBirtdayMonth.Location = new System.Drawing.Point(155, 121); - this.numBirtdayMonth.Margin = new System.Windows.Forms.Padding(4); + this.numBirtdayMonth.Location = new System.Drawing.Point(113, 98); this.numBirtdayMonth.Maximum = new decimal(new int[] { 12, 0, 0, 0}); this.numBirtdayMonth.Name = "numBirtdayMonth"; - this.numBirtdayMonth.Size = new System.Drawing.Size(43, 22); + this.numBirtdayMonth.Size = new System.Drawing.Size(35, 20); this.numBirtdayMonth.TabIndex = 48; this.Tooltips.SetToolTip(this.numBirtdayMonth, "Month\tStarsign\r\n____________________\r\n1-2\tThe Slime\r\n3-4\tThe Rabby\r\n5-6\tThe Bee\r\n" + "7-8\tThe Boar\r\n9-10\tThe Bloomo\r\n11-12\tThe Yeti"); @@ -544,15 +576,14 @@ private void InitializeComponent() // // numBirthdayDay // - this.numBirthdayDay.Location = new System.Drawing.Point(108, 121); - this.numBirthdayDay.Margin = new System.Windows.Forms.Padding(4); + this.numBirthdayDay.Location = new System.Drawing.Point(73, 98); this.numBirthdayDay.Maximum = new decimal(new int[] { 31, 0, 0, 0}); this.numBirthdayDay.Name = "numBirthdayDay"; - this.numBirthdayDay.Size = new System.Drawing.Size(43, 22); + this.numBirthdayDay.Size = new System.Drawing.Size(35, 20); this.numBirthdayDay.TabIndex = 46; this.numBirthdayDay.Value = new decimal(new int[] { 31, @@ -562,21 +593,19 @@ private void InitializeComponent() // // txtTimePlayed // - this.txtTimePlayed.Location = new System.Drawing.Point(97, 89); - this.txtTimePlayed.Margin = new System.Windows.Forms.Padding(4); + this.txtTimePlayed.Location = new System.Drawing.Point(73, 72); this.txtTimePlayed.MaxLength = 13; this.txtTimePlayed.Name = "txtTimePlayed"; - this.txtTimePlayed.Size = new System.Drawing.Size(99, 22); + this.txtTimePlayed.Size = new System.Drawing.Size(75, 20); this.txtTimePlayed.TabIndex = 45; this.Tooltips.SetToolTip(this.txtTimePlayed, "D:HH:MM:SS"); // // label49 // this.label49.AutoSize = true; - this.label49.Location = new System.Drawing.Point(8, 523); - this.label49.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label49.Location = new System.Drawing.Point(435, 378); this.label49.Name = "label49"; - this.label49.Size = new System.Drawing.Size(132, 16); + this.label49.Size = new System.Drawing.Size(116, 13); this.label49.TabIndex = 42; this.label49.Text = "↑ ↑ ↓ ↓ ← → ← → B A"; // @@ -598,11 +627,9 @@ private void InitializeComponent() this.groupBox1.Controls.Add(this.cbWeapon); this.groupBox1.Controls.Add(this.cbFacegear); this.groupBox1.Controls.Add(this.cbHat); - this.groupBox1.Location = new System.Drawing.Point(373, 5); - this.groupBox1.Margin = new System.Windows.Forms.Padding(4); + this.groupBox1.Location = new System.Drawing.Point(280, 4); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Padding = new System.Windows.Forms.Padding(4); - this.groupBox1.Size = new System.Drawing.Size(321, 294); + this.groupBox1.Size = new System.Drawing.Size(271, 239); this.groupBox1.TabIndex = 40; this.groupBox1.TabStop = false; this.groupBox1.Text = "Equipped Gear"; @@ -610,153 +637,137 @@ private void InitializeComponent() // label10 // this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(15, 260); - this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label10.Location = new System.Drawing.Point(11, 211); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(84, 16); + this.label10.Size = new System.Drawing.Size(68, 13); this.label10.TabIndex = 22; this.label10.Text = "Accessory 2:"; // // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(15, 226); - this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label9.Location = new System.Drawing.Point(11, 184); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(84, 16); + this.label9.Size = new System.Drawing.Size(68, 13); this.label9.TabIndex = 21; this.label9.Text = "Accessory 1:"; // // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(15, 193); - this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label8.Location = new System.Drawing.Point(11, 157); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(49, 16); + this.label8.Size = new System.Drawing.Size(40, 13); this.label8.TabIndex = 20; this.label8.Text = "Shoes:"; // // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(15, 160); - this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label7.Location = new System.Drawing.Point(11, 130); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(46, 16); + this.label7.Size = new System.Drawing.Size(37, 13); this.label7.TabIndex = 19; this.label7.Text = "Armor:"; // // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(15, 127); - this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label6.Location = new System.Drawing.Point(11, 103); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(48, 16); + this.label6.Size = new System.Drawing.Size(39, 13); this.label6.TabIndex = 18; this.label6.Text = "Shield:"; // // label11 // this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(15, 94); - this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label11.Location = new System.Drawing.Point(11, 76); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(62, 16); + this.label11.Size = new System.Drawing.Size(51, 13); this.label11.TabIndex = 17; this.label11.Text = "Weapon:"; // // label12 // this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(15, 60); - this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label12.Location = new System.Drawing.Point(11, 49); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(69, 16); + this.label12.Size = new System.Drawing.Size(55, 13); this.label12.TabIndex = 16; this.label12.Text = "Facegear:"; // // label13 // this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(15, 27); - this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label13.Location = new System.Drawing.Point(11, 22); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(31, 16); + this.label13.Size = new System.Drawing.Size(27, 13); this.label13.TabIndex = 15; this.label13.Text = "Hat:"; // // cbAccessory2 // this.cbAccessory2.FormattingEnabled = true; - this.cbAccessory2.Location = new System.Drawing.Point(105, 256); - this.cbAccessory2.Margin = new System.Windows.Forms.Padding(4); + this.cbAccessory2.Location = new System.Drawing.Point(79, 208); this.cbAccessory2.Name = "cbAccessory2"; - this.cbAccessory2.Size = new System.Drawing.Size(201, 24); + this.cbAccessory2.Size = new System.Drawing.Size(186, 21); this.cbAccessory2.TabIndex = 14; // // cbAccessory1 // this.cbAccessory1.FormattingEnabled = true; - this.cbAccessory1.Location = new System.Drawing.Point(105, 223); - this.cbAccessory1.Margin = new System.Windows.Forms.Padding(4); + this.cbAccessory1.Location = new System.Drawing.Point(79, 181); this.cbAccessory1.Name = "cbAccessory1"; - this.cbAccessory1.Size = new System.Drawing.Size(201, 24); + this.cbAccessory1.Size = new System.Drawing.Size(186, 21); this.cbAccessory1.TabIndex = 13; // // cbShoes // this.cbShoes.FormattingEnabled = true; - this.cbShoes.Location = new System.Drawing.Point(105, 190); - this.cbShoes.Margin = new System.Windows.Forms.Padding(4); + this.cbShoes.Location = new System.Drawing.Point(79, 154); this.cbShoes.Name = "cbShoes"; - this.cbShoes.Size = new System.Drawing.Size(201, 24); + this.cbShoes.Size = new System.Drawing.Size(186, 21); this.cbShoes.TabIndex = 12; // // cbArmor // this.cbArmor.FormattingEnabled = true; - this.cbArmor.Location = new System.Drawing.Point(105, 156); - this.cbArmor.Margin = new System.Windows.Forms.Padding(4); + this.cbArmor.Location = new System.Drawing.Point(79, 127); this.cbArmor.Name = "cbArmor"; - this.cbArmor.Size = new System.Drawing.Size(201, 24); + this.cbArmor.Size = new System.Drawing.Size(186, 21); this.cbArmor.TabIndex = 11; // // cbShield // this.cbShield.FormattingEnabled = true; - this.cbShield.Location = new System.Drawing.Point(105, 123); - this.cbShield.Margin = new System.Windows.Forms.Padding(4); + this.cbShield.Location = new System.Drawing.Point(79, 100); this.cbShield.Name = "cbShield"; - this.cbShield.Size = new System.Drawing.Size(201, 24); + this.cbShield.Size = new System.Drawing.Size(186, 21); this.cbShield.TabIndex = 10; // // cbWeapon // this.cbWeapon.FormattingEnabled = true; - this.cbWeapon.Location = new System.Drawing.Point(105, 90); - this.cbWeapon.Margin = new System.Windows.Forms.Padding(4); + this.cbWeapon.Location = new System.Drawing.Point(79, 73); this.cbWeapon.Name = "cbWeapon"; - this.cbWeapon.Size = new System.Drawing.Size(201, 24); + this.cbWeapon.Size = new System.Drawing.Size(186, 21); this.cbWeapon.TabIndex = 9; // // cbFacegear // this.cbFacegear.FormattingEnabled = true; - this.cbFacegear.Location = new System.Drawing.Point(105, 57); - this.cbFacegear.Margin = new System.Windows.Forms.Padding(4); + this.cbFacegear.Location = new System.Drawing.Point(79, 46); this.cbFacegear.Name = "cbFacegear"; - this.cbFacegear.Size = new System.Drawing.Size(201, 24); + this.cbFacegear.Size = new System.Drawing.Size(186, 21); this.cbFacegear.TabIndex = 8; // // cbHat // this.cbHat.FormattingEnabled = true; - this.cbHat.Location = new System.Drawing.Point(105, 23); - this.cbHat.Margin = new System.Windows.Forms.Padding(4); + this.cbHat.Location = new System.Drawing.Point(79, 19); this.cbHat.Name = "cbHat"; - this.cbHat.Size = new System.Drawing.Size(201, 24); + this.cbHat.Size = new System.Drawing.Size(186, 21); this.cbHat.TabIndex = 7; // // groupBox2 @@ -769,11 +780,9 @@ private void InitializeComponent() this.groupBox2.Controls.Add(this.cbStyleFacegear); this.groupBox2.Controls.Add(this.label17); this.groupBox2.Controls.Add(this.cbStyleWeapon); - this.groupBox2.Location = new System.Drawing.Point(373, 306); - this.groupBox2.Margin = new System.Windows.Forms.Padding(4); + this.groupBox2.Location = new System.Drawing.Point(280, 249); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Padding = new System.Windows.Forms.Padding(4); - this.groupBox2.Size = new System.Drawing.Size(321, 159); + this.groupBox2.Size = new System.Drawing.Size(271, 129); this.groupBox2.TabIndex = 41; this.groupBox2.TabStop = false; this.groupBox2.Text = "Equipped Style"; @@ -781,77 +790,69 @@ private void InitializeComponent() // label14 // this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(15, 127); - this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label14.Location = new System.Drawing.Point(11, 103); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(48, 16); + this.label14.Size = new System.Drawing.Size(39, 13); this.label14.TabIndex = 30; this.label14.Text = "Shield:"; // // cbStyleShield // this.cbStyleShield.FormattingEnabled = true; - this.cbStyleShield.Location = new System.Drawing.Point(105, 123); - this.cbStyleShield.Margin = new System.Windows.Forms.Padding(4); + this.cbStyleShield.Location = new System.Drawing.Point(79, 100); this.cbStyleShield.Name = "cbStyleShield"; - this.cbStyleShield.Size = new System.Drawing.Size(201, 24); + this.cbStyleShield.Size = new System.Drawing.Size(186, 21); this.cbStyleShield.TabIndex = 26; // // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(15, 94); - this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label15.Location = new System.Drawing.Point(11, 76); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(62, 16); + this.label15.Size = new System.Drawing.Size(51, 13); this.label15.TabIndex = 29; this.label15.Text = "Weapon:"; // // cbStyleHat // this.cbStyleHat.FormattingEnabled = true; - this.cbStyleHat.Location = new System.Drawing.Point(105, 23); - this.cbStyleHat.Margin = new System.Windows.Forms.Padding(4); + this.cbStyleHat.Location = new System.Drawing.Point(79, 19); this.cbStyleHat.Name = "cbStyleHat"; - this.cbStyleHat.Size = new System.Drawing.Size(201, 24); + this.cbStyleHat.Size = new System.Drawing.Size(186, 21); this.cbStyleHat.TabIndex = 23; // // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(15, 60); - this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label16.Location = new System.Drawing.Point(11, 49); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(69, 16); + this.label16.Size = new System.Drawing.Size(55, 13); this.label16.TabIndex = 28; this.label16.Text = "Facegear:"; // // cbStyleFacegear // this.cbStyleFacegear.FormattingEnabled = true; - this.cbStyleFacegear.Location = new System.Drawing.Point(105, 57); - this.cbStyleFacegear.Margin = new System.Windows.Forms.Padding(4); + this.cbStyleFacegear.Location = new System.Drawing.Point(79, 46); this.cbStyleFacegear.Name = "cbStyleFacegear"; - this.cbStyleFacegear.Size = new System.Drawing.Size(201, 24); + this.cbStyleFacegear.Size = new System.Drawing.Size(186, 21); this.cbStyleFacegear.TabIndex = 24; // // label17 // this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(15, 27); - this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label17.Location = new System.Drawing.Point(11, 22); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(31, 16); + this.label17.Size = new System.Drawing.Size(27, 13); this.label17.TabIndex = 27; this.label17.Text = "Hat:"; // // cbStyleWeapon // this.cbStyleWeapon.FormattingEnabled = true; - this.cbStyleWeapon.Location = new System.Drawing.Point(105, 90); - this.cbStyleWeapon.Margin = new System.Windows.Forms.Padding(4); + this.cbStyleWeapon.Location = new System.Drawing.Point(79, 73); this.cbStyleWeapon.Name = "cbStyleWeapon"; - this.cbStyleWeapon.Size = new System.Drawing.Size(201, 24); + this.cbStyleWeapon.Size = new System.Drawing.Size(186, 21); this.cbStyleWeapon.TabIndex = 25; // // groupBox6 @@ -862,81 +863,73 @@ private void InitializeComponent() this.groupBox6.Controls.Add(this.numSkillGoldPoints); this.groupBox6.Controls.Add(this.label35); this.groupBox6.Controls.Add(this.label34); - this.groupBox6.Location = new System.Drawing.Point(11, 396); - this.groupBox6.Margin = new System.Windows.Forms.Padding(4); + this.groupBox6.Location = new System.Drawing.Point(6, 288); this.groupBox6.Name = "groupBox6"; - this.groupBox6.Padding = new System.Windows.Forms.Padding(4); - this.groupBox6.Size = new System.Drawing.Size(207, 123); + this.groupBox6.Size = new System.Drawing.Size(157, 100); this.groupBox6.TabIndex = 37; this.groupBox6.TabStop = false; this.groupBox6.Text = "Skill Points"; // // numSkillTalentPoints // - this.numSkillTalentPoints.Location = new System.Drawing.Point(127, 25); - this.numSkillTalentPoints.Margin = new System.Windows.Forms.Padding(4); + this.numSkillTalentPoints.Location = new System.Drawing.Point(95, 20); this.numSkillTalentPoints.Maximum = new decimal(new int[] { 32767, 0, 0, 0}); this.numSkillTalentPoints.Name = "numSkillTalentPoints"; - this.numSkillTalentPoints.Size = new System.Drawing.Size(68, 22); + this.numSkillTalentPoints.Size = new System.Drawing.Size(51, 20); this.numSkillTalentPoints.TabIndex = 3; // // label36 // this.label36.AutoSize = true; - this.label36.Location = new System.Drawing.Point(13, 91); - this.label36.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label36.Location = new System.Drawing.Point(5, 74); this.label36.Name = "label36"; - this.label36.Size = new System.Drawing.Size(100, 16); + this.label36.Size = new System.Drawing.Size(81, 13); this.label36.TabIndex = 2; this.label36.Text = "Gold Skill Point:"; // // numSkillSilverPoints // - this.numSkillSilverPoints.Location = new System.Drawing.Point(127, 57); - this.numSkillSilverPoints.Margin = new System.Windows.Forms.Padding(4); + this.numSkillSilverPoints.Location = new System.Drawing.Point(95, 46); this.numSkillSilverPoints.Maximum = new decimal(new int[] { 32767, 0, 0, 0}); this.numSkillSilverPoints.Name = "numSkillSilverPoints"; - this.numSkillSilverPoints.Size = new System.Drawing.Size(68, 22); + this.numSkillSilverPoints.Size = new System.Drawing.Size(51, 20); this.numSkillSilverPoints.TabIndex = 4; // // numSkillGoldPoints // - this.numSkillGoldPoints.Location = new System.Drawing.Point(127, 89); - this.numSkillGoldPoints.Margin = new System.Windows.Forms.Padding(4); + this.numSkillGoldPoints.Location = new System.Drawing.Point(95, 72); this.numSkillGoldPoints.Maximum = new decimal(new int[] { 32767, 0, 0, 0}); this.numSkillGoldPoints.Name = "numSkillGoldPoints"; - this.numSkillGoldPoints.Size = new System.Drawing.Size(68, 22); + this.numSkillGoldPoints.Size = new System.Drawing.Size(51, 20); this.numSkillGoldPoints.TabIndex = 5; // // label35 // this.label35.AutoSize = true; - this.label35.Location = new System.Drawing.Point(13, 59); - this.label35.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label35.Location = new System.Drawing.Point(5, 48); this.label35.Name = "label35"; - this.label35.Size = new System.Drawing.Size(105, 16); + this.label35.Size = new System.Drawing.Size(85, 13); this.label35.TabIndex = 1; this.label35.Text = "Silver Skill Point:"; // // label34 // this.label34.AutoSize = true; - this.label34.Location = new System.Drawing.Point(13, 27); - this.label34.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label34.Location = new System.Drawing.Point(5, 22); this.label34.Name = "label34"; - this.label34.Size = new System.Drawing.Size(88, 16); + this.label34.Size = new System.Drawing.Size(72, 13); this.label34.TabIndex = 0; this.label34.Text = "Talent Points:"; // @@ -950,11 +943,9 @@ private void InitializeComponent() this.groupBox5.Controls.Add(this.numEXPUnknown0); this.groupBox5.Controls.Add(this.numEXPcurrent); this.groupBox5.Controls.Add(this.numLevel); - this.groupBox5.Location = new System.Drawing.Point(8, 231); - this.groupBox5.Margin = new System.Windows.Forms.Padding(4); + this.groupBox5.Location = new System.Drawing.Point(6, 158); this.groupBox5.Name = "groupBox5"; - this.groupBox5.Padding = new System.Windows.Forms.Padding(4); - this.groupBox5.Size = new System.Drawing.Size(208, 155); + this.groupBox5.Size = new System.Drawing.Size(157, 126); this.groupBox5.TabIndex = 36; this.groupBox5.TabStop = false; this.groupBox5.Text = "Level"; @@ -962,90 +953,82 @@ private void InitializeComponent() // label33 // this.label33.AutoSize = true; - this.label33.Location = new System.Drawing.Point(8, 122); - this.label33.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label33.Location = new System.Drawing.Point(5, 99); this.label33.Name = "label33"; this.label33.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.label33.Size = new System.Drawing.Size(106, 16); + this.label33.Size = new System.Drawing.Size(89, 13); this.label33.TabIndex = 7; this.label33.Text = "[EXPUnknown1]:"; // // label32 // this.label32.AutoSize = true; - this.label32.Location = new System.Drawing.Point(8, 90); - this.label32.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label32.Location = new System.Drawing.Point(5, 73); this.label32.Name = "label32"; - this.label32.Size = new System.Drawing.Size(106, 16); + this.label32.Size = new System.Drawing.Size(89, 13); this.label32.TabIndex = 6; this.label32.Text = "[EXPUnknown0]:"; // // label31 // this.label31.AutoSize = true; - this.label31.Location = new System.Drawing.Point(8, 58); - this.label31.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label31.Location = new System.Drawing.Point(5, 47); this.label31.Name = "label31"; - this.label31.Size = new System.Drawing.Size(81, 16); + this.label31.Size = new System.Drawing.Size(68, 13); this.label31.TabIndex = 5; this.label31.Text = "Current EXP:"; // // label30 // this.label30.AutoSize = true; - this.label30.Location = new System.Drawing.Point(8, 26); - this.label30.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label30.Location = new System.Drawing.Point(5, 21); this.label30.Name = "label30"; - this.label30.Size = new System.Drawing.Size(43, 16); + this.label30.Size = new System.Drawing.Size(36, 13); this.label30.TabIndex = 4; this.label30.Text = "Level:"; // // numEXPUnknown1 // - this.numEXPUnknown1.Location = new System.Drawing.Point(128, 119); - this.numEXPUnknown1.Margin = new System.Windows.Forms.Padding(4); + this.numEXPUnknown1.Location = new System.Drawing.Point(96, 97); this.numEXPUnknown1.Maximum = new decimal(new int[] { 32767, 0, 0, 0}); this.numEXPUnknown1.Name = "numEXPUnknown1"; - this.numEXPUnknown1.Size = new System.Drawing.Size(68, 22); + this.numEXPUnknown1.Size = new System.Drawing.Size(51, 20); this.numEXPUnknown1.TabIndex = 3; this.Tooltips.SetToolTip(this.numEXPUnknown1, "idk? probably the exp you need to level up?"); // // numEXPUnknown0 // - this.numEXPUnknown0.Location = new System.Drawing.Point(128, 87); - this.numEXPUnknown0.Margin = new System.Windows.Forms.Padding(4); + this.numEXPUnknown0.Location = new System.Drawing.Point(96, 71); this.numEXPUnknown0.Maximum = new decimal(new int[] { 32767, 0, 0, 0}); this.numEXPUnknown0.Name = "numEXPUnknown0"; - this.numEXPUnknown0.Size = new System.Drawing.Size(68, 22); + this.numEXPUnknown0.Size = new System.Drawing.Size(51, 20); this.numEXPUnknown0.TabIndex = 2; this.Tooltips.SetToolTip(this.numEXPUnknown0, "idk"); // // numEXPcurrent // - this.numEXPcurrent.Location = new System.Drawing.Point(128, 55); - this.numEXPcurrent.Margin = new System.Windows.Forms.Padding(4); + this.numEXPcurrent.Location = new System.Drawing.Point(96, 45); this.numEXPcurrent.Maximum = new decimal(new int[] { 32767, 0, 0, 0}); this.numEXPcurrent.Name = "numEXPcurrent"; - this.numEXPcurrent.Size = new System.Drawing.Size(68, 22); + this.numEXPcurrent.Size = new System.Drawing.Size(51, 20); this.numEXPcurrent.TabIndex = 1; this.Tooltips.SetToolTip(this.numEXPcurrent, "Seit it to 9999 to level up after next kill"); // // numLevel // - this.numLevel.Location = new System.Drawing.Point(144, 23); - this.numLevel.Margin = new System.Windows.Forms.Padding(4); + this.numLevel.Location = new System.Drawing.Point(108, 19); this.numLevel.Maximum = new decimal(new int[] { 32767, 0, @@ -1057,7 +1040,7 @@ private void InitializeComponent() 0, 0}); this.numLevel.Name = "numLevel"; - this.numLevel.Size = new System.Drawing.Size(52, 22); + this.numLevel.Size = new System.Drawing.Size(39, 20); this.numLevel.TabIndex = 0; this.Tooltips.SetToolTip(this.numLevel, "Changing Level won\'t give you any Skill Points!"); this.numLevel.Value = new decimal(new int[] { @@ -1068,6 +1051,7 @@ private void InitializeComponent() // // gbColors // + this.gbColors.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom))); this.gbColors.Controls.Add(this.label5); this.gbColors.Controls.Add(this.label4); this.gbColors.Controls.Add(this.label3); @@ -1078,11 +1062,9 @@ private void InitializeComponent() this.gbColors.Controls.Add(this.btnSkinColor); this.gbColors.Controls.Add(this.btnHairColor); this.gbColors.Controls.Add(this.label1); - this.gbColors.Location = new System.Drawing.Point(227, 5); - this.gbColors.Margin = new System.Windows.Forms.Padding(4); + this.gbColors.Location = new System.Drawing.Point(169, 4); this.gbColors.Name = "gbColors"; - this.gbColors.Padding = new System.Windows.Forms.Padding(4); - this.gbColors.Size = new System.Drawing.Size(135, 185); + this.gbColors.Size = new System.Drawing.Size(105, 148); this.gbColors.TabIndex = 33; this.gbColors.TabStop = false; this.gbColors.Text = "Colors"; @@ -1090,50 +1072,45 @@ private void InitializeComponent() // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(8, 150); - this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label5.Location = new System.Drawing.Point(6, 122); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(44, 16); + this.label5.Size = new System.Drawing.Size(37, 13); this.label5.TabIndex = 13; this.label5.Text = "Pants:"; // // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(8, 118); - this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label4.Location = new System.Drawing.Point(6, 96); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(36, 16); + this.label4.Size = new System.Drawing.Size(31, 13); this.label4.TabIndex = 12; this.label4.Text = "Shirt:"; // // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(8, 86); - this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label3.Location = new System.Drawing.Point(6, 70); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(56, 16); + this.label3.Size = new System.Drawing.Size(47, 13); this.label3.TabIndex = 11; this.label3.Text = "Poncho:"; // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(8, 54); - this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label2.Location = new System.Drawing.Point(6, 44); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(36, 16); + this.label2.Size = new System.Drawing.Size(31, 13); this.label2.TabIndex = 10; this.label2.Text = "Skin:"; // // btnPantsColor // this.btnPantsColor.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnPantsColor.Location = new System.Drawing.Point(81, 145); - this.btnPantsColor.Margin = new System.Windows.Forms.Padding(4); + this.btnPantsColor.Location = new System.Drawing.Point(74, 118); this.btnPantsColor.Name = "btnPantsColor"; - this.btnPantsColor.Size = new System.Drawing.Size(27, 25); + this.btnPantsColor.Size = new System.Drawing.Size(20, 20); this.btnPantsColor.TabIndex = 9; this.btnPantsColor.TabStop = false; this.btnPantsColor.UseVisualStyleBackColor = false; @@ -1142,10 +1119,9 @@ private void InitializeComponent() // btnShirtColor // this.btnShirtColor.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnShirtColor.Location = new System.Drawing.Point(81, 113); - this.btnShirtColor.Margin = new System.Windows.Forms.Padding(4); + this.btnShirtColor.Location = new System.Drawing.Point(74, 92); this.btnShirtColor.Name = "btnShirtColor"; - this.btnShirtColor.Size = new System.Drawing.Size(27, 25); + this.btnShirtColor.Size = new System.Drawing.Size(20, 20); this.btnShirtColor.TabIndex = 8; this.btnShirtColor.TabStop = false; this.btnShirtColor.UseVisualStyleBackColor = false; @@ -1154,10 +1130,9 @@ private void InitializeComponent() // btnPonchoColor // this.btnPonchoColor.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnPonchoColor.Location = new System.Drawing.Point(81, 81); - this.btnPonchoColor.Margin = new System.Windows.Forms.Padding(4); + this.btnPonchoColor.Location = new System.Drawing.Point(74, 66); this.btnPonchoColor.Name = "btnPonchoColor"; - this.btnPonchoColor.Size = new System.Drawing.Size(27, 25); + this.btnPonchoColor.Size = new System.Drawing.Size(20, 20); this.btnPonchoColor.TabIndex = 7; this.btnPonchoColor.TabStop = false; this.btnPonchoColor.UseVisualStyleBackColor = false; @@ -1166,10 +1141,9 @@ private void InitializeComponent() // btnSkinColor // this.btnSkinColor.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnSkinColor.Location = new System.Drawing.Point(81, 49); - this.btnSkinColor.Margin = new System.Windows.Forms.Padding(4); + this.btnSkinColor.Location = new System.Drawing.Point(74, 40); this.btnSkinColor.Name = "btnSkinColor"; - this.btnSkinColor.Size = new System.Drawing.Size(27, 25); + this.btnSkinColor.Size = new System.Drawing.Size(20, 20); this.btnSkinColor.TabIndex = 6; this.btnSkinColor.TabStop = false; this.Tooltips.SetToolTip(this.btnSkinColor, "Not implemented yet"); @@ -1179,10 +1153,9 @@ private void InitializeComponent() // this.btnHairColor.BackColor = System.Drawing.Color.White; this.btnHairColor.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnHairColor.Location = new System.Drawing.Point(81, 17); - this.btnHairColor.Margin = new System.Windows.Forms.Padding(4); + this.btnHairColor.Location = new System.Drawing.Point(74, 14); this.btnHairColor.Name = "btnHairColor"; - this.btnHairColor.Size = new System.Drawing.Size(27, 25); + this.btnHairColor.Size = new System.Drawing.Size(20, 20); this.btnHairColor.TabIndex = 5; this.btnHairColor.TabStop = false; this.btnHairColor.UseVisualStyleBackColor = false; @@ -1191,10 +1164,9 @@ private void InitializeComponent() // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(8, 22); - this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label1.Location = new System.Drawing.Point(6, 18); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(35, 16); + this.label1.Size = new System.Drawing.Size(29, 13); this.label1.TabIndex = 0; this.label1.Text = "Hair:"; // @@ -1204,11 +1176,10 @@ private void InitializeComponent() this.tabInventory.Controls.Add(this.label37); this.tabInventory.Controls.Add(this.groupBox4); this.tabInventory.Controls.Add(this.lstInventory); - this.tabInventory.Location = new System.Drawing.Point(4, 25); - this.tabInventory.Margin = new System.Windows.Forms.Padding(4); + this.tabInventory.Location = new System.Drawing.Point(4, 22); this.tabInventory.Name = "tabInventory"; - this.tabInventory.Padding = new System.Windows.Forms.Padding(4); - this.tabInventory.Size = new System.Drawing.Size(748, 483); + this.tabInventory.Padding = new System.Windows.Forms.Padding(3); + this.tabInventory.Size = new System.Drawing.Size(559, 396); this.tabInventory.TabIndex = 2; this.tabInventory.Text = "Inventory"; this.tabInventory.UseVisualStyleBackColor = true; @@ -1216,15 +1187,14 @@ private void InitializeComponent() // numGold // this.numGold.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.numGold.Location = new System.Drawing.Point(603, 432); - this.numGold.Margin = new System.Windows.Forms.Padding(4); + this.numGold.Location = new System.Drawing.Point(450, 361); this.numGold.Maximum = new decimal(new int[] { 2147483647, 0, 0, 0}); this.numGold.Name = "numGold"; - this.numGold.Size = new System.Drawing.Size(135, 22); + this.numGold.Size = new System.Drawing.Size(101, 20); this.numGold.TabIndex = 40; this.Tooltips.SetToolTip(this.numGold, "Money/Papes/Cheddar/Mulla/Dollar/Coins/Green Faces/Loochies/Bread/Dosh"); // @@ -1232,10 +1202,9 @@ private void InitializeComponent() // this.label37.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.label37.AutoSize = true; - this.label37.Location = new System.Drawing.Point(599, 412); - this.label37.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label37.Location = new System.Drawing.Point(447, 345); this.label37.Name = "label37"; - this.label37.Size = new System.Drawing.Size(39, 16); + this.label37.Size = new System.Drawing.Size(32, 13); this.label37.TabIndex = 41; this.label37.Text = "Gold:"; // @@ -1247,21 +1216,18 @@ private void InitializeComponent() this.groupBox4.Controls.Add(this.label28); this.groupBox4.Controls.Add(this.numItemCount); this.groupBox4.Controls.Add(this.cbSelectedItem); - this.groupBox4.Location = new System.Drawing.Point(8, 375); - this.groupBox4.Margin = new System.Windows.Forms.Padding(4); + this.groupBox4.Location = new System.Drawing.Point(3, 315); this.groupBox4.Name = "groupBox4"; - this.groupBox4.Padding = new System.Windows.Forms.Padding(4); - this.groupBox4.Size = new System.Drawing.Size(425, 97); + this.groupBox4.Size = new System.Drawing.Size(319, 74); this.groupBox4.TabIndex = 1; this.groupBox4.TabStop = false; this.groupBox4.Text = "Item"; // // btnDeleteSelectedItem // - this.btnDeleteSelectedItem.Location = new System.Drawing.Point(337, 53); - this.btnDeleteSelectedItem.Margin = new System.Windows.Forms.Padding(4); + this.btnDeleteSelectedItem.Location = new System.Drawing.Point(253, 43); this.btnDeleteSelectedItem.Name = "btnDeleteSelectedItem"; - this.btnDeleteSelectedItem.Size = new System.Drawing.Size(80, 28); + this.btnDeleteSelectedItem.Size = new System.Drawing.Size(60, 23); this.btnDeleteSelectedItem.TabIndex = 2; this.btnDeleteSelectedItem.Text = "Remove"; this.btnDeleteSelectedItem.UseVisualStyleBackColor = true; @@ -1269,10 +1235,9 @@ private void InitializeComponent() // // btnAddItem // - this.btnAddItem.Location = new System.Drawing.Point(337, 21); - this.btnAddItem.Margin = new System.Windows.Forms.Padding(4); + this.btnAddItem.Location = new System.Drawing.Point(253, 17); this.btnAddItem.Name = "btnAddItem"; - this.btnAddItem.Size = new System.Drawing.Size(80, 28); + this.btnAddItem.Size = new System.Drawing.Size(60, 23); this.btnAddItem.TabIndex = 2; this.btnAddItem.Text = "Add"; this.Tooltips.SetToolTip(this.btnAddItem, "Some Items COULD potentially break your game"); @@ -1282,40 +1247,37 @@ private void InitializeComponent() // label28 // this.label28.AutoSize = true; - this.label28.Location = new System.Drawing.Point(176, 59); - this.label28.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label28.Location = new System.Drawing.Point(132, 48); this.label28.Name = "label28"; - this.label28.Size = new System.Drawing.Size(44, 16); + this.label28.Size = new System.Drawing.Size(38, 13); this.label28.TabIndex = 2; this.label28.Text = "Count:"; // // numItemCount // - this.numItemCount.Location = new System.Drawing.Point(235, 57); - this.numItemCount.Margin = new System.Windows.Forms.Padding(4); + this.numItemCount.Location = new System.Drawing.Point(176, 46); this.numItemCount.Maximum = new decimal(new int[] { 9999, 0, 0, 0}); this.numItemCount.Name = "numItemCount"; - this.numItemCount.Size = new System.Drawing.Size(95, 22); + this.numItemCount.Size = new System.Drawing.Size(71, 20); this.numItemCount.TabIndex = 1; this.numItemCount.ValueChanged += new System.EventHandler(this.NumItemCount_ValueChanged); // // cbSelectedItem // this.cbSelectedItem.FormattingEnabled = true; - this.cbSelectedItem.Location = new System.Drawing.Point(8, 23); - this.cbSelectedItem.Margin = new System.Windows.Forms.Padding(4); + this.cbSelectedItem.Location = new System.Drawing.Point(6, 19); this.cbSelectedItem.Name = "cbSelectedItem"; - this.cbSelectedItem.Size = new System.Drawing.Size(320, 24); + this.cbSelectedItem.Size = new System.Drawing.Size(241, 21); this.cbSelectedItem.TabIndex = 0; // // lstInventory // - this.lstInventory.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) + this.lstInventory.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.lstInventory.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.Item, @@ -1325,11 +1287,10 @@ private void InitializeComponent() this.lstInventory.GridLines = true; this.lstInventory.HideSelection = false; this.lstInventory.LabelWrap = false; - this.lstInventory.Location = new System.Drawing.Point(8, 7); - this.lstInventory.Margin = new System.Windows.Forms.Padding(4); + this.lstInventory.Location = new System.Drawing.Point(6, 6); this.lstInventory.MultiSelect = false; this.lstInventory.Name = "lstInventory"; - this.lstInventory.Size = new System.Drawing.Size(728, 360); + this.lstInventory.Size = new System.Drawing.Size(547, 303); this.lstInventory.TabIndex = 0; this.lstInventory.UseCompatibleStateImageBehavior = false; this.lstInventory.View = System.Windows.Forms.View.Details; @@ -1354,11 +1315,10 @@ private void InitializeComponent() // this.tabPets.Controls.Add(this.lstPets); this.tabPets.Controls.Add(this.groupBox7); - this.tabPets.Location = new System.Drawing.Point(4, 25); - this.tabPets.Margin = new System.Windows.Forms.Padding(4); + this.tabPets.Location = new System.Drawing.Point(4, 22); this.tabPets.Name = "tabPets"; - this.tabPets.Padding = new System.Windows.Forms.Padding(4); - this.tabPets.Size = new System.Drawing.Size(748, 548); + this.tabPets.Padding = new System.Windows.Forms.Padding(3); + this.tabPets.Size = new System.Drawing.Size(559, 396); this.tabPets.TabIndex = 8; this.tabPets.Text = "Pets"; this.tabPets.UseVisualStyleBackColor = true; @@ -1376,11 +1336,10 @@ private void InitializeComponent() this.lstPets.FullRowSelect = true; this.lstPets.GridLines = true; this.lstPets.HideSelection = false; - this.lstPets.Location = new System.Drawing.Point(8, 9); - this.lstPets.Margin = new System.Windows.Forms.Padding(4); + this.lstPets.Location = new System.Drawing.Point(6, 7); this.lstPets.MultiSelect = false; this.lstPets.Name = "lstPets"; - this.lstPets.Size = new System.Drawing.Size(460, 463); + this.lstPets.Size = new System.Drawing.Size(368, 383); this.lstPets.TabIndex = 1; this.lstPets.UseCompatibleStateImageBehavior = false; this.lstPets.View = System.Windows.Forms.View.Details; @@ -1394,7 +1353,7 @@ private void InitializeComponent() // Nickname // this.Nickname.Text = "Nickname"; - this.Nickname.Width = 67; + this.Nickname.Width = 92; // // HP // @@ -1439,11 +1398,9 @@ private void InitializeComponent() this.groupBox7.Controls.Add(this.numPetDamage); this.groupBox7.Controls.Add(this.numPetEnergy); this.groupBox7.Controls.Add(this.numPetHP); - this.groupBox7.Location = new System.Drawing.Point(477, 9); - this.groupBox7.Margin = new System.Windows.Forms.Padding(4); + this.groupBox7.Location = new System.Drawing.Point(380, 6); this.groupBox7.Name = "groupBox7"; - this.groupBox7.Padding = new System.Windows.Forms.Padding(4); - this.groupBox7.Size = new System.Drawing.Size(228, 279); + this.groupBox7.Size = new System.Drawing.Size(171, 227); this.groupBox7.TabIndex = 0; this.groupBox7.TabStop = false; this.groupBox7.Text = "Pet"; @@ -1452,182 +1409,166 @@ private void InitializeComponent() // this.cbPetType.Enabled = false; this.cbPetType.FormattingEnabled = true; - this.cbPetType.Location = new System.Drawing.Point(97, 57); - this.cbPetType.Margin = new System.Windows.Forms.Padding(4); + this.cbPetType.Location = new System.Drawing.Point(73, 46); this.cbPetType.Name = "cbPetType"; - this.cbPetType.Size = new System.Drawing.Size(123, 24); + this.cbPetType.Size = new System.Drawing.Size(93, 21); this.cbPetType.TabIndex = 2; // // label52 // this.label52.AutoSize = true; - this.label52.Location = new System.Drawing.Point(8, 60); - this.label52.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label52.Location = new System.Drawing.Point(6, 49); this.label52.Name = "label52"; - this.label52.Size = new System.Drawing.Size(30, 16); + this.label52.Size = new System.Drawing.Size(26, 13); this.label52.TabIndex = 15; this.label52.Text = "Pet:"; // // numPetLevel // - this.numPetLevel.Location = new System.Drawing.Point(148, 89); - this.numPetLevel.Margin = new System.Windows.Forms.Padding(4); + this.numPetLevel.Location = new System.Drawing.Point(111, 72); this.numPetLevel.Maximum = new decimal(new int[] { 255, 0, 0, 0}); this.numPetLevel.Name = "numPetLevel"; - this.numPetLevel.Size = new System.Drawing.Size(73, 22); + this.numPetLevel.Size = new System.Drawing.Size(55, 20); this.numPetLevel.TabIndex = 14; this.numPetLevel.ValueChanged += new System.EventHandler(this.NumPetStat_ValueChanged); // // label48 // this.label48.AutoSize = true; - this.label48.Location = new System.Drawing.Point(8, 91); - this.label48.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label48.Location = new System.Drawing.Point(6, 74); this.label48.Name = "label48"; - this.label48.Size = new System.Drawing.Size(62, 16); + this.label48.Size = new System.Drawing.Size(51, 13); this.label48.TabIndex = 13; this.label48.Text = "Pet level:"; // // label47 // this.label47.AutoSize = true; - this.label47.Location = new System.Drawing.Point(8, 245); - this.label47.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label47.Location = new System.Drawing.Point(6, 199); this.label47.Name = "label47"; - this.label47.Size = new System.Drawing.Size(83, 16); + this.label47.Size = new System.Drawing.Size(66, 13); this.label47.TabIndex = 12; this.label47.Text = "Speed level:"; // // label46 // this.label46.AutoSize = true; - this.label46.Location = new System.Drawing.Point(8, 214); - this.label46.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label46.Location = new System.Drawing.Point(6, 174); this.label46.Name = "label46"; - this.label46.Size = new System.Drawing.Size(61, 16); + this.label46.Size = new System.Drawing.Size(50, 13); this.label46.TabIndex = 11; this.label46.Text = "Crit level:"; // // label45 // this.label45.AutoSize = true; - this.label45.Location = new System.Drawing.Point(8, 183); - this.label45.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label45.Location = new System.Drawing.Point(6, 149); this.label45.Name = "label45"; - this.label45.Size = new System.Drawing.Size(95, 16); + this.label45.Size = new System.Drawing.Size(75, 13); this.label45.TabIndex = 10; this.label45.Text = "Damage level:"; // // label44 // this.label44.AutoSize = true; - this.label44.Location = new System.Drawing.Point(8, 153); - this.label44.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label44.Location = new System.Drawing.Point(6, 124); this.label44.Name = "label44"; - this.label44.Size = new System.Drawing.Size(85, 16); + this.label44.Size = new System.Drawing.Size(68, 13); this.label44.TabIndex = 9; this.label44.Text = "Energy level:"; // // label42 // this.label42.AutoSize = true; - this.label42.Location = new System.Drawing.Point(8, 30); - this.label42.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label42.Location = new System.Drawing.Point(6, 24); this.label42.Name = "label42"; - this.label42.Size = new System.Drawing.Size(71, 16); + this.label42.Size = new System.Drawing.Size(58, 13); this.label42.TabIndex = 2; this.label42.Text = "Nickname:"; // // txtPetNickname // - this.txtPetNickname.Location = new System.Drawing.Point(97, 26); - this.txtPetNickname.Margin = new System.Windows.Forms.Padding(4); + this.txtPetNickname.Location = new System.Drawing.Point(73, 21); this.txtPetNickname.Name = "txtPetNickname"; - this.txtPetNickname.Size = new System.Drawing.Size(123, 22); + this.txtPetNickname.Size = new System.Drawing.Size(93, 20); this.txtPetNickname.TabIndex = 1; this.txtPetNickname.TextChanged += new System.EventHandler(this.TxtPetNickname_TextChanged); // // label43 // this.label43.AutoSize = true; - this.label43.Location = new System.Drawing.Point(8, 122); - this.label43.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label43.Location = new System.Drawing.Point(6, 99); this.label43.Name = "label43"; - this.label43.Size = new System.Drawing.Size(81, 16); + this.label43.Size = new System.Drawing.Size(66, 13); this.label43.TabIndex = 8; this.label43.Text = "Health level:"; // // numPetSpeed // - this.numPetSpeed.Location = new System.Drawing.Point(148, 242); - this.numPetSpeed.Margin = new System.Windows.Forms.Padding(4); + this.numPetSpeed.Location = new System.Drawing.Point(111, 197); this.numPetSpeed.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.numPetSpeed.Name = "numPetSpeed"; - this.numPetSpeed.Size = new System.Drawing.Size(73, 22); + this.numPetSpeed.Size = new System.Drawing.Size(55, 20); this.numPetSpeed.TabIndex = 7; this.numPetSpeed.ValueChanged += new System.EventHandler(this.NumPetStat_ValueChanged); // // numPetCrit // - this.numPetCrit.Location = new System.Drawing.Point(148, 212); - this.numPetCrit.Margin = new System.Windows.Forms.Padding(4); + this.numPetCrit.Location = new System.Drawing.Point(111, 172); this.numPetCrit.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.numPetCrit.Name = "numPetCrit"; - this.numPetCrit.Size = new System.Drawing.Size(73, 22); + this.numPetCrit.Size = new System.Drawing.Size(55, 20); this.numPetCrit.TabIndex = 6; this.numPetCrit.ValueChanged += new System.EventHandler(this.NumPetStat_ValueChanged); // // numPetDamage // - this.numPetDamage.Location = new System.Drawing.Point(148, 181); - this.numPetDamage.Margin = new System.Windows.Forms.Padding(4); + this.numPetDamage.Location = new System.Drawing.Point(111, 147); this.numPetDamage.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.numPetDamage.Name = "numPetDamage"; - this.numPetDamage.Size = new System.Drawing.Size(73, 22); + this.numPetDamage.Size = new System.Drawing.Size(55, 20); this.numPetDamage.TabIndex = 5; this.numPetDamage.ValueChanged += new System.EventHandler(this.NumPetStat_ValueChanged); // // numPetEnergy // - this.numPetEnergy.Location = new System.Drawing.Point(148, 150); - this.numPetEnergy.Margin = new System.Windows.Forms.Padding(4); + this.numPetEnergy.Location = new System.Drawing.Point(111, 122); this.numPetEnergy.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.numPetEnergy.Name = "numPetEnergy"; - this.numPetEnergy.Size = new System.Drawing.Size(73, 22); + this.numPetEnergy.Size = new System.Drawing.Size(55, 20); this.numPetEnergy.TabIndex = 4; this.numPetEnergy.ValueChanged += new System.EventHandler(this.NumPetStat_ValueChanged); // // numPetHP // - this.numPetHP.Location = new System.Drawing.Point(148, 119); - this.numPetHP.Margin = new System.Windows.Forms.Padding(4); + this.numPetHP.Location = new System.Drawing.Point(111, 97); this.numPetHP.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.numPetHP.Name = "numPetHP"; - this.numPetHP.Size = new System.Drawing.Size(73, 22); + this.numPetHP.Size = new System.Drawing.Size(55, 20); this.numPetHP.TabIndex = 3; this.numPetHP.ValueChanged += new System.EventHandler(this.NumPetStat_ValueChanged); // @@ -1635,11 +1576,10 @@ private void InitializeComponent() // this.tabQuickslots.Controls.Add(this.label57); this.tabQuickslots.Controls.Add(this.groupBox3); - this.tabQuickslots.Location = new System.Drawing.Point(4, 25); - this.tabQuickslots.Margin = new System.Windows.Forms.Padding(4); + this.tabQuickslots.Location = new System.Drawing.Point(4, 22); this.tabQuickslots.Name = "tabQuickslots"; - this.tabQuickslots.Padding = new System.Windows.Forms.Padding(4); - this.tabQuickslots.Size = new System.Drawing.Size(748, 483); + this.tabQuickslots.Padding = new System.Windows.Forms.Padding(3); + this.tabQuickslots.Size = new System.Drawing.Size(559, 396); this.tabQuickslots.TabIndex = 1; this.tabQuickslots.Text = "*Quickslots"; this.tabQuickslots.UseVisualStyleBackColor = true; @@ -1649,10 +1589,9 @@ private void InitializeComponent() this.label57.AutoSize = true; this.label57.BackColor = System.Drawing.Color.Transparent; this.label57.ForeColor = System.Drawing.SystemColors.Desktop; - this.label57.Location = new System.Drawing.Point(8, 373); - this.label57.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label57.Location = new System.Drawing.Point(6, 303); this.label57.Name = "label57"; - this.label57.Size = new System.Drawing.Size(481, 16); + this.label57.Size = new System.Drawing.Size(389, 13); this.label57.TabIndex = 32; this.label57.Text = "* = support for this function was removed due to the risk of losing your save gam" + "e"; @@ -1669,11 +1608,9 @@ private void InitializeComponent() this.groupBox3.Controls.Add(this.label25); this.groupBox3.Controls.Add(this.label26); this.groupBox3.Controls.Add(this.label27); - this.groupBox3.Location = new System.Drawing.Point(8, 7); - this.groupBox3.Margin = new System.Windows.Forms.Padding(4); + this.groupBox3.Location = new System.Drawing.Point(6, 6); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Padding = new System.Windows.Forms.Padding(4); - this.groupBox3.Size = new System.Drawing.Size(455, 362); + this.groupBox3.Size = new System.Drawing.Size(341, 294); this.groupBox3.TabIndex = 29; this.groupBox3.TabStop = false; this.groupBox3.Text = "Quckslots"; @@ -1681,100 +1618,90 @@ private void InitializeComponent() // label22 // this.label22.AutoSize = true; - this.label22.Location = new System.Drawing.Point(16, 27); - this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label22.Location = new System.Drawing.Point(12, 22); this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(92, 16); + this.label22.Size = new System.Drawing.Size(77, 13); this.label22.TabIndex = 26; this.label22.Text = "Quckslot 0 (C):"; // // label21 // this.label21.AutoSize = true; - this.label21.Location = new System.Drawing.Point(16, 326); - this.label21.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label21.Location = new System.Drawing.Point(12, 265); this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(93, 16); + this.label21.Size = new System.Drawing.Size(78, 13); this.label21.TabIndex = 24; this.label21.Text = "Quckslot 9 (R):"; // // label18 // this.label18.AutoSize = true; - this.label18.Location = new System.Drawing.Point(16, 293); - this.label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label18.Location = new System.Drawing.Point(12, 238); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(92, 16); + this.label18.Size = new System.Drawing.Size(77, 13); this.label18.TabIndex = 22; this.label18.Text = "Quckslot 8 (E):"; // // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(16, 260); - this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label19.Location = new System.Drawing.Point(12, 211); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(96, 16); + this.label19.Size = new System.Drawing.Size(81, 13); this.label19.TabIndex = 21; this.label19.Text = "Quckslot 7 (W):"; // // label20 // this.label20.AutoSize = true; - this.label20.Location = new System.Drawing.Point(16, 226); - this.label20.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label20.Location = new System.Drawing.Point(12, 184); this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(93, 16); + this.label20.Size = new System.Drawing.Size(78, 13); this.label20.TabIndex = 20; this.label20.Text = "Quckslot 6 (Q):"; // // label23 // this.label23.AutoSize = true; - this.label23.Location = new System.Drawing.Point(16, 193); - this.label23.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label23.Location = new System.Drawing.Point(12, 157); this.label23.Name = "label23"; - this.label23.Size = new System.Drawing.Size(91, 16); + this.label23.Size = new System.Drawing.Size(76, 13); this.label23.TabIndex = 19; this.label23.Text = "Quckslot 5 (F):"; // // label24 // this.label24.AutoSize = true; - this.label24.Location = new System.Drawing.Point(16, 160); - this.label24.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label24.Location = new System.Drawing.Point(12, 130); this.label24.Name = "label24"; - this.label24.Size = new System.Drawing.Size(92, 16); + this.label24.Size = new System.Drawing.Size(77, 13); this.label24.TabIndex = 18; this.label24.Text = "Quckslot 4 (V):"; // // label25 // this.label25.AutoSize = true; - this.label25.Location = new System.Drawing.Point(16, 127); - this.label25.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label25.Location = new System.Drawing.Point(12, 103); this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(93, 16); + this.label25.Size = new System.Drawing.Size(78, 13); this.label25.TabIndex = 17; this.label25.Text = "Quckslot 3 (D):"; // // label26 // this.label26.AutoSize = true; - this.label26.Location = new System.Drawing.Point(16, 94); - this.label26.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label26.Location = new System.Drawing.Point(12, 76); this.label26.Name = "label26"; - this.label26.Size = new System.Drawing.Size(92, 16); + this.label26.Size = new System.Drawing.Size(77, 13); this.label26.TabIndex = 16; this.label26.Text = "Quckslot 2 (S):"; // // label27 // this.label27.AutoSize = true; - this.label27.Location = new System.Drawing.Point(16, 60); - this.label27.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label27.Location = new System.Drawing.Point(12, 49); this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(92, 16); + this.label27.Size = new System.Drawing.Size(77, 13); this.label27.TabIndex = 15; this.label27.Text = "Quckslot 1 (A):"; // @@ -1782,11 +1709,10 @@ private void InitializeComponent() // this.tabSkills.BackColor = System.Drawing.Color.Transparent; this.tabSkills.Controls.Add(this.tabControl1); - this.tabSkills.Location = new System.Drawing.Point(4, 25); - this.tabSkills.Margin = new System.Windows.Forms.Padding(4); + this.tabSkills.Location = new System.Drawing.Point(4, 22); this.tabSkills.Name = "tabSkills"; - this.tabSkills.Padding = new System.Windows.Forms.Padding(4); - this.tabSkills.Size = new System.Drawing.Size(748, 483); + this.tabSkills.Padding = new System.Windows.Forms.Padding(3); + this.tabSkills.Size = new System.Drawing.Size(559, 396); this.tabSkills.TabIndex = 7; this.tabSkills.Text = "*Skills"; this.tabSkills.UseVisualStyleBackColor = true; @@ -1802,12 +1728,11 @@ private void InitializeComponent() this.tabControl1.Controls.Add(this.tabTalentsMagic); this.tabControl1.DrawMode = System.Windows.Forms.TabDrawMode.OwnerDrawFixed; this.tabControl1.ItemSize = new System.Drawing.Size(60, 100); - this.tabControl1.Location = new System.Drawing.Point(11, 7); - this.tabControl1.Margin = new System.Windows.Forms.Padding(4); + this.tabControl1.Location = new System.Drawing.Point(8, 6); this.tabControl1.Multiline = true; this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(727, 449); + this.tabControl1.Size = new System.Drawing.Size(545, 365); this.tabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed; this.tabControl1.TabIndex = 32; this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.TabControl1_DrawItem); @@ -1817,10 +1742,9 @@ private void InitializeComponent() this.tabSkillsMelee.Controls.Add(this.groupBox11); this.tabSkillsMelee.Controls.Add(this.groupBox10); this.tabSkillsMelee.Location = new System.Drawing.Point(104, 4); - this.tabSkillsMelee.Margin = new System.Windows.Forms.Padding(4); this.tabSkillsMelee.Name = "tabSkillsMelee"; - this.tabSkillsMelee.Padding = new System.Windows.Forms.Padding(4); - this.tabSkillsMelee.Size = new System.Drawing.Size(619, 441); + this.tabSkillsMelee.Padding = new System.Windows.Forms.Padding(3); + this.tabSkillsMelee.Size = new System.Drawing.Size(437, 357); this.tabSkillsMelee.TabIndex = 0; this.tabSkillsMelee.Text = "Skills: Melee"; this.tabSkillsMelee.UseVisualStyleBackColor = true; @@ -1837,11 +1761,9 @@ private void InitializeComponent() this.groupBox11.Controls.Add(this.sliderSkillMelee2h3); this.groupBox11.Controls.Add(this.sliderSkillMelee2h2); this.groupBox11.Controls.Add(this.pictureBox9); - this.groupBox11.Location = new System.Drawing.Point(8, 209); - this.groupBox11.Margin = new System.Windows.Forms.Padding(4); + this.groupBox11.Location = new System.Drawing.Point(6, 170); this.groupBox11.Name = "groupBox11"; - this.groupBox11.Padding = new System.Windows.Forms.Padding(4); - this.groupBox11.Size = new System.Drawing.Size(567, 167); + this.groupBox11.Size = new System.Drawing.Size(425, 136); this.groupBox11.TabIndex = 21; this.groupBox11.TabStop = false; this.groupBox11.Text = "Two Handed"; @@ -1849,10 +1771,9 @@ private void InitializeComponent() // sliderSkillMelee2h4 // this.sliderSkillMelee2h4.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.sliderSkillMelee2h4.Location = new System.Drawing.Point(451, 106); - this.sliderSkillMelee2h4.Margin = new System.Windows.Forms.Padding(4); + this.sliderSkillMelee2h4.Location = new System.Drawing.Point(338, 86); this.sliderSkillMelee2h4.Name = "sliderSkillMelee2h4"; - this.sliderSkillMelee2h4.Size = new System.Drawing.Size(105, 56); + this.sliderSkillMelee2h4.Size = new System.Drawing.Size(79, 45); this.sliderSkillMelee2h4.TabIndex = 18; this.sliderSkillMelee2h4.TickStyle = System.Windows.Forms.TickStyle.TopLeft; this.sliderSkillMelee2h4.Value = 10; @@ -1860,10 +1781,9 @@ private void InitializeComponent() // sliderSkillMelee2h0 // this.sliderSkillMelee2h0.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.sliderSkillMelee2h0.Location = new System.Drawing.Point(13, 106); - this.sliderSkillMelee2h0.Margin = new System.Windows.Forms.Padding(4); + this.sliderSkillMelee2h0.Location = new System.Drawing.Point(10, 86); this.sliderSkillMelee2h0.Name = "sliderSkillMelee2h0"; - this.sliderSkillMelee2h0.Size = new System.Drawing.Size(105, 56); + this.sliderSkillMelee2h0.Size = new System.Drawing.Size(79, 45); this.sliderSkillMelee2h0.TabIndex = 10; this.sliderSkillMelee2h0.TickStyle = System.Windows.Forms.TickStyle.TopLeft; this.sliderSkillMelee2h0.Value = 10; @@ -1871,10 +1791,9 @@ private void InitializeComponent() // pictureBox7 // this.pictureBox7.Image = global::SoG_SGreader.Properties.Resources.icon_berserk; - this.pictureBox7.Location = new System.Drawing.Point(473, 42); - this.pictureBox7.Margin = new System.Windows.Forms.Padding(4); + this.pictureBox7.Location = new System.Drawing.Point(355, 34); this.pictureBox7.Name = "pictureBox7"; - this.pictureBox7.Size = new System.Drawing.Size(61, 57); + this.pictureBox7.Size = new System.Drawing.Size(46, 46); this.pictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox7.TabIndex = 19; this.pictureBox7.TabStop = false; @@ -1882,10 +1801,9 @@ private void InitializeComponent() // pictureBox11 // this.pictureBox11.Image = global::SoG_SGreader.Properties.Resources.icon_overhead; - this.pictureBox11.Location = new System.Drawing.Point(36, 42); - this.pictureBox11.Margin = new System.Windows.Forms.Padding(4); + this.pictureBox11.Location = new System.Drawing.Point(27, 34); this.pictureBox11.Name = "pictureBox11"; - this.pictureBox11.Size = new System.Drawing.Size(61, 57); + this.pictureBox11.Size = new System.Drawing.Size(46, 46); this.pictureBox11.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox11.TabIndex = 11; this.pictureBox11.TabStop = false; @@ -1893,10 +1811,9 @@ private void InitializeComponent() // sliderSkillMelee2h1 // this.sliderSkillMelee2h1.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.sliderSkillMelee2h1.Location = new System.Drawing.Point(127, 106); - this.sliderSkillMelee2h1.Margin = new System.Windows.Forms.Padding(4); + this.sliderSkillMelee2h1.Location = new System.Drawing.Point(95, 86); this.sliderSkillMelee2h1.Name = "sliderSkillMelee2h1"; - this.sliderSkillMelee2h1.Size = new System.Drawing.Size(105, 56); + this.sliderSkillMelee2h1.Size = new System.Drawing.Size(79, 45); this.sliderSkillMelee2h1.TabIndex = 12; this.sliderSkillMelee2h1.TickStyle = System.Windows.Forms.TickStyle.TopLeft; this.sliderSkillMelee2h1.Value = 10; @@ -1904,10 +1821,9 @@ private void InitializeComponent() // pictureBox8 // this.pictureBox8.Image = global::SoG_SGreader.Properties.Resources.icon_2hsmash; - this.pictureBox8.Location = new System.Drawing.Point(360, 42); - this.pictureBox8.Margin = new System.Windows.Forms.Padding(4); + this.pictureBox8.Location = new System.Drawing.Point(270, 34); this.pictureBox8.Name = "pictureBox8"; - this.pictureBox8.Size = new System.Drawing.Size(61, 57); + this.pictureBox8.Size = new System.Drawing.Size(46, 46); this.pictureBox8.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox8.TabIndex = 17; this.pictureBox8.TabStop = false; @@ -1915,10 +1831,9 @@ private void InitializeComponent() // pictureBox10 // this.pictureBox10.Image = global::SoG_SGreader.Properties.Resources.icon_swirl_clover; - this.pictureBox10.Location = new System.Drawing.Point(149, 42); - this.pictureBox10.Margin = new System.Windows.Forms.Padding(4); + this.pictureBox10.Location = new System.Drawing.Point(112, 34); this.pictureBox10.Name = "pictureBox10"; - this.pictureBox10.Size = new System.Drawing.Size(61, 57); + this.pictureBox10.Size = new System.Drawing.Size(46, 46); this.pictureBox10.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox10.TabIndex = 13; this.pictureBox10.TabStop = false; @@ -1926,10 +1841,9 @@ private void InitializeComponent() // sliderSkillMelee2h3 // this.sliderSkillMelee2h3.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.sliderSkillMelee2h3.Location = new System.Drawing.Point(337, 106); - this.sliderSkillMelee2h3.Margin = new System.Windows.Forms.Padding(4); + this.sliderSkillMelee2h3.Location = new System.Drawing.Point(253, 86); this.sliderSkillMelee2h3.Name = "sliderSkillMelee2h3"; - this.sliderSkillMelee2h3.Size = new System.Drawing.Size(105, 56); + this.sliderSkillMelee2h3.Size = new System.Drawing.Size(79, 45); this.sliderSkillMelee2h3.TabIndex = 16; this.sliderSkillMelee2h3.TickStyle = System.Windows.Forms.TickStyle.TopLeft; this.sliderSkillMelee2h3.Value = 10; @@ -1937,10 +1851,9 @@ private void InitializeComponent() // sliderSkillMelee2h2 // this.sliderSkillMelee2h2.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.sliderSkillMelee2h2.Location = new System.Drawing.Point(232, 106); - this.sliderSkillMelee2h2.Margin = new System.Windows.Forms.Padding(4); + this.sliderSkillMelee2h2.Location = new System.Drawing.Point(174, 86); this.sliderSkillMelee2h2.Name = "sliderSkillMelee2h2"; - this.sliderSkillMelee2h2.Size = new System.Drawing.Size(105, 56); + this.sliderSkillMelee2h2.Size = new System.Drawing.Size(79, 45); this.sliderSkillMelee2h2.TabIndex = 14; this.sliderSkillMelee2h2.TickStyle = System.Windows.Forms.TickStyle.TopLeft; this.sliderSkillMelee2h2.Value = 10; @@ -1948,10 +1861,9 @@ private void InitializeComponent() // pictureBox9 // this.pictureBox9.Image = global::SoG_SGreader.Properties.Resources.icon_2hthrow; - this.pictureBox9.Location = new System.Drawing.Point(255, 42); - this.pictureBox9.Margin = new System.Windows.Forms.Padding(4); + this.pictureBox9.Location = new System.Drawing.Point(191, 34); this.pictureBox9.Name = "pictureBox9"; - this.pictureBox9.Size = new System.Drawing.Size(61, 57); + this.pictureBox9.Size = new System.Drawing.Size(46, 46); this.pictureBox9.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox9.TabIndex = 15; this.pictureBox9.TabStop = false; @@ -1970,11 +1882,9 @@ private void InitializeComponent() this.groupBox10.Controls.Add(this.pictureBox5); this.groupBox10.Controls.Add(this.sliderSkillMelee1h4); this.groupBox10.Controls.Add(this.pictureBox6); - this.groupBox10.Location = new System.Drawing.Point(8, 7); - this.groupBox10.Margin = new System.Windows.Forms.Padding(4); + this.groupBox10.Location = new System.Drawing.Point(6, 6); this.groupBox10.Name = "groupBox10"; - this.groupBox10.Padding = new System.Windows.Forms.Padding(4); - this.groupBox10.Size = new System.Drawing.Size(567, 194); + this.groupBox10.Size = new System.Drawing.Size(425, 158); this.groupBox10.TabIndex = 20; this.groupBox10.TabStop = false; this.groupBox10.Text = "One Handed"; @@ -1982,30 +1892,27 @@ private void InitializeComponent() // label56 // this.label56.AutoSize = true; - this.label56.Location = new System.Drawing.Point(32, 25); - this.label56.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label56.Location = new System.Drawing.Point(24, 20); this.label56.Name = "label56"; - this.label56.Size = new System.Drawing.Size(199, 16); + this.label56.Size = new System.Drawing.Size(160, 13); this.label56.TabIndex = 11; this.label56.Text = "*These values will not be saved."; // // label38 // this.label38.AutoSize = true; - this.label38.Location = new System.Drawing.Point(32, 148); - this.label38.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label38.Location = new System.Drawing.Point(24, 120); this.label38.Name = "label38"; - this.label38.Size = new System.Drawing.Size(53, 16); + this.label38.Size = new System.Drawing.Size(45, 13); this.label38.TabIndex = 10; this.label38.Text = "Level: 0"; // // sliderSkillMelee1h0 // this.sliderSkillMelee1h0.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.sliderSkillMelee1h0.Location = new System.Drawing.Point(13, 108); - this.sliderSkillMelee1h0.Margin = new System.Windows.Forms.Padding(4); + this.sliderSkillMelee1h0.Location = new System.Drawing.Point(10, 88); this.sliderSkillMelee1h0.Name = "sliderSkillMelee1h0"; - this.sliderSkillMelee1h0.Size = new System.Drawing.Size(105, 56); + this.sliderSkillMelee1h0.Size = new System.Drawing.Size(79, 45); this.sliderSkillMelee1h0.TabIndex = 0; this.sliderSkillMelee1h0.TickStyle = System.Windows.Forms.TickStyle.TopLeft; this.Tooltips.SetToolTip(this.sliderSkillMelee1h0, "{sliderSkillMelee1h0.Value}"); @@ -2014,10 +1921,9 @@ private void InitializeComponent() // pictureBox1 // this.pictureBox1.Image = global::SoG_SGreader.Properties.Resources.icon_stinger_clover; - this.pictureBox1.Location = new System.Drawing.Point(36, 44); - this.pictureBox1.Margin = new System.Windows.Forms.Padding(4); + this.pictureBox1.Location = new System.Drawing.Point(27, 36); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(61, 57); + this.pictureBox1.Size = new System.Drawing.Size(46, 46); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox1.TabIndex = 1; this.pictureBox1.TabStop = false; @@ -2025,10 +1931,9 @@ private void InitializeComponent() // sliderSkillMelee1h1 // this.sliderSkillMelee1h1.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.sliderSkillMelee1h1.Location = new System.Drawing.Point(127, 108); - this.sliderSkillMelee1h1.Margin = new System.Windows.Forms.Padding(4); + this.sliderSkillMelee1h1.Location = new System.Drawing.Point(95, 88); this.sliderSkillMelee1h1.Name = "sliderSkillMelee1h1"; - this.sliderSkillMelee1h1.Size = new System.Drawing.Size(105, 56); + this.sliderSkillMelee1h1.Size = new System.Drawing.Size(79, 45); this.sliderSkillMelee1h1.TabIndex = 2; this.sliderSkillMelee1h1.TickStyle = System.Windows.Forms.TickStyle.TopLeft; this.sliderSkillMelee1h1.Value = 10; @@ -2036,10 +1941,9 @@ private void InitializeComponent() // pictureBox2 // this.pictureBox2.Image = global::SoG_SGreader.Properties.Resources.icon_millionstabs; - this.pictureBox2.Location = new System.Drawing.Point(149, 44); - this.pictureBox2.Margin = new System.Windows.Forms.Padding(4); + this.pictureBox2.Location = new System.Drawing.Point(112, 36); this.pictureBox2.Name = "pictureBox2"; - this.pictureBox2.Size = new System.Drawing.Size(61, 57); + this.pictureBox2.Size = new System.Drawing.Size(46, 46); this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox2.TabIndex = 3; this.pictureBox2.TabStop = false; @@ -2047,10 +1951,9 @@ private void InitializeComponent() // sliderSkillMelee1h2 // this.sliderSkillMelee1h2.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.sliderSkillMelee1h2.Location = new System.Drawing.Point(232, 108); - this.sliderSkillMelee1h2.Margin = new System.Windows.Forms.Padding(4); + this.sliderSkillMelee1h2.Location = new System.Drawing.Point(174, 88); this.sliderSkillMelee1h2.Name = "sliderSkillMelee1h2"; - this.sliderSkillMelee1h2.Size = new System.Drawing.Size(105, 56); + this.sliderSkillMelee1h2.Size = new System.Drawing.Size(79, 45); this.sliderSkillMelee1h2.TabIndex = 4; this.sliderSkillMelee1h2.TickStyle = System.Windows.Forms.TickStyle.TopLeft; this.sliderSkillMelee1h2.Value = 10; @@ -2058,10 +1961,9 @@ private void InitializeComponent() // pictureBox4 // this.pictureBox4.Image = global::SoG_SGreader.Properties.Resources.icon_soulstrike; - this.pictureBox4.Location = new System.Drawing.Point(255, 44); - this.pictureBox4.Margin = new System.Windows.Forms.Padding(4); + this.pictureBox4.Location = new System.Drawing.Point(191, 36); this.pictureBox4.Name = "pictureBox4"; - this.pictureBox4.Size = new System.Drawing.Size(61, 57); + this.pictureBox4.Size = new System.Drawing.Size(46, 46); this.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox4.TabIndex = 5; this.pictureBox4.TabStop = false; @@ -2069,10 +1971,9 @@ private void InitializeComponent() // sliderSkillMelee1h3 // this.sliderSkillMelee1h3.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.sliderSkillMelee1h3.Location = new System.Drawing.Point(337, 108); - this.sliderSkillMelee1h3.Margin = new System.Windows.Forms.Padding(4); + this.sliderSkillMelee1h3.Location = new System.Drawing.Point(253, 88); this.sliderSkillMelee1h3.Name = "sliderSkillMelee1h3"; - this.sliderSkillMelee1h3.Size = new System.Drawing.Size(105, 56); + this.sliderSkillMelee1h3.Size = new System.Drawing.Size(79, 45); this.sliderSkillMelee1h3.TabIndex = 6; this.sliderSkillMelee1h3.TickStyle = System.Windows.Forms.TickStyle.TopLeft; this.sliderSkillMelee1h3.Value = 10; @@ -2080,10 +1981,9 @@ private void InitializeComponent() // pictureBox5 // this.pictureBox5.Image = global::SoG_SGreader.Properties.Resources.icon_shadowclone; - this.pictureBox5.Location = new System.Drawing.Point(360, 44); - this.pictureBox5.Margin = new System.Windows.Forms.Padding(4); + this.pictureBox5.Location = new System.Drawing.Point(270, 36); this.pictureBox5.Name = "pictureBox5"; - this.pictureBox5.Size = new System.Drawing.Size(61, 57); + this.pictureBox5.Size = new System.Drawing.Size(46, 46); this.pictureBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox5.TabIndex = 7; this.pictureBox5.TabStop = false; @@ -2091,10 +1991,9 @@ private void InitializeComponent() // sliderSkillMelee1h4 // this.sliderSkillMelee1h4.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.sliderSkillMelee1h4.Location = new System.Drawing.Point(451, 108); - this.sliderSkillMelee1h4.Margin = new System.Windows.Forms.Padding(4); + this.sliderSkillMelee1h4.Location = new System.Drawing.Point(338, 88); this.sliderSkillMelee1h4.Name = "sliderSkillMelee1h4"; - this.sliderSkillMelee1h4.Size = new System.Drawing.Size(105, 56); + this.sliderSkillMelee1h4.Size = new System.Drawing.Size(79, 45); this.sliderSkillMelee1h4.TabIndex = 8; this.sliderSkillMelee1h4.TickStyle = System.Windows.Forms.TickStyle.TopLeft; this.sliderSkillMelee1h4.Value = 10; @@ -2102,10 +2001,9 @@ private void InitializeComponent() // pictureBox6 // this.pictureBox6.Image = global::SoG_SGreader.Properties.Resources.icon_dodgingstrike; - this.pictureBox6.Location = new System.Drawing.Point(473, 44); - this.pictureBox6.Margin = new System.Windows.Forms.Padding(4); + this.pictureBox6.Location = new System.Drawing.Point(355, 36); this.pictureBox6.Name = "pictureBox6"; - this.pictureBox6.Size = new System.Drawing.Size(61, 57); + this.pictureBox6.Size = new System.Drawing.Size(46, 46); this.pictureBox6.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox6.TabIndex = 9; this.pictureBox6.TabStop = false; @@ -2117,10 +2015,9 @@ private void InitializeComponent() this.tabSkillsMagic.Controls.Add(this.groupBox13); this.tabSkillsMagic.Controls.Add(this.groupBox12); this.tabSkillsMagic.Location = new System.Drawing.Point(104, 4); - this.tabSkillsMagic.Margin = new System.Windows.Forms.Padding(4); this.tabSkillsMagic.Name = "tabSkillsMagic"; - this.tabSkillsMagic.Padding = new System.Windows.Forms.Padding(4); - this.tabSkillsMagic.Size = new System.Drawing.Size(619, 441); + this.tabSkillsMagic.Padding = new System.Windows.Forms.Padding(3); + this.tabSkillsMagic.Size = new System.Drawing.Size(437, 357); this.tabSkillsMagic.TabIndex = 1; this.tabSkillsMagic.Text = "Skills: Magic"; this.tabSkillsMagic.UseVisualStyleBackColor = true; @@ -2133,11 +2030,9 @@ private void InitializeComponent() this.groupBox15.Controls.Add(this.pictureBox22); this.groupBox15.Controls.Add(this.sliderSkillMagicA0); this.groupBox15.Controls.Add(this.pictureBox23); - this.groupBox15.Location = new System.Drawing.Point(295, 209); - this.groupBox15.Margin = new System.Windows.Forms.Padding(4); + this.groupBox15.Location = new System.Drawing.Point(221, 170); this.groupBox15.Name = "groupBox15"; - this.groupBox15.Padding = new System.Windows.Forms.Padding(4); - this.groupBox15.Size = new System.Drawing.Size(279, 194); + this.groupBox15.Size = new System.Drawing.Size(209, 158); this.groupBox15.TabIndex = 22; this.groupBox15.TabStop = false; this.groupBox15.Text = "Air Magic"; @@ -2145,10 +2040,9 @@ private void InitializeComponent() // sliderSkillMagicA2 // this.sliderSkillMagicA2.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.sliderSkillMagicA2.Location = new System.Drawing.Point(181, 108); - this.sliderSkillMagicA2.Margin = new System.Windows.Forms.Padding(4); + this.sliderSkillMagicA2.Location = new System.Drawing.Point(136, 88); this.sliderSkillMagicA2.Name = "sliderSkillMagicA2"; - this.sliderSkillMagicA2.Size = new System.Drawing.Size(89, 56); + this.sliderSkillMagicA2.Size = new System.Drawing.Size(67, 45); this.sliderSkillMagicA2.TabIndex = 10; this.sliderSkillMagicA2.TickStyle = System.Windows.Forms.TickStyle.TopLeft; this.sliderSkillMagicA2.Value = 10; @@ -2156,10 +2050,9 @@ private void InitializeComponent() // pictureBox21 // this.pictureBox21.Image = global::SoG_SGreader.Properties.Resources.icon_statictouch; - this.pictureBox21.Location = new System.Drawing.Point(195, 44); - this.pictureBox21.Margin = new System.Windows.Forms.Padding(4); + this.pictureBox21.Location = new System.Drawing.Point(146, 36); this.pictureBox21.Name = "pictureBox21"; - this.pictureBox21.Size = new System.Drawing.Size(61, 57); + this.pictureBox21.Size = new System.Drawing.Size(46, 46); this.pictureBox21.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox21.TabIndex = 11; this.pictureBox21.TabStop = false; @@ -2167,10 +2060,9 @@ private void InitializeComponent() // sliderSkillMagicA1 // this.sliderSkillMagicA1.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.sliderSkillMagicA1.Location = new System.Drawing.Point(97, 108); - this.sliderSkillMagicA1.Margin = new System.Windows.Forms.Padding(4); + this.sliderSkillMagicA1.Location = new System.Drawing.Point(73, 88); this.sliderSkillMagicA1.Name = "sliderSkillMagicA1"; - this.sliderSkillMagicA1.Size = new System.Drawing.Size(89, 56); + this.sliderSkillMagicA1.Size = new System.Drawing.Size(67, 45); this.sliderSkillMagicA1.TabIndex = 8; this.sliderSkillMagicA1.TickStyle = System.Windows.Forms.TickStyle.TopLeft; this.sliderSkillMagicA1.Value = 10; @@ -2178,10 +2070,9 @@ private void InitializeComponent() // pictureBox22 // this.pictureBox22.Image = global::SoG_SGreader.Properties.Resources.icon_summoncloud; - this.pictureBox22.Location = new System.Drawing.Point(111, 44); - this.pictureBox22.Margin = new System.Windows.Forms.Padding(4); + this.pictureBox22.Location = new System.Drawing.Point(83, 36); this.pictureBox22.Name = "pictureBox22"; - this.pictureBox22.Size = new System.Drawing.Size(61, 57); + this.pictureBox22.Size = new System.Drawing.Size(46, 46); this.pictureBox22.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox22.TabIndex = 9; this.pictureBox22.TabStop = false; @@ -2189,10 +2080,9 @@ private void InitializeComponent() // sliderSkillMagicA0 // this.sliderSkillMagicA0.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.sliderSkillMagicA0.Location = new System.Drawing.Point(12, 108); - this.sliderSkillMagicA0.Margin = new System.Windows.Forms.Padding(4); + this.sliderSkillMagicA0.Location = new System.Drawing.Point(9, 88); this.sliderSkillMagicA0.Name = "sliderSkillMagicA0"; - this.sliderSkillMagicA0.Size = new System.Drawing.Size(89, 56); + this.sliderSkillMagicA0.Size = new System.Drawing.Size(67, 45); this.sliderSkillMagicA0.TabIndex = 6; this.sliderSkillMagicA0.TickStyle = System.Windows.Forms.TickStyle.TopLeft; this.sliderSkillMagicA0.Value = 10; @@ -2200,10 +2090,9 @@ private void InitializeComponent() // pictureBox23 // this.pictureBox23.Image = global::SoG_SGreader.Properties.Resources.icon_chainlightning; - this.pictureBox23.Location = new System.Drawing.Point(25, 44); - this.pictureBox23.Margin = new System.Windows.Forms.Padding(4); + this.pictureBox23.Location = new System.Drawing.Point(19, 36); this.pictureBox23.Name = "pictureBox23"; - this.pictureBox23.Size = new System.Drawing.Size(61, 57); + this.pictureBox23.Size = new System.Drawing.Size(46, 46); this.pictureBox23.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox23.TabIndex = 7; this.pictureBox23.TabStop = false; @@ -2216,11 +2105,9 @@ private void InitializeComponent() this.groupBox14.Controls.Add(this.pictureBox19); this.groupBox14.Controls.Add(this.sliderSkillMagicE0); this.groupBox14.Controls.Add(this.pictureBox20); - this.groupBox14.Location = new System.Drawing.Point(8, 209); - this.groupBox14.Margin = new System.Windows.Forms.Padding(4); + this.groupBox14.Location = new System.Drawing.Point(6, 170); this.groupBox14.Name = "groupBox14"; - this.groupBox14.Padding = new System.Windows.Forms.Padding(4); - this.groupBox14.Size = new System.Drawing.Size(279, 194); + this.groupBox14.Size = new System.Drawing.Size(209, 158); this.groupBox14.TabIndex = 22; this.groupBox14.TabStop = false; this.groupBox14.Text = "Earth Magic"; @@ -2228,10 +2115,9 @@ private void InitializeComponent() // sliderSkillMagicE2 // this.sliderSkillMagicE2.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.sliderSkillMagicE2.Location = new System.Drawing.Point(181, 108); - this.sliderSkillMagicE2.Margin = new System.Windows.Forms.Padding(4); + this.sliderSkillMagicE2.Location = new System.Drawing.Point(136, 88); this.sliderSkillMagicE2.Name = "sliderSkillMagicE2"; - this.sliderSkillMagicE2.Size = new System.Drawing.Size(89, 56); + this.sliderSkillMagicE2.Size = new System.Drawing.Size(67, 45); this.sliderSkillMagicE2.TabIndex = 10; this.sliderSkillMagicE2.TickStyle = System.Windows.Forms.TickStyle.TopLeft; this.sliderSkillMagicE2.Value = 10; @@ -2239,10 +2125,9 @@ private void InitializeComponent() // pictureBox18 // this.pictureBox18.Image = global::SoG_SGreader.Properties.Resources.icon_swarm; - this.pictureBox18.Location = new System.Drawing.Point(195, 44); - this.pictureBox18.Margin = new System.Windows.Forms.Padding(4); + this.pictureBox18.Location = new System.Drawing.Point(146, 36); this.pictureBox18.Name = "pictureBox18"; - this.pictureBox18.Size = new System.Drawing.Size(61, 57); + this.pictureBox18.Size = new System.Drawing.Size(46, 46); this.pictureBox18.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox18.TabIndex = 11; this.pictureBox18.TabStop = false; @@ -2250,10 +2135,9 @@ private void InitializeComponent() // sliderSkillMagicE1 // this.sliderSkillMagicE1.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.sliderSkillMagicE1.Location = new System.Drawing.Point(97, 108); - this.sliderSkillMagicE1.Margin = new System.Windows.Forms.Padding(4); + this.sliderSkillMagicE1.Location = new System.Drawing.Point(73, 88); this.sliderSkillMagicE1.Name = "sliderSkillMagicE1"; - this.sliderSkillMagicE1.Size = new System.Drawing.Size(89, 56); + this.sliderSkillMagicE1.Size = new System.Drawing.Size(67, 45); this.sliderSkillMagicE1.TabIndex = 8; this.sliderSkillMagicE1.TickStyle = System.Windows.Forms.TickStyle.TopLeft; this.sliderSkillMagicE1.Value = 10; @@ -2261,10 +2145,9 @@ private void InitializeComponent() // pictureBox19 // this.pictureBox19.Image = global::SoG_SGreader.Properties.Resources.icon_plantsummon; - this.pictureBox19.Location = new System.Drawing.Point(111, 44); - this.pictureBox19.Margin = new System.Windows.Forms.Padding(4); + this.pictureBox19.Location = new System.Drawing.Point(83, 36); this.pictureBox19.Name = "pictureBox19"; - this.pictureBox19.Size = new System.Drawing.Size(61, 57); + this.pictureBox19.Size = new System.Drawing.Size(46, 46); this.pictureBox19.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox19.TabIndex = 9; this.pictureBox19.TabStop = false; @@ -2272,10 +2155,9 @@ private void InitializeComponent() // sliderSkillMagicE0 // this.sliderSkillMagicE0.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.sliderSkillMagicE0.Location = new System.Drawing.Point(12, 108); - this.sliderSkillMagicE0.Margin = new System.Windows.Forms.Padding(4); + this.sliderSkillMagicE0.Location = new System.Drawing.Point(9, 88); this.sliderSkillMagicE0.Name = "sliderSkillMagicE0"; - this.sliderSkillMagicE0.Size = new System.Drawing.Size(89, 56); + this.sliderSkillMagicE0.Size = new System.Drawing.Size(67, 45); this.sliderSkillMagicE0.TabIndex = 6; this.sliderSkillMagicE0.TickStyle = System.Windows.Forms.TickStyle.TopLeft; this.sliderSkillMagicE0.Value = 10; @@ -2283,10 +2165,9 @@ private void InitializeComponent() // pictureBox20 // this.pictureBox20.Image = global::SoG_SGreader.Properties.Resources.icon_earthspike; - this.pictureBox20.Location = new System.Drawing.Point(25, 44); - this.pictureBox20.Margin = new System.Windows.Forms.Padding(4); + this.pictureBox20.Location = new System.Drawing.Point(19, 36); this.pictureBox20.Name = "pictureBox20"; - this.pictureBox20.Size = new System.Drawing.Size(61, 57); + this.pictureBox20.Size = new System.Drawing.Size(46, 46); this.pictureBox20.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox20.TabIndex = 7; this.pictureBox20.TabStop = false; @@ -2299,11 +2180,9 @@ private void InitializeComponent() this.groupBox13.Controls.Add(this.pictureBox16); this.groupBox13.Controls.Add(this.sliderSkillMagicI0); this.groupBox13.Controls.Add(this.pictureBox17); - this.groupBox13.Location = new System.Drawing.Point(295, 7); - this.groupBox13.Margin = new System.Windows.Forms.Padding(4); + this.groupBox13.Location = new System.Drawing.Point(221, 6); this.groupBox13.Name = "groupBox13"; - this.groupBox13.Padding = new System.Windows.Forms.Padding(4); - this.groupBox13.Size = new System.Drawing.Size(279, 194); + this.groupBox13.Size = new System.Drawing.Size(209, 158); this.groupBox13.TabIndex = 22; this.groupBox13.TabStop = false; this.groupBox13.Text = "Ice Magic"; @@ -2311,10 +2190,9 @@ private void InitializeComponent() // sliderSkillMagicI2 // this.sliderSkillMagicI2.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.sliderSkillMagicI2.Location = new System.Drawing.Point(181, 108); - this.sliderSkillMagicI2.Margin = new System.Windows.Forms.Padding(4); + this.sliderSkillMagicI2.Location = new System.Drawing.Point(136, 88); this.sliderSkillMagicI2.Name = "sliderSkillMagicI2"; - this.sliderSkillMagicI2.Size = new System.Drawing.Size(89, 56); + this.sliderSkillMagicI2.Size = new System.Drawing.Size(67, 45); this.sliderSkillMagicI2.TabIndex = 10; this.sliderSkillMagicI2.TickStyle = System.Windows.Forms.TickStyle.TopLeft; this.sliderSkillMagicI2.Value = 10; @@ -2322,10 +2200,9 @@ private void InitializeComponent() // pictureBox15 // this.pictureBox15.Image = global::SoG_SGreader.Properties.Resources.icon_frosty; - this.pictureBox15.Location = new System.Drawing.Point(195, 44); - this.pictureBox15.Margin = new System.Windows.Forms.Padding(4); + this.pictureBox15.Location = new System.Drawing.Point(146, 36); this.pictureBox15.Name = "pictureBox15"; - this.pictureBox15.Size = new System.Drawing.Size(61, 57); + this.pictureBox15.Size = new System.Drawing.Size(46, 46); this.pictureBox15.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox15.TabIndex = 11; this.pictureBox15.TabStop = false; @@ -2333,10 +2210,9 @@ private void InitializeComponent() // sliderSkillMagicI1 // this.sliderSkillMagicI1.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.sliderSkillMagicI1.Location = new System.Drawing.Point(97, 108); - this.sliderSkillMagicI1.Margin = new System.Windows.Forms.Padding(4); + this.sliderSkillMagicI1.Location = new System.Drawing.Point(73, 88); this.sliderSkillMagicI1.Name = "sliderSkillMagicI1"; - this.sliderSkillMagicI1.Size = new System.Drawing.Size(89, 56); + this.sliderSkillMagicI1.Size = new System.Drawing.Size(67, 45); this.sliderSkillMagicI1.TabIndex = 8; this.sliderSkillMagicI1.TickStyle = System.Windows.Forms.TickStyle.TopLeft; this.sliderSkillMagicI1.Value = 10; @@ -2344,10 +2220,9 @@ private void InitializeComponent() // pictureBox16 // this.pictureBox16.Image = global::SoG_SGreader.Properties.Resources.icon_frostnova_clover; - this.pictureBox16.Location = new System.Drawing.Point(111, 44); - this.pictureBox16.Margin = new System.Windows.Forms.Padding(4); + this.pictureBox16.Location = new System.Drawing.Point(83, 36); this.pictureBox16.Name = "pictureBox16"; - this.pictureBox16.Size = new System.Drawing.Size(61, 57); + this.pictureBox16.Size = new System.Drawing.Size(46, 46); this.pictureBox16.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox16.TabIndex = 9; this.pictureBox16.TabStop = false; @@ -2355,10 +2230,9 @@ private void InitializeComponent() // sliderSkillMagicI0 // this.sliderSkillMagicI0.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.sliderSkillMagicI0.Location = new System.Drawing.Point(12, 108); - this.sliderSkillMagicI0.Margin = new System.Windows.Forms.Padding(4); + this.sliderSkillMagicI0.Location = new System.Drawing.Point(9, 88); this.sliderSkillMagicI0.Name = "sliderSkillMagicI0"; - this.sliderSkillMagicI0.Size = new System.Drawing.Size(89, 56); + this.sliderSkillMagicI0.Size = new System.Drawing.Size(67, 45); this.sliderSkillMagicI0.TabIndex = 6; this.sliderSkillMagicI0.TickStyle = System.Windows.Forms.TickStyle.TopLeft; this.sliderSkillMagicI0.Value = 10; @@ -2366,10 +2240,9 @@ private void InitializeComponent() // pictureBox17 // this.pictureBox17.Image = global::SoG_SGreader.Properties.Resources.icon_icespikes; - this.pictureBox17.Location = new System.Drawing.Point(25, 44); - this.pictureBox17.Margin = new System.Windows.Forms.Padding(4); + this.pictureBox17.Location = new System.Drawing.Point(19, 36); this.pictureBox17.Name = "pictureBox17"; - this.pictureBox17.Size = new System.Drawing.Size(61, 57); + this.pictureBox17.Size = new System.Drawing.Size(46, 46); this.pictureBox17.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox17.TabIndex = 7; this.pictureBox17.TabStop = false; @@ -2382,11 +2255,9 @@ private void InitializeComponent() this.groupBox12.Controls.Add(this.pictureBox13); this.groupBox12.Controls.Add(this.sliderSkillMagicF0); this.groupBox12.Controls.Add(this.pictureBox12); - this.groupBox12.Location = new System.Drawing.Point(8, 7); - this.groupBox12.Margin = new System.Windows.Forms.Padding(4); + this.groupBox12.Location = new System.Drawing.Point(6, 6); this.groupBox12.Name = "groupBox12"; - this.groupBox12.Padding = new System.Windows.Forms.Padding(4); - this.groupBox12.Size = new System.Drawing.Size(279, 194); + this.groupBox12.Size = new System.Drawing.Size(209, 158); this.groupBox12.TabIndex = 21; this.groupBox12.TabStop = false; this.groupBox12.Text = "Fire Magic"; @@ -2394,10 +2265,9 @@ private void InitializeComponent() // sliderSkillMagicF2 // this.sliderSkillMagicF2.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.sliderSkillMagicF2.Location = new System.Drawing.Point(181, 108); - this.sliderSkillMagicF2.Margin = new System.Windows.Forms.Padding(4); + this.sliderSkillMagicF2.Location = new System.Drawing.Point(136, 88); this.sliderSkillMagicF2.Name = "sliderSkillMagicF2"; - this.sliderSkillMagicF2.Size = new System.Drawing.Size(89, 56); + this.sliderSkillMagicF2.Size = new System.Drawing.Size(67, 45); this.sliderSkillMagicF2.TabIndex = 10; this.sliderSkillMagicF2.TickStyle = System.Windows.Forms.TickStyle.TopLeft; this.sliderSkillMagicF2.Value = 10; @@ -2405,10 +2275,9 @@ private void InitializeComponent() // pictureBox14 // this.pictureBox14.Image = global::SoG_SGreader.Properties.Resources.icon_flamethrower; - this.pictureBox14.Location = new System.Drawing.Point(195, 44); - this.pictureBox14.Margin = new System.Windows.Forms.Padding(4); + this.pictureBox14.Location = new System.Drawing.Point(146, 36); this.pictureBox14.Name = "pictureBox14"; - this.pictureBox14.Size = new System.Drawing.Size(61, 57); + this.pictureBox14.Size = new System.Drawing.Size(46, 46); this.pictureBox14.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox14.TabIndex = 11; this.pictureBox14.TabStop = false; @@ -2416,10 +2285,9 @@ private void InitializeComponent() // sliderSkillMagicF1 // this.sliderSkillMagicF1.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.sliderSkillMagicF1.Location = new System.Drawing.Point(97, 108); - this.sliderSkillMagicF1.Margin = new System.Windows.Forms.Padding(4); + this.sliderSkillMagicF1.Location = new System.Drawing.Point(73, 88); this.sliderSkillMagicF1.Name = "sliderSkillMagicF1"; - this.sliderSkillMagicF1.Size = new System.Drawing.Size(89, 56); + this.sliderSkillMagicF1.Size = new System.Drawing.Size(67, 45); this.sliderSkillMagicF1.TabIndex = 8; this.sliderSkillMagicF1.TickStyle = System.Windows.Forms.TickStyle.TopLeft; this.sliderSkillMagicF1.Value = 10; @@ -2427,10 +2295,9 @@ private void InitializeComponent() // pictureBox13 // this.pictureBox13.Image = global::SoG_SGreader.Properties.Resources.icon_meteor; - this.pictureBox13.Location = new System.Drawing.Point(111, 44); - this.pictureBox13.Margin = new System.Windows.Forms.Padding(4); + this.pictureBox13.Location = new System.Drawing.Point(83, 36); this.pictureBox13.Name = "pictureBox13"; - this.pictureBox13.Size = new System.Drawing.Size(61, 57); + this.pictureBox13.Size = new System.Drawing.Size(46, 46); this.pictureBox13.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox13.TabIndex = 9; this.pictureBox13.TabStop = false; @@ -2438,10 +2305,9 @@ private void InitializeComponent() // sliderSkillMagicF0 // this.sliderSkillMagicF0.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.sliderSkillMagicF0.Location = new System.Drawing.Point(12, 108); - this.sliderSkillMagicF0.Margin = new System.Windows.Forms.Padding(4); + this.sliderSkillMagicF0.Location = new System.Drawing.Point(9, 88); this.sliderSkillMagicF0.Name = "sliderSkillMagicF0"; - this.sliderSkillMagicF0.Size = new System.Drawing.Size(89, 56); + this.sliderSkillMagicF0.Size = new System.Drawing.Size(67, 45); this.sliderSkillMagicF0.TabIndex = 6; this.sliderSkillMagicF0.TickStyle = System.Windows.Forms.TickStyle.TopLeft; this.sliderSkillMagicF0.Value = 10; @@ -2449,10 +2315,9 @@ private void InitializeComponent() // pictureBox12 // this.pictureBox12.Image = global::SoG_SGreader.Properties.Resources.icon_fireball; - this.pictureBox12.Location = new System.Drawing.Point(25, 44); - this.pictureBox12.Margin = new System.Windows.Forms.Padding(4); + this.pictureBox12.Location = new System.Drawing.Point(19, 36); this.pictureBox12.Name = "pictureBox12"; - this.pictureBox12.Size = new System.Drawing.Size(61, 57); + this.pictureBox12.Size = new System.Drawing.Size(46, 46); this.pictureBox12.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox12.TabIndex = 7; this.pictureBox12.TabStop = false; @@ -2463,10 +2328,9 @@ private void InitializeComponent() this.tabSkillsUtility.Controls.Add(this.groupBox17); this.tabSkillsUtility.Controls.Add(this.groupBox16); this.tabSkillsUtility.Location = new System.Drawing.Point(104, 4); - this.tabSkillsUtility.Margin = new System.Windows.Forms.Padding(4); this.tabSkillsUtility.Name = "tabSkillsUtility"; - this.tabSkillsUtility.Padding = new System.Windows.Forms.Padding(4); - this.tabSkillsUtility.Size = new System.Drawing.Size(619, 441); + this.tabSkillsUtility.Padding = new System.Windows.Forms.Padding(3); + this.tabSkillsUtility.Size = new System.Drawing.Size(437, 357); this.tabSkillsUtility.TabIndex = 2; this.tabSkillsUtility.Text = "Skills: Utility"; this.tabSkillsUtility.UseVisualStyleBackColor = true; @@ -2479,11 +2343,9 @@ private void InitializeComponent() this.groupBox18.Controls.Add(this.pictureBox31); this.groupBox18.Controls.Add(this.sliderUtilityE2); this.groupBox18.Controls.Add(this.pictureBox32); - this.groupBox18.Location = new System.Drawing.Point(8, 311); - this.groupBox18.Margin = new System.Windows.Forms.Padding(4); + this.groupBox18.Location = new System.Drawing.Point(6, 253); this.groupBox18.Name = "groupBox18"; - this.groupBox18.Padding = new System.Windows.Forms.Padding(4); - this.groupBox18.Size = new System.Drawing.Size(567, 149); + this.groupBox18.Size = new System.Drawing.Size(425, 121); this.groupBox18.TabIndex = 22; this.groupBox18.TabStop = false; this.groupBox18.Text = "Enhancing"; @@ -2491,11 +2353,10 @@ private void InitializeComponent() // sliderUtilityE0 // this.sliderUtilityE0.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.sliderUtilityE0.Location = new System.Drawing.Point(120, 84); - this.sliderUtilityE0.Margin = new System.Windows.Forms.Padding(4); + this.sliderUtilityE0.Location = new System.Drawing.Point(90, 68); this.sliderUtilityE0.Maximum = 3; this.sliderUtilityE0.Name = "sliderUtilityE0"; - this.sliderUtilityE0.Size = new System.Drawing.Size(105, 56); + this.sliderUtilityE0.Size = new System.Drawing.Size(79, 45); this.sliderUtilityE0.TabIndex = 0; this.sliderUtilityE0.TickStyle = System.Windows.Forms.TickStyle.TopLeft; this.sliderUtilityE0.Value = 3; @@ -2503,10 +2364,9 @@ private void InitializeComponent() // pictureBox30 // this.pictureBox30.Image = global::SoG_SGreader.Properties.Resources.icon_dmgup; - this.pictureBox30.Location = new System.Drawing.Point(143, 23); - this.pictureBox30.Margin = new System.Windows.Forms.Padding(4); + this.pictureBox30.Location = new System.Drawing.Point(107, 19); this.pictureBox30.Name = "pictureBox30"; - this.pictureBox30.Size = new System.Drawing.Size(61, 57); + this.pictureBox30.Size = new System.Drawing.Size(46, 46); this.pictureBox30.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox30.TabIndex = 1; this.pictureBox30.TabStop = false; @@ -2514,11 +2374,10 @@ private void InitializeComponent() // sliderUtilityE1 // this.sliderUtilityE1.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.sliderUtilityE1.Location = new System.Drawing.Point(233, 84); - this.sliderUtilityE1.Margin = new System.Windows.Forms.Padding(4); + this.sliderUtilityE1.Location = new System.Drawing.Point(175, 68); this.sliderUtilityE1.Maximum = 3; this.sliderUtilityE1.Name = "sliderUtilityE1"; - this.sliderUtilityE1.Size = new System.Drawing.Size(105, 56); + this.sliderUtilityE1.Size = new System.Drawing.Size(79, 45); this.sliderUtilityE1.TabIndex = 2; this.sliderUtilityE1.TickStyle = System.Windows.Forms.TickStyle.TopLeft; this.sliderUtilityE1.Value = 3; @@ -2526,10 +2385,9 @@ private void InitializeComponent() // pictureBox31 // this.pictureBox31.Image = global::SoG_SGreader.Properties.Resources.icon_speedup; - this.pictureBox31.Location = new System.Drawing.Point(256, 23); - this.pictureBox31.Margin = new System.Windows.Forms.Padding(4); + this.pictureBox31.Location = new System.Drawing.Point(192, 19); this.pictureBox31.Name = "pictureBox31"; - this.pictureBox31.Size = new System.Drawing.Size(61, 57); + this.pictureBox31.Size = new System.Drawing.Size(46, 46); this.pictureBox31.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox31.TabIndex = 3; this.pictureBox31.TabStop = false; @@ -2537,11 +2395,10 @@ private void InitializeComponent() // sliderUtilityE2 // this.sliderUtilityE2.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.sliderUtilityE2.Location = new System.Drawing.Point(339, 84); - this.sliderUtilityE2.Margin = new System.Windows.Forms.Padding(4); + this.sliderUtilityE2.Location = new System.Drawing.Point(254, 68); this.sliderUtilityE2.Maximum = 3; this.sliderUtilityE2.Name = "sliderUtilityE2"; - this.sliderUtilityE2.Size = new System.Drawing.Size(105, 56); + this.sliderUtilityE2.Size = new System.Drawing.Size(79, 45); this.sliderUtilityE2.TabIndex = 4; this.sliderUtilityE2.TickStyle = System.Windows.Forms.TickStyle.TopLeft; this.sliderUtilityE2.Value = 3; @@ -2549,10 +2406,9 @@ private void InitializeComponent() // pictureBox32 // this.pictureBox32.Image = global::SoG_SGreader.Properties.Resources.icon_protect_clover; - this.pictureBox32.Location = new System.Drawing.Point(361, 23); - this.pictureBox32.Margin = new System.Windows.Forms.Padding(4); + this.pictureBox32.Location = new System.Drawing.Point(271, 19); this.pictureBox32.Name = "pictureBox32"; - this.pictureBox32.Size = new System.Drawing.Size(61, 57); + this.pictureBox32.Size = new System.Drawing.Size(46, 46); this.pictureBox32.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox32.TabIndex = 5; this.pictureBox32.TabStop = false; @@ -2565,11 +2421,9 @@ private void InitializeComponent() this.groupBox17.Controls.Add(this.pictureBox28); this.groupBox17.Controls.Add(this.sliderUtilityD2); this.groupBox17.Controls.Add(this.pictureBox29); - this.groupBox17.Location = new System.Drawing.Point(8, 156); - this.groupBox17.Margin = new System.Windows.Forms.Padding(4); + this.groupBox17.Location = new System.Drawing.Point(6, 127); this.groupBox17.Name = "groupBox17"; - this.groupBox17.Padding = new System.Windows.Forms.Padding(4); - this.groupBox17.Size = new System.Drawing.Size(567, 149); + this.groupBox17.Size = new System.Drawing.Size(425, 121); this.groupBox17.TabIndex = 22; this.groupBox17.TabStop = false; this.groupBox17.Text = "Defensive"; @@ -2577,11 +2431,10 @@ private void InitializeComponent() // sliderUtilityD0 // this.sliderUtilityD0.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.sliderUtilityD0.Location = new System.Drawing.Point(120, 84); - this.sliderUtilityD0.Margin = new System.Windows.Forms.Padding(4); + this.sliderUtilityD0.Location = new System.Drawing.Point(90, 68); this.sliderUtilityD0.Maximum = 3; this.sliderUtilityD0.Name = "sliderUtilityD0"; - this.sliderUtilityD0.Size = new System.Drawing.Size(105, 56); + this.sliderUtilityD0.Size = new System.Drawing.Size(79, 45); this.sliderUtilityD0.TabIndex = 0; this.sliderUtilityD0.TickStyle = System.Windows.Forms.TickStyle.TopLeft; this.sliderUtilityD0.Value = 3; @@ -2589,10 +2442,9 @@ private void InitializeComponent() // pictureBox27 // this.pictureBox27.Image = global::SoG_SGreader.Properties.Resources.icon_utility_blink; - this.pictureBox27.Location = new System.Drawing.Point(143, 23); - this.pictureBox27.Margin = new System.Windows.Forms.Padding(4); + this.pictureBox27.Location = new System.Drawing.Point(107, 19); this.pictureBox27.Name = "pictureBox27"; - this.pictureBox27.Size = new System.Drawing.Size(61, 57); + this.pictureBox27.Size = new System.Drawing.Size(46, 46); this.pictureBox27.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox27.TabIndex = 1; this.pictureBox27.TabStop = false; @@ -2600,11 +2452,10 @@ private void InitializeComponent() // sliderUtilityD1 // this.sliderUtilityD1.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.sliderUtilityD1.Location = new System.Drawing.Point(233, 84); - this.sliderUtilityD1.Margin = new System.Windows.Forms.Padding(4); + this.sliderUtilityD1.Location = new System.Drawing.Point(175, 68); this.sliderUtilityD1.Maximum = 3; this.sliderUtilityD1.Name = "sliderUtilityD1"; - this.sliderUtilityD1.Size = new System.Drawing.Size(105, 56); + this.sliderUtilityD1.Size = new System.Drawing.Size(79, 45); this.sliderUtilityD1.TabIndex = 2; this.sliderUtilityD1.TickStyle = System.Windows.Forms.TickStyle.TopLeft; this.sliderUtilityD1.Value = 3; @@ -2612,10 +2463,9 @@ private void InitializeComponent() // pictureBox28 // this.pictureBox28.Image = global::SoG_SGreader.Properties.Resources.icon_utility_focus; - this.pictureBox28.Location = new System.Drawing.Point(256, 23); - this.pictureBox28.Margin = new System.Windows.Forms.Padding(4); + this.pictureBox28.Location = new System.Drawing.Point(192, 19); this.pictureBox28.Name = "pictureBox28"; - this.pictureBox28.Size = new System.Drawing.Size(61, 57); + this.pictureBox28.Size = new System.Drawing.Size(46, 46); this.pictureBox28.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox28.TabIndex = 3; this.pictureBox28.TabStop = false; @@ -2623,11 +2473,10 @@ private void InitializeComponent() // sliderUtilityD2 // this.sliderUtilityD2.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.sliderUtilityD2.Location = new System.Drawing.Point(339, 84); - this.sliderUtilityD2.Margin = new System.Windows.Forms.Padding(4); + this.sliderUtilityD2.Location = new System.Drawing.Point(254, 68); this.sliderUtilityD2.Maximum = 3; this.sliderUtilityD2.Name = "sliderUtilityD2"; - this.sliderUtilityD2.Size = new System.Drawing.Size(105, 56); + this.sliderUtilityD2.Size = new System.Drawing.Size(79, 45); this.sliderUtilityD2.TabIndex = 4; this.sliderUtilityD2.TickStyle = System.Windows.Forms.TickStyle.TopLeft; this.sliderUtilityD2.Value = 3; @@ -2635,10 +2484,9 @@ private void InitializeComponent() // pictureBox29 // this.pictureBox29.Image = global::SoG_SGreader.Properties.Resources.icon_utility_barrier; - this.pictureBox29.Location = new System.Drawing.Point(361, 23); - this.pictureBox29.Margin = new System.Windows.Forms.Padding(4); + this.pictureBox29.Location = new System.Drawing.Point(271, 19); this.pictureBox29.Name = "pictureBox29"; - this.pictureBox29.Size = new System.Drawing.Size(61, 57); + this.pictureBox29.Size = new System.Drawing.Size(46, 46); this.pictureBox29.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox29.TabIndex = 5; this.pictureBox29.TabStop = false; @@ -2651,11 +2499,9 @@ private void InitializeComponent() this.groupBox16.Controls.Add(this.pictureBox25); this.groupBox16.Controls.Add(this.sliderUtilityO2); this.groupBox16.Controls.Add(this.pictureBox26); - this.groupBox16.Location = new System.Drawing.Point(8, 7); - this.groupBox16.Margin = new System.Windows.Forms.Padding(4); + this.groupBox16.Location = new System.Drawing.Point(6, 6); this.groupBox16.Name = "groupBox16"; - this.groupBox16.Padding = new System.Windows.Forms.Padding(4); - this.groupBox16.Size = new System.Drawing.Size(567, 149); + this.groupBox16.Size = new System.Drawing.Size(425, 121); this.groupBox16.TabIndex = 21; this.groupBox16.TabStop = false; this.groupBox16.Text = "Offensive"; @@ -2663,21 +2509,19 @@ private void InitializeComponent() // sliderUtilityO0 // this.sliderUtilityO0.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.sliderUtilityO0.Location = new System.Drawing.Point(120, 84); - this.sliderUtilityO0.Margin = new System.Windows.Forms.Padding(4); + this.sliderUtilityO0.Location = new System.Drawing.Point(90, 68); this.sliderUtilityO0.Maximum = 3; this.sliderUtilityO0.Name = "sliderUtilityO0"; - this.sliderUtilityO0.Size = new System.Drawing.Size(105, 56); + this.sliderUtilityO0.Size = new System.Drawing.Size(79, 45); this.sliderUtilityO0.TabIndex = 0; this.sliderUtilityO0.TickStyle = System.Windows.Forms.TickStyle.TopLeft; // // pictureBox24 // this.pictureBox24.Image = global::SoG_SGreader.Properties.Resources.icon_utility_deathmark; - this.pictureBox24.Location = new System.Drawing.Point(143, 23); - this.pictureBox24.Margin = new System.Windows.Forms.Padding(4); + this.pictureBox24.Location = new System.Drawing.Point(107, 19); this.pictureBox24.Name = "pictureBox24"; - this.pictureBox24.Size = new System.Drawing.Size(61, 57); + this.pictureBox24.Size = new System.Drawing.Size(46, 46); this.pictureBox24.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox24.TabIndex = 1; this.pictureBox24.TabStop = false; @@ -2685,11 +2529,10 @@ private void InitializeComponent() // sliderUtilityO1 // this.sliderUtilityO1.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.sliderUtilityO1.Location = new System.Drawing.Point(233, 84); - this.sliderUtilityO1.Margin = new System.Windows.Forms.Padding(4); + this.sliderUtilityO1.Location = new System.Drawing.Point(175, 68); this.sliderUtilityO1.Maximum = 3; this.sliderUtilityO1.Name = "sliderUtilityO1"; - this.sliderUtilityO1.Size = new System.Drawing.Size(105, 56); + this.sliderUtilityO1.Size = new System.Drawing.Size(79, 45); this.sliderUtilityO1.TabIndex = 2; this.sliderUtilityO1.TickStyle = System.Windows.Forms.TickStyle.TopLeft; this.sliderUtilityO1.Value = 3; @@ -2697,10 +2540,9 @@ private void InitializeComponent() // pictureBox25 // this.pictureBox25.Image = global::SoG_SGreader.Properties.Resources.icon_utility_sleep; - this.pictureBox25.Location = new System.Drawing.Point(256, 23); - this.pictureBox25.Margin = new System.Windows.Forms.Padding(4); + this.pictureBox25.Location = new System.Drawing.Point(192, 19); this.pictureBox25.Name = "pictureBox25"; - this.pictureBox25.Size = new System.Drawing.Size(61, 57); + this.pictureBox25.Size = new System.Drawing.Size(46, 46); this.pictureBox25.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox25.TabIndex = 3; this.pictureBox25.TabStop = false; @@ -2708,11 +2550,10 @@ private void InitializeComponent() // sliderUtilityO2 // this.sliderUtilityO2.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.sliderUtilityO2.Location = new System.Drawing.Point(339, 84); - this.sliderUtilityO2.Margin = new System.Windows.Forms.Padding(4); + this.sliderUtilityO2.Location = new System.Drawing.Point(254, 68); this.sliderUtilityO2.Maximum = 3; this.sliderUtilityO2.Name = "sliderUtilityO2"; - this.sliderUtilityO2.Size = new System.Drawing.Size(105, 56); + this.sliderUtilityO2.Size = new System.Drawing.Size(79, 45); this.sliderUtilityO2.TabIndex = 4; this.sliderUtilityO2.TickStyle = System.Windows.Forms.TickStyle.TopLeft; this.sliderUtilityO2.Value = 3; @@ -2720,10 +2561,9 @@ private void InitializeComponent() // pictureBox26 // this.pictureBox26.Image = global::SoG_SGreader.Properties.Resources.icon_utility_taunt; - this.pictureBox26.Location = new System.Drawing.Point(361, 23); - this.pictureBox26.Margin = new System.Windows.Forms.Padding(4); + this.pictureBox26.Location = new System.Drawing.Point(271, 19); this.pictureBox26.Name = "pictureBox26"; - this.pictureBox26.Size = new System.Drawing.Size(61, 57); + this.pictureBox26.Size = new System.Drawing.Size(46, 46); this.pictureBox26.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox26.TabIndex = 5; this.pictureBox26.TabStop = false; @@ -2731,9 +2571,8 @@ private void InitializeComponent() // tabTalentsGeneral // this.tabTalentsGeneral.Location = new System.Drawing.Point(104, 4); - this.tabTalentsGeneral.Margin = new System.Windows.Forms.Padding(4); this.tabTalentsGeneral.Name = "tabTalentsGeneral"; - this.tabTalentsGeneral.Size = new System.Drawing.Size(619, 441); + this.tabTalentsGeneral.Size = new System.Drawing.Size(437, 357); this.tabTalentsGeneral.TabIndex = 3; this.tabTalentsGeneral.Text = "Talents: General"; this.tabTalentsGeneral.UseVisualStyleBackColor = true; @@ -2741,9 +2580,8 @@ private void InitializeComponent() // tabTalentsMelee // this.tabTalentsMelee.Location = new System.Drawing.Point(104, 4); - this.tabTalentsMelee.Margin = new System.Windows.Forms.Padding(4); this.tabTalentsMelee.Name = "tabTalentsMelee"; - this.tabTalentsMelee.Size = new System.Drawing.Size(619, 441); + this.tabTalentsMelee.Size = new System.Drawing.Size(437, 357); this.tabTalentsMelee.TabIndex = 4; this.tabTalentsMelee.Text = "Talents: Melee"; this.tabTalentsMelee.UseVisualStyleBackColor = true; @@ -2751,9 +2589,8 @@ private void InitializeComponent() // tabTalentsMagic // this.tabTalentsMagic.Location = new System.Drawing.Point(104, 4); - this.tabTalentsMagic.Margin = new System.Windows.Forms.Padding(4); this.tabTalentsMagic.Name = "tabTalentsMagic"; - this.tabTalentsMagic.Size = new System.Drawing.Size(619, 441); + this.tabTalentsMagic.Size = new System.Drawing.Size(437, 357); this.tabTalentsMagic.TabIndex = 5; this.tabTalentsMagic.Text = "Talents: Magic"; this.tabTalentsMagic.UseVisualStyleBackColor = true; @@ -2761,11 +2598,10 @@ private void InitializeComponent() // tabMerchant // this.tabMerchant.Controls.Add(this.label39); - this.tabMerchant.Location = new System.Drawing.Point(4, 25); - this.tabMerchant.Margin = new System.Windows.Forms.Padding(4); + this.tabMerchant.Location = new System.Drawing.Point(4, 22); this.tabMerchant.Name = "tabMerchant"; - this.tabMerchant.Padding = new System.Windows.Forms.Padding(4); - this.tabMerchant.Size = new System.Drawing.Size(748, 483); + this.tabMerchant.Padding = new System.Windows.Forms.Padding(3); + this.tabMerchant.Size = new System.Drawing.Size(559, 396); this.tabMerchant.TabIndex = 4; this.tabMerchant.Text = "*Merchant"; this.tabMerchant.UseVisualStyleBackColor = true; @@ -2775,21 +2611,19 @@ private void InitializeComponent() this.label39.AutoSize = true; this.label39.BackColor = System.Drawing.Color.Transparent; this.label39.ForeColor = System.Drawing.SystemColors.Desktop; - this.label39.Location = new System.Drawing.Point(8, 4); - this.label39.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label39.Location = new System.Drawing.Point(6, 3); this.label39.Name = "label39"; - this.label39.Size = new System.Drawing.Size(145, 16); + this.label39.Size = new System.Drawing.Size(117, 13); this.label39.TabIndex = 31; this.label39.Text = "* = not yet implemented"; // // tabCards // this.tabCards.Controls.Add(this.label40); - this.tabCards.Location = new System.Drawing.Point(4, 25); - this.tabCards.Margin = new System.Windows.Forms.Padding(4); + this.tabCards.Location = new System.Drawing.Point(4, 22); this.tabCards.Name = "tabCards"; - this.tabCards.Padding = new System.Windows.Forms.Padding(4); - this.tabCards.Size = new System.Drawing.Size(748, 483); + this.tabCards.Padding = new System.Windows.Forms.Padding(3); + this.tabCards.Size = new System.Drawing.Size(559, 396); this.tabCards.TabIndex = 5; this.tabCards.Text = "*Cards"; this.tabCards.UseVisualStyleBackColor = true; @@ -2799,21 +2633,19 @@ private void InitializeComponent() this.label40.AutoSize = true; this.label40.BackColor = System.Drawing.Color.Transparent; this.label40.ForeColor = System.Drawing.SystemColors.Desktop; - this.label40.Location = new System.Drawing.Point(8, 4); - this.label40.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label40.Location = new System.Drawing.Point(6, 3); this.label40.Name = "label40"; - this.label40.Size = new System.Drawing.Size(145, 16); + this.label40.Size = new System.Drawing.Size(117, 13); this.label40.TabIndex = 31; this.label40.Text = "* = not yet implemented"; // // tabTreasureMaps // this.tabTreasureMaps.Controls.Add(this.label41); - this.tabTreasureMaps.Location = new System.Drawing.Point(4, 25); - this.tabTreasureMaps.Margin = new System.Windows.Forms.Padding(4); + this.tabTreasureMaps.Location = new System.Drawing.Point(4, 22); this.tabTreasureMaps.Name = "tabTreasureMaps"; - this.tabTreasureMaps.Padding = new System.Windows.Forms.Padding(4); - this.tabTreasureMaps.Size = new System.Drawing.Size(748, 483); + this.tabTreasureMaps.Padding = new System.Windows.Forms.Padding(3); + this.tabTreasureMaps.Size = new System.Drawing.Size(559, 396); this.tabTreasureMaps.TabIndex = 6; this.tabTreasureMaps.Text = "*Treasure Maps"; this.tabTreasureMaps.UseVisualStyleBackColor = true; @@ -2823,21 +2655,19 @@ private void InitializeComponent() this.label41.AutoSize = true; this.label41.BackColor = System.Drawing.Color.Transparent; this.label41.ForeColor = System.Drawing.SystemColors.Desktop; - this.label41.Location = new System.Drawing.Point(8, 4); - this.label41.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label41.Location = new System.Drawing.Point(6, 3); this.label41.Name = "label41"; - this.label41.Size = new System.Drawing.Size(145, 16); + this.label41.Size = new System.Drawing.Size(117, 13); this.label41.TabIndex = 31; this.label41.Text = "* = not yet implemented"; // // tabPage1 // this.tabPage1.Controls.Add(this.label50); - this.tabPage1.Location = new System.Drawing.Point(4, 25); - this.tabPage1.Margin = new System.Windows.Forms.Padding(4); + this.tabPage1.Location = new System.Drawing.Point(4, 22); this.tabPage1.Name = "tabPage1"; - this.tabPage1.Padding = new System.Windows.Forms.Padding(4); - this.tabPage1.Size = new System.Drawing.Size(748, 483); + this.tabPage1.Padding = new System.Windows.Forms.Padding(3); + this.tabPage1.Size = new System.Drawing.Size(559, 396); this.tabPage1.TabIndex = 9; this.tabPage1.Text = "*Quests"; this.tabPage1.UseVisualStyleBackColor = true; @@ -2847,23 +2677,22 @@ private void InitializeComponent() this.label50.AutoSize = true; this.label50.BackColor = System.Drawing.Color.Transparent; this.label50.ForeColor = System.Drawing.SystemColors.Desktop; - this.label50.Location = new System.Drawing.Point(8, 4); - this.label50.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label50.Location = new System.Drawing.Point(6, 3); this.label50.Name = "label50"; - this.label50.Size = new System.Drawing.Size(145, 16); + this.label50.Size = new System.Drawing.Size(117, 13); this.label50.TabIndex = 32; this.label50.Text = "* = not yet implemented"; // // msMenu // - this.msMenu.GripStyle = System.Windows.Forms.ToolStripGripStyle.Visible; this.msMenu.ImageScalingSize = new System.Drawing.Size(20, 20); this.msMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileToolStripMenuItem, this.helpToolStripMenuItem}); this.msMenu.Location = new System.Drawing.Point(0, 0); this.msMenu.Name = "msMenu"; - this.msMenu.Size = new System.Drawing.Size(756, 28); + this.msMenu.Padding = new System.Windows.Forms.Padding(2, 2, 0, 2); + this.msMenu.Size = new System.Drawing.Size(567, 24); this.msMenu.TabIndex = 1; this.msMenu.Text = "msMenu"; // @@ -2876,13 +2705,13 @@ private void InitializeComponent() this.exportAsToolStripMenuItem, this.exitToolStripMenuItem}); this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(46, 24); + this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); this.fileToolStripMenuItem.Text = "File"; // // openToolStripMenuItem // this.openToolStripMenuItem.Name = "openToolStripMenuItem"; - this.openToolStripMenuItem.Size = new System.Drawing.Size(162, 26); + this.openToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.openToolStripMenuItem.Text = "Open"; this.openToolStripMenuItem.Click += new System.EventHandler(this.OpenToolStripMenuItem_Click); // @@ -2890,7 +2719,7 @@ private void InitializeComponent() // this.saveToolStripMenuItem.Enabled = false; this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; - this.saveToolStripMenuItem.Size = new System.Drawing.Size(162, 26); + this.saveToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.saveToolStripMenuItem.Text = "Save"; this.saveToolStripMenuItem.Click += new System.EventHandler(this.SaveToolStripMenuItem_Click); // @@ -2898,36 +2727,28 @@ private void InitializeComponent() // this.importToolStripMenuItem.Enabled = false; this.importToolStripMenuItem.Name = "importToolStripMenuItem"; - this.importToolStripMenuItem.Size = new System.Drawing.Size(162, 26); + this.importToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.importToolStripMenuItem.Text = "Import"; // // exportAsToolStripMenuItem // this.exportAsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.jSONToolStripMenuItem, - this.xMLToolStripMenuItem}); + this.jSONToolStripMenuItem}); this.exportAsToolStripMenuItem.Name = "exportAsToolStripMenuItem"; - this.exportAsToolStripMenuItem.Size = new System.Drawing.Size(162, 26); + this.exportAsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.exportAsToolStripMenuItem.Text = "Export as..."; // // jSONToolStripMenuItem // this.jSONToolStripMenuItem.Name = "jSONToolStripMenuItem"; - this.jSONToolStripMenuItem.Size = new System.Drawing.Size(127, 26); + this.jSONToolStripMenuItem.Size = new System.Drawing.Size(102, 22); this.jSONToolStripMenuItem.Text = "JSON"; this.jSONToolStripMenuItem.Click += new System.EventHandler(this.JSONToolStripMenuItem_Click); // - // xMLToolStripMenuItem - // - this.xMLToolStripMenuItem.Enabled = false; - this.xMLToolStripMenuItem.Name = "xMLToolStripMenuItem"; - this.xMLToolStripMenuItem.Size = new System.Drawing.Size(127, 26); - this.xMLToolStripMenuItem.Text = "XML"; - // // exitToolStripMenuItem // this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; - this.exitToolStripMenuItem.Size = new System.Drawing.Size(162, 26); + this.exitToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.exitToolStripMenuItem.Text = "Exit"; this.exitToolStripMenuItem.Click += new System.EventHandler(this.ExitToolStripMenuItem_Click); // @@ -2936,29 +2757,28 @@ private void InitializeComponent() this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.aboutToolStripMenuItem}); this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; - this.helpToolStripMenuItem.Size = new System.Drawing.Size(55, 24); + this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 20); this.helpToolStripMenuItem.Text = "Help"; // // aboutToolStripMenuItem // this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; - this.aboutToolStripMenuItem.Size = new System.Drawing.Size(133, 26); + this.aboutToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.aboutToolStripMenuItem.Text = "About"; this.aboutToolStripMenuItem.Click += new System.EventHandler(this.AboutToolStripMenuItem_Click); // // txtConsole // - this.txtConsole.BackColor = System.Drawing.SystemColors.InactiveCaptionText; + this.txtConsole.BackColor = System.Drawing.Color.Black; this.txtConsole.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtConsole.Dock = System.Windows.Forms.DockStyle.Bottom; this.txtConsole.ForeColor = System.Drawing.Color.LimeGreen; - this.txtConsole.Location = new System.Drawing.Point(0, 606); - this.txtConsole.Margin = new System.Windows.Forms.Padding(4); + this.txtConsole.Location = new System.Drawing.Point(0, 441); this.txtConsole.Multiline = true; this.txtConsole.Name = "txtConsole"; this.txtConsole.ReadOnly = true; this.txtConsole.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.txtConsole.Size = new System.Drawing.Size(756, 136); + this.txtConsole.Size = new System.Drawing.Size(567, 129); this.txtConsole.TabIndex = 28; this.txtConsole.TabStop = false; // @@ -2966,62 +2786,27 @@ private void InitializeComponent() // this.pictureBox3.BackColor = System.Drawing.Color.Transparent; this.pictureBox3.Image = global::SoG_SGreader.Properties.Resources.ada21; - this.pictureBox3.Location = new System.Drawing.Point(729, 2); - this.pictureBox3.Margin = new System.Windows.Forms.Padding(4); + this.pictureBox3.Location = new System.Drawing.Point(547, 2); this.pictureBox3.Name = "pictureBox3"; - this.pictureBox3.Size = new System.Drawing.Size(23, 21); + this.pictureBox3.Size = new System.Drawing.Size(17, 17); this.pictureBox3.TabIndex = 30; this.pictureBox3.TabStop = false; this.pictureBox3.Click += new System.EventHandler(this.PictureBox3_Click); // - // lblGender - // - this.lblGender.AutoSize = true; - this.lblGender.Location = new System.Drawing.Point(7, 155); - this.lblGender.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.lblGender.Name = "lblGender"; - this.lblGender.Size = new System.Drawing.Size(59, 16); - this.lblGender.TabIndex = 52; - this.lblGender.Text = "Birthday:"; - this.Tooltips.SetToolTip(this.lblGender, "Day / Month"); - // - // rbMale - // - this.rbMale.AutoSize = true; - this.rbMale.Location = new System.Drawing.Point(73, 155); - this.rbMale.Name = "rbMale"; - this.rbMale.Size = new System.Drawing.Size(58, 20); - this.rbMale.TabIndex = 1; - this.rbMale.TabStop = true; - this.rbMale.Text = "Male"; - this.rbMale.UseVisualStyleBackColor = true; - // - // rbFemale - // - this.rbFemale.AutoSize = true; - this.rbFemale.Location = new System.Drawing.Point(73, 182); - this.rbFemale.Name = "rbFemale"; - this.rbFemale.Size = new System.Drawing.Size(74, 20); - this.rbFemale.TabIndex = 2; - this.rbFemale.TabStop = true; - this.rbFemale.Text = "Female"; - this.rbFemale.UseVisualStyleBackColor = true; - // // FrmMain // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.ClientSize = new System.Drawing.Size(756, 742); + this.ClientSize = new System.Drawing.Size(567, 570); this.Controls.Add(this.pictureBox3); this.Controls.Add(this.txtConsole); this.Controls.Add(this.tabContainer); this.Controls.Add(this.msMenu); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MainMenuStrip = this.msMenu; - this.Margin = new System.Windows.Forms.Padding(4); this.Name = "FrmMain"; - this.Text = "SoG: Savegame Reader v0.5.0 by tolik518"; + this.Text = "SoG: Savegame Editor v16.9.30803.129 by tolik518"; this.Load += new System.EventHandler(this.FrmMain_Load); this.tabContainer.ResumeLayout(false); this.tabChar.ResumeLayout(false); @@ -3180,7 +2965,6 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem saveToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem exportAsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem jSONToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem xMLToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem helpToolStripMenuItem; private System.Windows.Forms.GroupBox groupBox3; @@ -3401,5 +3185,6 @@ private void InitializeComponent() private System.Windows.Forms.RadioButton rbFemale; private System.Windows.Forms.Label lblGender; private System.Windows.Forms.RadioButton rbMale; + private Label lblGamePatch; } } diff --git a/SoG_SGreader/Forms/FrmMain.cs b/SoG_SGreader/Forms/FrmMain.cs index 8379c1f..2eda253 100644 --- a/SoG_SGreader/Forms/FrmMain.cs +++ b/SoG_SGreader/Forms/FrmMain.cs @@ -3,15 +3,14 @@ using System.IO; using System.Linq; using System.Windows.Forms; -using Newtonsoft.Json; -using Newtonsoft.Json.Serialization; using SoG_SGreader.Wrapper; namespace SoG_SGreader { public partial class FrmMain : Form { - public static readonly string CurrentPatch = "Patch 0.949a"; + public static readonly string SupportedPatch = "0.949a"; + public string InstalledGamePatch = ""; private Player playerObject = new Player(); private readonly ComboBox[] cbQuickslot = new ComboBox[10]; private readonly ComboBox[] cbQuickslotType = new ComboBox[10]; @@ -19,11 +18,9 @@ public partial class FrmMain : Form public FrmMain(string saveGamePath) { - InitializeComponent(); //Initializing elements from the Designer + InitializeComponent(); //Initializing elements from the Designer InitElements(); //Initializing elements from this file - txtConsole.AppendText("Support me by giving the Repository a star on Github \r\n"); - txtConsole.AppendText("https://github.com/tolik518/SoG_SGreader \r\n"); - txtConsole.AppendText("________________________________________\r\n"); + txtConsole.AppendText("Official Repository: https://github.com/tolik518/SoG_SGreader \r\n"); if (File.Exists(saveGamePath)) { @@ -173,6 +170,7 @@ private void InitFields() private void PopulateFields() { + txtNickname.Text = playerObject.Nickname; cbHat.Text = ((SogItems)playerObject.Equip.Hat).ToString(); @@ -626,6 +624,27 @@ private void PictureBox3_Click(object sender, EventArgs e) //:3 Icon in the top frmAbout.ShowDialog(); } - private void FrmMain_Load(object sender, EventArgs e) { } + private async void FrmMain_Load(object sender, EventArgs e) + { + this.Text = "SoG: Savegame Editor v" + Application.ProductVersion + " by tolik518"; + + ITextBoxWrapper txtConsoleWrapped = new UITextBox(txtConsole); + + try + { + var patchVersion = await GamePatchReader.GetCurrentGamePatchAsync(txtConsoleWrapped); + if (!patchVersion.Equals(SupportedPatch) && !patchVersion.Equals("?.???a")) + { + txtConsole.AppendText("\r\nPlease open an issue on Github or contact me. There is a mismatch between the supported patch and game patch which could lead to potential data loss."); + } + lblGamePatch.Text = lblGamePatch.Text.Replace("0.000a", patchVersion); + } + catch (Exception ex) + { + // Handle any exceptions that might occur + lblGamePatch.Text = "?.???a"; + txtConsole.AppendText("\r\n" + ex.Message); + } + } } } \ No newline at end of file diff --git a/SoG_SGreader/GamePatchReader.cs b/SoG_SGreader/GamePatchReader.cs new file mode 100644 index 0000000..2f99602 --- /dev/null +++ b/SoG_SGreader/GamePatchReader.cs @@ -0,0 +1,118 @@ +using System; +using System.Collections; +using System.IO; +using System.Reflection; +using System.Threading.Tasks; + +namespace SoG_SGreader +{ + class GamePatchReader + { + public static async Task GetCurrentGamePatchAsync(ITextBoxWrapper txtConsole) + { + string gameDataPath = GetGameDataPath(txtConsole); + if (string.IsNullOrEmpty(gameDataPath)) + { + txtConsole.AppendText("\r\nGame data folder not found under: " + gameDataPath); + return "?.???a"; + } + + txtConsole.AppendText("\r\nGame data folder located: " + gameDataPath); + string exeFile = Path.Combine(gameDataPath, "Secrets Of Grindea.exe"); + + if (!File.Exists(exeFile)) + { + txtConsole.AppendText("\r\nGame exe not found under: " + exeFile); + return "?.???a"; + } + + return await Task.Run(() => GetLatestGamePatch(exeFile, txtConsole)); // Run the heavy reflection code on a background thread + } + + private static string GetGameDataPath(ITextBoxWrapper txtConsole) + { + PlatformID pid = Environment.OSVersion.Platform; + + if (pid == PlatformID.Win32NT || pid == PlatformID.Win32S || pid == PlatformID.Win32Windows || pid == PlatformID.WinCE) + { + // Windows-specific code + txtConsole.AppendText("\r\nOS: Windows"); + string steamPath = (string)Microsoft.Win32.Registry.GetValue(@"HKEY_CURRENT_USER\Software\Valve\Steam", "SteamPath", null); + return Path.Combine(steamPath, "steamapps", "common", "SecretsOfGrindea"); + } + else if (pid == PlatformID.Unix) + { + // Linux-specific code + txtConsole.AppendText("\r\nOS: Linux"); + return Path.Combine(Environment.GetEnvironmentVariable("HOME"), ".local", "share", "Steam", "steamapps", "common", "SecretsOfGrindea"); + } + else if (pid == PlatformID.MacOSX) + { + // MacOSX-specific code + txtConsole.AppendText("\r\nOS: MacOSX"); + return Path.Combine(Environment.GetEnvironmentVariable("HOME"), "Library", "Application Support", "Steam", "steamapps", "common", "SecretsOfGrindeaa"); + } + else + { + // Unknown OS + txtConsole.AppendText("\r\nOS: Unknown"); + return null; + } + } + + private static string GetLatestGamePatch(string exeFilePath, ITextBoxWrapper txtConsole) + { + try + { + // Load the Secrets of Grindea assembly + Assembly sogAssembly = Assembly.LoadFrom(exeFilePath); + + // Get the Game1 type + Type game1Type = sogAssembly.GetType("SoG.Game1"); + + // Create an instance of Game1 + object game1Instance = Activator.CreateInstance(game1Type); + + // Invoke _Menu_FillPatchNotes to populate the list + MethodInfo fillPatchNotesMethod = game1Type.GetMethod("_Menu_FillPatchNotes", BindingFlags.NonPublic | BindingFlags.Instance); + fillPatchNotesMethod.Invoke(game1Instance, null); + + // Get the type for the GlobalData.MainMenu.PatchNoteMenu class + Type patchNoteMenuType = sogAssembly.GetType("SoG.GlobalData+MainMenu+PatchNoteMenu"); + + // Use reflection to get the static lxNotes field from the PatchNoteMenu class + FieldInfo lxNotesField = patchNoteMenuType.GetField("lxNotes", BindingFlags.Static | BindingFlags.Public); + + // Get the value of the lxNotes list + IList lxNotes = (IList)lxNotesField.GetValue(null); + + txtConsole.AppendText("\r\nlxNotes.Count: " + lxNotes.Count); + + // If the list is not empty, get the last patch note + if (lxNotes.Count > 0) + { + // Get the last patch note object + object latestPatchNote = lxNotes[0]; + + // Get the type of the PatchNotes class to access its fields + Type patchNotesType = latestPatchNote.GetType(); + + // Get the sPatchName field from the PatchNotes class and extract its value + FieldInfo sPatchNameField = patchNotesType.GetField("sPatchName"); + string locatedGamePatch = (string)sPatchNameField.GetValue(latestPatchNote); + + txtConsole.AppendText("\r\nLocated Game Patch: " + locatedGamePatch); + return locatedGamePatch; + } + } + catch (Exception e) + { + txtConsole.AppendText("\r\nCouldn't locate game patch version: "); + txtConsole.AppendText(e.Message); + } + return "?.???a"; + } + + + } +} diff --git a/SoG_SGreader/Program.cs b/SoG_SGreader/Program.cs index a2ab374..08c346e 100644 --- a/SoG_SGreader/Program.cs +++ b/SoG_SGreader/Program.cs @@ -27,7 +27,7 @@ static void RunOptions(ComandLineOptions opts) } else if (opts.ShowPatch) { - Console.WriteLine(FrmMain.CurrentPatch); + Console.WriteLine(FrmMain.SupportedPatch); } else { diff --git a/SoG_SGreader/Resources/ada2.png b/SoG_SGreader/Resources/ada2.png index 2b8201c..b97cee3 100644 Binary files a/SoG_SGreader/Resources/ada2.png and b/SoG_SGreader/Resources/ada2.png differ diff --git a/SoG_SGreader/SoG_SGreader.csproj b/SoG_SGreader/SoG_SGreader.csproj index b571195..45cfa38 100644 --- a/SoG_SGreader/SoG_SGreader.csproj +++ b/SoG_SGreader/SoG_SGreader.csproj @@ -85,6 +85,25 @@ + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + 8 + prompt + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + 8 + prompt + true + ..\packages\CommandLineParser.2.9.1\lib\net45\CommandLine.dll @@ -107,6 +126,7 @@ + @@ -187,6 +207,7 @@ FrmAbout.cs + Designer FrmLoadSaveGame.cs @@ -203,7 +224,7 @@ Always - + SettingsSingleFileGenerator Settings.Designer.cs @@ -289,4 +310,4 @@ - + \ No newline at end of file diff --git a/SoG_SGreader/VersionInc.cs b/SoG_SGreader/VersionInc.cs index 8a92662..1cacb8f 100644 --- a/SoG_SGreader/VersionInc.cs +++ b/SoG_SGreader/VersionInc.cs @@ -1,5 +1,7 @@  using System.Reflection; -[assembly: AssemblyVersion("0.5.1319.1121")] +[assembly: AssemblyVersion("0.5.1")] +[assembly: AssemblyFileVersion("0.5.1.1320")] +[assembly: AssemblyInformationalVersionAttribute("0.5.1")] diff --git a/SoG_SGreader/VersionInc.tt b/SoG_SGreader/VersionInc.tt index 7d41e04..a88d11f 100644 --- a/SoG_SGreader/VersionInc.tt +++ b/SoG_SGreader/VersionInc.tt @@ -3,16 +3,21 @@ using System.Reflection; -[assembly: AssemblyVersion("<#= this.Major #>.<#= this.Minor #>.<#= this.DaysSinceProjectStarted #>.<#= this.MinutesSinceMidnight #>")] +[assembly: AssemblyVersion("<#= AssemblyVersion() #>")] +[assembly: AssemblyFileVersion("<#= AssemblyFileVersion() #>")] +[assembly: AssemblyInformationalVersionAttribute("<#= AssemblyInformationalVersionAttribute() #>")] <#+ + public static int Major = 0; + public static int Minor = 5; + public static int Patch = 1; + public static string Version = Major + "." + Minor + "." + Patch; - int Major = 0; - int Minor = 5; - - static DateTime ProjectStartedDate = new DateTime(year: 2020, month: 3, day: 12); - int DaysSinceProjectStarted = (int)((DateTime.UtcNow - ProjectStartedDate).TotalDays); + public static DateTime ProjectStartedDate = new DateTime(year: 2020, month: 3, day: 12); + public static int DaysSinceProjectStarted = (int)((DateTime.UtcNow - ProjectStartedDate).TotalDays); + public static int MinutesSinceMidnight = (int)DateTime.UtcNow.TimeOfDay.TotalMinutes; - int MinutesSinceMidnight = (int)DateTime.UtcNow.TimeOfDay.TotalMinutes; - -#> \ No newline at end of file + string AssemblyVersion() => Version; + string AssemblyFileVersion() => $"{Major}.{Minor}.{Patch}.{DaysSinceProjectStarted}"; + string AssemblyInformationalVersionAttribute() => Version; +#> diff --git a/SoG_SGreader/Wrapper/CommandLineTextBox.cs b/SoG_SGreader/Wrapper/CommandLineTextBox.cs index a041c8c..1fcdf12 100644 --- a/SoG_SGreader/Wrapper/CommandLineTextBox.cs +++ b/SoG_SGreader/Wrapper/CommandLineTextBox.cs @@ -8,5 +8,11 @@ public void AppendText(string text) { Console.Write(text); } + + bool ITextBoxWrapper.InvokeRequired => throw new NotImplementedException(); + + public void Invoke(Action action) + { + } } } \ No newline at end of file diff --git a/SoG_SGreader/Wrapper/FakeTextBox.cs b/SoG_SGreader/Wrapper/FakeTextBox.cs index 3104923..3c9ca7e 100644 --- a/SoG_SGreader/Wrapper/FakeTextBox.cs +++ b/SoG_SGreader/Wrapper/FakeTextBox.cs @@ -8,5 +8,11 @@ public void AppendText(string text) { // Do nothing } + bool ITextBoxWrapper.InvokeRequired => throw new NotImplementedException(); + + public void Invoke(Action action) + { + // + } } } \ No newline at end of file diff --git a/SoG_SGreader/Wrapper/ITextBoxWrapper.cs b/SoG_SGreader/Wrapper/ITextBoxWrapper.cs index 0bdcbdd..0785666 100644 --- a/SoG_SGreader/Wrapper/ITextBoxWrapper.cs +++ b/SoG_SGreader/Wrapper/ITextBoxWrapper.cs @@ -1,4 +1,8 @@ +using System; + public interface ITextBoxWrapper { + bool InvokeRequired { get; } + void Invoke(Action action); void AppendText(string text); } \ No newline at end of file diff --git a/SoG_SGreader/Wrapper/UITextBox.cs b/SoG_SGreader/Wrapper/UITextBox.cs index 95d4dd4..84ddc3f 100644 --- a/SoG_SGreader/Wrapper/UITextBox.cs +++ b/SoG_SGreader/Wrapper/UITextBox.cs @@ -1,3 +1,4 @@ +using System; using System.Windows.Forms; namespace SoG_SGreader.Wrapper @@ -13,7 +14,22 @@ public UITextBox(TextBox textBox) public void AppendText(string text) { - _textBox.AppendText(text); + if (_textBox.InvokeRequired) + { + _textBox.Invoke(new Action(() => _textBox.AppendText(text))); + } + else + { + _textBox.AppendText(text); + } + } + + + public bool InvokeRequired => _textBox.InvokeRequired; + + public void Invoke(Action action) + { + _textBox.Invoke(action); } } } \ No newline at end of file