-Fixed Goblin Chieftain typos

-Old plandos now have typos fixed
-Reverted back to having all the dlls unpacked

Data/Enemies.cs

@@ -74,7 +74,7 @@ public class Enemies
 
         public static Enemy munchkin = new Enemy("Munchkin", "m054").ForParties(Parties.Ch10_11);
         public static Enemy borgbear = new Enemy("Borgbear", "m055").ForParties(Parties.Ch12_13);
-        public static Enemy goblinChieftan = new Enemy("Goblin Chieftan", "m056").ForParties(Parties.Ch10_11);
+        public static Enemy goblinChieftan = new Enemy("Goblin Chieftain", "m056").ForParties(Parties.Ch10_11);
         public static Enemy munchkinMaestro = new Enemy("Munchkin Maestro", "m057").ForParties(Parties.Ch10_11);
         public static Enemy borgbearHero = new Enemy("Borgbear Hero", "m058", null, EnemyType.Rare).ForParties(Parties.Ch12_13);
 

Data/Treasures.cs

@@ -455,11 +455,11 @@ public class Treasures
         public static Treasure mission11Repeat = new Treasure("Mission 11 Repeat", "tre_ms_n006_02", TreasureArea.Mission);
         public static Treasure mission12 = new Treasure("Mission 12: Geiseric", "tre_ms_k002_01", TreasureArea.Mission);
         public static Treasure mission12Repeat = new Treasure("Mission 12 Repeat", "tre_ms_k002_02", TreasureArea.Mission);
-        public static Treasure mission13 = new Treasure("Mission 13: Goblin Chieftan", "tre_ms_n008_01", TreasureArea.Mission);
+        public static Treasure mission13 = new Treasure("Mission 13: Goblin Chieftain", "tre_ms_n008_01", TreasureArea.Mission);
         public static Treasure mission13Repeat = new Treasure("Mission 13 Repeat", "tre_ms_n008_02", TreasureArea.Mission);
         public static Treasure mission14 = new Treasure("Mission 14: Sahagin", "tre_ms_n007_01", TreasureArea.Mission);
         public static Treasure mission14Repeat = new Treasure("Mission 14 Repeat", "tre_ms_n007_02", TreasureArea.Mission);
-        public static Treasure mission15 = new Treasure("Mission 15: Goblin Chieftan", "tre_ms_n011_01", TreasureArea.Mission);
+        public static Treasure mission15 = new Treasure("Mission 15: Goblin Chieftain", "tre_ms_n011_01", TreasureArea.Mission);
         public static Treasure mission15Repeat = new Treasure("Mission 15 Repeat", "tre_ms_n011_02", TreasureArea.Mission);
         public static Treasure mission16 = new Treasure("Mission 16: Sahagin", "tre_ms_n012_01", TreasureArea.Mission);
         public static Treasure mission16Repeat = new Treasure("Mission 16 Repeat", "tre_ms_n012_02", TreasureArea.Mission);
@@ -469,7 +469,7 @@ public class Treasures
         public static Treasure mission18Repeat = new Treasure("Mission 18 Repeat", "tre_ms_t006_02", TreasureArea.Mission);
         public static Treasure mission19 = new Treasure("Mission 19: Uridimmu", "tre_ms_t007_01", TreasureArea.Mission);
         public static Treasure mission19Repeat = new Treasure("Mission 19 Repeat", "tre_ms_t007_02", TreasureArea.Mission);
-        public static Treasure mission20 = new Treasure("Mission 20: Goblin Chieftan", "tre_ms_t008_01", TreasureArea.Mission);
+        public static Treasure mission20 = new Treasure("Mission 20: Goblin Chieftain", "tre_ms_t008_01", TreasureArea.Mission);
         public static Treasure mission20Repeat = new Treasure("Mission 20 Repeat", "tre_ms_t008_02", TreasureArea.Mission);
 
         public static Treasure mission21 = new Treasure("Mission 21: Gelatitan", "tre_ms_z001_01", TreasureArea.Mission);

