From 2587c1a6f313b81b5e93ab2ba5e3f48cad5309ff Mon Sep 17 00:00:00 2001 From: Mahmut YILDIRIM Date: Sun, 13 Aug 2023 15:25:25 +0300 Subject: [PATCH] Improved Stability --- Application/RSBot/RSBot.csproj | 2 +- Application/RSBot/Views/Main.Designer.cs | 36 +++++------ Application/RSBot/Views/Main.resx | 62 ++++++++++++++++++- Botbases/RSBot.Default/Bootstrap.cs | 2 +- .../RSBot.Default/Bundle/Loot/Lootbundle.cs | 2 +- .../Bundle/Movement/MovementBundle.cs | 4 +- .../RSBot.Inventory/Views/Main.Designer.cs | 60 +++++++----------- Plugins/RSBot.Inventory/Views/Main.cs | 38 ++++++++++-- Plugins/RSBot.Inventory/Views/Main.resx | 62 ++++++++++++++++++- Plugins/RSBot.Items/Views/Main.Designer.cs | 24 +++---- Plugins/RSBot.Items/Views/Main.resx | 2 +- 11 files changed, 212 insertions(+), 82 deletions(-) diff --git a/Application/RSBot/RSBot.csproj b/Application/RSBot/RSBot.csproj index eb77f086..79a8ed20 100644 --- a/Application/RSBot/RSBot.csproj +++ b/Application/RSBot/RSBot.csproj @@ -13,7 +13,7 @@ https://github.com/SDClowen/RSBot WinExe app.ico - 2.9.1 + 2.9.2 x86 False diff --git a/Application/RSBot/Views/Main.Designer.cs b/Application/RSBot/Views/Main.Designer.cs index d50a9732..ec59e3f5 100644 --- a/Application/RSBot/Views/Main.Designer.cs +++ b/Application/RSBot/Views/Main.Designer.cs @@ -89,9 +89,9 @@ private void InitializeComponent() stripStatus.ImageScalingSize = new System.Drawing.Size(17, 17); stripStatus.Items.AddRange(new ToolStripItem[] { lblIngameStatus, menuCurrentProfile }); stripStatus.LayoutStyle = ToolStripLayoutStyle.HorizontalStackWithOverflow; - stripStatus.Location = new System.Drawing.Point(1, 747); + stripStatus.Location = new System.Drawing.Point(1, 717); stripStatus.Name = "stripStatus"; - stripStatus.Size = new System.Drawing.Size(1042, 22); + stripStatus.Size = new System.Drawing.Size(988, 22); stripStatus.SizingGrip = false; stripStatus.TabIndex = 0; stripStatus.Tag = "private"; @@ -136,18 +136,18 @@ private void InitializeComponent() bottomPanel.Controls.Add(btnSave); bottomPanel.Controls.Add(btnStartStop); bottomPanel.Dock = DockStyle.Bottom; - bottomPanel.Location = new System.Drawing.Point(1, 695); + bottomPanel.Location = new System.Drawing.Point(1, 672); bottomPanel.Name = "bottomPanel"; bottomPanel.Radius = 0; bottomPanel.ShadowDepth = 4F; - bottomPanel.Size = new System.Drawing.Size(1042, 52); + bottomPanel.Size = new System.Drawing.Size(988, 45); bottomPanel.TabIndex = 2; // // buttonConfig // buttonConfig.Color = System.Drawing.Color.Transparent; buttonConfig.Font = new System.Drawing.Font("Webdings", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - buttonConfig.Location = new System.Drawing.Point(249, 15); + buttonConfig.Location = new System.Drawing.Point(249, 12); buttonConfig.Name = "buttonConfig"; buttonConfig.Radius = 6; buttonConfig.ShadowDepth = 4F; @@ -165,7 +165,7 @@ private void InitializeComponent() comboServer.FormattingEnabled = true; comboServer.IntegralHeight = false; comboServer.ItemHeight = 17; - comboServer.Location = new System.Drawing.Point(111, 15); + comboServer.Location = new System.Drawing.Point(111, 12); comboServer.Name = "comboServer"; comboServer.Radius = 5; comboServer.ShadowDepth = 4F; @@ -181,7 +181,7 @@ private void InitializeComponent() comboDivision.FormattingEnabled = true; comboDivision.IntegralHeight = false; comboDivision.ItemHeight = 17; - comboDivision.Location = new System.Drawing.Point(14, 15); + comboDivision.Location = new System.Drawing.Point(14, 12); comboDivision.Name = "comboDivision"; comboDivision.Radius = 5; comboDivision.ShadowDepth = 4F; @@ -196,7 +196,7 @@ private void InitializeComponent() btnSave.Color = System.Drawing.Color.FromArgb(56, 155, 90); btnSave.Font = new System.Drawing.Font("Segoe UI Semibold", 9.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point); btnSave.ForeColor = System.Drawing.Color.White; - btnSave.Location = new System.Drawing.Point(834, 12); + btnSave.Location = new System.Drawing.Point(780, 9); btnSave.Name = "btnSave"; btnSave.Radius = 6; btnSave.ShadowDepth = 4F; @@ -216,7 +216,7 @@ private void InitializeComponent() btnStartStop.Color = System.Drawing.Color.FromArgb(33, 150, 243); btnStartStop.Font = new System.Drawing.Font("Segoe UI Semibold", 9.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point); btnStartStop.ForeColor = System.Drawing.Color.White; - btnStartStop.Location = new System.Drawing.Point(935, 12); + btnStartStop.Location = new System.Drawing.Point(881, 9); btnStartStop.Name = "btnStartStop"; btnStartStop.Radius = 6; btnStartStop.ShadowDepth = 4F; @@ -236,11 +236,11 @@ private void InitializeComponent() pSidebar.Controls.Add(entity1); pSidebar.Controls.Add(cosController); pSidebar.Dock = DockStyle.Right; - pSidebar.Location = new System.Drawing.Point(793, 33); + pSidebar.Location = new System.Drawing.Point(739, 33); pSidebar.Name = "pSidebar"; pSidebar.Radius = 0; pSidebar.ShadowDepth = 0F; - pSidebar.Size = new System.Drawing.Size(250, 662); + pSidebar.Size = new System.Drawing.Size(250, 639); pSidebar.TabIndex = 6; // // entity1 @@ -378,7 +378,7 @@ private void InitializeComponent() menuStrip.Location = new System.Drawing.Point(1, 0); menuStrip.Name = "menuStrip"; menuStrip.Padding = new Padding(6, 4, 6, 4); - menuStrip.Size = new System.Drawing.Size(1042, 32); + menuStrip.Size = new System.Drawing.Size(988, 32); menuStrip.TabIndex = 10; menuStrip.MouseDown += menuStrip_MouseDown; // @@ -507,7 +507,7 @@ private void InitializeComponent() tabMain.Name = "tabMain"; tabMain.Radius = new Padding(4, 4, 0, 0); tabMain.SelectedIndex = 0; - tabMain.Size = new System.Drawing.Size(792, 583); + tabMain.Size = new System.Drawing.Size(738, 560); tabMain.TabIndex = 3; tabMain.Selecting += tabMain_Selecting; // @@ -517,7 +517,7 @@ private void InitializeComponent() separator.IsVertical = false; separator.Location = new System.Drawing.Point(1, 32); separator.Name = "separator"; - separator.Size = new System.Drawing.Size(1042, 1); + separator.Size = new System.Drawing.Size(988, 1); separator.TabIndex = 11; // // topCharacter @@ -528,7 +528,7 @@ private void InitializeComponent() topCharacter.Location = new System.Drawing.Point(1, 33); topCharacter.Margin = new Padding(4); topCharacter.Name = "topCharacter"; - topCharacter.Size = new System.Drawing.Size(792, 79); + topCharacter.Size = new System.Drawing.Size(738, 79); topCharacter.TabIndex = 7; // // Main @@ -536,7 +536,7 @@ private void InitializeComponent() AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); AutoScaleMode = AutoScaleMode.Dpi; BackColor = System.Drawing.Color.FromArgb(249, 249, 249); - ClientSize = new System.Drawing.Size(1044, 770); + ClientSize = new System.Drawing.Size(990, 740); Controls.Add(tabMain); Controls.Add(topCharacter); Controls.Add(pSidebar); @@ -550,8 +550,8 @@ private void InitializeComponent() Location = new System.Drawing.Point(0, 0); MainMenuStrip = menuStrip; MaximizeBox = false; - MaximumSize = new System.Drawing.Size(1048, 770); - MinimumSize = new System.Drawing.Size(1022, 726); + MaximumSize = new System.Drawing.Size(990, 740); + MinimumSize = new System.Drawing.Size(990, 740); Name = "Main"; Padding = new Padding(1, 0, 1, 1); ShowTitle = false; diff --git a/Application/RSBot/Views/Main.resx b/Application/RSBot/Views/Main.resx index 62500000..8539a287 100644 --- a/Application/RSBot/Views/Main.resx +++ b/Application/RSBot/Views/Main.resx @@ -1,4 +1,64 @@ - + + + diff --git a/Botbases/RSBot.Default/Bootstrap.cs b/Botbases/RSBot.Default/Bootstrap.cs index c35aae39..fa00db7b 100644 --- a/Botbases/RSBot.Default/Bootstrap.cs +++ b/Botbases/RSBot.Default/Bootstrap.cs @@ -104,7 +104,7 @@ public void Register() Container.Lock = new(); Container.Bot = new(); - Bundles.Reload(); + //Bundles.Reload(); Subscriber.BundleSubscriber.SubscribeEvents(); Subscriber.ConfigSubscriber.SubscribeEvents(); diff --git a/Botbases/RSBot.Default/Bundle/Loot/Lootbundle.cs b/Botbases/RSBot.Default/Bundle/Loot/Lootbundle.cs index 6c714891..1c3eab25 100644 --- a/Botbases/RSBot.Default/Bundle/Loot/Lootbundle.cs +++ b/Botbases/RSBot.Default/Bundle/Loot/Lootbundle.cs @@ -45,7 +45,7 @@ public void Refresh() Config = new LootConfig { UseAbilityPet = PlayerConfig.Get("RSBot.Items.Pickup.EnableAbilityPet", true), - DontPickupWhileBotting = PlayerConfig.Get("RSBot.Items.Pickup.DontPickupWhileBotting", true), + DontPickupWhileBotting = PlayerConfig.Get("RSBot.Items.Pickup.DontPickupWhileBotting", false), DontPickupInBerzerk = PlayerConfig.Get("RSBot.Items.Pickup.DontPickupInBerzerk", true) }; } diff --git a/Botbases/RSBot.Default/Bundle/Movement/MovementBundle.cs b/Botbases/RSBot.Default/Bundle/Movement/MovementBundle.cs index 581fc385..47c1a4c1 100644 --- a/Botbases/RSBot.Default/Bundle/Movement/MovementBundle.cs +++ b/Botbases/RSBot.Default/Bundle/Movement/MovementBundle.cs @@ -97,8 +97,8 @@ public void Refresh() { Config = new MovementConfig { - WalkAround = PlayerConfig.Get("RSBot.Training.radioWalkAround"), - WalkToCenter = PlayerConfig.Get("RSBot.Training.radioCenter", true) + WalkAround = PlayerConfig.Get("RSBot.Training.radioWalkAround", true), + WalkToCenter = PlayerConfig.Get("RSBot.Training.radioCenter") }; } diff --git a/Plugins/RSBot.Inventory/Views/Main.Designer.cs b/Plugins/RSBot.Inventory/Views/Main.Designer.cs index 4e6db8ee..5ae2868d 100644 --- a/Plugins/RSBot.Inventory/Views/Main.Designer.cs +++ b/Plugins/RSBot.Inventory/Views/Main.Designer.cs @@ -28,7 +28,6 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - label2 = new SDUI.Controls.Label(); lblFreeSlots = new SDUI.Controls.Label(); listViewMain = new SDUI.Controls.ListView(); colName = new System.Windows.Forms.ColumnHeader(); @@ -45,7 +44,7 @@ private void InitializeComponent() useItemAtTrainingPlaceMenuItem = new System.Windows.Forms.ToolStripMenuItem(); autoUseAccordingToPurposeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); panel1 = new SDUI.Controls.Panel(); - shapeProgressBar1 = new SDUI.Controls.ShapeProgressBar(); + pbInventoryStatus = new SDUI.Controls.ShapeProgressBar(); checkAutoSort = new SDUI.Controls.CheckBox(); btnSort = new SDUI.Controls.Button(); buttonInventory = new SDUI.Controls.Button(); @@ -64,34 +63,19 @@ private void InitializeComponent() topPanel.SuspendLayout(); SuspendLayout(); // - // label2 - // - label2.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left; - label2.ApplyGradient = false; - label2.AutoSize = true; - label2.BackColor = System.Drawing.Color.Transparent; - label2.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point); - label2.ForeColor = System.Drawing.Color.FromArgb(0, 0, 0); - label2.Gradient = (new System.Drawing.Color[] { System.Drawing.Color.Gray, System.Drawing.Color.Black }); - label2.GradientAnimation = false; - label2.Location = new System.Drawing.Point(124, 10); - label2.Name = "label2"; - label2.Size = new System.Drawing.Size(65, 15); - label2.TabIndex = 3; - label2.Text = "Free Slots:"; - // // lblFreeSlots // lblFreeSlots.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left; lblFreeSlots.ApplyGradient = false; lblFreeSlots.AutoSize = true; lblFreeSlots.BackColor = System.Drawing.Color.Transparent; + lblFreeSlots.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); lblFreeSlots.ForeColor = System.Drawing.Color.FromArgb(0, 0, 0); - lblFreeSlots.Gradient = (new System.Drawing.Color[] { System.Drawing.Color.Gray, System.Drawing.Color.Black }); + lblFreeSlots.Gradient = new System.Drawing.Color[] { System.Drawing.Color.Gray, System.Drawing.Color.Black }; lblFreeSlots.GradientAnimation = false; - lblFreeSlots.Location = new System.Drawing.Point(47, 10); + lblFreeSlots.Location = new System.Drawing.Point(47, 13); lblFreeSlots.Name = "lblFreeSlots"; - lblFreeSlots.Size = new System.Drawing.Size(13, 15); + lblFreeSlots.Size = new System.Drawing.Size(17, 20); lblFreeSlots.TabIndex = 4; lblFreeSlots.Text = "0"; // @@ -212,10 +196,9 @@ private void InitializeComponent() panel1.BackColor = System.Drawing.Color.Transparent; panel1.Border = new System.Windows.Forms.Padding(0, 1, 0, 0); panel1.BorderColor = System.Drawing.Color.Transparent; - panel1.Controls.Add(shapeProgressBar1); + panel1.Controls.Add(pbInventoryStatus); panel1.Controls.Add(checkAutoSort); panel1.Controls.Add(btnSort); - panel1.Controls.Add(label2); panel1.Controls.Add(lblFreeSlots); panel1.Dock = System.Windows.Forms.DockStyle.Bottom; panel1.Location = new System.Drawing.Point(0, 413); @@ -226,21 +209,20 @@ private void InitializeComponent() panel1.Size = new System.Drawing.Size(792, 45); panel1.TabIndex = 6; // - // shapeProgressBar1 - // - shapeProgressBar1.BackColor = System.Drawing.Color.Transparent; - shapeProgressBar1.DrawHatch = false; - shapeProgressBar1.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - shapeProgressBar1.Gradient = (new System.Drawing.Color[] { System.Drawing.Color.FromArgb(224, 224, 224), System.Drawing.Color.Teal }); - shapeProgressBar1.HatchType = System.Drawing.Drawing2D.HatchStyle.Horizontal; - shapeProgressBar1.Location = new System.Drawing.Point(9, 7); - shapeProgressBar1.Maximum = 100L; - shapeProgressBar1.Name = "shapeProgressBar1"; - shapeProgressBar1.Size = new System.Drawing.Size(32, 32); - shapeProgressBar1.TabIndex = 7; - shapeProgressBar1.Text = "pbInventoryStatus"; - shapeProgressBar1.Value = 50L; - shapeProgressBar1.Weight = 4F; + // pbInventoryStatus + // + pbInventoryStatus.BackColor = System.Drawing.Color.Transparent; + pbInventoryStatus.DrawHatch = false; + pbInventoryStatus.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + pbInventoryStatus.Gradient = new System.Drawing.Color[] { System.Drawing.Color.FromArgb(224, 224, 224), System.Drawing.Color.Teal }; + pbInventoryStatus.HatchType = System.Drawing.Drawing2D.HatchStyle.Horizontal; + pbInventoryStatus.Location = new System.Drawing.Point(9, 7); + pbInventoryStatus.Maximum = 100L; + pbInventoryStatus.Name = "pbInventoryStatus"; + pbInventoryStatus.Size = new System.Drawing.Size(32, 32); + pbInventoryStatus.TabIndex = 7; + pbInventoryStatus.Value = 50L; + pbInventoryStatus.Weight = 4F; // // checkAutoSort // @@ -485,6 +467,6 @@ private void InitializeComponent() private SDUI.Controls.CheckBox checkAutoSort; private System.Windows.Forms.ToolStripMenuItem useItemAtTrainingPlaceMenuItem; private System.Windows.Forms.ToolStripMenuItem autoUseAccordingToPurposeToolStripMenuItem; - private SDUI.Controls.ShapeProgressBar shapeProgressBar1; + private SDUI.Controls.ShapeProgressBar pbInventoryStatus; } } diff --git a/Plugins/RSBot.Inventory/Views/Main.cs b/Plugins/RSBot.Inventory/Views/Main.cs index ead7795b..bc0be1fc 100644 --- a/Plugins/RSBot.Inventory/Views/Main.cs +++ b/Plugins/RSBot.Inventory/Views/Main.cs @@ -4,14 +4,13 @@ using RSBot.Core.Extensions; using RSBot.Core.Network; using RSBot.Core.Objects; +using RSBot.Core.Objects.Inventory; using SDUI; using System; using System.Drawing; using System.Linq; using System.Threading.Tasks; using System.Windows.Forms; -using System.Xml.Linq; -using RSBot.Core.Objects.Inventory; namespace RSBot.Inventory.Views { @@ -113,15 +112,20 @@ public void UpdateInventoryList() AddItem(item); lblFreeSlots.Text = Game.Player.Inventory.FreeSlots + "/" + Game.Player.Inventory.Capacity; - + pbInventoryStatus.Value = Game.Player.Inventory.FreeSlots; + pbInventoryStatus.Maximum = Game.Player.Inventory.Capacity; break; case 1: - foreach (var item in Game.Player.Inventory.GetEquippedPartItems()) + var items = Game.Player.Inventory.GetEquippedPartItems(); + foreach (var item in items) AddItem(item); - lblFreeSlots.Text = "0"; + lblFreeSlots.Text = items.Count + " / 13"; + + pbInventoryStatus.Value = items.Count; + pbInventoryStatus.Maximum = 13; break; @@ -132,6 +136,9 @@ public void UpdateInventoryList() lblFreeSlots.Text = "0"; + pbInventoryStatus.Value = Game.Player.Avatars.FreeSlots; + pbInventoryStatus.Maximum = Game.Player.Avatars.Capacity; + break; case 3: @@ -148,6 +155,9 @@ public void UpdateInventoryList() lblFreeSlots.Text = Game.Player.AbilityPet.Inventory.FreeSlots + "/" + Game.Player.AbilityPet.Inventory.Capacity; + pbInventoryStatus.Value = Game.Player.AbilityPet.Inventory.FreeSlots; + pbInventoryStatus.Maximum = Game.Player.AbilityPet.Inventory.Capacity; + break; case 4: @@ -163,6 +173,9 @@ public void UpdateInventoryList() lblFreeSlots.Text = Game.Player.Storage.FreeSlots + "/" + Game.Player.Storage.Capacity; + pbInventoryStatus.Value = Game.Player.Storage.FreeSlots; + pbInventoryStatus.Maximum = Game.Player.Storage.Capacity; + break; case 5: @@ -178,6 +191,9 @@ public void UpdateInventoryList() lblFreeSlots.Text = Game.Player.GuildStorage.FreeSlots + "/" + Game.Player.GuildStorage.Capacity; + pbInventoryStatus.Value = Game.Player.GuildStorage.FreeSlots; + pbInventoryStatus.Maximum = Game.Player.GuildStorage.Capacity; + break; case 6: @@ -194,6 +210,9 @@ public void UpdateInventoryList() lblFreeSlots.Text = Game.Player.JobTransport.Inventory.FreeSlots + "/" + Game.Player.JobTransport.Inventory.Capacity; + pbInventoryStatus.Value = Game.Player.JobTransport.Inventory.FreeSlots; + pbInventoryStatus.Maximum = Game.Player.JobTransport.Inventory.Capacity; + break; case 7: @@ -210,6 +229,9 @@ public void UpdateInventoryList() lblFreeSlots.Text = Game.Player.Job2SpecialtyBag.FreeSlots + "/" + Game.Player.Job2SpecialtyBag.Capacity; + pbInventoryStatus.Value = Game.Player.Job2SpecialtyBag.FreeSlots; + pbInventoryStatus.Maximum = Game.Player.Job2SpecialtyBag.Capacity; + break; case 8: @@ -225,6 +247,9 @@ public void UpdateInventoryList() lblFreeSlots.Text = Game.Player.Job2.FreeSlots + "/" + Game.Player.Job2.Capacity; + pbInventoryStatus.Value = Game.Player.Job2.FreeSlots; + pbInventoryStatus.Maximum = Game.Player.Job2.Capacity; + break; case 9: @@ -241,6 +266,9 @@ public void UpdateInventoryList() lblFreeSlots.Text = Game.Player.Fellow.Inventory.FreeSlots + "/" + Game.Player.Fellow.Inventory.Capacity; + pbInventoryStatus.Value = Game.Player.Fellow.Inventory.FreeSlots; + pbInventoryStatus.Maximum = Game.Player.Fellow.Inventory.Capacity; + break; } diff --git a/Plugins/RSBot.Inventory/Views/Main.resx b/Plugins/RSBot.Inventory/Views/Main.resx index 39d5bcfd..2a93502a 100644 --- a/Plugins/RSBot.Inventory/Views/Main.resx +++ b/Plugins/RSBot.Inventory/Views/Main.resx @@ -1,4 +1,64 @@ - + + + diff --git a/Plugins/RSBot.Items/Views/Main.Designer.cs b/Plugins/RSBot.Items/Views/Main.Designer.cs index 3020ad23..bed3e451 100644 --- a/Plugins/RSBot.Items/Views/Main.Designer.cs +++ b/Plugins/RSBot.Items/Views/Main.Designer.cs @@ -474,7 +474,7 @@ private void InitializeComponent() checkSellItemsFromPet.Checked = true; checkSellItemsFromPet.CheckState = CheckState.Checked; checkSellItemsFromPet.Depth = 0; - checkSellItemsFromPet.Location = new Point(425, 33); + checkSellItemsFromPet.Location = new Point(425, 27); checkSellItemsFromPet.Margin = new Padding(0); checkSellItemsFromPet.MouseLocation = new Point(-1, -1); checkSellItemsFromPet.Name = "checkSellItemsFromPet"; @@ -492,7 +492,7 @@ private void InitializeComponent() checkStoreItemsFromPet.Checked = true; checkStoreItemsFromPet.CheckState = CheckState.Checked; checkStoreItemsFromPet.Depth = 0; - checkStoreItemsFromPet.Location = new Point(567, 33); + checkStoreItemsFromPet.Location = new Point(567, 27); checkStoreItemsFromPet.Margin = new Padding(0); checkStoreItemsFromPet.MouseLocation = new Point(-1, -1); checkStoreItemsFromPet.Name = "checkStoreItemsFromPet"; @@ -510,7 +510,7 @@ private void InitializeComponent() checkRepairGear.Checked = true; checkRepairGear.CheckState = CheckState.Checked; checkRepairGear.Depth = 0; - checkRepairGear.Location = new Point(231, 33); + checkRepairGear.Location = new Point(231, 27); checkRepairGear.Margin = new Padding(0); checkRepairGear.MouseLocation = new Point(-1, -1); checkRepairGear.Name = "checkRepairGear"; @@ -528,7 +528,7 @@ private void InitializeComponent() checkEnable.Checked = true; checkEnable.CheckState = CheckState.Checked; checkEnable.Depth = 0; - checkEnable.Location = new Point(13, 33); + checkEnable.Location = new Point(13, 27); checkEnable.Margin = new Padding(0); checkEnable.MouseLocation = new Point(-1, -1); checkEnable.Name = "checkEnable"; @@ -710,7 +710,7 @@ private void InitializeComponent() groupOthers.Controls.Add(checkCoin); groupOthers.Controls.Add(checkOther); groupOthers.Dock = DockStyle.Top; - groupOthers.Location = new Point(12, 591); + groupOthers.Location = new Point(12, 611); groupOthers.Name = "groupOthers"; groupOthers.Padding = new Padding(3, 10, 3, 3); groupOthers.Radius = 10; @@ -799,7 +799,7 @@ private void InitializeComponent() // separator1.Dock = DockStyle.Top; separator1.IsVertical = false; - separator1.Location = new Point(12, 581); + separator1.Location = new Point(12, 601); separator1.Name = "separator1"; separator1.Size = new Size(224, 10); separator1.TabIndex = 5; @@ -824,13 +824,13 @@ private void InitializeComponent() groupWeapons.Controls.Add(checkSword); groupWeapons.Controls.Add(checkBlade); groupWeapons.Dock = DockStyle.Top; - groupWeapons.Location = new Point(12, 374); + groupWeapons.Location = new Point(12, 384); groupWeapons.Margin = new Padding(6); groupWeapons.Name = "groupWeapons"; groupWeapons.Padding = new Padding(3, 10, 3, 3); groupWeapons.Radius = 10; groupWeapons.ShadowDepth = 4; - groupWeapons.Size = new Size(224, 207); + groupWeapons.Size = new Size(224, 217); groupWeapons.TabIndex = 40; groupWeapons.TabStop = false; groupWeapons.Text = "Weapons"; @@ -1064,7 +1064,7 @@ private void InitializeComponent() // separator2.Dock = DockStyle.Top; separator2.IsVertical = false; - separator2.Location = new Point(12, 364); + separator2.Location = new Point(12, 374); separator2.Name = "separator2"; separator2.Size = new Size(224, 10); separator2.TabIndex = 45; @@ -1077,7 +1077,7 @@ private void InitializeComponent() groupAccessories.Controls.Add(checkEarring); groupAccessories.Controls.Add(checkRing); groupAccessories.Dock = DockStyle.Top; - groupAccessories.Location = new Point(12, 306); + groupAccessories.Location = new Point(12, 316); groupAccessories.Name = "groupAccessories"; groupAccessories.Padding = new Padding(3, 10, 3, 3); groupAccessories.Radius = 10; @@ -1136,7 +1136,7 @@ private void InitializeComponent() // separator3.Dock = DockStyle.Top; separator3.IsVertical = false; - separator3.Location = new Point(12, 296); + separator3.Location = new Point(12, 306); separator3.Name = "separator3"; separator3.Size = new Size(224, 10); separator3.TabIndex = 46; @@ -1160,7 +1160,7 @@ private void InitializeComponent() groupClothes.Padding = new Padding(3, 10, 3, 3); groupClothes.Radius = 10; groupClothes.ShadowDepth = 4; - groupClothes.Size = new Size(224, 135); + groupClothes.Size = new Size(224, 145); groupClothes.TabIndex = 41; groupClothes.TabStop = false; groupClothes.Text = "Clothes"; diff --git a/Plugins/RSBot.Items/Views/Main.resx b/Plugins/RSBot.Items/Views/Main.resx index c94c7c41..3da88ce1 100644 --- a/Plugins/RSBot.Items/Views/Main.resx +++ b/Plugins/RSBot.Items/Views/Main.resx @@ -18,7 +18,7 @@ System.Resources.ResXResourceReader, System.Windows.Forms, ... System.Resources.ResXResourceWriter, System.Windows.Forms, ... this is my long stringthis is a comment - Blue + Blue [base64 mime encoded serialized .NET Framework object]