Skip to content

Commit

Permalink
Now all of placebos should be fixed both UI and config wise. New defa…
Browse files Browse the repository at this point in the history
…ults 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
  • Loading branch information
cosmii02 committed Aug 21, 2024
1 parent 0e266e3 commit 4b1cf89
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 31 deletions.
4 changes: 2 additions & 2 deletions App.config
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
<userSettings>
<RacingDSX.Properties.Settings>
<setting name="_grip_Loss_Val" serializeAs="String">
<value>0.6</value>
<value>0.05</value>
</setting>
<setting name="_throttle_Grip_Loss_Val" serializeAs="String">
<value>0.2</value>
<value>0.6</value>
</setting>
<setting name="_max_Brake_Vibration" serializeAs="String">
<value>35</value>
Expand Down
24 changes: 12 additions & 12 deletions Config/BrakeSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
2 changes: 1 addition & 1 deletion Config/Config.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}
Expand Down
22 changes: 11 additions & 11 deletions Config/ThrottleSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

}
}
2 changes: 1 addition & 1 deletion RacingDSX.sln.DotSettings.user
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=RacingDSX_002FNameForm/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=RacingDSX_002FProperties_002FResources/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=RacingDSX_002FProperties_002FResources/@EntryIndexedValue">False</s:Boolean>
<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=RacingDSX_002FUI/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/ResxEditorPersonal/Initialized/@EntryValue">True</s:Boolean></wpf:ResourceDictionary>
2 changes: 1 addition & 1 deletion UI.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions UI.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion obj/rider.project.restore.info
Original file line number Diff line number Diff line change
@@ -1 +1 @@
17242782777158005
17242807876053121

0 comments on commit 4b1cf89

Please sign in to comment.