Updated Elena and using merged data from both kernels - fixes an issu…

…e with modded version where text is wrong.
Shojy · Jul 16, 2019 · a7bad77 · a7bad77
1 parent 86e27f2
commit a7bad77
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/Tseng/Program.cs b/Tseng/Program.cs
@@ -46,9 +46,10 @@ private static void LoadDataFromKernel()
             }
             var ff7Exe = FF7.MainModule?.FileName;
             var ff7Folder = Path.GetDirectoryName(ff7Exe);
-            var kernelLocation = Path.Combine(ff7Folder, "data", "lang-en", "kernel", "KERNEL.BIN");
+            var kernelLocation = Path.Combine(ff7Folder, "data", "lang-en", "kernel");
 
-            var elena = new KernelReader(kernelLocation);
+            var elena = new KernelReader(Path.Combine(kernelLocation, "KERNEL.BIN"));
+            elena.MergeKernel2Data(Path.Combine(kernelLocation, "kernel2.bin"));
 
             // Map Elena's data into local data dbs.
             foreach (var materia in elena.MateriaData.Materias)
@@ -341,7 +342,7 @@ private static void SearchForProcess(string processName)
             Console.WriteLine("Searching...");
             if (Timer is null)
             {
-                Timer = new Timer(500);
+                Timer = new Timer(300);
                 Timer.Elapsed += Timer_Elapsed;
                 Timer.AutoReset = true;
 

diff --git a/Tseng/Tseng.csproj b/Tseng/Tseng.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net461</TargetFramework>
@@ -25,7 +25,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.1.1" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageReference Include="Shojy.FF7.Elena" Version="0.1.0-pre" />
+    <PackageReference Include="Shojy.FF7.Elena" Version="0.1.1-dev" />
   </ItemGroup>
 
 </Project>
diff --git a/Tseng/Views/Home/Index.cshtml b/Tseng/Views/Home/Index.cshtml
@@ -39,8 +39,8 @@
         </div>
     </div>
 
-    <script src="vue.js"></script>
-    <script src="axios.js"></script>
+    <script src="~/vue.js"></script>
+    <script src="~/axios.js"></script>
     <script>
         const baseWeapon = {
             name: 'Buster Sword',