FF13Randomizer.csproj

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\Costura.Fody.5.1.0\build\Costura.Fody.props" Condition="Exists('..\packages\Costura.Fody.5.1.0\build\Costura.Fody.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -52,9 +51,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Costura, Version=5.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Costura.Fody.5.1.0\lib\netstandard1.0\Costura.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
       <Private>True</Private>
@@ -346,8 +342,6 @@
     <Compile Include="Randomizers\RandoMusic.cs" />
     <Compile Include="Randomizers\RandoTreasure.cs" />
     <Compile Include="Randomizers\RandoCrystarium.cs" />
-    <Compile Include="StatValuesWeighted.cs" />
-    <Compile Include="StatValues.cs" />
     <Compile Include="VersionOrder.cs" />
     <EmbeddedResource Include="FormMain.resx">
       <DependentUpon>FormMain.cs</DependentUpon>
@@ -455,12 +449,15 @@
     <Content Include="FodyWeavers.xml" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\Fody.6.4.0\build\Fody.targets" Condition="Exists('..\packages\Fody.6.4.0\build\Fody.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Fody.6.4.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.4.0\build\Fody.targets'))" />
-    <Error Condition="!Exists('..\packages\Costura.Fody.5.1.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.5.1.0\build\Costura.Fody.props'))" />
+  <Target Name="AfterBuild">
+    <Exec Command="copy $(TargetPath) $(TargetDir)\comp\$(TargetFileName)" />
+    <Exec Command="copy $(TargetDir)\Bartz24.Data.dll $(TargetDir)\comp\Bartz24.Data.dll" />
+    <Exec Command="copy $(TargetDir)\Bartz24.Docs.dll $(TargetDir)\comp\Bartz24.Docs.dll" />
+    <Exec Command="copy $(TargetDir)\Bartz24.Rando.dll $(TargetDir)\comp\Bartz24.Rando.dll" />
+    <Exec Command="copy $(TargetDir)\Bartz24.FF13.dll $(TargetDir)\comp\Bartz24.FF13.dll" />
+    <Exec Command="copy $(TargetDir)\HtmlAgilityPack.dll $(TargetDir)\comp\HtmlAgilityPack.dll" />
+    <Exec Command="copy $(TargetDir)\System.Diagnostics.DiagnosticSource.dll $(TargetDir)\comp\System.Diagnostics.DiagnosticSource.dll" />
+    <Exec Command="del  $(TargetDir)\FF13Randomizer.7z" />
+    <Exec Command="7z.exe a -t7z $(TargetDir)\FF13Randomizer.7z $(TargetDir)\comp\**" />
   </Target>
 </Project>

FormMain.cs

@@ -21,7 +21,7 @@ namespace FF13Randomizer
 {
     public partial class FormMain : Form
     {
-        public static string Version { get; set; } = "1.9.0.Pre-8";
+        public static string Version { get; set; } = "1.9.0";
 
         public static bool PlandoModified { get; set; } = false;
 

Plandos/TreasurePlando.cs

@@ -192,6 +192,10 @@ private List<JSONPlandoTreasure> MigrateJSON(List<JSONPlandoTreasure> list, stri
                 return list;
             List<JSONPlandoTreasure> migrated = new List<JSONPlandoTreasure>(list);
 
+            if (VersionOrder.Compare(version, "1.9.0") == -1)
+            {
+                migrated.Where(j => j.Item == "Stilstone Ring").ForEach(j => j.Item = "Siltstone Ring");
+            }
             if (VersionOrder.Compare(version, "1.8.0.Pre-3") == -1)
             {
                 migrated.Where(j => j.Amount == 0).ForEach(j => j.Amount = -1);

VersionOrder.cs

@@ -24,6 +24,7 @@ public class VersionOrder
             "1.9.0.Pre-5",
             "1.9.0.Pre-6",
             "1.9.0.Pre-7",
+            "1.9.0.Pre-8",
             FormMain.Version
         };
 

packages.config

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Costura.Fody" version="5.1.0" targetFramework="net472" developmentDependency="true" />
-  <package id="Fody" version="6.4.0" targetFramework="net472" developmentDependency="true" />
   <package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net472" />
   <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net472" />
   <package id="NETStandard.Library" version="1.6.1" targetFramework="net472" />