cleaning

Unknown · Unknown · commit 97d7d964d948 · 2019-07-21T10:30:54.000-04:00
diff --git a/Base/Base/Data_Classes/Character.cs b/Base/Base/Data_Classes/Character.cs
@@ -621,24 +621,22 @@ int GetFirstAvailableSlotLevel(int iLevel = 0)
 
         public int SlotCheck(PowerEntry power)
         {
-            int num1;
             if (power.Power == null || !this.CanPlaceSlot || power.SlotCount > 5)
-                num1 = -1;
+                return -1;
             else if (!DatabaseAPI.Database.Power[power.NIDPower].Slottable)
             {
-                num1 = -1;
+                return -1;
             }
             else
             {
                 int iLevel = power.Level;
                 if (DatabaseAPI.Database.Power[power.NIDPower].AllowFrontLoading)
                     iLevel = 0;
-                int num2 = this.GetFirstAvailableSlotLevel(iLevel);
-                if (MidsContext.Config.BuildMode == Enums.dmModes.LevelUp && num2 > this.CurrentBuild.GetMaxLevel() + 1)
-                    num2 = -1;
-                num1 = num2;
+                int firstAvailable = this.GetFirstAvailableSlotLevel(iLevel);
+                if (MidsContext.Config.BuildMode == Enums.dmModes.LevelUp && firstAvailable > this.CurrentBuild.GetMaxLevel() + 1)
+                    firstAvailable = -1;
+                return firstAvailable;
             }
-            return num1;
         }
 
         public int[] GetSlotCounts()
diff --git a/Base/ConfigData.cs b/Base/ConfigData.cs
diff --git a/Base/Extensions.cs b/Base/Extensions.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -9,6 +10,9 @@ namespace Base
 {
     public static class Extensions
     {
+        public static Color ReadRGB(this BinaryReader reader)
+            => Color.FromArgb(reader.ReadByte(), reader.ReadByte(), reader.ReadByte());
+ 
         //public static T[] Append<T>(this T[] source, T item)
         //{
         //    var next = new T[source.Length + 1];
diff --git a/Hero Designer/Extensions.cs b/Hero Designer/Extensions.cs
@@ -17,6 +17,7 @@ public class ListBoxT<T>
         public ListBoxT(ListBox lb) => this._lb = lb;
 
     }
+
     public class ComboBoxT<T>
     {
         readonly ComboBox _cb;
@@ -67,9 +68,7 @@ public static void ExecuteWithCatchMessage(this Action f, string titlingOpt = nu
         // this could be chained indefinitely so... be careful with it
         // defer the execution until later
         public static Action WithCatchMessage(this Action f, string titling, string captionOpt = null)
-        {
-            return () => ExecuteWithCatchMessage(f, titling, captionOpt);
-        }
+            => () => ExecuteWithCatchMessage(f, titling, captionOpt);
 
         // does not handle the possibility this is a child control, and a parent is in design mode
         public static bool IsInDesignMode(this Control c) => LicenseManager.UsageMode == LicenseUsageMode.Designtime || c?.Site?.DesignMode == true;
diff --git a/Hero Designer/Forms/DataView.cs b/Hero Designer/Forms/DataView.cs
@@ -1030,7 +1030,7 @@ void DisplayFlippedEnhancements()
                                 Bounds.Y -= 3f;
                                 Bounds.Height = Control.DefaultFont.GetHeight(this.bxFlip.Graphics);
                                 Graphics graphics2 = this.bxFlip.Graphics;
-                                clsDrawX.DrawOutlineText(Conversions.ToString(MidsContext.Character.CurrentBuild.Powers[inToonHistory].Slots[index].Enhancement.IOLevel + 1), Bounds, Color.Cyan, Color.FromArgb(128, 0, 0, 0), this.pnlEnhActive.Font, 1f, ref graphics2, false, false);
+                                clsDrawX.DrawOutlineText(Conversions.ToString(MidsContext.Character.CurrentBuild.Powers[inToonHistory].Slots[index].Enhancement.IOLevel + 1), Bounds, Color.Cyan, Color.FromArgb(128, 0, 0, 0), this.pnlEnhActive.Font, 1f, graphics2, false, false);
                             }
                             else if (MidsContext.Config.ShowEnhRel & (DatabaseAPI.Database.Enhancements[MidsContext.Character.CurrentBuild.Powers[inToonHistory].Slots[index].Enhancement.Enh].TypeID == Enums.eType.Normal | DatabaseAPI.Database.Enhancements[MidsContext.Character.CurrentBuild.Powers[inToonHistory].Slots[index].Enhancement.Enh].TypeID == Enums.eType.SpecialO))
                             {
@@ -1039,7 +1039,7 @@ void DisplayFlippedEnhancements()
                                 Bounds.Height = Control.DefaultFont.GetHeight(this.bxFlip.Graphics);
                                 Color Text = MidsContext.Character.CurrentBuild.Powers[inToonHistory].Slots[index].Enhancement.RelativeLevel != Enums.eEnhRelative.None ? (MidsContext.Character.CurrentBuild.Powers[inToonHistory].Slots[index].Enhancement.RelativeLevel >= Enums.eEnhRelative.Even ? (MidsContext.Character.CurrentBuild.Powers[inToonHistory].Slots[index].Enhancement.RelativeLevel <= Enums.eEnhRelative.Even ? Color.White : Color.FromArgb(0, (int)byte.MaxValue, (int)byte.MaxValue)) : Color.Yellow) : Color.Red;
                                 Graphics graphics2 = this.bxFlip.Graphics;
-                                clsDrawX.DrawOutlineText(Enums.GetRelativeString(MidsContext.Character.CurrentBuild.Powers[inToonHistory].Slots[index].Enhancement.RelativeLevel, MidsContext.Config.ShowRelSymbols), Bounds, Text, Color.FromArgb(128, 0, 0, 0), this.pnlEnhActive.Font, 1f, ref graphics2, false, false);
+                                clsDrawX.DrawOutlineText(Enums.GetRelativeString(MidsContext.Character.CurrentBuild.Powers[inToonHistory].Slots[index].Enhancement.RelativeLevel, MidsContext.Config.ShowRelSymbols), Bounds, Text, Color.FromArgb(128, 0, 0, 0), this.pnlEnhActive.Font, 1f, graphics2, false, false);
                             }
                         }
                     }
