General cleanup

Masterplan/Controls/DeckGrid.cs

@@ -4,7 +4,6 @@
 using System.Windows.Forms;
 
 using Masterplan.Data;
-using Masterplan.Events;
 
 namespace Masterplan.Controls
 {

Masterplan/Controls/DiceGraphPanel.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
+
 using Masterplan.Tools;
 
 namespace Masterplan.Controls

Masterplan/Controls/DicePanel.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Drawing;
 using System.Windows.Forms;
 

Masterplan/Controls/Elements/EncounterPanel.cs

@@ -1,10 +1,7 @@
 using System;
-using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
 
-using Utils;
-
 using Masterplan.Data;
 using Masterplan.Tools;
 using Masterplan.UI;

Masterplan/Controls/Elements/RegionalMapPanel.cs

@@ -1,5 +1,4 @@
 using System;
-using System.ComponentModel;
 using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Drawing.Text;

Masterplan/Controls/Elements/SkillChallengePanel.cs

@@ -3,7 +3,6 @@
 using System.Windows.Forms;
 
 using Masterplan.Data;
-using Masterplan.Tools;
 using Masterplan.UI;
 
 namespace Masterplan.Controls

Masterplan/Controls/KeyAbilitiesPanel.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Windows.Forms;

Masterplan/Controls/LevelRangePanel.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Windows.Forms;
 
-using Utils;
-
 namespace Masterplan.Controls
 {
 	partial class LevelRangePanel : UserControl

Masterplan/Controls/LibraryHelpPanel.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Windows.Forms;
 
 using Masterplan.Tools;

Masterplan/Controls/TitlePanel.cs

@@ -5,7 +5,6 @@
 using System.Drawing.Imaging;
 using System.Drawing.Text;
 using System.Reflection;
-using System.Resources;
 using System.Windows.Forms;
 
 using Utils;

Masterplan/Controls/TokenPanel.cs

@@ -4,7 +4,6 @@
 
 using Masterplan.Data;
 using Masterplan.UI;
-using System.Drawing.Drawing2D;
 
 namespace Masterplan.Controls
 {

Masterplan/Data/AutoBuildData.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 
-using Masterplan.Tools;
-
 namespace Masterplan.Data
 {
 	/// <summary>

Masterplan/Data/Creature.cs

@@ -29,7 +29,7 @@ enum DetailsField
 	/// Class representing a creature.
 	/// </summary>
 	[Serializable]
-	public class Creature : ICreature, IComparable<Creature>
+	public class Creature : ICreature
 	{
 		/// <summary>
 		/// Default constructor.
@@ -431,16 +431,6 @@ public Image Image
 		}
 		Image fImage = null;
 
-		/// <summary>
-		/// Gets or sets the Compendium URL for the creature.
-		/// </summary>
-		public string URL
-		{
-			get { return fURL; }
-			set { fURL = value; }
-		}
-		string fURL = "";
-
 		/// <summary>
 		/// Level N [role]
 		/// </summary>
@@ -470,6 +460,15 @@ public string Phenotype
 			}
         }
 
+		/// <summary>
+		/// Gets a string representation of the creature.
+		/// </summary>
+		/// <returns>Returns the name of the creature, followed by level and role.</returns>
+		public override string ToString()
+		{
+			return fName + " (" + Info + ")";
+		}
+
 		/// <summary>
 		/// Creates a copy of the creature.
 		/// </summary>
@@ -527,26 +526,15 @@ public Creature Copy()
 
 			c.Image = fImage;
 
-			c.URL = fURL;
-
 			return c;
 		}
 
-		/// <summary>
-		/// Name (Info)
-		/// </summary>
-		/// <returns></returns>
-		public override string ToString()
-		{
-			return fName + " (" + Info + ")";
-		}
-
 		/// <summary>
 		/// Compares this creature to another.
 		/// </summary>
 		/// <param name="rhs">The other creature.</param>
 		/// <returns>Returns -1 if this creature should be sorted before the other, +1 if the other should be sorted before this; 0 otherwise.</returns>
-		public int CompareTo(Creature rhs)
+		public int CompareTo(ICreature rhs)
 		{
 			return fName.CompareTo(rhs.Name);
 		}

Masterplan/Data/CreaturePower.cs

@@ -1,11 +1,11 @@
 using System;
 using System.Collections.Generic;
-
-using Masterplan.Tools;
 using System.Drawing;
-using Masterplan.Properties;
 using System.IO;
 
+using Masterplan.Properties;
+using Masterplan.Tools;
+
 namespace Masterplan.Data
 {
 	#region Enumerations

Masterplan/Data/CustomCreature.cs

@@ -579,7 +579,7 @@ public string Phenotype
         }
 
 		/// <summary>
-		/// Gea string representation of the creature.
+		/// Gets a string representation of the creature.
 		/// </summary>
 		/// <returns>Returns the name of the creature.</returns>
 		public override string ToString()
@@ -645,5 +645,15 @@ public CustomCreature Copy()
 
 			return cc;
 		}
+
+		/// <summary>
+		/// Compares this creature to another.
+		/// </summary>
+		/// <param name="rhs">The other creature.</param>
+		/// <returns>Returns -1 if this creature should be sorted before the other, +1 if the other should be sorted before this; 0 otherwise.</returns>
+		public int CompareTo(ICreature rhs)
+		{
+			return fName.CompareTo(rhs.Name);
+		}
 	}
 }

Masterplan/Data/Difficulty.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace Masterplan.Data
+namespace Masterplan.Data
 {
 	/// <summary>
 	/// Difficulty level.

Masterplan/Data/Encounter.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 
-using Utils;
-
 using Masterplan.Tools;
 
 namespace Masterplan.Data

Masterplan/Data/EncounterCard.cs

@@ -2366,15 +2366,6 @@ public List<string> AsText(CombatData combat_data, CardMode mode, bool full)
 					content.Add("</TR>");
 				}
 
-				if ((c != null) && (c.URL != ""))
-				{
-					content.Add("<TR>");
-					content.Add("<TD colspan=3>");
-					content.Add("Copyright <A href=\"" + c.URL + "\">Wizards of the Coast</A> 2010");
-					content.Add("</TD>");
-					content.Add("</TR>");
-				}
-
 				#endregion
 			}
 

Masterplan/Data/EncounterLog.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+
 using Utils;
 
 namespace Masterplan.Data

Masterplan/Data/Encyclopedia.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Drawing;
-using System.Xml.Serialization;
 using System.IO;
-using System.ComponentModel;
+using System.Xml.Serialization;
 
 namespace Masterplan.Data
 {