Merge pull request #4 from IGI-Research-Devs/bug/sound-ai-ux-fix

Fixed Music/AI settings and UX.
Jones-HM · Jan 16, 2023 · 4a93f12 · 4a93f12
2 parents eae6871 + 4b420f4
commit 4a93f12
Show file tree

Hide file tree

Showing 7 changed files with 1,243 additions and 1,185 deletions.
diff --git a/IGI1Editor.csproj b/IGI1Editor.csproj
@@ -46,10 +46,10 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;RELEASE</DefineConstants>
+    <DefineConstants>TRACE;RELEASE,WIN32</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
+    <Prefer32Bit>true</Prefer32Bit>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup>
@@ -127,7 +127,7 @@
     </Reference>
     <Reference Include="Microsoft.VisualBasic" />
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/IGI1Editor.sln b/IGI1Editor.sln
@@ -29,8 +29,8 @@ Global
 		{1BBBB5FC-3CF7-46C3-8837-9DBEE8BBD41F}.External|Any CPU.Build.0 = External|Any CPU
 		{1BBBB5FC-3CF7-46C3-8837-9DBEE8BBD41F}.External|x86.ActiveCfg = External|x86
 		{1BBBB5FC-3CF7-46C3-8837-9DBEE8BBD41F}.External|x86.Build.0 = External|x86
-		{1BBBB5FC-3CF7-46C3-8837-9DBEE8BBD41F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1BBBB5FC-3CF7-46C3-8837-9DBEE8BBD41F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1BBBB5FC-3CF7-46C3-8837-9DBEE8BBD41F}.Release|Any CPU.ActiveCfg = Release|x86
+		{1BBBB5FC-3CF7-46C3-8837-9DBEE8BBD41F}.Release|Any CPU.Build.0 = Release|x86
 		{1BBBB5FC-3CF7-46C3-8837-9DBEE8BBD41F}.Release|x86.ActiveCfg = Release|x86
 		{1BBBB5FC-3CF7-46C3-8837-9DBEE8BBD41F}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection

diff --git a/IGIEditor/IGIEditorUI.Designer.cs b/IGIEditor/IGIEditorUI.Designer.cs
diff --git a/IGIEditor/IGIEditorUI.cs b/IGIEditor/IGIEditorUI.cs
@@ -77,7 +77,7 @@ public IGIEditorUI()
                 editorTabs.TabPages.RemoveByKey("devMode");
                 gameItemsLbl.Visible = true;
 #else
-                GAME_MAX_LEVEL = 3;
+                GAME_MAX_LEVEL = 14;
                 editorTabs.TabPages.RemoveByKey("threeDEditor");
                 //editorTabs.TabPages.RemoveByKey("graphEditor");
                 versionLbl.Text = appEditorSubVersion;
@@ -3089,7 +3089,7 @@ private void enableMusicCb_CheckedChanged(object sender, EventArgs e)
         private void gfxResetBtn_Click(object sender, EventArgs e)
         {
             QInternals.GraphicsReset();
-            QInternals.StatusMessageShow("Graphics settings reset");
+            SetStatusText("Graphics settings reset");
         }
 
         private void resetPosCb_CheckedChanged(object sender, EventArgs e)
@@ -3603,7 +3603,7 @@ private void createUpdateBtn_Click(object sender, EventArgs e)
             }
             catch (Exception ex)
             {
-                QUtils.LogException(MethodBase.GetCurrentMethod().Name, ex);
+                QUtils.ShowException(MethodBase.GetCurrentMethod().Name, ex);
             }
         }
 
@@ -3905,7 +3905,7 @@ private void saveAIBtn_Click(object sender, EventArgs e)
         private void autoRefreshGameCb_CheckedChanged(object sender, EventArgs e)
         {
             autoRefreshGameCb.Checked = !autoRefreshGameCb.Checked;
-            QUtils.gameRefresh = ((CheckBox)sender).Checked;
+            QUtils.gameRefresh = autoRefreshGameCb.Checked;
             if (autoRefreshGameCb.Checked)
             {
                 internalsAttachTimer.Start();
@@ -4466,12 +4466,20 @@ private void playModeCb_Click(object sender, EventArgs e)
 
         private void musicVolumeUpdateBtn_Click(object sender, EventArgs e)
         {
-
+            var musicVolume = musicVolumeUpdateTxt.Text;
+            float volume = Convert.ToSingle(musicVolume);
+            if (volume < 0.0f || volume > 10.0f) musicVolume = "5.0";
+            QInternals.MusicVolumeSet(musicVolume);
+            SetStatusText("Music volume has been set to " + musicVolume);
         }
 
         private void sfxVolumeUpdateBtn_Click(object sender, EventArgs e)
         {
-
+            var sfxVolume = sfxVolumeUpdateTxt.Text;
+            float volume = Convert.ToSingle(sfxVolume);
+            if (volume < 0.0f || volume > 10.0f) sfxVolume = "5.0";
+            QInternals.MusicSFXVolumeSet(sfxVolume);
+            SetStatusText("SFX volume has been set to " + sfxVolume);
         }
 
         private void framesTxt_KeyDown(object sender, KeyEventArgs e)

diff --git a/IGIEditor/QUtils.cs b/IGIEditor/QUtils.cs
@@ -146,7 +146,7 @@ internal class WeaponGroup
 
         #region App Version
         internal static string versionFileName = "VERSION";
-        internal static string appEditorSubVersion = "0.7.1.0";
+        internal static string appEditorSubVersion = "0.7.2.0";
         internal static float viewPortDelta = 10000.0f;
         #endregion
 

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -31,5 +31,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("0.5.0.0")]
+[assembly: AssemblyVersion("0.7.0.0")]
 [assembly: AssemblyFileVersion("0.5.0.0")]
diff --git a/packages.config b/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="DynamicJson" version="1.2.0.0" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="13.0.2" targetFramework="net45" />
 </packages>