@@ -1060,7 +1060,7 @@ void DisplayFlippedEnhancements()
                                 Bounds.Y -= 3f;
                                 Bounds.Height = Control.DefaultFont.GetHeight(this.bxFlip.Graphics);
                                 Graphics graphics2 = this.bxFlip.Graphics;
-                                clsDrawX.DrawOutlineText(Conversions.ToString(MidsContext.Character.CurrentBuild.Powers[inToonHistory].Slots[index].FlippedEnhancement.IOLevel + 1), Bounds, Color.Cyan, Color.FromArgb(128, 0, 0, 0), this.pnlEnhActive.Font, 1f, ref graphics2, false, false);
+                                clsDrawX.DrawOutlineText(Conversions.ToString(MidsContext.Character.CurrentBuild.Powers[inToonHistory].Slots[index].FlippedEnhancement.IOLevel + 1), Bounds, Color.Cyan, Color.FromArgb(128, 0, 0, 0), this.pnlEnhActive.Font, 1f, graphics2, false, false);
                             }
                             else if (MidsContext.Config.ShowEnhRel & (DatabaseAPI.Database.Enhancements[MidsContext.Character.CurrentBuild.Powers[inToonHistory].Slots[index].FlippedEnhancement.Enh].TypeID == Enums.eType.Normal | DatabaseAPI.Database.Enhancements[MidsContext.Character.CurrentBuild.Powers[inToonHistory].Slots[index].FlippedEnhancement.Enh].TypeID == Enums.eType.SpecialO))
                             {
@@ -1069,7 +1069,7 @@ void DisplayFlippedEnhancements()
                                 Bounds.Height = Control.DefaultFont.GetHeight(this.bxFlip.Graphics);
                                 Color Text = MidsContext.Character.CurrentBuild.Powers[inToonHistory].Slots[index].FlippedEnhancement.RelativeLevel != Enums.eEnhRelative.None ? (MidsContext.Character.CurrentBuild.Powers[inToonHistory].Slots[index].FlippedEnhancement.RelativeLevel >= Enums.eEnhRelative.Even ? (MidsContext.Character.CurrentBuild.Powers[inToonHistory].Slots[index].FlippedEnhancement.RelativeLevel <= Enums.eEnhRelative.Even ? Color.White : Color.FromArgb(0, (int)byte.MaxValue, (int)byte.MaxValue)) : Color.Yellow) : Color.Red;
                                 Graphics graphics2 = this.bxFlip.Graphics;
-                                clsDrawX.DrawOutlineText(Enums.GetRelativeString(MidsContext.Character.CurrentBuild.Powers[inToonHistory].Slots[index].FlippedEnhancement.RelativeLevel, MidsContext.Config.ShowRelSymbols), Bounds, Text, Color.FromArgb(128, 0, 0, 0), this.pnlEnhActive.Font, 1f, ref graphics2, false, false);
+                                clsDrawX.DrawOutlineText(Enums.GetRelativeString(MidsContext.Character.CurrentBuild.Powers[inToonHistory].Slots[index].FlippedEnhancement.RelativeLevel, MidsContext.Config.ShowRelSymbols), Bounds, Text, Color.FromArgb(128, 0, 0, 0), this.pnlEnhActive.Font, 1f, graphics2, false, false);
                             }
                         }
                     }
