Cleanup: minor code changes; readme update; .gitignore update.

Author: AsYlum-

.gitignore

@@ -1,7 +1,7 @@
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 ##
-## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
 
 # User-specific files
 *.rsuser
@@ -23,6 +23,7 @@ mono_crash.*
 [Rr]eleases/
 x64/
 x86/
+[Ww][Ii][Nn]32/
 [Aa][Rr][Mm]/
 [Aa][Rr][Mm]64/
 bld/
@@ -61,6 +62,9 @@ project.lock.json
 project.fragment.lock.json
 artifacts/
 
+# ASP.NET Scaffolding
+ScaffoldingReadMe.txt
+
 # StyleCop
 StyleCopReport.xml
 
@@ -86,6 +90,7 @@ StyleCopReport.xml
 *.tmp_proj
 *_wpftmp.csproj
 *.log
+*.tlog
 *.vspscc
 *.vssscc
 .builds
@@ -137,6 +142,11 @@ _TeamCity*
 .axoCover/*
 !.axoCover/settings.json
 
+# Coverlet is a free, cross platform Code Coverage Tool
+coverage*.json
+coverage*.xml
+coverage*.info
+
 # Visual Studio code coverage results
 *.coverage
 *.coveragexml
@@ -284,6 +294,17 @@ node_modules/
 # Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
 *.vbw
 
+# Visual Studio 6 auto-generated project file (contains which files were open etc.)
+*.vbp
+
+# Visual Studio 6 workspace and project file (working project files containing files to include in project)
+*.dsw
+*.dsp
+
+# Visual Studio 6 technical files
+*.ncb
+*.aps
+
 # Visual Studio LightSwitch build output
 **/*.HTMLClient/GeneratedArtifacts
 **/*.DesktopClient/GeneratedArtifacts
@@ -340,6 +361,9 @@ ASALocalRun/
 # Local History for Visual Studio
 .localhistory/
 
+# Visual Studio History (VSHistory) files
+.vshistory/
+
 # BeatPulse healthcheck temp database
 healthchecksdb
 
@@ -349,8 +373,28 @@ MigrationBackup/
 # Ionide (cross platform F# VS Code tools) working folder
 .ionide/
 
-# SonarQube
-.sonarqube/
-
+# Fody - auto-generated XML schema
+FodyWeavers.xsd
+
+# VS Code files for those working on multiple tools
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+*.code-workspace
+
+# Local History for Visual Studio Code
+.history/
+
+# Windows Installer files from build outputs
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# JetBrains Rider
+*.sln.iml
 # Jetbrains Rider IDE
 .idea/

README.md

@@ -1,8 +1,16 @@
-## UO Fiddler
+# UO Fiddler
+
+## About
+
+UOFiddler based on Ultima SDK it's a tool to view and alter almost every UO 2D client file. Source code is released under the Beerware license.
+
+## Requirements
 
 Requires .NET Framework 4.8
 You can download it at: <https://dotnet.microsoft.com/download/dotnet-framework>
 
 Minimum supported Windows version is 7.
 
+## Reporting bugs and issues
+
 Please report bugs or problems on [issues](https://github.com/polserver/UOFiddler/issues) page.

UoFiddler.Controls/Forms/AnimationEditForm.cs

@@ -59,7 +59,7 @@ public AnimationEditForm()
             _loaded = false;
         }
 
-        private string[][] AnimNames =
+        private readonly string[][] _animNames =
         {
             new string[]
             {
@@ -170,7 +170,7 @@ private void OnLoad(object sender, EventArgs e)
                             TreeNode treeNode = new TreeNode
                             {
                                 Tag = j,
-                                Text = string.Format("{0:D2} {1}", j, AnimNames[animLength == 22 ? 1 : animLength == 13 ? 0 : 2][j])
+                                Text = string.Format("{0:D2} {1}", j, _animNames[animLength == 22 ? 1 : animLength == 13 ? 0 : 2][j])
                         };
 
                             if (AnimationEdit.IsActionDefined(_fileType, i, j))

UoFiddler.Controls/Forms/HueEditForm.cs

@@ -14,13 +14,11 @@
 using System.Windows.Forms;
 using Ultima;
 using UoFiddler.Controls.Classes;
-using UoFiddler.Controls.UserControls;
 
 namespace UoFiddler.Controls.Forms
 {
     public partial class HueEditForm : Form
     {
-        //private readonly HuesControl _refMarker; // TODO: unused? 
         private readonly Hue _hue;
         private readonly short[] _colors;
         private int _selected;
@@ -52,12 +50,11 @@ private int SecondSelected
             }
         }
 
-        public HueEditForm(int index, HuesControl mRefMarker)
+        public HueEditForm(int index)
         {
             InitializeComponent();
             Icon = Options.GetFiddlerIcon();
 
-            //_refMarker = mRefMarker;
             Text = $"HueEdit {index} / 0x{index:X}";
 
             _hue = Hues.GetHue(index);
@@ -177,7 +174,9 @@ private void OnClickSpread(object sender, EventArgs e)
 
                 _colors[start + i] = Hues.ColorToHue(newC);
             }
+
             pictureBox.Invalidate();
+
             RefreshPreview();
         }
 
@@ -190,6 +189,7 @@ private void OnClickEpxGradient(object sender, EventArgs e)
 
             int start = Math.Min(SecondSelected, Selected);
             int end = Math.Max(SecondSelected, Selected);
+
             int diff = end - start;
             if (diff <= 1)
             {
@@ -198,9 +198,11 @@ private void OnClickEpxGradient(object sender, EventArgs e)
 
             Color startColor = Hues.HueToColor(_colors[start]);
             Color endColor = Hues.HueToColor(_colors[end]);
+
             double redDiv = Math.Log(Math.Abs(endColor.R - startColor.R), Math.E) / Math.Log(diff, Math.E);
             double greenDiv = Math.Log(Math.Abs(endColor.G - startColor.G), Math.E) / Math.Log(diff, Math.E);
             double blueDiv = Math.Log(Math.Abs(endColor.B - startColor.B), Math.E) / Math.Log(diff, Math.E);
+
             int redFac = 1;
             if (endColor.R - startColor.R < 0)
             {
@@ -225,9 +227,12 @@ private void OnClickEpxGradient(object sender, EventArgs e)
                     (int)(startColor.R + (redFac * Math.Pow(i, redDiv))),
                     (int)(startColor.G + (greenFac * Math.Pow(i, greenDiv))),
                     (int)(startColor.B + (blueFac * Math.Pow(i, blueDiv))));
+
                 _colors[start + i] = Hues.ColorToHue(newColor);
             }
+
             pictureBox.Invalidate();
+
             RefreshPreview();
         }
 
@@ -240,6 +245,7 @@ private void OnClickInverse(object sender, EventArgs e)
 
             int start = Math.Min(SecondSelected, Selected);
             int end = Math.Max(SecondSelected, Selected);
+
             while (start < end)
             {
                 short temp = _colors[start];
@@ -248,7 +254,9 @@ private void OnClickInverse(object sender, EventArgs e)
                 ++start;
                 --end;
             }
+
             Selected = _selected;
+
             RefreshPreview();
         }
 
@@ -261,6 +269,7 @@ private void OnClickModifyRange(object sender, EventArgs e)
 
             int start = Math.Min(SecondSelected, Selected);
             int end = Math.Max(SecondSelected, Selected);
+
             for (int i = start; i <= end; ++i)
             {
                 Color color = Hues.HueToColor(_colors[i]);
@@ -273,7 +282,9 @@ private void OnClickModifyRange(object sender, EventArgs e)
                     Math.Max(0, Math.Min(255, b)));
                 _colors[i] = Hues.ColorToHue(newColor);
             }
+
             Selected = _selected;
+
             RefreshPreview();
         }
 
@@ -307,7 +318,9 @@ private void OnKeyDownArt(object sender, KeyEventArgs e)
             }
 
             contextMenuStrip1.Close();
+
             _preview = Art.GetStatic(index);
+
             RefreshPreview();
         }
 
@@ -336,14 +349,18 @@ private void OnKeyDownAnim(object sender, KeyEventArgs e)
             }
 
             contextMenuStrip1.Close();
+
             int hueRef = 0;
+
             AnimationFrame[] frames = Animations.GetAnimation(index, 0, 1, ref hueRef, false, true);
+
             if (frames == null)
             {
                 return;
             }
 
             _preview = frames[0].Bitmap;
+
             RefreshPreview();
         }
 
@@ -377,7 +394,9 @@ private void OnKeyDownGump(object sender, KeyEventArgs e)
             }
 
             contextMenuStrip1.Close();
+
             _preview = Gumps.GetGump(index);
+
             RefreshPreview();
         }
 
@@ -399,13 +418,15 @@ private void RefreshPreview()
                     g.DrawImage(bmp, x, y);
                 }
             }
+
             pictureBoxPreview.Invalidate();
         }
 
         private void SetColorButton_Click(object sender, EventArgs e)
         {
-            _colors[_selected] = Hues.ColorToHue(Color.FromArgb((int)numericUpDownR.Value, (int)numericUpDownG.Value,
-                (int)numericUpDownB.Value));
+            _colors[_selected] = Hues.ColorToHue(Color.FromArgb((int)numericUpDownR.Value,
+                                                                (int)numericUpDownG.Value,
+                                                                (int)numericUpDownB.Value));
 
             pictureBox.Invalidate();
             pictureBoxIndex.Invalidate();

UoFiddler.Controls/UserControls/HuesControl.cs

@@ -228,7 +228,7 @@ private void OnMouseDoubleClick(object sender, MouseEventArgs e)
 
             if (Selected >= 0)
             {
-                new HueEditForm(Selected, _refMarker).Show();
+                new HueEditForm(Selected).Show();
             }
         }