Update 3.3.4

vektor9999 · Jul 8, 2023 · 4c4b7fd · 4c4b7fd
1 parent 7f3db94
commit 4c4b7fd
Show file tree

Hide file tree

Showing 10 changed files with 72 additions and 10 deletions.
diff --git a/Vcc.Nolvus.Dashboard/Frames/ErrorFrame.Designer.cs b/Vcc.Nolvus.Dashboard/Frames/ErrorFrame.Designer.cs
diff --git a/Vcc.Nolvus.Dashboard/Frames/ErrorFrame.cs b/Vcc.Nolvus.Dashboard/Frames/ErrorFrame.cs
@@ -5,6 +5,7 @@
 using Vcc.Nolvus.Core.Interfaces;
 using Vcc.Nolvus.Core.Frames;
 using System.Threading.Tasks;
+using Vcc.Nolvus.Core.Services;
 
 namespace Vcc.Nolvus.Dashboard.Frames
 {
@@ -66,12 +67,22 @@ public ErrorFrame()
             LblTitle.Text = Title;
             LblError.Text = Message;
             LblTrace.Text = Trace;
-            BtnRetry.Visible = Retry;            
+            BtnRetry.Visible = Retry;    
+
+            if (!Retry)
+            {
+                BtnHelp.Location = BtnRetry.Location;
+            }        
         }                 
 
         private void BtnRetry_Click(object sender, EventArgs e)
         {
-            //ShowFrame(typeof(ResumeInstall), true);
-        }                
+            ServiceSingleton.Dashboard.LoadFrame<ResumeFrame>();
+        }
+
+        private void BtnHelp_Click(object sender, EventArgs e)
+        {
+            System.Diagnostics.Process.Start("https://www.nolvus.net/appendix/installer/faq");
+        }
     }
 }
diff --git a/Vcc.Nolvus.Dashboard/Frames/Installer/InstallFrame.cs b/Vcc.Nolvus.Dashboard/Frames/Installer/InstallFrame.cs
@@ -133,7 +133,7 @@ await ServiceSingleton.Packages.InstallModList(new ModInstallSettings()
             catch (Exception ex)
             {
                 ServiceSingleton.Logger.Log(string.Format("Error during mod list installation with message {0}", ex.Message));
-                await ServiceSingleton.Dashboard.Error("Error during mod installation", ex.Message, ex.StackTrace);
+                await ServiceSingleton.Dashboard.Error("Error during mod installation", ex.Message, ex.StackTrace, true);
             }
 
         }            

