From 9f84f6c73f243995e8907ae65c30ebf7527f904a Mon Sep 17 00:00:00 2001 From: Li Date: Fri, 10 Mar 2023 13:09:25 +1300 Subject: [PATCH] Implement adding schemes --- LibW4M/Data/Schemes/SchemeData.cs | 126 ++++++++++- LibW4M/Data/Schemes/SchemesCollective.cs | 5 +- LibW4M/Data/Schemes/WeaponSettingsData.cs | 11 +- W4Gui/Components/SchemePanel.Designer.cs | 254 ++++++++++++---------- W4Gui/Components/SchemePanel.cs | 6 +- W4Gui/Tabs/SchemeTab.cs | 4 +- W4Gui/Tabs/TeamsTab.cs | 4 +- 7 files changed, 287 insertions(+), 123 deletions(-) diff --git a/LibW4M/Data/Schemes/SchemeData.cs b/LibW4M/Data/Schemes/SchemeData.cs index 98bd5b1..b963a15 100644 --- a/LibW4M/Data/Schemes/SchemeData.cs +++ b/LibW4M/Data/Schemes/SchemeData.cs @@ -111,7 +111,7 @@ namespace LibW4M.Data.Schemes public bool TelepadsOn; public int WindMaxStrength; - public SchemeData(W4SaveFile fileBelongs, XomContainer mainContainer) : base(fileBelongs, mainContainer) + public SchemeData(W4SaveFile fileBelongs, XomContainer mainContainer, bool load=true) : base(fileBelongs, mainContainer, load) { } @@ -184,6 +184,8 @@ namespace LibW4M.Data.Schemes this.BadPoisonMystery = new WeaponSettingsData(fileBelongs, fileBelongs.LookupContainerById(reader.ReadCompressedInt())); this.GoodPoisonMystery = new WeaponSettingsData(fileBelongs, fileBelongs.LookupContainerById(reader.ReadCompressedInt())); + + this.ArtileryMode = reader.ReadInt32(); this.TeleportIn = reader.ReadInt32(); this.Wins = reader.ReadInt32(); @@ -216,6 +218,128 @@ namespace LibW4M.Data.Schemes } } + internal override void loadDefaults() + { + this.Name = this.fileBelongs.LookupString("Untitled Scheme"); + this.Permanant = false; + this.Lock = this.fileBelongs.LookupString(""); + + this.Airstrike = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.BananaBomb = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.BaseballBat = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.Bazooka = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.ClusterGrenade = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.ConcreteDonkey = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.CrateShower = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.CrateSpy = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.DoubleDamage = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.Dynamite = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.FirePunch = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.GasCanister = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.Girder = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.Grenade = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.HolyHandGrenade = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.HomingMissile = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.Jetpack = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.Landmine = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.NinjaRope = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.OldWoman = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.Parachute = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.Prod = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.SelectWorm = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.Sheep = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.Shotgun = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.SkipGo = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.SuperSheep = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.Redbull = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.Flood = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.Armour = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.WeaponFactoryWeapon = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.AlienAbduction = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.Fatkins = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.Scouser = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.NoMoreNails = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.PoisonArrow = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.SentryGun = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.SniperRifle = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.SuperAirstrike = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.BubbleTrouble = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.Starburst = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.Surrender = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.MineLayerMystery = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.MineTripletMystery = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.BarrelTripletMystery = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.FloodMystery = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.DisarmMystery = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.TeleportMystery = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.QuickWalkMystery = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.LowGravityMystery = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.DoubleTurnTimeMystery = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.HealthMystery = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.DamageMystery = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.SuperHealthMystery = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.SpecialWeaponMystery = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.BadPoisonMystery = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + this.GoodPoisonMystery = new WeaponSettingsData(this.fileBelongs, this.fileBelongs.CreateContainer("WeaponSettingsData"), false); + + this.Surrender.Ammo = -1; + this.SkipGo.Ammo = -1; + + this.CrateShower.Crate = 50; + this.CrateSpy.Crate = 50; + this.DoubleDamage.Crate = 50; + this.Armour.Crate = 50; + + this.MineTripletMystery.Crate = 40; + this.MineLayerMystery.Crate = 30; + this.BarrelTripletMystery.Crate = 40; + this.FloodMystery.Crate = 50; + this.DisarmMystery.Crate = 40; + this.TeleportMystery.Crate = 60; + this.QuickWalkMystery.Crate = 70; + this.LowGravityMystery.Crate = 70; + this.DoubleTurnTimeMystery.Crate = 60; + this.SuperHealthMystery.Crate = 70; + this.DamageMystery.Crate = 40; + this.SuperHealthMystery.Crate = 70; + this.SpecialWeaponMystery.Crate = 50; + this.BadPoisonMystery.Crate = 20; + this.GoodPoisonMystery.Crate = 30; + + this.ArtileryMode = 0; + this.TeleportIn = 0; + this.Wins = 2; + this.WormSelect = 0; + this.WormHealth = 100; + this.RoundTime = 1800000; + this.TurnTime = 30000; + this.Objects = LandObjects.Full; + this.RandomCrateChancePerTurn = 30; + this.MysteryChance = 20; + this.WeaponChance = 30; + this.UtilityChance = 20; + this.HealthChance = 30; + this.HealthInCrates = 25; + + this.Stockpiling = Stockpiling.Normal; + this.SuddenDeath = SuddenDeath.OneHealth; + this.WaterSpeed = WaterSpeed.Medium; + + this.DisplayTime = 1; + this.LandTime = 3000; + this.RopeTime = 5000; + this.FallDamage = 1; + this.HotSeat = 10000; + this.Special = 0; + this.HelpPanelDelay = 3000; + + this.TelepadsOn = true; + this.MineFactoryOn = true; + this.WindMaxStrength = 10; + + base.loadDefaults(); + } + public override void DeleteEntries() { this.Airstrike.DeleteEntries(); diff --git a/LibW4M/Data/Schemes/SchemesCollective.cs b/LibW4M/Data/Schemes/SchemesCollective.cs index 46910bf..3619dcc 100644 --- a/LibW4M/Data/Schemes/SchemesCollective.cs +++ b/LibW4M/Data/Schemes/SchemesCollective.cs @@ -16,7 +16,8 @@ namespace LibW4M.Data.Schemes public override void Create() { - throw new NotImplementedException(); + SchemeData scheme = new SchemeData(this.fileBelongs, this.fileBelongs.CreateContainer("SchemeData"), false); + this.collectiveEntries.Add(scheme); } public override void Load() @@ -25,7 +26,7 @@ namespace LibW4M.Data.Schemes for (int i = 0; i < collective[0]; i++) { SchemeData scheme = new SchemeData(this.fileBelongs, this.fileBelongs.LookupContainerById(collective[i + 1])); - base.collectiveEntries.Add(scheme); + this.collectiveEntries.Add(scheme); } } diff --git a/LibW4M/Data/Schemes/WeaponSettingsData.cs b/LibW4M/Data/Schemes/WeaponSettingsData.cs index 322b55d..f33242f 100644 --- a/LibW4M/Data/Schemes/WeaponSettingsData.cs +++ b/LibW4M/Data/Schemes/WeaponSettingsData.cs @@ -14,7 +14,7 @@ namespace LibW4M.Data.Schemes public int Crate; public int Delay; - public WeaponSettingsData(W4SaveFile fileBelongs, XomContainer mainContainer) : base(fileBelongs, mainContainer) + public WeaponSettingsData(W4SaveFile fileBelongs, XomContainer mainContainer, bool load=true) : base(fileBelongs, mainContainer, load) { } @@ -29,6 +29,15 @@ namespace LibW4M.Data.Schemes } } + internal override void loadDefaults() + { + this.Ammo = 0; + this.Crate = 0; + this.Delay = 0; + + base.loadDefaults(); + } + public override void Save() { using (MemoryStream ms = new MemoryStream()) diff --git a/W4Gui/Components/SchemePanel.Designer.cs b/W4Gui/Components/SchemePanel.Designer.cs index af2ad7e..6020466 100644 --- a/W4Gui/Components/SchemePanel.Designer.cs +++ b/W4Gui/Components/SchemePanel.Designer.cs @@ -69,6 +69,8 @@ this.selPermanent = new System.Windows.Forms.CheckBox(); this.crateTab = new System.Windows.Forms.TabPage(); this.tblCrate = new System.Windows.Forms.TableLayoutPanel(); + this.selWeapCrateChance = new W4Gui.Components.IntUpDown(); + this.lblWeapCrateChance = new System.Windows.Forms.Label(); this.selHealthCrateAmount = new W4Gui.Components.IntUpDown(); this.selHealthCrateChance = new W4Gui.Components.IntUpDown(); this.lblHealthCrateAmount = new System.Windows.Forms.Label(); @@ -80,9 +82,6 @@ this.selCrateChance = new W4Gui.Components.IntUpDown(); this.selUtilityCrateChance = new W4Gui.Components.IntUpDown(); this.mapTab = new System.Windows.Forms.TabPage(); - this.tblMineFactoryTelepadToggles = new System.Windows.Forms.TableLayoutPanel(); - this.selTelepads = new System.Windows.Forms.CheckBox(); - this.selMineFactory = new System.Windows.Forms.CheckBox(); this.tblMap = new System.Windows.Forms.TableLayoutPanel(); this.selMaxWindStrength = new W4Gui.Components.IntUpDown(); this.lblWindMaxStrength = new System.Windows.Forms.Label(); @@ -94,6 +93,9 @@ this.selLndObjects = new System.Windows.Forms.ComboBox(); this.selSuddenDeath = new System.Windows.Forms.ComboBox(); this.selWaterSpeed = new System.Windows.Forms.ComboBox(); + this.tblMineFactoryTelepadToggles = new System.Windows.Forms.TableLayoutPanel(); + this.selTelepads = new System.Windows.Forms.CheckBox(); + this.selMineFactory = new System.Windows.Forms.CheckBox(); this.weaponsTab = new System.Windows.Forms.TabPage(); this.weapTypeTabControl = new System.Windows.Forms.TabControl(); this.weaponTab = new System.Windows.Forms.TabPage(); @@ -223,8 +225,8 @@ this.crateTab.SuspendLayout(); this.tblCrate.SuspendLayout(); this.mapTab.SuspendLayout(); - this.tblMineFactoryTelepadToggles.SuspendLayout(); this.tblMap.SuspendLayout(); + this.tblMineFactoryTelepadToggles.SuspendLayout(); this.weaponsTab.SuspendLayout(); this.weapTypeTabControl.SuspendLayout(); this.weaponTab.SuspendLayout(); @@ -256,7 +258,7 @@ this.generalTab.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; this.generalTab.Controls.Add(this.tblGeneral); this.generalTab.Controls.Add(this.tblPermanatToggle); - this.generalTab.Location = new System.Drawing.Point(0, 24); + this.generalTab.Location = new System.Drawing.Point(4, 24); this.generalTab.Name = "generalTab"; this.generalTab.Padding = new System.Windows.Forms.Padding(3); this.generalTab.Size = new System.Drawing.Size(699, 387); @@ -720,13 +722,12 @@ this.crateTab.BackColor = System.Drawing.Color.Transparent; this.crateTab.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; this.crateTab.Controls.Add(this.tblCrate); - this.crateTab.Location = new System.Drawing.Point(2, 24); + this.crateTab.Location = new System.Drawing.Point(4, 24); this.crateTab.Name = "crateTab"; this.crateTab.Padding = new System.Windows.Forms.Padding(3); this.crateTab.Size = new System.Drawing.Size(699, 387); this.crateTab.TabIndex = 2; this.crateTab.Text = "Crates"; - // // tblCrate // @@ -735,37 +736,59 @@ this.tblCrate.ColumnCount = 2; this.tblCrate.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.tblCrate.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tblCrate.Controls.Add(this.selHealthCrateAmount, 1, 4); - this.tblCrate.Controls.Add(this.selHealthCrateChance, 1, 3); - this.tblCrate.Controls.Add(this.lblHealthCrateAmount, 0, 4); - this.tblCrate.Controls.Add(this.lblHealthCrateChance, 0, 3); - this.tblCrate.Controls.Add(this.lblUtilityCrateChance, 0, 2); - this.tblCrate.Controls.Add(this.selMysteryCrateChance, 1, 1); - this.tblCrate.Controls.Add(this.lblMysteryCrateChance, 0, 1); + this.tblCrate.Controls.Add(this.selWeapCrateChance, 1, 1); + this.tblCrate.Controls.Add(this.lblWeapCrateChance, 0, 1); + this.tblCrate.Controls.Add(this.selHealthCrateAmount, 1, 5); + this.tblCrate.Controls.Add(this.selHealthCrateChance, 1, 4); + this.tblCrate.Controls.Add(this.lblHealthCrateAmount, 0, 5); + this.tblCrate.Controls.Add(this.lblHealthCrateChance, 0, 4); + this.tblCrate.Controls.Add(this.lblUtilityCrateChance, 0, 3); + this.tblCrate.Controls.Add(this.selMysteryCrateChance, 1, 2); + this.tblCrate.Controls.Add(this.lblMysteryCrateChance, 0, 2); this.tblCrate.Controls.Add(this.lblPerTurnCrateChance, 0, 0); this.tblCrate.Controls.Add(this.selCrateChance, 1, 0); - this.tblCrate.Controls.Add(this.selUtilityCrateChance, 1, 2); + this.tblCrate.Controls.Add(this.selUtilityCrateChance, 1, 3); this.tblCrate.Dock = System.Windows.Forms.DockStyle.Top; this.tblCrate.Location = new System.Drawing.Point(3, 3); this.tblCrate.Name = "tblCrate"; - this.tblCrate.RowCount = 5; + this.tblCrate.RowCount = 6; + this.tblCrate.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tblCrate.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tblCrate.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tblCrate.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tblCrate.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tblCrate.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tblCrate.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tblCrate.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tblCrate.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tblCrate.Size = new System.Drawing.Size(695, 157); + this.tblCrate.Size = new System.Drawing.Size(689, 188); this.tblCrate.TabIndex = 1; // + // selWeapCrateChance + // + this.selWeapCrateChance.Dock = System.Windows.Forms.DockStyle.Top; + this.selWeapCrateChance.Location = new System.Drawing.Point(144, 36); + this.selWeapCrateChance.Name = "selWeapCrateChance"; + this.selWeapCrateChance.Size = new System.Drawing.Size(540, 23); + this.selWeapCrateChance.TabIndex = 36; + this.selWeapCrateChance.Text = "0"; + this.selWeapCrateChance.Value = 0; + // + // lblWeapCrateChance + // + this.lblWeapCrateChance.AutoSize = true; + this.lblWeapCrateChance.Dock = System.Windows.Forms.DockStyle.Fill; + this.lblWeapCrateChance.Location = new System.Drawing.Point(5, 33); + this.lblWeapCrateChance.Name = "lblWeapCrateChance"; + this.lblWeapCrateChance.Size = new System.Drawing.Size(131, 29); + this.lblWeapCrateChance.TabIndex = 35; + this.lblWeapCrateChance.Text = "Weapon Crate Chance:"; + this.lblWeapCrateChance.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // // selHealthCrateAmount // this.selHealthCrateAmount.Dock = System.Windows.Forms.DockStyle.Top; - this.selHealthCrateAmount.Location = new System.Drawing.Point(144, 129); + this.selHealthCrateAmount.Location = new System.Drawing.Point(144, 160); this.selHealthCrateAmount.Name = "selHealthCrateAmount"; - this.selHealthCrateAmount.Size = new System.Drawing.Size(546, 23); + this.selHealthCrateAmount.Size = new System.Drawing.Size(540, 23); this.selHealthCrateAmount.TabIndex = 34; this.selHealthCrateAmount.Text = "0"; this.selHealthCrateAmount.Value = 0; @@ -773,9 +796,9 @@ // selHealthCrateChance // this.selHealthCrateChance.Dock = System.Windows.Forms.DockStyle.Top; - this.selHealthCrateChance.Location = new System.Drawing.Point(144, 98); + this.selHealthCrateChance.Location = new System.Drawing.Point(144, 129); this.selHealthCrateChance.Name = "selHealthCrateChance"; - this.selHealthCrateChance.Size = new System.Drawing.Size(546, 23); + this.selHealthCrateChance.Size = new System.Drawing.Size(540, 23); this.selHealthCrateChance.TabIndex = 32; this.selHealthCrateChance.Text = "0"; this.selHealthCrateChance.Value = 0; @@ -784,7 +807,7 @@ // this.lblHealthCrateAmount.AutoSize = true; this.lblHealthCrateAmount.Dock = System.Windows.Forms.DockStyle.Fill; - this.lblHealthCrateAmount.Location = new System.Drawing.Point(5, 126); + this.lblHealthCrateAmount.Location = new System.Drawing.Point(5, 157); this.lblHealthCrateAmount.Name = "lblHealthCrateAmount"; this.lblHealthCrateAmount.Size = new System.Drawing.Size(131, 29); this.lblHealthCrateAmount.TabIndex = 28; @@ -795,7 +818,7 @@ // this.lblHealthCrateChance.AutoSize = true; this.lblHealthCrateChance.Dock = System.Windows.Forms.DockStyle.Fill; - this.lblHealthCrateChance.Location = new System.Drawing.Point(5, 95); + this.lblHealthCrateChance.Location = new System.Drawing.Point(5, 126); this.lblHealthCrateChance.Name = "lblHealthCrateChance"; this.lblHealthCrateChance.Size = new System.Drawing.Size(131, 29); this.lblHealthCrateChance.TabIndex = 27; @@ -806,7 +829,7 @@ // this.lblUtilityCrateChance.AutoSize = true; this.lblUtilityCrateChance.Dock = System.Windows.Forms.DockStyle.Fill; - this.lblUtilityCrateChance.Location = new System.Drawing.Point(5, 64); + this.lblUtilityCrateChance.Location = new System.Drawing.Point(5, 95); this.lblUtilityCrateChance.Name = "lblUtilityCrateChance"; this.lblUtilityCrateChance.Size = new System.Drawing.Size(131, 29); this.lblUtilityCrateChance.TabIndex = 25; @@ -816,9 +839,9 @@ // selMysteryCrateChance // this.selMysteryCrateChance.Dock = System.Windows.Forms.DockStyle.Top; - this.selMysteryCrateChance.Location = new System.Drawing.Point(144, 36); + this.selMysteryCrateChance.Location = new System.Drawing.Point(144, 67); this.selMysteryCrateChance.Name = "selMysteryCrateChance"; - this.selMysteryCrateChance.Size = new System.Drawing.Size(546, 23); + this.selMysteryCrateChance.Size = new System.Drawing.Size(540, 23); this.selMysteryCrateChance.TabIndex = 24; this.selMysteryCrateChance.Text = "0"; this.selMysteryCrateChance.Value = 0; @@ -827,7 +850,7 @@ // this.lblMysteryCrateChance.AutoSize = true; this.lblMysteryCrateChance.Dock = System.Windows.Forms.DockStyle.Fill; - this.lblMysteryCrateChance.Location = new System.Drawing.Point(5, 33); + this.lblMysteryCrateChance.Location = new System.Drawing.Point(5, 64); this.lblMysteryCrateChance.Name = "lblMysteryCrateChance"; this.lblMysteryCrateChance.Size = new System.Drawing.Size(131, 29); this.lblMysteryCrateChance.TabIndex = 23; @@ -850,7 +873,7 @@ this.selCrateChance.Dock = System.Windows.Forms.DockStyle.Top; this.selCrateChance.Location = new System.Drawing.Point(144, 5); this.selCrateChance.Name = "selCrateChance"; - this.selCrateChance.Size = new System.Drawing.Size(546, 23); + this.selCrateChance.Size = new System.Drawing.Size(540, 23); this.selCrateChance.TabIndex = 22; this.selCrateChance.Text = "0"; this.selCrateChance.Value = 0; @@ -858,9 +881,9 @@ // selUtilityCrateChance // this.selUtilityCrateChance.Dock = System.Windows.Forms.DockStyle.Top; - this.selUtilityCrateChance.Location = new System.Drawing.Point(144, 67); + this.selUtilityCrateChance.Location = new System.Drawing.Point(144, 98); this.selUtilityCrateChance.Name = "selUtilityCrateChance"; - this.selUtilityCrateChance.Size = new System.Drawing.Size(546, 23); + this.selUtilityCrateChance.Size = new System.Drawing.Size(540, 23); this.selUtilityCrateChance.TabIndex = 26; this.selUtilityCrateChance.Text = "0"; this.selUtilityCrateChance.Value = 0; @@ -872,52 +895,13 @@ this.mapTab.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; this.mapTab.Controls.Add(this.tblMap); this.mapTab.Controls.Add(this.tblMineFactoryTelepadToggles); - this.mapTab.Location = new System.Drawing.Point(3, 24); + this.mapTab.Location = new System.Drawing.Point(4, 24); this.mapTab.Name = "mapTab"; this.mapTab.Padding = new System.Windows.Forms.Padding(3); - this.mapTab.Size = new System.Drawing.Size(699, 387); + this.mapTab.Size = new System.Drawing.Size(192, 72); this.mapTab.TabIndex = 2; this.mapTab.Text = "Map"; // - // tblMineFactoryTelepadToggles - // - this.tblMineFactoryTelepadToggles.AutoSize = true; - this.tblMineFactoryTelepadToggles.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.Inset; - this.tblMineFactoryTelepadToggles.ColumnCount = 2; - this.tblMineFactoryTelepadToggles.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tblMineFactoryTelepadToggles.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tblMineFactoryTelepadToggles.Controls.Add(this.selTelepads, 1, 0); - this.tblMineFactoryTelepadToggles.Controls.Add(this.selMineFactory, 0, 0); - this.tblMineFactoryTelepadToggles.Dock = System.Windows.Forms.DockStyle.Bottom; - this.tblMineFactoryTelepadToggles.Location = new System.Drawing.Point(0, 39); - this.tblMineFactoryTelepadToggles.Name = "tblMineFactoryTelepadToggles"; - this.tblMineFactoryTelepadToggles.RowCount = 1; - this.tblMineFactoryTelepadToggles.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tblMineFactoryTelepadToggles.Size = new System.Drawing.Size(188, 29); - this.tblMineFactoryTelepadToggles.TabIndex = 26; - // - // selTelepads - // - this.selTelepads.AutoSize = true; - this.selTelepads.Dock = System.Windows.Forms.DockStyle.Fill; - this.selTelepads.Location = new System.Drawing.Point(98, 5); - this.selTelepads.Name = "selTelepads"; - this.selTelepads.Size = new System.Drawing.Size(85, 19); - this.selTelepads.TabIndex = 21; - this.selTelepads.Text = "Telepads"; - this.selTelepads.UseVisualStyleBackColor = true; - // - // selMineFactory - // - this.selMineFactory.AutoSize = true; - this.selMineFactory.Dock = System.Windows.Forms.DockStyle.Fill; - this.selMineFactory.Location = new System.Drawing.Point(5, 5); - this.selMineFactory.Name = "selMineFactory"; - this.selMineFactory.Size = new System.Drawing.Size(85, 19); - this.selMineFactory.TabIndex = 20; - this.selMineFactory.Text = "Mine Factory"; - this.selMineFactory.UseVisualStyleBackColor = true; - // // tblMap // this.tblMap.AutoSize = true; @@ -947,7 +931,7 @@ this.tblMap.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.tblMap.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.tblMap.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tblMap.Size = new System.Drawing.Size(188, 157); + this.tblMap.Size = new System.Drawing.Size(165, 157); this.tblMap.TabIndex = 1; // // selMaxWindStrength @@ -955,7 +939,7 @@ this.selMaxWindStrength.Dock = System.Windows.Forms.DockStyle.Top; this.selMaxWindStrength.Location = new System.Drawing.Point(124, 129); this.selMaxWindStrength.Name = "selMaxWindStrength"; - this.selMaxWindStrength.Size = new System.Drawing.Size(59, 23); + this.selMaxWindStrength.Size = new System.Drawing.Size(36, 23); this.selMaxWindStrength.TabIndex = 44; this.selMaxWindStrength.Text = "0"; this.selMaxWindStrength.Value = 0; @@ -998,7 +982,7 @@ this.selMineFuse.Dock = System.Windows.Forms.DockStyle.Top; this.selMineFuse.Location = new System.Drawing.Point(124, 36); this.selMineFuse.Name = "selMineFuse"; - this.selMineFuse.Size = new System.Drawing.Size(59, 23); + this.selMineFuse.Size = new System.Drawing.Size(36, 23); this.selMineFuse.TabIndex = 38; this.selMineFuse.Text = "0"; this.selMineFuse.Value = 0; @@ -1037,7 +1021,7 @@ "Full"}); this.selLndObjects.Location = new System.Drawing.Point(124, 5); this.selLndObjects.Name = "selLndObjects"; - this.selLndObjects.Size = new System.Drawing.Size(59, 23); + this.selLndObjects.Size = new System.Drawing.Size(36, 23); this.selLndObjects.TabIndex = 45; // // selSuddenDeath @@ -1051,7 +1035,7 @@ "Draw Round"}); this.selSuddenDeath.Location = new System.Drawing.Point(124, 67); this.selSuddenDeath.Name = "selSuddenDeath"; - this.selSuddenDeath.Size = new System.Drawing.Size(59, 23); + this.selSuddenDeath.Size = new System.Drawing.Size(36, 23); this.selSuddenDeath.TabIndex = 46; // // selWaterSpeed @@ -1066,9 +1050,48 @@ "Fast"}); this.selWaterSpeed.Location = new System.Drawing.Point(124, 98); this.selWaterSpeed.Name = "selWaterSpeed"; - this.selWaterSpeed.Size = new System.Drawing.Size(59, 23); + this.selWaterSpeed.Size = new System.Drawing.Size(36, 23); this.selWaterSpeed.TabIndex = 47; // + // tblMineFactoryTelepadToggles + // + this.tblMineFactoryTelepadToggles.AutoSize = true; + this.tblMineFactoryTelepadToggles.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.Inset; + this.tblMineFactoryTelepadToggles.ColumnCount = 2; + this.tblMineFactoryTelepadToggles.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tblMineFactoryTelepadToggles.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tblMineFactoryTelepadToggles.Controls.Add(this.selTelepads, 1, 0); + this.tblMineFactoryTelepadToggles.Controls.Add(this.selMineFactory, 0, 0); + this.tblMineFactoryTelepadToggles.Dock = System.Windows.Forms.DockStyle.Bottom; + this.tblMineFactoryTelepadToggles.Location = new System.Drawing.Point(3, 157); + this.tblMineFactoryTelepadToggles.Name = "tblMineFactoryTelepadToggles"; + this.tblMineFactoryTelepadToggles.RowCount = 1; + this.tblMineFactoryTelepadToggles.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tblMineFactoryTelepadToggles.Size = new System.Drawing.Size(165, 29); + this.tblMineFactoryTelepadToggles.TabIndex = 26; + // + // selTelepads + // + this.selTelepads.AutoSize = true; + this.selTelepads.Dock = System.Windows.Forms.DockStyle.Fill; + this.selTelepads.Location = new System.Drawing.Point(86, 5); + this.selTelepads.Name = "selTelepads"; + this.selTelepads.Size = new System.Drawing.Size(74, 19); + this.selTelepads.TabIndex = 21; + this.selTelepads.Text = "Telepads"; + this.selTelepads.UseVisualStyleBackColor = true; + // + // selMineFactory + // + this.selMineFactory.AutoSize = true; + this.selMineFactory.Dock = System.Windows.Forms.DockStyle.Fill; + this.selMineFactory.Location = new System.Drawing.Point(5, 5); + this.selMineFactory.Name = "selMineFactory"; + this.selMineFactory.Size = new System.Drawing.Size(73, 19); + this.selMineFactory.TabIndex = 20; + this.selMineFactory.Text = "Mine Factory"; + this.selMineFactory.UseVisualStyleBackColor = true; + // // weaponsTab // this.weaponsTab.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; @@ -1086,7 +1109,7 @@ this.weapTypeTabControl.Controls.Add(this.utilityTab); this.weapTypeTabControl.Controls.Add(this.mysteryTab); this.weapTypeTabControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.weapTypeTabControl.Location = new System.Drawing.Point(3, 3); + this.weapTypeTabControl.Location = new System.Drawing.Point(0, 0); this.weapTypeTabControl.Name = "weapTypeTabControl"; this.weapTypeTabControl.SelectedIndex = 0; this.weapTypeTabControl.Size = new System.Drawing.Size(188, 68); @@ -1794,7 +1817,7 @@ this.utilityTab.Location = new System.Drawing.Point(4, 24); this.utilityTab.Name = "utilityTab"; this.utilityTab.Padding = new System.Windows.Forms.Padding(3); - this.utilityTab.Size = new System.Drawing.Size(180, 40); + this.utilityTab.Size = new System.Drawing.Size(687, 355); this.utilityTab.TabIndex = 1; this.utilityTab.Text = "Utilties"; this.utilityTab.UseVisualStyleBackColor = true; @@ -1850,7 +1873,7 @@ this.tblWeapUtil.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tblWeapUtil.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tblWeapUtil.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tblWeapUtil.Size = new System.Drawing.Size(153, 1341); + this.tblWeapUtil.Size = new System.Drawing.Size(660, 1341); this.tblWeapUtil.TabIndex = 1; // // selArmour @@ -1859,7 +1882,7 @@ this.selArmour.Dock = System.Windows.Forms.DockStyle.Top; this.selArmour.Location = new System.Drawing.Point(108, 1241); this.selArmour.Name = "selArmour"; - this.selArmour.Size = new System.Drawing.Size(40, 95); + this.selArmour.Size = new System.Drawing.Size(547, 95); this.selArmour.TabIndex = 32; // // selDoubleDamage @@ -1868,7 +1891,7 @@ this.selDoubleDamage.Dock = System.Windows.Forms.DockStyle.Top; this.selDoubleDamage.Location = new System.Drawing.Point(108, 1138); this.selDoubleDamage.Name = "selDoubleDamage"; - this.selDoubleDamage.Size = new System.Drawing.Size(40, 95); + this.selDoubleDamage.Size = new System.Drawing.Size(547, 95); this.selDoubleDamage.TabIndex = 31; // // selCrateSpy @@ -1877,7 +1900,7 @@ this.selCrateSpy.Dock = System.Windows.Forms.DockStyle.Top; this.selCrateSpy.Location = new System.Drawing.Point(108, 1035); this.selCrateSpy.Name = "selCrateSpy"; - this.selCrateSpy.Size = new System.Drawing.Size(40, 95); + this.selCrateSpy.Size = new System.Drawing.Size(547, 95); this.selCrateSpy.TabIndex = 30; // // selCrateShower @@ -1886,7 +1909,7 @@ this.selCrateShower.Dock = System.Windows.Forms.DockStyle.Top; this.selCrateShower.Location = new System.Drawing.Point(108, 932); this.selCrateShower.Name = "selCrateShower"; - this.selCrateShower.Size = new System.Drawing.Size(40, 95); + this.selCrateShower.Size = new System.Drawing.Size(547, 95); this.selCrateShower.TabIndex = 29; // // selSkipGo @@ -1895,7 +1918,7 @@ this.selSkipGo.Dock = System.Windows.Forms.DockStyle.Top; this.selSkipGo.Location = new System.Drawing.Point(108, 829); this.selSkipGo.Name = "selSkipGo"; - this.selSkipGo.Size = new System.Drawing.Size(40, 95); + this.selSkipGo.Size = new System.Drawing.Size(547, 95); this.selSkipGo.TabIndex = 27; // // lblArmour @@ -1959,7 +1982,7 @@ this.selSurrender.Dock = System.Windows.Forms.DockStyle.Top; this.selSurrender.Location = new System.Drawing.Point(108, 726); this.selSurrender.Name = "selSurrender"; - this.selSurrender.Size = new System.Drawing.Size(40, 95); + this.selSurrender.Size = new System.Drawing.Size(547, 95); this.selSurrender.TabIndex = 15; // // selGirder @@ -1968,7 +1991,7 @@ this.selGirder.Dock = System.Windows.Forms.DockStyle.Top; this.selGirder.Location = new System.Drawing.Point(108, 623); this.selGirder.Name = "selGirder"; - this.selGirder.Size = new System.Drawing.Size(40, 95); + this.selGirder.Size = new System.Drawing.Size(547, 95); this.selGirder.TabIndex = 14; // // selBubbleTrouble @@ -1977,7 +2000,7 @@ this.selBubbleTrouble.Dock = System.Windows.Forms.DockStyle.Top; this.selBubbleTrouble.Location = new System.Drawing.Point(108, 520); this.selBubbleTrouble.Name = "selBubbleTrouble"; - this.selBubbleTrouble.Size = new System.Drawing.Size(40, 95); + this.selBubbleTrouble.Size = new System.Drawing.Size(547, 95); this.selBubbleTrouble.TabIndex = 13; // // lblSurrender @@ -2019,7 +2042,7 @@ this.selIcarusPotion.Dock = System.Windows.Forms.DockStyle.Top; this.selIcarusPotion.Location = new System.Drawing.Point(108, 314); this.selIcarusPotion.Name = "selIcarusPotion"; - this.selIcarusPotion.Size = new System.Drawing.Size(40, 95); + this.selIcarusPotion.Size = new System.Drawing.Size(547, 95); this.selIcarusPotion.TabIndex = 9; // // selWormSelect @@ -2028,7 +2051,7 @@ this.selWormSelect.Dock = System.Windows.Forms.DockStyle.Top; this.selWormSelect.Location = new System.Drawing.Point(108, 417); this.selWormSelect.Name = "selWormSelect"; - this.selWormSelect.Size = new System.Drawing.Size(40, 95); + this.selWormSelect.Size = new System.Drawing.Size(547, 95); this.selWormSelect.TabIndex = 8; // // selNinjaRope @@ -2037,7 +2060,7 @@ this.selNinjaRope.Dock = System.Windows.Forms.DockStyle.Top; this.selNinjaRope.Location = new System.Drawing.Point(108, 211); this.selNinjaRope.Name = "selNinjaRope"; - this.selNinjaRope.Size = new System.Drawing.Size(40, 95); + this.selNinjaRope.Size = new System.Drawing.Size(547, 95); this.selNinjaRope.TabIndex = 7; // // lblWormSelector @@ -2079,7 +2102,7 @@ this.selParachute.Dock = System.Windows.Forms.DockStyle.Top; this.selParachute.Location = new System.Drawing.Point(108, 108); this.selParachute.Name = "selParachute"; - this.selParachute.Size = new System.Drawing.Size(40, 95); + this.selParachute.Size = new System.Drawing.Size(547, 95); this.selParachute.TabIndex = 3; // // lblParachute @@ -2110,7 +2133,7 @@ this.selJetpack.Dock = System.Windows.Forms.DockStyle.Top; this.selJetpack.Location = new System.Drawing.Point(108, 5); this.selJetpack.Name = "selJetpack"; - this.selJetpack.Size = new System.Drawing.Size(40, 95); + this.selJetpack.Size = new System.Drawing.Size(547, 95); this.selJetpack.TabIndex = 1; // // mysteryTab @@ -2121,11 +2144,10 @@ this.mysteryTab.Location = new System.Drawing.Point(4, 24); this.mysteryTab.Name = "mysteryTab"; this.mysteryTab.Padding = new System.Windows.Forms.Padding(3); - this.mysteryTab.Size = new System.Drawing.Size(180, 40); + this.mysteryTab.Size = new System.Drawing.Size(687, 355); this.mysteryTab.TabIndex = 1; this.mysteryTab.Text = "Mystery"; this.mysteryTab.UseVisualStyleBackColor = true; - // // tblWeapMystery // @@ -2183,7 +2205,7 @@ this.tblWeapMystery.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tblWeapMystery.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tblWeapMystery.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tblWeapMystery.Size = new System.Drawing.Size(159, 1547); + this.tblWeapMystery.Size = new System.Drawing.Size(660, 1547); this.tblWeapMystery.TabIndex = 1; // // selBadPoisonMystery @@ -2192,7 +2214,7 @@ this.selBadPoisonMystery.Dock = System.Windows.Forms.DockStyle.Top; this.selBadPoisonMystery.Location = new System.Drawing.Point(130, 1344); this.selBadPoisonMystery.Name = "selBadPoisonMystery"; - this.selBadPoisonMystery.Size = new System.Drawing.Size(24, 95); + this.selBadPoisonMystery.Size = new System.Drawing.Size(525, 95); this.selBadPoisonMystery.TabIndex = 36; // // selGoodPoisonMystery @@ -2201,7 +2223,7 @@ this.selGoodPoisonMystery.Dock = System.Windows.Forms.DockStyle.Top; this.selGoodPoisonMystery.Location = new System.Drawing.Point(130, 1447); this.selGoodPoisonMystery.Name = "selGoodPoisonMystery"; - this.selGoodPoisonMystery.Size = new System.Drawing.Size(24, 95); + this.selGoodPoisonMystery.Size = new System.Drawing.Size(525, 95); this.selGoodPoisonMystery.TabIndex = 35; // // lblTeamDisease @@ -2232,7 +2254,7 @@ this.selSpecialWeaponMystery.Dock = System.Windows.Forms.DockStyle.Top; this.selSpecialWeaponMystery.Location = new System.Drawing.Point(130, 1241); this.selSpecialWeaponMystery.Name = "selSpecialWeaponMystery"; - this.selSpecialWeaponMystery.Size = new System.Drawing.Size(24, 95); + this.selSpecialWeaponMystery.Size = new System.Drawing.Size(525, 95); this.selSpecialWeaponMystery.TabIndex = 32; // // selSuperHealthMystery @@ -2241,7 +2263,7 @@ this.selSuperHealthMystery.Dock = System.Windows.Forms.DockStyle.Top; this.selSuperHealthMystery.Location = new System.Drawing.Point(130, 1138); this.selSuperHealthMystery.Name = "selSuperHealthMystery"; - this.selSuperHealthMystery.Size = new System.Drawing.Size(24, 95); + this.selSuperHealthMystery.Size = new System.Drawing.Size(525, 95); this.selSuperHealthMystery.TabIndex = 31; // // selDamageMystery @@ -2250,7 +2272,7 @@ this.selDamageMystery.Dock = System.Windows.Forms.DockStyle.Top; this.selDamageMystery.Location = new System.Drawing.Point(130, 1035); this.selDamageMystery.Name = "selDamageMystery"; - this.selDamageMystery.Size = new System.Drawing.Size(24, 95); + this.selDamageMystery.Size = new System.Drawing.Size(525, 95); this.selDamageMystery.TabIndex = 30; // // selHealthMystery @@ -2259,7 +2281,7 @@ this.selHealthMystery.Dock = System.Windows.Forms.DockStyle.Top; this.selHealthMystery.Location = new System.Drawing.Point(130, 932); this.selHealthMystery.Name = "selHealthMystery"; - this.selHealthMystery.Size = new System.Drawing.Size(24, 95); + this.selHealthMystery.Size = new System.Drawing.Size(525, 95); this.selHealthMystery.TabIndex = 29; // // selDoubleTurnTimeMystery @@ -2268,7 +2290,7 @@ this.selDoubleTurnTimeMystery.Dock = System.Windows.Forms.DockStyle.Top; this.selDoubleTurnTimeMystery.Location = new System.Drawing.Point(130, 829); this.selDoubleTurnTimeMystery.Name = "selDoubleTurnTimeMystery"; - this.selDoubleTurnTimeMystery.Size = new System.Drawing.Size(24, 95); + this.selDoubleTurnTimeMystery.Size = new System.Drawing.Size(525, 95); this.selDoubleTurnTimeMystery.TabIndex = 27; // // lblBigGuns @@ -2332,7 +2354,7 @@ this.selLowGravityMystery.Dock = System.Windows.Forms.DockStyle.Top; this.selLowGravityMystery.Location = new System.Drawing.Point(130, 726); this.selLowGravityMystery.Name = "selLowGravityMystery"; - this.selLowGravityMystery.Size = new System.Drawing.Size(24, 95); + this.selLowGravityMystery.Size = new System.Drawing.Size(525, 95); this.selLowGravityMystery.TabIndex = 15; // // selQuickWalkMystery @@ -2341,7 +2363,7 @@ this.selQuickWalkMystery.Dock = System.Windows.Forms.DockStyle.Top; this.selQuickWalkMystery.Location = new System.Drawing.Point(130, 623); this.selQuickWalkMystery.Name = "selQuickWalkMystery"; - this.selQuickWalkMystery.Size = new System.Drawing.Size(24, 95); + this.selQuickWalkMystery.Size = new System.Drawing.Size(525, 95); this.selQuickWalkMystery.TabIndex = 14; // // selTeleportMystery @@ -2350,7 +2372,7 @@ this.selTeleportMystery.Dock = System.Windows.Forms.DockStyle.Top; this.selTeleportMystery.Location = new System.Drawing.Point(130, 520); this.selTeleportMystery.Name = "selTeleportMystery"; - this.selTeleportMystery.Size = new System.Drawing.Size(24, 95); + this.selTeleportMystery.Size = new System.Drawing.Size(525, 95); this.selTeleportMystery.TabIndex = 13; // // lblMoonPhysics @@ -2392,7 +2414,7 @@ this.selFloodMystery.Dock = System.Windows.Forms.DockStyle.Top; this.selFloodMystery.Location = new System.Drawing.Point(130, 314); this.selFloodMystery.Name = "selFloodMystery"; - this.selFloodMystery.Size = new System.Drawing.Size(24, 95); + this.selFloodMystery.Size = new System.Drawing.Size(525, 95); this.selFloodMystery.TabIndex = 9; // // selDisarmMystery @@ -2401,7 +2423,7 @@ this.selDisarmMystery.Dock = System.Windows.Forms.DockStyle.Top; this.selDisarmMystery.Location = new System.Drawing.Point(130, 417); this.selDisarmMystery.Name = "selDisarmMystery"; - this.selDisarmMystery.Size = new System.Drawing.Size(24, 95); + this.selDisarmMystery.Size = new System.Drawing.Size(525, 95); this.selDisarmMystery.TabIndex = 8; // // selBarrelTripletMystery @@ -2410,7 +2432,7 @@ this.selBarrelTripletMystery.Dock = System.Windows.Forms.DockStyle.Top; this.selBarrelTripletMystery.Location = new System.Drawing.Point(130, 211); this.selBarrelTripletMystery.Name = "selBarrelTripletMystery"; - this.selBarrelTripletMystery.Size = new System.Drawing.Size(24, 95); + this.selBarrelTripletMystery.Size = new System.Drawing.Size(525, 95); this.selBarrelTripletMystery.TabIndex = 7; // // lblSabotageInventory @@ -2452,7 +2474,7 @@ this.selMineTripletMystery.Dock = System.Windows.Forms.DockStyle.Top; this.selMineTripletMystery.Location = new System.Drawing.Point(130, 108); this.selMineTripletMystery.Name = "selMineTripletMystery"; - this.selMineTripletMystery.Size = new System.Drawing.Size(24, 95); + this.selMineTripletMystery.Size = new System.Drawing.Size(525, 95); this.selMineTripletMystery.TabIndex = 3; // // lblRandomDetonation @@ -2483,7 +2505,7 @@ this.selMineLayerMystery.Dock = System.Windows.Forms.DockStyle.Top; this.selMineLayerMystery.Location = new System.Drawing.Point(130, 5); this.selMineLayerMystery.Name = "selMineLayerMystery"; - this.selMineLayerMystery.Size = new System.Drawing.Size(24, 95); + this.selMineLayerMystery.Size = new System.Drawing.Size(525, 95); this.selMineLayerMystery.TabIndex = 1; // // SchemePanel @@ -2507,10 +2529,10 @@ this.tblCrate.PerformLayout(); this.mapTab.ResumeLayout(false); this.mapTab.PerformLayout(); - this.tblMineFactoryTelepadToggles.ResumeLayout(false); - this.tblMineFactoryTelepadToggles.PerformLayout(); this.tblMap.ResumeLayout(false); this.tblMap.PerformLayout(); + this.tblMineFactoryTelepadToggles.ResumeLayout(false); + this.tblMineFactoryTelepadToggles.PerformLayout(); this.weaponsTab.ResumeLayout(false); this.weapTypeTabControl.ResumeLayout(false); this.weaponTab.ResumeLayout(false); @@ -2719,5 +2741,7 @@ private ComboBox selStockpiling; private ComboBox selSuddenDeath; private ComboBox selWaterSpeed; + private IntUpDown selWeapCrateChance; + private Label lblWeapCrateChance; } } diff --git a/W4Gui/Components/SchemePanel.cs b/W4Gui/Components/SchemePanel.cs index 890a76d..1e360de 100644 --- a/W4Gui/Components/SchemePanel.cs +++ b/W4Gui/Components/SchemePanel.cs @@ -76,7 +76,7 @@ namespace W4Gui.Components this.selLowGravityMystery.SaveWeaponSettingsData(ref scheme.LowGravityMystery); this.selDoubleTurnTimeMystery.SaveWeaponSettingsData(ref scheme.DoubleTurnTimeMystery); this.selHealthMystery.SaveWeaponSettingsData(ref scheme.HealthMystery); - this.selDoubleDamage.SaveWeaponSettingsData(ref scheme.DamageMystery); + this.selDamageMystery.SaveWeaponSettingsData(ref scheme.DamageMystery); this.selSuperHealthMystery.SaveWeaponSettingsData(ref scheme.SuperHealthMystery); this.selSpecialWeaponMystery.SaveWeaponSettingsData(ref scheme.SpecialWeaponMystery); this.selBadPoisonMystery.SaveWeaponSettingsData(ref scheme.BadPoisonMystery); @@ -102,6 +102,7 @@ namespace W4Gui.Components scheme.Permanant = this.selPermanent.Checked; scheme.RandomCrateChancePerTurn = this.selCrateChance.Value; + scheme.WeaponChance = this.selWeapCrateChance.Value; scheme.MysteryChance = this.selMysteryCrateChance.Value; scheme.UtilityChance = this.selUtilityCrateChance.Value; scheme.HealthChance = this.selHealthCrateChance.Value; @@ -172,7 +173,7 @@ namespace W4Gui.Components this.selLowGravityMystery.LoadWeaponSettingsData(scheme.LowGravityMystery); this.selDoubleTurnTimeMystery.LoadWeaponSettingsData(scheme.DoubleTurnTimeMystery); this.selHealthMystery.LoadWeaponSettingsData(scheme.HealthMystery); - this.selDoubleDamage.LoadWeaponSettingsData(scheme.DamageMystery); + this.selDamageMystery.LoadWeaponSettingsData(scheme.DamageMystery); this.selSuperHealthMystery.LoadWeaponSettingsData(scheme.SuperHealthMystery); this.selSpecialWeaponMystery.LoadWeaponSettingsData(scheme.SpecialWeaponMystery); this.selBadPoisonMystery.LoadWeaponSettingsData(scheme.BadPoisonMystery); @@ -198,6 +199,7 @@ namespace W4Gui.Components this.selPermanent.Checked = scheme.Permanant; this.selCrateChance.Value = scheme.RandomCrateChancePerTurn; + this.selWeapCrateChance.Value = scheme.WeaponChance; this.selMysteryCrateChance.Value = scheme.MysteryChance; this.selUtilityCrateChance.Value = scheme.UtilityChance; this.selHealthCrateChance.Value = scheme.HealthChance; diff --git a/W4Gui/Tabs/SchemeTab.cs b/W4Gui/Tabs/SchemeTab.cs index 0e8c36a..9f21e7b 100644 --- a/W4Gui/Tabs/SchemeTab.cs +++ b/W4Gui/Tabs/SchemeTab.cs @@ -50,7 +50,9 @@ namespace W4Gui.Tabs private void schemesList_NewButton(object sender, EventArgs e) { - throw new NotImplementedException("Adding new schemes from here not implemented yet ;)"); + DataManager.SaveFile.SchemesCollective.Create(); + schemesList.List.Add(DataManager.SaveFile.SchemesCollective.Last().FriendlyName); + schemesList.List.SelectedIndex = (schemesList.List.Items.Count - 1); } private void schemesList_DeleteButton(object sender, EventArgs e) diff --git a/W4Gui/Tabs/TeamsTab.cs b/W4Gui/Tabs/TeamsTab.cs index 245cba0..ab9f74a 100644 --- a/W4Gui/Tabs/TeamsTab.cs +++ b/W4Gui/Tabs/TeamsTab.cs @@ -50,7 +50,9 @@ namespace W4Gui.Tabs private void teamsList_NewButton(object sender, EventArgs e) { - throw new NotImplementedException("Adding new teams from here not implemented yet ;)"); + DataManager.SaveFile.TeamDataColective.Create(); + teamsList.List.Add(DataManager.SaveFile.TeamDataColective.Last().FriendlyName); + teamsList.List.SelectedIndex = (teamsList.List.Items.Count - 1); } private void teamsList_DeleteButton(object sender, EventArgs e)