From 170d8ff3f12a26efced81a21fe0e543196d54061 Mon Sep 17 00:00:00 2001 From: siim Date: Thu, 27 Aug 2026 21:15:36 +0300 Subject: [PATCH] =?UTF-8?q?siim=20timmimised=20v=C3=A4iksed?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- camera_follow.gd | 9 --------- camera_follow.gd.uid | 1 - camera_spring_arm.gd | 39 --------------------------------------- camera_spring_arm.gd.uid | 1 - debug_params.gd | 2 +- project.godot | 4 ++-- 6 files changed, 3 insertions(+), 53 deletions(-) delete mode 100644 camera_follow.gd delete mode 100644 camera_follow.gd.uid delete mode 100644 camera_spring_arm.gd delete mode 100644 camera_spring_arm.gd.uid diff --git a/camera_follow.gd b/camera_follow.gd deleted file mode 100644 index d8b2cd4..0000000 --- a/camera_follow.gd +++ /dev/null @@ -1,9 +0,0 @@ -extends Camera3D - - -@export var spring_arm: Node3D - - -func _process(delta: float) -> void: - var lerp_power: float = DP.f("cam_lerp_power") - position = position.lerp(spring_arm.position, delta * lerp_power) diff --git a/camera_follow.gd.uid b/camera_follow.gd.uid deleted file mode 100644 index d50d605..0000000 --- a/camera_follow.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://b720l6m0ehrj3 diff --git a/camera_spring_arm.gd b/camera_spring_arm.gd deleted file mode 100644 index e0096c9..0000000 --- a/camera_spring_arm.gd +++ /dev/null @@ -1,39 +0,0 @@ -extends Node3D - -@onready var spring_arm: SpringArm3D = $SpringArm3D -var _desired_length: float = 7.0 - - -func _ready() -> void: - Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED) - _desired_length = DP.f("cam_spring_length") - spring_arm.spring_length = _desired_length - - -func _unhandled_input(event: InputEvent) -> void: - var sensitivity: float = DP.f("cam_sensitivity") - var min_vert: float = deg_to_rad(DP.f("cam_min_vert_angle")) - var max_vert: float = deg_to_rad(DP.f("cam_max_vert_angle")) - var min_zoom: float = DP.f("cam_min_zoom") - var max_zoom: float = DP.f("cam_max_zoom") - - if event is InputEventMouseMotion: - rotation.y -= event.relative.x * sensitivity - rotation.y = wrapf(rotation.y, 0.0, TAU) - rotation.x -= event.relative.y * sensitivity - rotation.x = clamp(rotation.x, min_vert, max_vert) - - if event.is_action_pressed("zoom_in"): - _desired_length = clamp(_desired_length / 1.2, min_zoom, max_zoom) - if event.is_action_pressed("zoom_out"): - _desired_length = clamp(_desired_length * 1.2, min_zoom, max_zoom) - - if event.is_action_pressed("toggle_mouse_capture"): - if Input.mouse_mode == Input.MOUSE_MODE_CAPTURED: - Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE) - else: - Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED) - - -func _process(_delta: float) -> void: - spring_arm.spring_length = _desired_length diff --git a/camera_spring_arm.gd.uid b/camera_spring_arm.gd.uid deleted file mode 100644 index 968c3e9..0000000 --- a/camera_spring_arm.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://b4td4k8yo5y78 diff --git a/debug_params.gd b/debug_params.gd index 7a10667..cc8d790 100644 --- a/debug_params.gd +++ b/debug_params.gd @@ -148,7 +148,7 @@ func _register_all() -> void: # Stops "sword's off to the side but I still died" — you're only gored when the # blade is actually presented at you. _reg_f("Matador", "mat_stab_arc", 55.0, 5.0, 180.0, 5.0) - _reg_f("Matador", "mat_roll_chance", 0.35, 0.0, 1.0, 0.05) + _reg_f("Matador", "mat_roll_chance", 1.5, 0.0, 1.0, 0.05) _reg_f("Matador", "mat_roll_duration", 0.45, 0.1, 1.5, 0.05) # Playback rate of the Draw_weapon clip used for both drawing and sheathing — # higher = snappier unholster/holster. diff --git a/project.godot b/project.godot index 3a181f1..c721e03 100644 --- a/project.godot +++ b/project.godot @@ -75,13 +75,13 @@ move_right={ zoom_in={ "deadzone": 0.2, "events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":8,"position":Vector2(726, 8),"global_position":Vector2(735, 56),"factor":1.0,"button_index":4,"canceled":false,"pressed":true,"double_click":false,"script":null) -, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":3,"axis_value":-1.0,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":6,"pressure":0.0,"pressed":false,"script":null) ] } zoom_out={ "deadzone": 0.2, "events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":16,"position":Vector2(400, 21),"global_position":Vector2(409, 69),"factor":1.0,"button_index":5,"canceled":false,"pressed":true,"double_click":false,"script":null) -, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":3,"axis_value":1.0,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":4,"pressure":0.0,"pressed":false,"script":null) ] } toggle_mouse_capture={