diff --git a/Hero Designer/Forms/WindowMenuItems/frmTotals.cs b/Hero Designer/Forms/WindowMenuItems/frmTotals.cs
@@ -152,7 +152,7 @@ void PbClosePaint(object sender, PaintEventArgs e)
             float height2 = bFont.GetHeight(e.Graphics) + 2f;
             RectangleF Bounds = new RectangleF(0.0f, (float)(((double)this.tab0.Height - (double)height2) / 2.0), (float)this.tab0.Width, height2);
             Graphics graphics = extendedBitmap.Graphics;
-            clsDrawX.DrawOutlineText(iStr, Bounds, Color.WhiteSmoke, Color.FromArgb(192, 0, 0, 0), bFont, 1f, ref graphics, false, false);
+            clsDrawX.DrawOutlineText(iStr, Bounds, Color.WhiteSmoke, Color.FromArgb(192, 0, 0, 0), bFont, 1f, graphics, false, false);
             e.Graphics.DrawImage((Image)extendedBitmap.Bitmap, 0, 0);
         }
 
@@ -186,7 +186,7 @@ void PbTopMostPaint(object sender, PaintEventArgs e)
             float height = bFont.GetHeight(e.Graphics) + 2f;
             RectangleF Bounds = new RectangleF(0.0f, (float)(((double)this.tab0.Height - (double)height) / 2.0), (float)this.tab0.Width, height);
             Graphics graphics = extendedBitmap.Graphics;
-            clsDrawX.DrawOutlineText(iStr, Bounds, Color.WhiteSmoke, Color.FromArgb(192, 0, 0, 0), bFont, 1f, ref graphics, false, false);
+            clsDrawX.DrawOutlineText(iStr, Bounds, Color.WhiteSmoke, Color.FromArgb(192, 0, 0, 0), bFont, 1f, graphics, false, false);
             e.Graphics.DrawImage((Image)extendedBitmap.Bitmap, 0, 0);
         }
 
@@ -406,7 +406,7 @@ void TabPaint(ref PictureBox iTab, PaintEventArgs e, string iString, bool iState
             float height = bFont.GetHeight(e.Graphics) + 2f;
             RectangleF Bounds = new RectangleF(0.0f, (float)(((double)this.tab0.Height - (double)height) / 2.0), (float)this.tab0.Width, height);
             Graphics graphics = extendedBitmap.Graphics;
-            clsDrawX.DrawOutlineText(iString, Bounds, Color.WhiteSmoke, Color.FromArgb(192, 0, 0, 0), bFont, 1f, ref graphics, false, false);
+            clsDrawX.DrawOutlineText(iString, Bounds, Color.WhiteSmoke, Color.FromArgb(192, 0, 0, 0), bFont, 1f, graphics, false, false);
             e.Graphics.DrawImage((Image)extendedBitmap.Bitmap, 0, 0);
         }
 
