diff --git a/NethackHelper/MainForm.Designer.cs b/NethackHelper/MainForm.Designer.cs index 3c541f2..c7af428 100644 --- a/NethackHelper/MainForm.Designer.cs +++ b/NethackHelper/MainForm.Designer.cs @@ -30,6 +30,8 @@ namespace NethackHelper { this.components = new System.ComponentModel.Container(); Label extrinsicLabel; Label intrinsicLabel; + Label label3; + Label label4; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); this.mainTabControl = new TabControl(); this.itemsTab = new TabPage(); @@ -50,8 +52,12 @@ namespace NethackHelper { this.toolDisplay = new ItemDisplay(); this.charismaSelector = new ComboBox(); this.propertiesTab = new TabPage(); - this.godAngryCheckbox = new CheckBox(); + this.waterWalkingBox = new PropertyBox(); this.propertiesBindingSource = new BindingSource(this.components); + this.lifeSavingBox = new PropertyBox(); + this.flyingBox = new PropertyBox(); + this.jumpingBox = new PropertyBox(); + this.godAngryCheckbox = new CheckBox(); this.hungerBox = new PropertyBox(); this.freeActionBox = new PropertyBox(); this.slowDigestionBox = new PropertyBox(); @@ -98,6 +104,8 @@ namespace NethackHelper { this.toolTip1 = new ToolTip(this.components); extrinsicLabel = new Label(); intrinsicLabel = new Label(); + label3 = new Label(); + label4 = new Label(); this.mainTabControl.SuspendLayout(); this.itemsTab.SuspendLayout(); ((System.ComponentModel.ISupportInitialize) this.saveSourceBindingSource).BeginInit(); @@ -137,6 +145,28 @@ namespace NethackHelper { intrinsicLabel.Text = "I"; intrinsicLabel.TextAlign = ContentAlignment.MiddleCenter; // + // label3 + // + label3.Font = new Font("Consolas", 9F); + label3.Location = new Point(317, 8); + label3.Margin = new Padding(1); + label3.Name = "label3"; + label3.Size = new Size(16, 16); + label3.TabIndex = 55; + label3.Text = "E"; + label3.TextAlign = ContentAlignment.MiddleCenter; + // + // label4 + // + label4.Font = new Font("Consolas", 9F); + label4.Location = new Point(340, 8); + label4.Margin = new Padding(1); + label4.Name = "label4"; + label4.Size = new Size(16, 16); + label4.TabIndex = 56; + label4.Text = "I"; + label4.TextAlign = ContentAlignment.MiddleCenter; + // // mainTabControl // this.mainTabControl.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; @@ -334,6 +364,10 @@ namespace NethackHelper { // // propertiesTab // + this.propertiesTab.Controls.Add(this.waterWalkingBox); + this.propertiesTab.Controls.Add(this.lifeSavingBox); + this.propertiesTab.Controls.Add(this.flyingBox); + this.propertiesTab.Controls.Add(this.jumpingBox); this.propertiesTab.Controls.Add(this.godAngryCheckbox); this.propertiesTab.Controls.Add(this.hungerBox); this.propertiesTab.Controls.Add(this.freeActionBox); @@ -349,6 +383,7 @@ namespace NethackHelper { this.propertiesTab.Controls.Add(this.reflectionBox); this.propertiesTab.Controls.Add(this.acidResistanceBox); this.propertiesTab.Controls.Add(this.teleportitisBox); + this.propertiesTab.Controls.Add(label4); this.propertiesTab.Controls.Add(intrinsicLabel); this.propertiesTab.Controls.Add(this.warningBox); this.propertiesTab.Controls.Add(this.disintegrationResistanceBox); @@ -367,6 +402,7 @@ namespace NethackHelper { this.propertiesTab.Controls.Add(this.label2); this.propertiesTab.Controls.Add(this.lastPrayerPicker); this.propertiesTab.Controls.Add(this.label1); + this.propertiesTab.Controls.Add(label3); this.propertiesTab.Controls.Add(this.protectionPicker); this.propertiesTab.Controls.Add(extrinsicLabel); this.propertiesTab.Location = new Point(4, 24); @@ -377,12 +413,80 @@ namespace NethackHelper { this.propertiesTab.Text = "Properties"; this.propertiesTab.UseVisualStyleBackColor = true; // + // waterWalkingBox + // + this.waterWalkingBox.AllowExtrinsic = true; + this.waterWalkingBox.AllowIntrinsic = false; + this.waterWalkingBox.DataBindings.Add(new Binding("Property", this.propertiesBindingSource, "WaterWalking", true)); + this.waterWalkingBox.HasExtrinsic = false; + this.waterWalkingBox.HasIntrinsic = false; + this.waterWalkingBox.Location = new Point(314, 157); + this.waterWalkingBox.Margin = new Padding(1); + this.waterWalkingBox.Name = "waterWalkingBox"; + this.waterWalkingBox.PropertyImage = null; + this.waterWalkingBox.PropertyKey = "water_walking"; + this.waterWalkingBox.PropertyName = "Water Walking"; + this.waterWalkingBox.Size = new Size(300, 20); + this.waterWalkingBox.TabIndex = 90; + // + // propertiesBindingSource + // + this.propertiesBindingSource.DataSource = typeof(GameProperties); + // + // lifeSavingBox + // + this.lifeSavingBox.AllowExtrinsic = true; + this.lifeSavingBox.AllowIntrinsic = false; + this.lifeSavingBox.DataBindings.Add(new Binding("Property", this.propertiesBindingSource, "LifeSaving", true)); + this.lifeSavingBox.HasExtrinsic = false; + this.lifeSavingBox.HasIntrinsic = false; + this.lifeSavingBox.Location = new Point(314, 91); + this.lifeSavingBox.Margin = new Padding(1); + this.lifeSavingBox.Name = "lifeSavingBox"; + this.lifeSavingBox.PropertyImage = null; + this.lifeSavingBox.PropertyKey = "life_saving"; + this.lifeSavingBox.PropertyName = "Life Saving"; + this.lifeSavingBox.Size = new Size(300, 20); + this.lifeSavingBox.TabIndex = 89; + // + // flyingBox + // + this.flyingBox.AllowExtrinsic = true; + this.flyingBox.AllowIntrinsic = false; + this.flyingBox.DataBindings.Add(new Binding("Property", this.propertiesBindingSource, "Flying", true)); + this.flyingBox.HasExtrinsic = false; + this.flyingBox.HasIntrinsic = false; + this.flyingBox.Location = new Point(314, 47); + this.flyingBox.Margin = new Padding(1); + this.flyingBox.Name = "flyingBox"; + this.flyingBox.PropertyImage = null; + this.flyingBox.PropertyKey = "flying"; + this.flyingBox.PropertyName = "Flying"; + this.flyingBox.Size = new Size(300, 20); + this.flyingBox.TabIndex = 88; + // + // jumpingBox + // + this.jumpingBox.AllowExtrinsic = true; + this.jumpingBox.AllowIntrinsic = true; + this.jumpingBox.DataBindings.Add(new Binding("Property", this.propertiesBindingSource, "Jumping", true)); + this.jumpingBox.HasExtrinsic = false; + this.jumpingBox.HasIntrinsic = false; + this.jumpingBox.Location = new Point(314, 245); + this.jumpingBox.Margin = new Padding(1); + this.jumpingBox.Name = "jumpingBox"; + this.jumpingBox.PropertyImage = Resources.jumping; + this.jumpingBox.PropertyKey = "jumping"; + this.jumpingBox.PropertyName = "Jumping"; + this.jumpingBox.Size = new Size(300, 20); + this.jumpingBox.TabIndex = 87; + // // godAngryCheckbox // this.godAngryCheckbox.DataBindings.Add(new Binding("Checked", this.propertiesBindingSource, "GodAngry", true)); this.godAngryCheckbox.Image = Resources.angry_god; this.godAngryCheckbox.ImageAlign = ContentAlignment.MiddleLeft; - this.godAngryCheckbox.Location = new Point(23, 423); + this.godAngryCheckbox.Location = new Point(23, 455); this.godAngryCheckbox.Name = "godAngryCheckbox"; this.godAngryCheckbox.Size = new Size(98, 25); this.godAngryCheckbox.TabIndex = 86; @@ -391,10 +495,6 @@ namespace NethackHelper { this.godAngryCheckbox.UseVisualStyleBackColor = true; this.godAngryCheckbox.CheckedChanged += this.godAngryCheckbox_CheckedChanged; // - // propertiesBindingSource - // - this.propertiesBindingSource.DataSource = typeof(GameProperties); - // // hungerBox // this.hungerBox.AllowExtrinsic = true; @@ -402,7 +502,7 @@ namespace NethackHelper { this.hungerBox.DataBindings.Add(new Binding("Property", this.propertiesBindingSource, "Hunger", true)); this.hungerBox.HasExtrinsic = false; this.hungerBox.HasIntrinsic = false; - this.hungerBox.Location = new Point(314, 245); + this.hungerBox.Location = new Point(314, 223); this.hungerBox.Margin = new Padding(1); this.hungerBox.Name = "hungerBox"; this.hungerBox.PropertyImage = Resources.hunger; @@ -418,7 +518,7 @@ namespace NethackHelper { this.freeActionBox.DataBindings.Add(new Binding("Property", this.propertiesBindingSource, "FreeAction", true)); this.freeActionBox.HasExtrinsic = false; this.freeActionBox.HasIntrinsic = false; - this.freeActionBox.Location = new Point(314, 113); + this.freeActionBox.Location = new Point(314, 69); this.freeActionBox.Margin = new Padding(1); this.freeActionBox.Name = "freeActionBox"; this.freeActionBox.PropertyImage = Resources.fire_resistance; @@ -434,7 +534,7 @@ namespace NethackHelper { this.slowDigestionBox.DataBindings.Add(new Binding("Property", this.propertiesBindingSource, "SlowDigestion", true)); this.slowDigestionBox.HasExtrinsic = false; this.slowDigestionBox.HasIntrinsic = false; - this.slowDigestionBox.Location = new Point(314, 91); + this.slowDigestionBox.Location = new Point(314, 179); this.slowDigestionBox.Margin = new Padding(1); this.slowDigestionBox.Name = "slowDigestionBox"; this.slowDigestionBox.PropertyImage = Resources.slow_digestion; @@ -450,7 +550,7 @@ namespace NethackHelper { this.polymorphControlBox.DataBindings.Add(new Binding("Property", this.propertiesBindingSource, "PolymorphControl", true)); this.polymorphControlBox.HasExtrinsic = false; this.polymorphControlBox.HasIntrinsic = false; - this.polymorphControlBox.Location = new Point(314, 135); + this.polymorphControlBox.Location = new Point(314, 289); this.polymorphControlBox.Margin = new Padding(1); this.polymorphControlBox.Name = "polymorphControlBox"; this.polymorphControlBox.PropertyImage = Resources.polymorph_control; @@ -466,7 +566,7 @@ namespace NethackHelper { this.polymorphitisBox.DataBindings.Add(new Binding("Property", this.propertiesBindingSource, "Polymorphitis", true)); this.polymorphitisBox.HasExtrinsic = false; this.polymorphitisBox.HasIntrinsic = false; - this.polymorphitisBox.Location = new Point(314, 157); + this.polymorphitisBox.Location = new Point(314, 311); this.polymorphitisBox.Margin = new Padding(1); this.polymorphitisBox.Name = "polymorphitisBox"; this.polymorphitisBox.PropertyImage = Resources.polymorphitis; @@ -482,7 +582,7 @@ namespace NethackHelper { this.protectionFromShapeChangersBox.DataBindings.Add(new Binding("Property", this.propertiesBindingSource, "ProtectionFromShapeChangers", true)); this.protectionFromShapeChangersBox.HasExtrinsic = false; this.protectionFromShapeChangersBox.HasIntrinsic = false; - this.protectionFromShapeChangersBox.Location = new Point(314, 179); + this.protectionFromShapeChangersBox.Location = new Point(314, 333); this.protectionFromShapeChangersBox.Margin = new Padding(1); this.protectionFromShapeChangersBox.Name = "protectionFromShapeChangersBox"; this.protectionFromShapeChangersBox.PropertyImage = Resources.protection_from_shape_changers; @@ -498,7 +598,7 @@ namespace NethackHelper { this.regenerationBox.DataBindings.Add(new Binding("Property", this.propertiesBindingSource, "Regeneration", true)); this.regenerationBox.HasExtrinsic = false; this.regenerationBox.HasIntrinsic = false; - this.regenerationBox.Location = new Point(314, 201); + this.regenerationBox.Location = new Point(314, 355); this.regenerationBox.Margin = new Padding(1); this.regenerationBox.Name = "regenerationBox"; this.regenerationBox.PropertyImage = Resources.regeneration; @@ -514,7 +614,7 @@ namespace NethackHelper { this.conflictBox.DataBindings.Add(new Binding("Property", this.propertiesBindingSource, "Conflict", true)); this.conflictBox.HasExtrinsic = false; this.conflictBox.HasIntrinsic = false; - this.conflictBox.Location = new Point(314, 223); + this.conflictBox.Location = new Point(314, 201); this.conflictBox.Margin = new Padding(1); this.conflictBox.Name = "conflictBox"; this.conflictBox.PropertyImage = Resources.conflict; @@ -530,7 +630,7 @@ namespace NethackHelper { this.aggravateMonsterBox.DataBindings.Add(new Binding("Property", this.propertiesBindingSource, "AggravateMonster", true)); this.aggravateMonsterBox.HasExtrinsic = false; this.aggravateMonsterBox.HasIntrinsic = false; - this.aggravateMonsterBox.Location = new Point(314, 267); + this.aggravateMonsterBox.Location = new Point(12, 25); this.aggravateMonsterBox.Margin = new Padding(1); this.aggravateMonsterBox.Name = "aggravateMonsterBox"; this.aggravateMonsterBox.PropertyImage = Resources.aggravate_monster; @@ -546,7 +646,7 @@ namespace NethackHelper { this.magicalBreathingBox.DataBindings.Add(new Binding("Property", this.propertiesBindingSource, "MagicalBreathing", true)); this.magicalBreathingBox.HasExtrinsic = false; this.magicalBreathingBox.HasIntrinsic = false; - this.magicalBreathingBox.Location = new Point(314, 289); + this.magicalBreathingBox.Location = new Point(314, 267); this.magicalBreathingBox.Margin = new Padding(1); this.magicalBreathingBox.Name = "magicalBreathingBox"; this.magicalBreathingBox.PropertyImage = Resources.magical_breathing; @@ -562,7 +662,7 @@ namespace NethackHelper { this.magicResistanceBox.DataBindings.Add(new Binding("Property", this.propertiesBindingSource, "MagicResistance", true)); this.magicResistanceBox.HasExtrinsic = false; this.magicResistanceBox.HasIntrinsic = false; - this.magicResistanceBox.Location = new Point(314, 69); + this.magicResistanceBox.Location = new Point(314, 113); this.magicResistanceBox.Margin = new Padding(1); this.magicResistanceBox.Name = "magicResistanceBox"; this.magicResistanceBox.PropertyImage = Resources.magic_resistance; @@ -578,7 +678,7 @@ namespace NethackHelper { this.reflectionBox.DataBindings.Add(new Binding("Property", this.propertiesBindingSource, "Reflection", true)); this.reflectionBox.HasExtrinsic = false; this.reflectionBox.HasIntrinsic = false; - this.reflectionBox.Location = new Point(314, 47); + this.reflectionBox.Location = new Point(314, 135); this.reflectionBox.Margin = new Padding(1); this.reflectionBox.Name = "reflectionBox"; this.reflectionBox.PropertyImage = Resources.reflection; @@ -610,7 +710,7 @@ namespace NethackHelper { this.teleportitisBox.DataBindings.Add(new Binding("Property", this.propertiesBindingSource, "Teleportitis", true)); this.teleportitisBox.HasExtrinsic = false; this.teleportitisBox.HasIntrinsic = false; - this.teleportitisBox.Location = new Point(12, 311); + this.teleportitisBox.Location = new Point(12, 333); this.teleportitisBox.Margin = new Padding(1); this.teleportitisBox.Name = "teleportitisBox"; this.teleportitisBox.PropertyImage = Resources.teleportitis; @@ -626,7 +726,7 @@ namespace NethackHelper { this.warningBox.DataBindings.Add(new Binding("Property", this.propertiesBindingSource, "Warning", true)); this.warningBox.HasExtrinsic = false; this.warningBox.HasIntrinsic = false; - this.warningBox.Location = new Point(12, 333); + this.warningBox.Location = new Point(12, 355); this.warningBox.Margin = new Padding(1); this.warningBox.Name = "warningBox"; this.warningBox.PropertyImage = Resources.warning; @@ -642,7 +742,7 @@ namespace NethackHelper { this.disintegrationResistanceBox.DataBindings.Add(new Binding("Property", this.propertiesBindingSource, "DisintegrationResistance", true)); this.disintegrationResistanceBox.HasExtrinsic = false; this.disintegrationResistanceBox.HasIntrinsic = false; - this.disintegrationResistanceBox.Location = new Point(12, 47); + this.disintegrationResistanceBox.Location = new Point(12, 69); this.disintegrationResistanceBox.Margin = new Padding(1); this.disintegrationResistanceBox.Name = "disintegrationResistanceBox"; this.disintegrationResistanceBox.PropertyImage = Resources.disintegration_resistance; @@ -658,7 +758,7 @@ namespace NethackHelper { this.fireResistanceBox.DataBindings.Add(new Binding("Property", this.propertiesBindingSource, "FireResistance", true)); this.fireResistanceBox.HasExtrinsic = false; this.fireResistanceBox.HasIntrinsic = false; - this.fireResistanceBox.Location = new Point(12, 69); + this.fireResistanceBox.Location = new Point(12, 91); this.fireResistanceBox.Margin = new Padding(1); this.fireResistanceBox.Name = "fireResistanceBox"; this.fireResistanceBox.PropertyImage = Resources.fire_resistance; @@ -674,7 +774,7 @@ namespace NethackHelper { this.invisibilityBox.DataBindings.Add(new Binding("Property", this.propertiesBindingSource, "Invisibility", true)); this.invisibilityBox.HasExtrinsic = false; this.invisibilityBox.HasIntrinsic = false; - this.invisibilityBox.Location = new Point(12, 91); + this.invisibilityBox.Location = new Point(12, 113); this.invisibilityBox.Margin = new Padding(1); this.invisibilityBox.Name = "invisibilityBox"; this.invisibilityBox.PropertyImage = Resources.invisibility; @@ -690,7 +790,7 @@ namespace NethackHelper { this.poisonResistanceBox.DataBindings.Add(new Binding("Property", this.propertiesBindingSource, "PoisonResistance", true)); this.poisonResistanceBox.HasExtrinsic = false; this.poisonResistanceBox.HasIntrinsic = false; - this.poisonResistanceBox.Location = new Point(12, 113); + this.poisonResistanceBox.Location = new Point(12, 135); this.poisonResistanceBox.Margin = new Padding(1); this.poisonResistanceBox.Name = "poisonResistanceBox"; this.poisonResistanceBox.PropertyImage = Resources.poison_resistance; @@ -706,7 +806,7 @@ namespace NethackHelper { this.searchingBox.DataBindings.Add(new Binding("Property", this.propertiesBindingSource, "Searching", true)); this.searchingBox.HasExtrinsic = false; this.searchingBox.HasIntrinsic = false; - this.searchingBox.Location = new Point(12, 135); + this.searchingBox.Location = new Point(12, 157); this.searchingBox.Margin = new Padding(1); this.searchingBox.Name = "searchingBox"; this.searchingBox.PropertyImage = Resources.searching; @@ -722,7 +822,7 @@ namespace NethackHelper { this.seeInvisibleBox.DataBindings.Add(new Binding("Property", this.propertiesBindingSource, "SeeInvisible", true)); this.seeInvisibleBox.HasExtrinsic = false; this.seeInvisibleBox.HasIntrinsic = false; - this.seeInvisibleBox.Location = new Point(12, 157); + this.seeInvisibleBox.Location = new Point(12, 179); this.seeInvisibleBox.Margin = new Padding(1); this.seeInvisibleBox.Name = "seeInvisibleBox"; this.seeInvisibleBox.PropertyImage = Resources.see_invisible; @@ -738,7 +838,7 @@ namespace NethackHelper { this.shockResistanceBox.DataBindings.Add(new Binding("Property", this.propertiesBindingSource, "ShockResistance", true)); this.shockResistanceBox.HasExtrinsic = false; this.shockResistanceBox.HasIntrinsic = false; - this.shockResistanceBox.Location = new Point(12, 179); + this.shockResistanceBox.Location = new Point(12, 201); this.shockResistanceBox.Margin = new Padding(1); this.shockResistanceBox.Name = "shockResistanceBox"; this.shockResistanceBox.PropertyImage = Resources.shock_resistance; @@ -754,7 +854,7 @@ namespace NethackHelper { this.sleepResistanceBox.DataBindings.Add(new Binding("Property", this.propertiesBindingSource, "SleepResistance", true)); this.sleepResistanceBox.HasExtrinsic = false; this.sleepResistanceBox.HasIntrinsic = false; - this.sleepResistanceBox.Location = new Point(12, 201); + this.sleepResistanceBox.Location = new Point(12, 223); this.sleepResistanceBox.Margin = new Padding(1); this.sleepResistanceBox.Name = "sleepResistanceBox"; this.sleepResistanceBox.PropertyImage = Resources.sleep_resistance; @@ -770,7 +870,7 @@ namespace NethackHelper { this.speedBox.DataBindings.Add(new Binding("Property", this.propertiesBindingSource, "Speed", true)); this.speedBox.HasExtrinsic = false; this.speedBox.HasIntrinsic = false; - this.speedBox.Location = new Point(12, 223); + this.speedBox.Location = new Point(12, 245); this.speedBox.Margin = new Padding(1); this.speedBox.Name = "speedBox"; this.speedBox.PropertyImage = Resources.speed; @@ -786,7 +886,7 @@ namespace NethackHelper { this.stealthBox.DataBindings.Add(new Binding("Property", this.propertiesBindingSource, "Stealth", true)); this.stealthBox.HasExtrinsic = false; this.stealthBox.HasIntrinsic = false; - this.stealthBox.Location = new Point(12, 245); + this.stealthBox.Location = new Point(12, 267); this.stealthBox.Margin = new Padding(1); this.stealthBox.Name = "stealthBox"; this.stealthBox.PropertyImage = Resources.stealth; @@ -802,7 +902,7 @@ namespace NethackHelper { this.teleportControlBox.DataBindings.Add(new Binding("Property", this.propertiesBindingSource, "TeleportControl", true)); this.teleportControlBox.HasExtrinsic = false; this.teleportControlBox.HasIntrinsic = false; - this.teleportControlBox.Location = new Point(12, 289); + this.teleportControlBox.Location = new Point(12, 311); this.teleportControlBox.Margin = new Padding(1); this.teleportControlBox.Name = "teleportControlBox"; this.teleportControlBox.PropertyImage = Resources.teleport_control; @@ -818,7 +918,7 @@ namespace NethackHelper { this.telepathyBox.DataBindings.Add(new Binding("Property", this.propertiesBindingSource, "Telepathy", true)); this.telepathyBox.HasExtrinsic = false; this.telepathyBox.HasIntrinsic = false; - this.telepathyBox.Location = new Point(12, 267); + this.telepathyBox.Location = new Point(12, 289); this.telepathyBox.Margin = new Padding(1); this.telepathyBox.Name = "telepathyBox"; this.telepathyBox.PropertyImage = Resources.telepathy; @@ -834,7 +934,7 @@ namespace NethackHelper { this.coldResistanceBox.DataBindings.Add(new Binding("Property", this.propertiesBindingSource, "ColdResistance", true)); this.coldResistanceBox.HasExtrinsic = false; this.coldResistanceBox.HasIntrinsic = false; - this.coldResistanceBox.Location = new Point(12, 25); + this.coldResistanceBox.Location = new Point(12, 47); this.coldResistanceBox.Margin = new Padding(1); this.coldResistanceBox.Name = "coldResistanceBox"; this.coldResistanceBox.PropertyImage = Resources.cold_resistance; @@ -846,7 +946,7 @@ namespace NethackHelper { // label2 // this.label2.AutoSize = true; - this.label2.Location = new Point(12, 396); + this.label2.Location = new Point(12, 428); this.label2.Name = "label2"; this.label2.Size = new Size(64, 15); this.label2.TabIndex = 18; @@ -856,7 +956,7 @@ namespace NethackHelper { // this.lastPrayerPicker.DataBindings.Add(new Binding("Value", this.propertiesBindingSource, "LastPrayer", true)); this.lastPrayerPicker.Increment = new decimal(new int[] { 1000, 0, 0, 0 }); - this.lastPrayerPicker.Location = new Point(82, 394); + this.lastPrayerPicker.Location = new Point(82, 426); this.lastPrayerPicker.Maximum = new decimal(new int[] { 100000, 0, 0, 0 }); this.lastPrayerPicker.Name = "lastPrayerPicker"; this.lastPrayerPicker.Size = new Size(61, 23); @@ -867,7 +967,7 @@ namespace NethackHelper { // label1 // this.label1.AutoSize = true; - this.label1.Location = new Point(12, 367); + this.label1.Location = new Point(12, 399); this.label1.Name = "label1"; this.label1.Size = new Size(62, 15); this.label1.TabIndex = 16; @@ -876,7 +976,7 @@ namespace NethackHelper { // protectionPicker // this.protectionPicker.DataBindings.Add(new Binding("Value", this.propertiesBindingSource, "Protection", true)); - this.protectionPicker.Location = new Point(80, 365); + this.protectionPicker.Location = new Point(80, 397); this.protectionPicker.Maximum = new decimal(new int[] { 30, 0, 0, 0 }); this.protectionPicker.Name = "protectionPicker"; this.protectionPicker.Size = new Size(41, 23); @@ -1101,5 +1201,9 @@ namespace NethackHelper { private PropertyBox slowDigestionBox; private PropertyBox hungerBox; private CheckBox godAngryCheckbox; + private PropertyBox jumpingBox; + private PropertyBox waterWalkingBox; + private PropertyBox lifeSavingBox; + private PropertyBox flyingBox; } } \ No newline at end of file diff --git a/NethackHelper/MainForm.resx b/NethackHelper/MainForm.resx index 81c0c41..dbec451 100644 --- a/NethackHelper/MainForm.resx +++ b/NethackHelper/MainForm.resx @@ -123,15 +123,30 @@ False + + False + + + False + + + 17, 17 + + + 17, 17 + 416, 17 718, 17 + + 416, 17 + - AAEAAAD/////AQAAAAAAAAAMAgAAAEROZXRoYWNrSGVscGVyLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1 + AAEAAAD/////AQAAAAAAAAAMAgAAAEROZXRoYWNrSGVscGVyLCBWZXJzaW9uPTIuMS4wLjAsIEN1bHR1 cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbAQBAAAAeVN5c3RlbS5Db2xsZWN0aW9ucy5HZW5l cmljLkxpc3RgMVtbTmV0aGFja0hlbHBlci5JdGVtRGlzcGxheUNvbHVtbiwgTmV0aGFja0hlbHBlciwg Q3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1udWxsXV0DAAAABl9pdGVtcwVfc2l6ZQhfdmVy @@ -146,7 +161,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEROZXRoYWNrSGVscGVyLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1 + AAEAAAD/////AQAAAAAAAAAMAgAAAEROZXRoYWNrSGVscGVyLCBWZXJzaW9uPTIuMS4wLjAsIEN1bHR1 cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbAQBAAAAeVN5c3RlbS5Db2xsZWN0aW9ucy5HZW5l cmljLkxpc3RgMVtbTmV0aGFja0hlbHBlci5JdGVtRGlzcGxheUNvbHVtbiwgTmV0aGFja0hlbHBlciwg Q3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1udWxsXV0DAAAABl9pdGVtcwVfc2l6ZQhfdmVy @@ -162,7 +177,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEROZXRoYWNrSGVscGVyLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1 + AAEAAAD/////AQAAAAAAAAAMAgAAAEROZXRoYWNrSGVscGVyLCBWZXJzaW9uPTIuMS4wLjAsIEN1bHR1 cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbAQBAAAAeVN5c3RlbS5Db2xsZWN0aW9ucy5HZW5l cmljLkxpc3RgMVtbTmV0aGFja0hlbHBlci5JdGVtRGlzcGxheUNvbHVtbiwgTmV0aGFja0hlbHBlciwg Q3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1udWxsXV0DAAAABl9pdGVtcwVfc2l6ZQhfdmVy @@ -178,7 +193,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEROZXRoYWNrSGVscGVyLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1 + AAEAAAD/////AQAAAAAAAAAMAgAAAEROZXRoYWNrSGVscGVyLCBWZXJzaW9uPTIuMS4wLjAsIEN1bHR1 cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbAQBAAAAeVN5c3RlbS5Db2xsZWN0aW9ucy5HZW5l cmljLkxpc3RgMVtbTmV0aGFja0hlbHBlci5JdGVtRGlzcGxheUNvbHVtbiwgTmV0aGFja0hlbHBlciwg Q3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1udWxsXV0DAAAABl9pdGVtcwVfc2l6ZQhfdmVy @@ -193,7 +208,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEROZXRoYWNrSGVscGVyLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1 + AAEAAAD/////AQAAAAAAAAAMAgAAAEROZXRoYWNrSGVscGVyLCBWZXJzaW9uPTIuMS4wLjAsIEN1bHR1 cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbAQBAAAAeVN5c3RlbS5Db2xsZWN0aW9ucy5HZW5l cmljLkxpc3RgMVtbTmV0aGFja0hlbHBlci5JdGVtRGlzcGxheUNvbHVtbiwgTmV0aGFja0hlbHBlciwg Q3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1udWxsXV0DAAAABl9pdGVtcwVfc2l6ZQhfdmVy @@ -209,7 +224,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEROZXRoYWNrSGVscGVyLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1 + AAEAAAD/////AQAAAAAAAAAMAgAAAEROZXRoYWNrSGVscGVyLCBWZXJzaW9uPTIuMS4wLjAsIEN1bHR1 cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbAQBAAAAeVN5c3RlbS5Db2xsZWN0aW9ucy5HZW5l cmljLkxpc3RgMVtbTmV0aGFja0hlbHBlci5JdGVtRGlzcGxheUNvbHVtbiwgTmV0aGFja0hlbHBlciwg Q3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1udWxsXV0DAAAABl9pdGVtcwVfc2l6ZQhfdmVy @@ -225,7 +240,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEROZXRoYWNrSGVscGVyLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1 + AAEAAAD/////AQAAAAAAAAAMAgAAAEROZXRoYWNrSGVscGVyLCBWZXJzaW9uPTIuMS4wLjAsIEN1bHR1 cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbAQBAAAAeVN5c3RlbS5Db2xsZWN0aW9ucy5HZW5l cmljLkxpc3RgMVtbTmV0aGFja0hlbHBlci5JdGVtRGlzcGxheUNvbHVtbiwgTmV0aGFja0hlbHBlciwg Q3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1udWxsXV0DAAAABl9pdGVtcwVfc2l6ZQhfdmVy @@ -241,7 +256,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEROZXRoYWNrSGVscGVyLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1 + AAEAAAD/////AQAAAAAAAAAMAgAAAEROZXRoYWNrSGVscGVyLCBWZXJzaW9uPTIuMS4wLjAsIEN1bHR1 cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbAQBAAAAeVN5c3RlbS5Db2xsZWN0aW9ucy5HZW5l cmljLkxpc3RgMVtbTmV0aGFja0hlbHBlci5JdGVtRGlzcGxheUNvbHVtbiwgTmV0aGFja0hlbHBlciwg Q3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1udWxsXV0DAAAABl9pdGVtcwVfc2l6ZQhfdmVy @@ -254,15 +269,15 @@ AAAAAACPAAAAAQYAAAAFAAAAAfj////5////AQAAAC0AAAAL - - 17, 17 - 201, 17 606, 17 + + 718, 17 + diff --git a/NethackHelper/NethackHelper.csproj b/NethackHelper/NethackHelper.csproj index d5fbdc9..9b5050c 100644 --- a/NethackHelper/NethackHelper.csproj +++ b/NethackHelper/NethackHelper.csproj @@ -7,7 +7,7 @@ true disable icon.ico - 2.0.0 + 2.1.0 diff --git a/NethackHelper/SaveData.cs b/NethackHelper/SaveData.cs index 6c4c8eb..4e95c5d 100644 --- a/NethackHelper/SaveData.cs +++ b/NethackHelper/SaveData.cs @@ -184,6 +184,11 @@ public Property FreeAction { get; set; } public Property Hunger { get; set; } + public Property Jumping { get; set; } + public Property Flying { get; set; } + public Property LifeSaving { get; set; } + public Property WaterWalking { get; set; } + public int Protection { get; set; } public int LastPrayer { get; set; } public bool GodAngry { get; set; } diff --git a/NethackHelper/wwwroot/tracker.css b/NethackHelper/wwwroot/tracker.css index 2cc19b6..28a3434 100644 --- a/NethackHelper/wwwroot/tracker.css +++ b/NethackHelper/wwwroot/tracker.css @@ -81,3 +81,7 @@ img { --webkit-font-smoothing: antialiased; padding-top: 4px; } + +.prayer-timeout { + margin-left: 6px; +} diff --git a/NethackHelper/wwwroot/tracker.html b/NethackHelper/wwwroot/tracker.html index fe5ddaa..eb6b3f0 100644 --- a/NethackHelper/wwwroot/tracker.html +++ b/NethackHelper/wwwroot/tracker.html @@ -81,6 +81,11 @@
+