Add scav cooldown base selector

Author: Razzmatazzz

TarkovMonitor/App.config

@@ -82,6 +82,9 @@
             <setting name="questItemsAlert" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="scavCooldownBase" serializeAs="String">
+                <value>1500</value>
+            </setting>
         </TarkovMonitor.Properties.Settings>
     </userSettings>
 </configuration>

TarkovMonitor/Blazor/Pages/Settings/Settings.razor

@@ -56,6 +56,10 @@
                         }
                     }
                 </MudSelect>
+                <MudSelect @bind-Value="@ScavCooldownSelect" T="int" Label="Scav Cooldown Base Seconds" AnchorOrigin="Origin.BottomCenter" Class="d-inline-flex" xs="3">
+                    <MudSelectItem Value="2700">2700 (PVP default)</MudSelectItem>
+                    <MudSelectItem Value="1500">1500 (PVE default)</MudSelectItem>
+                </MudSelect>
             </div>
             <div>
                 <MudTextField @bind-Value="@RunthroughTime" Label="Runthrough Time (HH:MM:SS)" Class="d-inline-flex" sx="3" />
@@ -314,6 +318,19 @@
         }
     }
 
+    public int ScavCooldownSelect
+    {
+        get
+        {
+            return Properties.Settings.Default.scavCooldownBase;
+        }
+        set
+        {
+            Properties.Settings.Default.scavCooldownBase = value;
+            Properties.Settings.Default.Save();
+        }
+    }
+
     public int AudioOutputDeviceSelect
     {
         get

TarkovMonitor/Properties/Settings.Designer.cs

@@ -77,5 +77,8 @@
     <Setting Name="questItemsAlert" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="scavCooldownBase" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">1500</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

TarkovMonitor/Properties/Settings.settings

@@ -1,5 +1,4 @@
-using System.Net.WebSockets;
-using System.Text.Json.Nodes;
+using System.Text.Json.Nodes;
 using Websocket.Client;
 
 namespace TarkovMonitor
@@ -19,7 +18,7 @@ public static async Task Send(JsonObject message)
                 return;
             }
             message["sessionID"] = remoteid;
-            WebsocketClient socket = new(new Uri(wsUrl + $"?sessionid={remoteid}-tm"));
+            using WebsocketClient socket = new(new Uri(wsUrl + $"?sessionid={remoteid}-tm"));
             /*socket.MessageReceived.Subscribe(msg => {
                 if (msg.Text == null)
                 {
@@ -39,18 +38,7 @@ public static async Task Send(JsonObject message)
                 }
             });*/
             await socket.Start();
-            try
-            {
-                await socket.SendInstant(message.ToJsonString());
-            }
-            catch
-            {
-                throw;
-            }
-            finally
-            {
-                socket.Dispose();
-            }            
+            await socket.SendInstant(message.ToJsonString());          
         }
 
         public static async Task UpdatePlayerPosition(PlayerPositionEventArgs e)

TarkovMonitor/SocketClient.cs

@@ -523,7 +523,7 @@ public class PlayerProfileInfo
 
         public static int ScavCooldownSeconds()
         {
-            decimal baseTimer = 1500;
+            decimal baseTimer = Convert.ToDecimal(Properties.Settings.Default.scavCooldownBase);
 
             decimal hideoutBonus = 0;
             foreach (var station in Stations)

TarkovMonitor/TarkovDev.cs

@@ -7,7 +7,7 @@
     <UseWindowsForms>true</UseWindowsForms>
     <ImplicitUsings>enable</ImplicitUsings>
     <ApplicationIcon>Resources\TarkovDev.ico</ApplicationIcon>
-    <AssemblyVersion>1.7.1.0</AssemblyVersion>
+    <AssemblyVersion>1.8.0.0</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -24,16 +24,16 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="GraphQL.Client" Version="5.0.2" />
-    <PackageReference Include="GraphQL.Client.Serializer.SystemTextJson" Version="5.0.2" />
+    <PackageReference Include="GraphQL.Client" Version="6.1.0" />
+    <PackageReference Include="GraphQL.Client.Serializer.SystemTextJson" Version="6.1.0" />
     <PackageReference Include="Humanizer" Version="2.14.1" />
     <PackageReference Include="MaterialSkin.2" Version="2.3.1" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebView.WindowsForms" Version="6.0.424" />
     <PackageReference Include="MudBlazor" Version="6.19.1" />
     <PackageReference Include="NAudio" Version="2.2.1" />
     <PackageReference Include="Refit" Version="7.2.22" />
-    <PackageReference Include="System.Data.SQLite" Version="1.0.117" />
-    <PackageReference Include="Websocket.Client" Version="5.0.0" />
+    <PackageReference Include="System.Data.SQLite" Version="1.0.119" />
+    <PackageReference Include="Websocket.Client" Version="5.2.0" />
     <PackageReference Include="WindowsAPICodePack-Shell" Version="1.1.1" />
   </ItemGroup>