diff --git a/Hero Designer/Forms/frmMain.cs b/Hero Designer/Forms/frmMain.cs
@@ -25,7 +25,6 @@ public partial class frmMain : Form
     {
         #region "fields"
 
-        bool remember;
         Rectangle ActivePopupBounds;
         bool DataViewLocked;
         readonly short[] ddsa;
@@ -5238,7 +5237,7 @@ void UpdateDMBuffer()
             float height2 = bFont.GetHeight(this.dmBuffer.Graphics) + 2f;
             RectangleF Bounds = new RectangleF(0.0f, (float)(((double)this.pbDynMode.Height - (double)height2) / 2.0), (float)this.pbDynMode.Width, height2);
             Graphics graphics = this.dmBuffer.Graphics;
-            clsDrawX.DrawOutlineText(iStr, Bounds, Color.WhiteSmoke, Color.FromArgb(192, 0, 0, 0), bFont, 1f, ref graphics, false, false);
+            clsDrawX.DrawOutlineText(iStr, Bounds, Color.WhiteSmoke, Color.FromArgb(192, 0, 0, 0), bFont, 1f, graphics, false, false);
         }
 
         void UpdateDynamicModeInfo()
diff --git a/Hero Designer/clsToonX.cs b/Hero Designer/clsToonX.cs
@@ -1204,8 +1204,8 @@ public void GenerateBuffedPowerArray()
             this._selfBuffs.Reset();
             this._selfEnhance.Reset();
             this.ModifyEffects = new Dictionary<string, float>();
-            this._buffedPower = new IPower[this.CurrentBuild.Powers.Count - 1 + 1];
-            this._mathPower = new IPower[this.CurrentBuild.Powers.Count - 1 + 1];
+            this._buffedPower = new IPower[this.CurrentBuild.Powers.Count];
+            this._mathPower = new IPower[this.CurrentBuild.Powers.Count];
             this.GBPA_Pass0_InitializePowerArray();
             this.GenerateModifyEffectsArray();
             this.GenerateBuffData(ref this._selfEnhance, true);
diff --git a/midsControls/ListLabelV2.cs b/midsControls/ListLabelV2.cs
diff --git a/midsControls/clsDrawX.cs b/midsControls/clsDrawX.cs

Original file line number	Diff line number	Diff line change
`@@ -621,24 +621,22 @@ int GetFirstAvailableSlotLevel(int iLevel = 0)`
`621`	`621`
`622`	`622`	`public int SlotCheck(PowerEntry power)`
`623`	`623`	`{`
`624`		`- int num1;`
`625`	`624`	`if (power.Power == null \|\| !this.CanPlaceSlot \|\| power.SlotCount > 5)`
`626`		`- num1 = -1;`
	`625`	`+ return -1;`
`627`	`626`	`else if (!DatabaseAPI.Database.Power[power.NIDPower].Slottable)`
`628`	`627`	`{`
`629`		`- num1 = -1;`
	`628`	`+ return -1;`
`630`	`629`	`}`
`631`	`630`	`else`
`632`	`631`	`{`
`633`	`632`	`int iLevel = power.Level;`
`634`	`633`	`if (DatabaseAPI.Database.Power[power.NIDPower].AllowFrontLoading)`
`635`	`634`	`iLevel = 0;`
`636`		`- int num2 = this.GetFirstAvailableSlotLevel(iLevel);`
`637`		`- if (MidsContext.Config.BuildMode == Enums.dmModes.LevelUp && num2 > this.CurrentBuild.GetMaxLevel() + 1)`
`638`		`- num2 = -1;`
`639`		`- num1 = num2;`
	`635`	`+ int firstAvailable = this.GetFirstAvailableSlotLevel(iLevel);`
	`636`	`+ if (MidsContext.Config.BuildMode == Enums.dmModes.LevelUp && firstAvailable > this.CurrentBuild.GetMaxLevel() + 1)`
	`637`	`+ firstAvailable = -1;`
	`638`	`+ return firstAvailable;`
