Compare commits

..

1 Commits

Author SHA1 Message Date
3efbd41f56 aim assist in inputs
All checks were successful
Create tag and build when new code gets to main / BumpTag (push) Successful in 30s
Create tag and build when new code gets to main / Test (push) Successful in 9m0s
Create tag and build when new code gets to main / Export (push) Successful in 10m24s
2026-02-09 11:20:57 +01:00
2 changed files with 18 additions and 1 deletions

View File

@@ -93,7 +93,22 @@ text = "FOV change with speed :"
step = 0.1 step = 0.1
tick_count = 10 tick_count = 10
[node name="Aim assist" parent="VBoxContainer/MarginContainer/VBoxContainer" unique_id=1782285745 instance=ExtResource("2_iyvrj")]
layout_mode = 2
option_name = "Aim assist"
option_section = 1
key = "AimAssist"
section = "InputSettings"
[node name="OptionLabel" parent="VBoxContainer/MarginContainer/VBoxContainer/Aim assist" index="0" unique_id=1789907427]
text = "Aim assist :"
[node name="HSlider" parent="VBoxContainer/MarginContainer/VBoxContainer/Aim assist" index="1" unique_id=494926010]
max_value = 2.0
step = 0.1
[editable path="VBoxContainer/MarginContainer/VBoxContainer/LookSensitivityControl"] [editable path="VBoxContainer/MarginContainer/VBoxContainer/LookSensitivityControl"]
[editable path="VBoxContainer/MarginContainer/VBoxContainer/MouseSensitivityControl"] [editable path="VBoxContainer/MarginContainer/VBoxContainer/MouseSensitivityControl"]
[editable path="VBoxContainer/MarginContainer/VBoxContainer/HeadBobbingControl"] [editable path="VBoxContainer/MarginContainer/VBoxContainer/HeadBobbingControl"]
[editable path="VBoxContainer/MarginContainer/VBoxContainer/FOVChangeControl"] [editable path="VBoxContainer/MarginContainer/VBoxContainer/FOVChangeControl"]
[editable path="VBoxContainer/MarginContainer/VBoxContainer/Aim assist"]

View File

@@ -312,6 +312,7 @@ public partial class PlayerController : CharacterBody3D,
private float _mouseSensitivityMultiplier = 1.0f; private float _mouseSensitivityMultiplier = 1.0f;
private float _headBobbingMultiplier = 1.0f; private float _headBobbingMultiplier = 1.0f;
private float _fovChangeMultiplier = 1.0f; private float _fovChangeMultiplier = 1.0f;
private float _aimAssistMultiplier = 1.0f;
// Timers // Timers
private Timer _timeScaleAimInAirTimer; private Timer _timeScaleAimInAirTimer;
@@ -668,6 +669,7 @@ public partial class PlayerController : CharacterBody3D,
_mouseSensitivityMultiplier = (float) config.GetValue("InputSettings", "MouseSensitivity", 1.0f); _mouseSensitivityMultiplier = (float) config.GetValue("InputSettings", "MouseSensitivity", 1.0f);
_headBobbingMultiplier = (float) config.GetValue("InputSettings", "HeadBobbingWhileWalking", 1.0f); _headBobbingMultiplier = (float) config.GetValue("InputSettings", "HeadBobbingWhileWalking", 1.0f);
_fovChangeMultiplier = (float) config.GetValue("InputSettings", "FovChangeWithSpeed", 1.0f); _fovChangeMultiplier = (float) config.GetValue("InputSettings", "FovChangeWithSpeed", 1.0f);
_aimAssistMultiplier = (float) config.GetValue("InputSettings", "AimAssist", 1.0f);
} }
public void OnTutorialDone(Node3D _) public void OnTutorialDone(Node3D _)
{ {
@@ -972,7 +974,7 @@ public partial class PlayerController : CharacterBody3D,
// Reduce aim assist when closing in on target because it can mess with the camera when dashing through // Reduce aim assist when closing in on target because it can mess with the camera when dashing through
var distanceFactor = Mathf.Clamp(distanceToTarget / AimAssistReductionStartDistance, 0f, 1f); var distanceFactor = Mathf.Clamp(distanceToTarget / AimAssistReductionStartDistance, 0f, 1f);
var aimAssistReductionFactor = Mathf.Lerp(AimAssistReductionWhenCloseToTarget, 1f, distanceFactor); var aimAssistReductionFactor = Mathf.Lerp(AimAssistReductionWhenCloseToTarget, 1f, distanceFactor);
return aimAssist * aimAssistReductionFactor; return aimAssist * aimAssistReductionFactor * _aimAssistMultiplier;
} }
private void LookAround(double delta) private void LookAround(double delta)