diff --git a/OpenCS2hock.sln.DotSettings.user b/OpenCS2hock.sln.DotSettings.user index 2887714..3f9e9b1 100644 --- a/OpenCS2hock.sln.DotSettings.user +++ b/OpenCS2hock.sln.DotSettings.user @@ -1,5 +1,6 @@  True + True <AssemblyExplorer> <Assembly Path="C:\Users\Glax\RiderProjects\CShocker\CShocker\bin\Debug\net7.0\CShocker.dll" /> </AssemblyExplorer> diff --git a/OpenCS2hock/OpenCS2hock.csproj b/OpenCS2hock/OpenCS2hock.csproj index bdbbac4..0294fd4 100644 --- a/OpenCS2hock/OpenCS2hock.csproj +++ b/OpenCS2hock/OpenCS2hock.csproj @@ -10,9 +10,9 @@ - - - + + + diff --git a/OpenCS2hock/Setup.cs b/OpenCS2hock/Setup.cs index 14a32d6..4f86689 100644 --- a/OpenCS2hock/Setup.cs +++ b/OpenCS2hock/Setup.cs @@ -125,7 +125,7 @@ public static class Setup switch (selected) { case 1: //OpenShock (HTTP) - apiUri = QueryString("OpenShock API-Endpoint (https://api.shocklink.net):", "https://api.shocklink.net"); + apiUri = QueryString($"OpenShock API-Endpoint ({OpenShockApi.DefaultEndpoint}):", OpenShockApi.DefaultEndpoint); apiKey = QueryString("OpenShock API-Key:",""); api = new OpenShockHttp(apiKey, apiUri); foreach(OpenShockShocker shocker in ((OpenShockHttp)api).GetShockers()) @@ -134,7 +134,7 @@ public static class Setup case 2: //OpenShock (Serial) if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) throw new PlatformNotSupportedException("Serial is only supported on Windows."); - apiUri = QueryString("OpenShock API-Endpoint (https://api.shocklink.net):", "https://api.shocklink.net"); + apiUri = QueryString($"OpenShock API-Endpoint ({OpenShockApi.DefaultEndpoint}):", OpenShockApi.DefaultEndpoint); apiKey = QueryString("OpenShock API-Key:",""); SerialPortInfo serialPort = SelectSerialPort(); api = new OpenShockSerial(serialPort, apiKey, apiUri); diff --git a/OpenCS2hock/ShockerAction.cs b/OpenCS2hock/ShockerAction.cs index b2ac359..a81a9b2 100644 --- a/OpenCS2hock/ShockerAction.cs +++ b/OpenCS2hock/ShockerAction.cs @@ -9,10 +9,10 @@ public struct ShockerAction { public CS2Event TriggerEvent; // ReSharper disable MemberCanBePrivate.Global -> exposed - public readonly int ShockerId; - public readonly ControlAction Action; - public readonly bool ValueFromInput; - public readonly IntegerRange IntensityRange, DurationRange; + public int ShockerId; + public ControlAction Action; + public bool ValueFromInput; + public IntegerRange IntensityRange, DurationRange; public ShockerAction(CS2Event trigger, int shockerId, ControlAction action, bool valueFromInput, IntegerRange intensityRange, IntegerRange durationRange) {