`640`	`639`	`}`
`641`		`- return num1;`
`642`	`640`	`}`
`643`	`641`
`644`	`642`	`public int[] GetSlotCounts()`
Original file line number	Diff line number	Diff line change
`@@ -1030,7 +1030,7 @@ void DisplayFlippedEnhancements()`
`1030`	`1030`	`Bounds.Y -= 3f;`
`1031`	`1031`	`Bounds.Height = Control.DefaultFont.GetHeight(this.bxFlip.Graphics);`
`1032`	`1032`	`Graphics graphics2 = this.bxFlip.Graphics;`
`1033`		`- clsDrawX.DrawOutlineText(Conversions.ToString(MidsContext.Character.CurrentBuild.Powers[inToonHistory].Slots[index].Enhancement.IOLevel + 1), Bounds, Color.Cyan, Color.FromArgb(128, 0, 0, 0), this.pnlEnhActive.Font, 1f, ref graphics2, false, false);`
	`1033`	`+ clsDrawX.DrawOutlineText(Conversions.ToString(MidsContext.Character.CurrentBuild.Powers[inToonHistory].Slots[index].Enhancement.IOLevel + 1), Bounds, Color.Cyan, Color.FromArgb(128, 0, 0, 0), this.pnlEnhActive.Font, 1f, graphics2, false, false);`
`1034`	`1034`	`}`
`1035`	`1035`	`else if (MidsContext.Config.ShowEnhRel & (DatabaseAPI.Database.Enhancements[MidsContext.Character.CurrentBuild.Powers[inToonHistory].Slots[index].Enhancement.Enh].TypeID == Enums.eType.Normal \| DatabaseAPI.Database.Enhancements[MidsContext.Character.CurrentBuild.Powers[inToonHistory].Slots[index].Enhancement.Enh].TypeID == Enums.eType.SpecialO))`
`1036`	`1036`	`{`
`@@ -1039,7 +1039,7 @@ void DisplayFlippedEnhancements()`
`1039`	`1039`	`Bounds.Height = Control.DefaultFont.GetHeight(this.bxFlip.Graphics);`
`1040`	`1040`	`Color Text = MidsContext.Character.CurrentBuild.Powers[inToonHistory].Slots[index].Enhancement.RelativeLevel != Enums.eEnhRelative.None ? (MidsContext.Character.CurrentBuild.Powers[inToonHistory].Slots[index].Enhancement.RelativeLevel >= Enums.eEnhRelative.Even ? (MidsContext.Character.CurrentBuild.Powers[inToonHistory].Slots[index].Enhancement.RelativeLevel <= Enums.eEnhRelative.Even ? Color.White : Color.FromArgb(0, (int)byte.MaxValue, (int)byte.MaxValue)) : Color.Yellow) : Color.Red;`
`1041`	`1041`	`Graphics graphics2 = this.bxFlip.Graphics;`
`1042`		`- clsDrawX.DrawOutlineText(Enums.GetRelativeString(MidsContext.Character.CurrentBuild.Powers[inToonHistory].Slots[index].Enhancement.RelativeLevel, MidsContext.Config.ShowRelSymbols), Bounds, Text, Color.FromArgb(128, 0, 0, 0), this.pnlEnhActive.Font, 1f, ref graphics2, false, false);`
	`1042`	`+ clsDrawX.DrawOutlineText(Enums.GetRelativeString(MidsContext.Character.CurrentBuild.Powers[inToonHistory].Slots[index].Enhancement.RelativeLevel, MidsContext.Config.ShowRelSymbols), Bounds, Text, Color.FromArgb(128, 0, 0, 0), this.pnlEnhActive.Font, 1f, graphics2, false, false);`
`1043`	`1043`	`}`
`1044`	`1044`	`}`
`1045`	`1045`	`}`
`@@ -1060,7 +1060,7 @@ void DisplayFlippedEnhancements()`
`1060`	`1060`	`Bounds.Y -= 3f;`
`1061`	`1061`	`Bounds.Height = Control.DefaultFont.GetHeight(this.bxFlip.Graphics);`
`1062`	`1062`	`Graphics graphics2 = this.bxFlip.Graphics;`
`1063`		`- clsDrawX.DrawOutlineText(Conversions.ToString(MidsContext.Character.CurrentBuild.Powers[inToonHistory].Slots[index].FlippedEnhancement.IOLevel + 1), Bounds, Color.Cyan, Color.FromArgb(128, 0, 0, 0), this.pnlEnhActive.Font, 1f, ref graphics2, false, false);`
	`1063`	`+ clsDrawX.DrawOutlineText(Conversions.ToString(MidsContext.Character.CurrentBuild.Powers[inToonHistory].Slots[index].FlippedEnhancement.IOLevel + 1), Bounds, Color.Cyan, Color.FromArgb(128, 0, 0, 0), this.pnlEnhActive.Font, 1f, graphics2, false, false);`