diff --git a/Vcc.Nolvus.Dashboard/Frames/StartFrame.cs b/Vcc.Nolvus.Dashboard/Frames/StartFrame.cs
@@ -242,8 +242,7 @@ protected override async Task OnLoadedAsync()
             try
             {
                 try
-                {
-
+                {                    
                     if (!File.Exists(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "NolvusDashboard.ini")))
                     {
                         ServiceSingleton.Dashboard.LoadFrame<GameFrame>();

diff --git a/Vcc.Nolvus.Dashboard/Properties/AssemblyInfo.cs b/Vcc.Nolvus.Dashboard/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.3.3")]
-[assembly: AssemblyFileVersion("3.3.3.0")]
+[assembly: AssemblyVersion("3.3.4")]
+[assembly: AssemblyFileVersion("3.3.4.0")]
diff --git a/Vcc.Nolvus.Instance/Core/InstanceOptions.cs b/Vcc.Nolvus.Instance/Core/InstanceOptions.cs
@@ -5,6 +5,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using Vcc.Nolvus.Core.Interfaces;
+using Vcc.Nolvus.Core.Services;
 
 namespace Vcc.Nolvus.Instance.Core
 {
@@ -38,6 +39,13 @@ public void Load(XmlNode Node)
             }
 
             SkinType = Node["SkinType"].InnerText.Trim();
+
+            ServiceSingleton.Logger.Log(string.Format("Instance nudity : {0}", Nudity));
+            ServiceSingleton.Logger.Log(string.Format("Instance enb : {0}", AlternateENB));
+            ServiceSingleton.Logger.Log(string.Format("Instance hardcore mode : {0}", HardcoreMode));
+            ServiceSingleton.Logger.Log(string.Format("Instance alternate levelling : {0}", AlternateLeveling));
+            ServiceSingleton.Logger.Log(string.Format("Instance alternate start : {0}", AlternateStart));
+            ServiceSingleton.Logger.Log(string.Format("Instance skin type : {0}", SkinType));
         }
 
         public XmlNode Save(XmlDocument Storage)

diff --git a/Vcc.Nolvus.Instance/Core/InstancePerformance.cs b/Vcc.Nolvus.Instance/Core/InstancePerformance.cs
@@ -5,6 +5,7 @@
 using System.Xml;
 using System.Threading.Tasks;
 using Vcc.Nolvus.Core.Interfaces;
+using Vcc.Nolvus.Core.Services;
 
 namespace Vcc.Nolvus.Instance.Core
 {
@@ -48,7 +49,18 @@ public void Load(XmlNode Node)
             if (Node["FPSStabilizer"] != null)
             {
                 FPSStabilizer = Node["FPSStabilizer"].InnerText.Trim();
-            }          
+            }
+
+            ServiceSingleton.Logger.Log(string.Format("Instance advanced physics : {0}", AdvancedPhysics));
+            ServiceSingleton.Logger.Log(string.Format("Instance downscaling : {0}", DownScaling));
+            ServiceSingleton.Logger.Log(string.Format("Instance downscaling height : {0}", DownHeight));
+            ServiceSingleton.Logger.Log(string.Format("Instance downscaling width : {0}", DownWidth));
+            ServiceSingleton.Logger.Log(string.Format("Instance ini settings : {0}", IniSettings));
+            ServiceSingleton.Logger.Log(string.Format("Instance anti aliasing : {0}", AntiAliasing));
+            ServiceSingleton.Logger.Log(string.Format("Instance variant : {0}", Variant));
+            ServiceSingleton.Logger.Log(string.Format("Instance lods : {0}", LODs));
+            ServiceSingleton.Logger.Log(string.Format("Instance ray tracing : {0}", RayTracing));
+            ServiceSingleton.Logger.Log(string.Format("Instance fps stabilizer : {0}", FPSStabilizer));
         }
         public XmlNode Save(XmlDocument Storage)
         {

diff --git a/Vcc.Nolvus.Instance/Core/InstanceSettings.cs b/Vcc.Nolvus.Instance/Core/InstanceSettings.cs
@@ -49,6 +49,14 @@ public void Load(XmlNode Node)
             CDN = Node["CDN"].InnerText.Trim();
             LgCode = Node["LgCode"].InnerText.Trim();
             LgName = Node["LgName"].InnerText.Trim();
+
+            ServiceSingleton.Logger.Log(string.Format("Instance ratio : {0}", Ratio));
+            ServiceSingleton.Logger.Log(string.Format("Instance height : {0}", Height));
+            ServiceSingleton.Logger.Log(string.Format("Instance width : {0}", Width));
+            ServiceSingleton.Logger.Log(string.Format("Instance enable archiving : {0}", EnableArchiving));
+            ServiceSingleton.Logger.Log(string.Format("Instance CDN : {0}", CDN));
+            ServiceSingleton.Logger.Log(string.Format("Instance LgCode : {0}", LgCode));
+            ServiceSingleton.Logger.Log(string.Format("Instance LgName : {0}", LgName));
         }
 
         public XmlNode Save(XmlDocument Storage)

diff --git a/Vcc.Nolvus.Instance/Core/NolvusInstance.cs b/Vcc.Nolvus.Instance/Core/NolvusInstance.cs
@@ -128,6 +128,11 @@ public void Load(XmlNode Node)
             ArchiveDir = Node["ArchivePath"].InnerText.Trim();
             StockGame = Node["StockGame"].InnerText.Trim();
 
+            ServiceSingleton.Logger.Log(string.Format("Instance name : {0}", Name));
+            ServiceSingleton.Logger.Log(string.Format("Instance version : {0}", Version));
+            ServiceSingleton.Logger.Log(string.Format("Instance install directory : {0}", InstallDir));
+            ServiceSingleton.Logger.Log(string.Format("Instance archive directory : {0}", ArchiveDir));
+
             (Settings as InstanceSettings).Load(Node.ChildNodes.Cast<XmlNode>().Where(x => x.Name == "Settings").FirstOrDefault());
             (Performance as InstancePerformance).Load(Node.ChildNodes.Cast<XmlNode>().Where(x => x.Name == "Performance").FirstOrDefault());
             (Options as InstanceOptions).Load(Node.ChildNodes.Cast<XmlNode>().Where(x => x.Name == "Options").FirstOrDefault());                                                                                   

diff --git a/Vcc.Nolvus.Package/Mods/InstallableElement.cs b/Vcc.Nolvus.Package/Mods/InstallableElement.cs
@@ -335,7 +335,7 @@ public virtual async Task Install(CancellationToken Token, ModInstallSettings Se
                     Progress.Action = string.Empty;
                     Progress.Status = "Error detected waiting for the queue to finish to display the error message...";
                     ServiceSingleton.Logger.Log("Error during mod installation(" + this.Name + ") with message : " + ex.Message + Environment.NewLine + "Stack => " + ex.StackTrace);
-                    throw new Exception("Error during mod installation(" + this.Name + ") with message : " + ex.Message + Environment.NewLine + "Please consult the Dashboard Faq (https://www.nolvus.net/appendix/installer/faq) for more info.");                                        
+                    throw new Exception("Error during mod installation(" + this.Name + ") with message : " + ex.Message + Environment.NewLine + "Click the online help button for a possible fix.");                                        
                 }
             });