Revert progress of #6, #10, #16 and #12 so dev is clean again.

The code has been pushed to "6-save-import-characters"

Models/Character.cs → Character.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace CombatTracker.Models
+namespace CombatTracker
 {
 
     public enum Conditions
@@ -40,7 +40,7 @@ public class Character : IComparable<Character>
 
         public List<Conditions> Conditions { get; set; }
 
-        public Character(string name, short initiative, short fail, short success, List<Conditions> conditions, short? maxHP, short? HP, short? tempHP)
+        public Character(string name, short initiative, short? maxHP, short? HP, short? tempHP, short fail, short success, List<Conditions> conditions)
         {
             Name = name;
             Initiative = initiative;
@@ -52,10 +52,9 @@ public Character(string name, short initiative, short fail, short success, List<
             Conditions = conditions;
         }
 
-        public Character() { }
-
         public override string ToString()
         {
+            //Determine if the HP part should be shown or not:
             if (HP.HasValue)
             {
                 return $"({Initiative})\t{Name}\tHP:{HP}";
@@ -65,7 +64,7 @@ public override string ToString()
 
         public int CompareTo(Character other)
         {
-            return Initiative < other.Initiative ? -1 : (-Initiative == other.Initiative) ? 0 : 1;
+            return this.Initiative < other.Initiative ? -1 : (this.Initiative == other.Initiative) ? 0 : 1;
         }
     }
 }

CombatTracker.csproj

@@ -74,10 +74,6 @@
     <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>packages\Newtonsoft.Json.10.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -91,58 +87,16 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="MessageBoxEx.cs" />
-    <Compile Include="Views\AboutForm.cs">
+    <Compile Include="Character.cs" />
+    <Compile Include="OverviewForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Views\AboutForm.Designer.cs">
-      <DependentUpon>AboutForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Models\Category.cs" />
-    <Compile Include="Models\Character.cs" />
-    <Compile Include="DataSaver.cs" />
-    <Compile Include="Views\MutateCategoryForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Views\MutateCategoryForm.Designer.cs">
-      <DependentUpon>MutateCategoryForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Views\CharactersForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Views\CharactersForm.Designer.cs">
-      <DependentUpon>CharactersForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Views\OverviewForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Views\OverviewForm.Designer.cs">
+    <Compile Include="OverviewForm.Designer.cs">
       <DependentUpon>OverviewForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Views\OverwriteSaveForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Views\OverwriteSaveForm.Designer.cs">
-      <DependentUpon>OverwriteSaveForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Views\SaveCharactersForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Views\SaveCharactersForm.Designer.cs">
-      <DependentUpon>SaveCharactersForm.cs</DependentUpon>
-    </Compile>
-    <EmbeddedResource Include="Views\AboutForm.resx">
-      <DependentUpon>AboutForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Views\MutateCategoryForm.resx">
-      <DependentUpon>MutateCategoryForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Views\CharactersForm.resx">
-      <DependentUpon>CharactersForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Views\OverviewForm.resx">
+    <EmbeddedResource Include="OverviewForm.resx">
       <DependentUpon>OverviewForm.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
@@ -155,13 +109,6 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
-    <EmbeddedResource Include="Views\OverwriteSaveForm.resx">
-      <DependentUpon>OverwriteSaveForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Views\SaveCharactersForm.resx">
-      <DependentUpon>SaveCharactersForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <None Include="packages.config" />
     <None Include="Properties\app.manifest" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>