From 4b1cf896cc572cdc37b79e13288ee22fa9f20ddf Mon Sep 17 00:00:00 2001 From: Cosmii02 Date: Thu, 22 Aug 2024 02:32:06 +0300 Subject: [PATCH] Now all of placebos should be fixed both UI and config wise. New defaults have also been added, they are still being tuned as I am not sure what to want here, will gather community opinion on this commit's settings for future default settings --- App.config | 4 ++-- Config/BrakeSettings.cs | 24 ++++++++++++------------ Config/Config.cs | 2 +- Config/ThrottleSettings.cs | 22 +++++++++++----------- RacingDSX.sln.DotSettings.user | 2 +- UI.Designer.cs | 2 +- UI.cs | 4 ++-- obj/rider.project.restore.info | 2 +- 8 files changed, 31 insertions(+), 31 deletions(-) diff --git a/App.config b/App.config index ea5e343..d45f140 100644 --- a/App.config +++ b/App.config @@ -11,10 +11,10 @@ - 0.6 + 0.05 - 0.2 + 0.6 35 diff --git a/Config/BrakeSettings.cs b/Config/BrakeSettings.cs index b2f087b..f856f19 100644 --- a/Config/BrakeSettings.cs +++ b/Config/BrakeSettings.cs @@ -10,18 +10,18 @@ public class BrakeSettings { public TriggerMode TriggerMode { get; set; } = TriggerMode.Vibration; - public float EffectIntensity { get; set; } = 0.7f; + public float EffectIntensity { get; set; } = 1.0f; - public float GripLossValue { get; set; } = 0.5f; - public int VibrationStart { get; set; } = 20; - public int VibrationModeStart { get; set; } = 10; - public int MinVibration { get; set; } = 3; - public int MaxVibration { get; set; } = 35; - public float VibrationSmoothing { get; set; } = 1f; - public int MinStiffness { get; set; } = 200; - public int MaxStiffness { get; set; } = 1; - public int MinResistance { get; set; } = 1; - public int MaxResistance { get; set; } = 6; - public float ResistanceSmoothing { get; set; } = 1f; + public float GripLossValue { get; set; } = 0.05f; + public int VibrationStart { get; set; } = 0; + public int VibrationModeStart { get; set; } = 30; + public int MinVibration { get; set; } = 15; + public int MaxVibration { get; set; } = 20; + public float VibrationSmoothing { get; set; } = 1.0f; + public int MinStiffness { get; set; } = 150; + public int MaxStiffness { get; set; } = 5; + public int MinResistance { get; set; } = 0; + public int MaxResistance { get; set; } = 7; + public float ResistanceSmoothing { get; set; } = 0.4f; } } diff --git a/Config/Config.cs b/Config/Config.cs index 19f4bcc..778eee2 100644 --- a/Config/Config.cs +++ b/Config/Config.cs @@ -15,7 +15,7 @@ public class Config [JsonIgnore] public Profile ActiveProfile { get; set; } = null; - public int DSXPort { get; set; } = 6969; + public int DSXPort { get; set; } = 6969; // This sets the default dsx port public String DefaultProfile { get; set; } = "Forza"; } diff --git a/Config/ThrottleSettings.cs b/Config/ThrottleSettings.cs index 2411cb2..eb3b12f 100644 --- a/Config/ThrottleSettings.cs +++ b/Config/ThrottleSettings.cs @@ -9,20 +9,20 @@ namespace RacingDSX.Config public class ThrottleSettings { public TriggerMode TriggerMode { get; set; } = TriggerMode.Vibration; - public float GripLossValue { get; set; } = 0.2f; - public float EffectIntensity { get; set; } = 0.9f; - public float TurnAccelerationScale { get; set; } = 0.5f; + public float GripLossValue { get; set; } = 0.6f; + public float EffectIntensity { get; set; } = 1.0f; + public float TurnAccelerationScale { get; set; } = 0.25f; public float ForwardAccelerationScale { get; set; } = 1.0f; public int AccelerationLimit { get; set; } = 10; public int VibrationModeStart { get; set; } = 5; - public int MinVibration { get; set; } = 3; - public int MaxVibration { get; set; } = 35; - public float VibrationSmoothing { get; set; } = 0.5f; - public int MinStiffness { get; set; } = 200; - public int MaxStiffness { get; set; } = 75; - public int MinResistance { get; set; } = 1; - public int MaxResistance { get; set; } = 6; - public float ResistanceSmoothing { get; set; } = 0.01f; + public int MinVibration { get; set; } = 5; + public int MaxVibration { get; set; } = 55; + public float VibrationSmoothing { get; set; } = 1f; + public int MinStiffness { get; set; } = 255; + public int MaxStiffness { get; set; } = 175; + public int MinResistance { get; set; } = 0; + public int MaxResistance { get; set; } = 3; + public float ResistanceSmoothing { get; set; } = 0.9f; } } diff --git a/RacingDSX.sln.DotSettings.user b/RacingDSX.sln.DotSettings.user index 827faa7..0b82b22 100644 --- a/RacingDSX.sln.DotSettings.user +++ b/RacingDSX.sln.DotSettings.user @@ -1,5 +1,5 @@  True - True + False True True \ No newline at end of file diff --git a/UI.Designer.cs b/UI.Designer.cs index e388c3f..9e862b8 100644 --- a/UI.Designer.cs +++ b/UI.Designer.cs @@ -963,7 +963,7 @@ private void InitializeComponent() vibrationSmoothingTrackBar.LargeChange = 50; vibrationSmoothingTrackBar.Location = new System.Drawing.Point(199, 522); vibrationSmoothingTrackBar.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - vibrationSmoothingTrackBar.Maximum = 500; + vibrationSmoothingTrackBar.Maximum = 100; vibrationSmoothingTrackBar.Minimum = 1; vibrationSmoothingTrackBar.Name = "vibrationSmoothingTrackBar"; vibrationSmoothingTrackBar.Size = new System.Drawing.Size(574, 69); diff --git a/UI.cs b/UI.cs index 2492f63..48b8591 100644 --- a/UI.cs +++ b/UI.cs @@ -759,7 +759,7 @@ private void maxBrakeResistanceTrackBar_Scroll(object sender, EventArgs e) { int value = maxBrakeResistanceTrackBar.Value; - if (value > selectedProfile.brakeSettings.MinResistance) + if (value < selectedProfile.brakeSettings.MinResistance) value = selectedProfile.brakeSettings.MinResistance; selectedProfile.brakeSettings.MaxResistance = value; @@ -772,7 +772,7 @@ private void maxBrakeResistanceTrackBar_Scroll(object sender, EventArgs e) private void maxBrakeResistanceNumericUpDown_ValueChanged(object sender, EventArgs e) { int value = (int)Math.Floor(maxBrakeResistanceNumericUpDown.Value); - if (value > selectedProfile.brakeSettings.MinResistance) + if (value < selectedProfile.brakeSettings.MinResistance) value = selectedProfile.brakeSettings.MinResistance; selectedProfile.brakeSettings.MaxResistance = value; diff --git a/obj/rider.project.restore.info b/obj/rider.project.restore.info index 378ce55..d6c17c5 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -17242782777158005 \ No newline at end of file +17242807876053121 \ No newline at end of file