Add support for Mutagen ExtraSettingsDataPath

tr4wzified · Oct 15, 2020 · d0d460f · d0d460f
1 parent 42f144c
commit d0d460f
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/KnowYourEnemyMutagen/creature_rules.json → ...YourEnemyMutagen/Data/creature_rules.json b/KnowYourEnemyMutagen/creature_rules.json → ...YourEnemyMutagen/Data/creature_rules.json
diff --git a/KnowYourEnemyMutagen/misc.json → KnowYourEnemyMutagen/Data/misc.json b/KnowYourEnemyMutagen/misc.json → KnowYourEnemyMutagen/Data/misc.json
diff --git a/KnowYourEnemyMutagen/settings.json → KnowYourEnemyMutagen/Data/settings.json b/KnowYourEnemyMutagen/settings.json → KnowYourEnemyMutagen/Data/settings.json
diff --git a/KnowYourEnemyMutagen/KnowYourEnemyMutagen.csproj b/KnowYourEnemyMutagen/KnowYourEnemyMutagen.csproj
@@ -13,13 +13,13 @@
     </ItemGroup>
 
     <ItemGroup>
-      <None Update="creature_rules.json">
+      <None Update="Data\creature_rules.json">
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       </None>
-      <None Update="misc.json">
+      <None Update="Data\misc.json">
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       </None>
-      <None Update="settings.json">
+      <None Update="Data\settings.json">
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       </None>
     </ItemGroup>

diff --git a/KnowYourEnemyMutagen/Program.cs b/KnowYourEnemyMutagen/Program.cs
@@ -83,11 +83,11 @@ private static void RunPatch(SynthesisState<ISkyrimMod, ISkyrimModGetter> state)
             if (!state.LoadOrder.ContainsKey(KnowYourEnemy))
                 throw new Exception("ERROR: Know Your Enemy not detected in load order. You need to install KYE prior to running this patcher!");
 
-            string[] requiredFiles = { "creature_rules.json", "misc.json", "settings.json" };
-            foreach (string file in requiredFiles)
-            {
-                if (!File.Exists(file)) throw new Exception("Required file " + file + " does not exist! Make sure to copy all files over when installing the patcher, and don't run it from within an archive.");
-            }
+            Console.WriteLine(state.ExtraSettingsDataPath);
+            string[] requiredFiles = {@"\creature_rules.json", @"\misc.json", @"\settings.json"};
+            string[] foundFiles = Directory.GetFiles(state.ExtraSettingsDataPath);
+            if (!requiredFiles.SequenceEqual(foundFiles))
+                throw new Exception("Missing required files! Make sure to copy all files over when installing the patcher, and don't run it from within an archive.");
 
             // Retrieve all the perks that are going to be applied to NPCs in part 5
             Dictionary<string, FormKey> perks = PerkArray
@@ -106,8 +106,8 @@ private static void RunPatch(SynthesisState<ISkyrimMod, ISkyrimModGetter> state)
                 .ToDictionary(x => x.key, x => x.perk, StringComparer.OrdinalIgnoreCase);
 
             // Reading JSON and converting it to a normal list because .Contains() is weird in Newtonsoft.JSON
-            JObject misc = JObject.Parse(File.ReadAllText("misc.json"));
-            JObject settings = JObject.Parse(File.ReadAllText("settings.json"));
+            JObject misc = JObject.Parse(File.ReadAllText(state.ExtraSettingsDataPath + @"\misc.json"));
+            JObject settings = JObject.Parse(File.ReadAllText(state.ExtraSettingsDataPath + @"\settings.json"));
             var effectIntensity = (float)settings["effect_intensity"]!;
             var patchSilverPerk = (bool)settings["patch_silver_perk"]!;
             Console.WriteLine("*** DETECTED SETTINGS ***");
@@ -121,7 +121,7 @@ private static void RunPatch(SynthesisState<ISkyrimMod, ISkyrimModGetter> state)
             List<string> kyePerkNames = GetFromJson("kye_perk_names", misc).ToList();
             List<string> kyeAbilityNames = GetFromJson("kye_ability_names", misc).ToList();
 
-            Dictionary<string, string[]> creatureRules = JsonConvert.DeserializeObject<Dictionary<string, string[]>>(File.ReadAllText("creature_rules.json"));
+            Dictionary<string, string[]> creatureRules = JsonConvert.DeserializeObject<Dictionary<string, string[]>>(File.ReadAllText(state.ExtraSettingsDataPath + @"\creature_rules.json"));
 
             // Part 1a
             // Removing other magical resistance/weakness systems