`1064`	`1064`	`}`
`1065`	`1065`	`else if (MidsContext.Config.ShowEnhRel & (DatabaseAPI.Database.Enhancements[MidsContext.Character.CurrentBuild.Powers[inToonHistory].Slots[index].FlippedEnhancement.Enh].TypeID == Enums.eType.Normal \| DatabaseAPI.Database.Enhancements[MidsContext.Character.CurrentBuild.Powers[inToonHistory].Slots[index].FlippedEnhancement.Enh].TypeID == Enums.eType.SpecialO))`
`1066`	`1066`	`{`
`@@ -1069,7 +1069,7 @@ void DisplayFlippedEnhancements()`
`1069`	`1069`	`Bounds.Height = Control.DefaultFont.GetHeight(this.bxFlip.Graphics);`
`1070`	`1070`	Color Text = MidsContext.Character.CurrentBuild.Powers[inToonHistory].Slots[index].FlippedEnhancement.RelativeLevel != Enums.eEnhRelative.None ? (MidsContext.Character.CurrentBuild.Powers[inToonHistory].Slots[index].FlippedEnhancement.RelativeLevel >= Enums.eEnhRelative.Even ? (MidsContext.Character.CurrentBuild.Powers[inToonHistory].Slots[index].FlippedEnhancement.RelativeLevel <= Enums.eEnhRelative.Even ? Color.White : Color.FromArgb(0, (int)byte.MaxValue, (int)byte.MaxValue)) : Color.Yellow) : Color.Red;
`1071`	`1071`	`Graphics graphics2 = this.bxFlip.Graphics;`
`1072`		`- clsDrawX.DrawOutlineText(Enums.GetRelativeString(MidsContext.Character.CurrentBuild.Powers[inToonHistory].Slots[index].FlippedEnhancement.RelativeLevel, MidsContext.Config.ShowRelSymbols), Bounds, Text, Color.FromArgb(128, 0, 0, 0), this.pnlEnhActive.Font, 1f, ref graphics2, false, false);`
	`1072`	`+ clsDrawX.DrawOutlineText(Enums.GetRelativeString(MidsContext.Character.CurrentBuild.Powers[inToonHistory].Slots[index].FlippedEnhancement.RelativeLevel, MidsContext.Config.ShowRelSymbols), Bounds, Text, Color.FromArgb(128, 0, 0, 0), this.pnlEnhActive.Font, 1f, graphics2, false, false);`
`1073`	`1073`	`}`
`1074`	`1074`	`}`
`1075`	`1075`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ public partial class frmMain : Form`
`25`	`25`	`{`
`26`	`26`	`#region "fields"`
`27`	`27`
`28`		`- bool remember;`
`29`	`28`	`Rectangle ActivePopupBounds;`
`30`	`29`	`bool DataViewLocked;`
`31`	`30`	`readonly short[] ddsa;`
`@@ -5238,7 +5237,7 @@ void UpdateDMBuffer()`
`5238`	`5237`	`float height2 = bFont.GetHeight(this.dmBuffer.Graphics) + 2f;`
`5239`	`5238`	`RectangleF Bounds = new RectangleF(0.0f, (float)(((double)this.pbDynMode.Height - (double)height2) / 2.0), (float)this.pbDynMode.Width, height2);`
`5240`	`5239`	`Graphics graphics = this.dmBuffer.Graphics;`
`5241`		`- clsDrawX.DrawOutlineText(iStr, Bounds, Color.WhiteSmoke, Color.FromArgb(192, 0, 0, 0), bFont, 1f, ref graphics, false, false);`
	`5240`	`+ clsDrawX.DrawOutlineText(iStr, Bounds, Color.WhiteSmoke, Color.FromArgb(192, 0, 0, 0), bFont, 1f, graphics, false, false);`
`5242`	`5241`	`}`
`5243`	`5242`
`5244`	`5243`	`void UpdateDynamicModeInfo()`