diff --git a/player_controller/Assets/Textures/GridTexture/Dark/texture_01.png.import b/player_controller/Assets/Textures/GridTexture/Dark/texture_01.png.import index 824bacb..97b37c2 100644 --- a/player_controller/Assets/Textures/GridTexture/Dark/texture_01.png.import +++ b/player_controller/Assets/Textures/GridTexture/Dark/texture_01.png.import @@ -3,17 +3,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://boasm0g587eov" -path.s3tc="res://.godot/imported/texture_01.png-9deee4bf2e81814eb5c9325f2657f8c8.s3tc.ctex" path.etc2="res://.godot/imported/texture_01.png-9deee4bf2e81814eb5c9325f2657f8c8.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc", "etc2_astc"], +"imported_formats": ["etc2_astc"], "vram_texture": true } [deps] source_file="res://player_controller/Assets/Textures/GridTexture/Dark/texture_01.png" -dest_files=["res://.godot/imported/texture_01.png-9deee4bf2e81814eb5c9325f2657f8c8.s3tc.ctex", "res://.godot/imported/texture_01.png-9deee4bf2e81814eb5c9325f2657f8c8.etc2.ctex"] +dest_files=["res://.godot/imported/texture_01.png-9deee4bf2e81814eb5c9325f2657f8c8.etc2.ctex"] [params] diff --git a/player_controller/Assets/Textures/GridTexture/Green/texture_01.png.import b/player_controller/Assets/Textures/GridTexture/Green/texture_01.png.import index c0756a2..bb1f6a3 100644 --- a/player_controller/Assets/Textures/GridTexture/Green/texture_01.png.import +++ b/player_controller/Assets/Textures/GridTexture/Green/texture_01.png.import @@ -3,17 +3,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://3e1klega6uye" -path.s3tc="res://.godot/imported/texture_01.png-ae5afc2ae737d1e792f0b8a0a5af4d3f.s3tc.ctex" path.etc2="res://.godot/imported/texture_01.png-ae5afc2ae737d1e792f0b8a0a5af4d3f.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc", "etc2_astc"], +"imported_formats": ["etc2_astc"], "vram_texture": true } [deps] source_file="res://player_controller/Assets/Textures/GridTexture/Green/texture_01.png" -dest_files=["res://.godot/imported/texture_01.png-ae5afc2ae737d1e792f0b8a0a5af4d3f.s3tc.ctex", "res://.godot/imported/texture_01.png-ae5afc2ae737d1e792f0b8a0a5af4d3f.etc2.ctex"] +dest_files=["res://.godot/imported/texture_01.png-ae5afc2ae737d1e792f0b8a0a5af4d3f.etc2.ctex"] [params] diff --git a/player_controller/Assets/Textures/GridTexture/Light/texture_01.png.import b/player_controller/Assets/Textures/GridTexture/Light/texture_01.png.import index 681440f..cad96a2 100644 --- a/player_controller/Assets/Textures/GridTexture/Light/texture_01.png.import +++ b/player_controller/Assets/Textures/GridTexture/Light/texture_01.png.import @@ -3,17 +3,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://0t6ie0fkv2op" -path.s3tc="res://.godot/imported/texture_01.png-1dcf4b27bd12b1fd18e6c870b30bb902.s3tc.ctex" path.etc2="res://.godot/imported/texture_01.png-1dcf4b27bd12b1fd18e6c870b30bb902.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc", "etc2_astc"], +"imported_formats": ["etc2_astc"], "vram_texture": true } [deps] source_file="res://player_controller/Assets/Textures/GridTexture/Light/texture_01.png" -dest_files=["res://.godot/imported/texture_01.png-1dcf4b27bd12b1fd18e6c870b30bb902.s3tc.ctex", "res://.godot/imported/texture_01.png-1dcf4b27bd12b1fd18e6c870b30bb902.etc2.ctex"] +dest_files=["res://.godot/imported/texture_01.png-1dcf4b27bd12b1fd18e6c870b30bb902.etc2.ctex"] [params] diff --git a/player_controller/Assets/Textures/GridTexture/Orange/texture_01.png.import b/player_controller/Assets/Textures/GridTexture/Orange/texture_01.png.import index 832a0d2..5ac5649 100644 --- a/player_controller/Assets/Textures/GridTexture/Orange/texture_01.png.import +++ b/player_controller/Assets/Textures/GridTexture/Orange/texture_01.png.import @@ -3,17 +3,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://t10lfkxrg7ay" -path.s3tc="res://.godot/imported/texture_01.png-2d26b48d2dec4e4e9eea4b1c047417c0.s3tc.ctex" path.etc2="res://.godot/imported/texture_01.png-2d26b48d2dec4e4e9eea4b1c047417c0.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc", "etc2_astc"], +"imported_formats": ["etc2_astc"], "vram_texture": true } [deps] source_file="res://player_controller/Assets/Textures/GridTexture/Orange/texture_01.png" -dest_files=["res://.godot/imported/texture_01.png-2d26b48d2dec4e4e9eea4b1c047417c0.s3tc.ctex", "res://.godot/imported/texture_01.png-2d26b48d2dec4e4e9eea4b1c047417c0.etc2.ctex"] +dest_files=["res://.godot/imported/texture_01.png-2d26b48d2dec4e4e9eea4b1c047417c0.etc2.ctex"] [params] diff --git a/player_controller/Assets/Textures/GridTexture/Red/texture_01.png.import b/player_controller/Assets/Textures/GridTexture/Red/texture_01.png.import index 3d26250..bf717ef 100644 --- a/player_controller/Assets/Textures/GridTexture/Red/texture_01.png.import +++ b/player_controller/Assets/Textures/GridTexture/Red/texture_01.png.import @@ -3,17 +3,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://dgix86l87u86s" -path.s3tc="res://.godot/imported/texture_01.png-a7949be0e945f82b88e838fe48a6f350.s3tc.ctex" path.etc2="res://.godot/imported/texture_01.png-a7949be0e945f82b88e838fe48a6f350.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc", "etc2_astc"], +"imported_formats": ["etc2_astc"], "vram_texture": true } [deps] source_file="res://player_controller/Assets/Textures/GridTexture/Red/texture_01.png" -dest_files=["res://.godot/imported/texture_01.png-a7949be0e945f82b88e838fe48a6f350.s3tc.ctex", "res://.godot/imported/texture_01.png-a7949be0e945f82b88e838fe48a6f350.etc2.ctex"] +dest_files=["res://.godot/imported/texture_01.png-a7949be0e945f82b88e838fe48a6f350.etc2.ctex"] [params] diff --git a/player_controller/Assets/Textures/PerlinNoise/Gabor 1 - 512x512.png.import b/player_controller/Assets/Textures/PerlinNoise/Gabor 1 - 512x512.png.import index 9da5157..794c94c 100644 --- a/player_controller/Assets/Textures/PerlinNoise/Gabor 1 - 512x512.png.import +++ b/player_controller/Assets/Textures/PerlinNoise/Gabor 1 - 512x512.png.import @@ -3,17 +3,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://woq2hudxhckr" -path.s3tc="res://.godot/imported/Gabor 1 - 512x512.png-35241d8f4670c338b8c89a271f5b5891.s3tc.ctex" path.etc2="res://.godot/imported/Gabor 1 - 512x512.png-35241d8f4670c338b8c89a271f5b5891.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc", "etc2_astc"], +"imported_formats": ["etc2_astc"], "vram_texture": true } [deps] source_file="res://player_controller/Assets/Textures/PerlinNoise/Gabor 1 - 512x512.png" -dest_files=["res://.godot/imported/Gabor 1 - 512x512.png-35241d8f4670c338b8c89a271f5b5891.s3tc.ctex", "res://.godot/imported/Gabor 1 - 512x512.png-35241d8f4670c338b8c89a271f5b5891.etc2.ctex"] +dest_files=["res://.godot/imported/Gabor 1 - 512x512.png-35241d8f4670c338b8c89a271f5b5891.etc2.ctex"] [params] diff --git a/player_controller/Examples/MovementTestbed/Hills/kenney-green-checkerboar-cc0.png.import b/player_controller/Examples/MovementTestbed/Hills/kenney-green-checkerboar-cc0.png.import index e9c1f25..0baa577 100644 --- a/player_controller/Examples/MovementTestbed/Hills/kenney-green-checkerboar-cc0.png.import +++ b/player_controller/Examples/MovementTestbed/Hills/kenney-green-checkerboar-cc0.png.import @@ -3,17 +3,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://lp2pt8mtj7ty" -path.s3tc="res://.godot/imported/kenney-green-checkerboar-cc0.png-2ce8609a39a655125c8e037014f6f2db.s3tc.ctex" path.etc2="res://.godot/imported/kenney-green-checkerboar-cc0.png-2ce8609a39a655125c8e037014f6f2db.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc", "etc2_astc"], +"imported_formats": ["etc2_astc"], "vram_texture": true } [deps] source_file="res://player_controller/Examples/MovementTestbed/Hills/kenney-green-checkerboar-cc0.png" -dest_files=["res://.godot/imported/kenney-green-checkerboar-cc0.png-2ce8609a39a655125c8e037014f6f2db.s3tc.ctex", "res://.godot/imported/kenney-green-checkerboar-cc0.png-2ce8609a39a655125c8e037014f6f2db.etc2.ctex"] +dest_files=["res://.godot/imported/kenney-green-checkerboar-cc0.png-2ce8609a39a655125c8e037014f6f2db.etc2.ctex"] [params] diff --git a/player_controller/PlayerController.tscn b/player_controller/PlayerController.tscn index 2c4ac51..674a5cd 100644 --- a/player_controller/PlayerController.tscn +++ b/player_controller/PlayerController.tscn @@ -1,14 +1,19 @@ -[gd_scene load_steps=30 format=3 uid="uid://bei4nhkf8lwdo"] +[gd_scene load_steps=34 format=3 uid="uid://bei4nhkf8lwdo"] [ext_resource type="Script" uid="uid://bbbrf5ckydfna" path="res://player_controller/Scripts/PlayerController.cs" id="1_poq2x"] [ext_resource type="Material" uid="uid://dtq8i1ka1f2pn" path="res://player_controller/Assets/Materials/Health/CameraVignette.tres" id="2_6hee7"] [ext_resource type="Material" uid="uid://nyh5tn1yoxeu" path="res://player_controller/Assets/Materials/Health/CameraDistortion.tres" id="3_mxh1y"] [ext_resource type="Shader" uid="uid://btw6vsb6sa7sn" path="res://player_controller/Shaders/Blur.gdshader" id="4_jyscr"] +[ext_resource type="Resource" uid="uid://cpdaw41ah5gic" path="res://systems/inputs/walk_mode/rotate_y.tres" id="4_rxwoh"] +[ext_resource type="Resource" uid="uid://ccrb5xsnphc8" path="res://systems/inputs/walk_mode/rotate_floorplane.tres" id="5_4u7i3"] [ext_resource type="Script" uid="uid://dv7v1ywmbvvcd" path="res://player_controller/Scripts/HealthSystem.cs" id="5_umw0l"] [ext_resource type="Script" uid="uid://vuq8rjq3vegn" path="res://player_controller/Scripts/Stamina.cs" id="6_lxtc4"] [ext_resource type="Script" uid="uid://cwbvxlfvmocc1" path="res://player_controller/Scripts/StairsSystem.cs" id="7_bmt5a"] +[ext_resource type="Resource" uid="uid://dgfww8118d8gj" path="res://systems/inputs/walk_mode/aim.tres" id="7_cresl"] +[ext_resource type="Resource" uid="uid://j1o5ud0plk4" path="res://systems/inputs/walk_mode/aim_release.tres" id="8_lhb11"] [ext_resource type="Script" uid="uid://dd1yrt7eiiyf4" path="res://player_controller/Scripts/CapsuleCollider.cs" id="8_lmtjd"] [ext_resource type="PackedScene" uid="uid://wq1okogkhc5l" path="res://systems/mantle_system.tscn" id="8_qu4wy"] +[ext_resource type="Resource" uid="uid://7wm8ywvujwf" path="res://systems/inputs/walk_mode/aim_cancel.tres" id="9_5p2qc"] [ext_resource type="Script" uid="uid://bt0xv2q8iv1vn" path="res://player_controller/Scripts/Gravity.cs" id="9_lsueh"] [ext_resource type="Script" uid="uid://dwoppk8j5fxeg" path="res://player_controller/Scripts/DashSystem.cs" id="9_qu4wy"] [ext_resource type="Script" uid="uid://g8idirw62qe0" path="res://player_controller/Scripts/Bobbing.cs" id="10_7wk1w"] @@ -18,7 +23,6 @@ [ext_resource type="Script" uid="uid://b5nk6ntlps3x0" path="res://systems/inputs/input_system.gd" id="16_v31n3"] [ext_resource type="Resource" uid="uid://htqvokm8mufq" path="res://systems/inputs/walk_mode/move.tres" id="17_h6vvl"] [ext_resource type="Resource" uid="uid://dijkqkltwkrfe" path="res://systems/inputs/walk_mode/walk_mode.tres" id="18_sik0q"] -[ext_resource type="Resource" uid="uid://cpdaw41ah5gic" path="res://systems/inputs/walk_mode/rotate_y.tres" id="18_yvnfg"] [sub_resource type="CapsuleMesh" id="CapsuleMesh_xc2g5"] @@ -123,7 +127,16 @@ _data = { script = ExtResource("1_poq2x") WalkSpeed = 10.0 SprintSpeed = 15.0 -ControllerSensitivity = 30.0 + +[node name="InputController" type="Node3D" parent="."] +script = ExtResource("16_v31n3") +walk_mode = ExtResource("18_sik0q") +move = ExtResource("17_h6vvl") +rotate_y = ExtResource("4_rxwoh") +rotate_floorplane = ExtResource("5_4u7i3") +aim_pressed = ExtResource("7_cresl") +aim_released = ExtResource("8_lhb11") +aim_canceled = ExtResource("9_5p2qc") [node name="MeshInstance3D" type="MeshInstance3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0) @@ -196,6 +209,8 @@ target_position = Vector3(0, -0.55, 0) target_position = Vector3(0, -0.75, 0) [node name="MantleSystem" parent="." instance=ExtResource("8_qu4wy")] +MantleEndLocationDistanceFromWall = 1.0 +MantleHeightCastStart = 2.0 [node name="DashSystem" type="Node3D" parent="."] script = ExtResource("9_qu4wy") @@ -213,6 +228,8 @@ mesh = SubResource("SphereMesh_qu4wy") surface_material_override/0 = SubResource("StandardMaterial3D_v31n3") [node name="MantleSystem" parent="DashSystem" instance=ExtResource("8_qu4wy")] +MantleEndLocationDistanceFromWall = 1.0 +MantleHeightCastStart = 2.0 [node name="StairsSystem" type="Node3D" parent="."] script = ExtResource("7_bmt5a") @@ -254,8 +271,9 @@ target_position = Vector3(0, 1, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.296, 1.4, 0) target_position = Vector3(0, 1, 0) -[node name="InputController" type="Node3D" parent="."] -script = ExtResource("16_v31n3") -move = ExtResource("17_h6vvl") -rotate_player = ExtResource("18_yvnfg") -walk_mode = ExtResource("18_sik0q") +[connection signal="input_aim_canceled" from="InputController" to="." method="OnInputAimCanceled"] +[connection signal="input_aim_pressed" from="InputController" to="." method="OnInputAimPressed"] +[connection signal="input_aim_released" from="InputController" to="." method="OnInputAimReleased"] +[connection signal="input_move" from="InputController" to="." method="OnInputMove"] +[connection signal="input_rotate_floorplane" from="InputController" to="." method="OnInputRotateFloorplane"] +[connection signal="input_rotate_y" from="InputController" to="." method="OnInputRotateY"] diff --git a/player_controller/Scripts/PlayerController.cs b/player_controller/Scripts/PlayerController.cs index 69a1ca1..e744270 100644 --- a/player_controller/Scripts/PlayerController.cs +++ b/player_controller/Scripts/PlayerController.cs @@ -56,6 +56,45 @@ public partial class PlayerController : CharacterBody3D private const int NumOfHeadCollisionDetectors = 4; private RayCast3D[] _headCollisionDetectors; + + private Vector3 _inputMove = Vector3.Zero; + private float _inputRotateY = 0.0f; + private float _inputRotateFloorplane = 0.0f; + + private bool _isAiming = false; + + public void OnInputMove(Vector3 value) + { + _inputMove = value; + } + + public void OnInputRotateY(float value) + { + _inputRotateY = value; + } + + public void OnInputRotateFloorplane(float value) + { + _inputRotateFloorplane = value; + } + + public void OnInputAimPressed() + { + _isAiming = true; + GD.Print("Aim pressed"); + } + public void OnInputAimReleased() + { + _isAiming = false; + GD.Print("Aim released"); + } + public void OnInputAimCanceled() + { + _isAiming = false; + GD.Print("Aim canceled"); + } + + public override void _Ready() { @@ -286,18 +325,16 @@ public partial class PlayerController : CharacterBody3D _currentSpeed = SprintSpeed; } - Vector2 inputLookDir = Input.GetVector("look_left", "look_right", "look_up", "look_down"); + // Vector2 inputLookDir = Input.GetVector("look_left", "look_right", "look_up", "look_down"); + Vector2 inputLookDir = new Vector2(_inputRotateY, _inputRotateFloorplane); Mouse.LookAround(-1 * ControllerSensitivity * inputLookDir); - - // Get the input direction - Vector2 inputDir = Input.GetVector("left", "right", "up", "down"); - + // Basis is a 3x4 matrix. It contains information about scaling and rotation of head. // By multiplying our Vector3 by this matrix we're doing multiple things: // a) We start to operate in global space; // b) We're applying to Vector3 the current rotation of "head" object; // c) We're applying to Vector3 the current scaling of "head" object; - Vector3 direction = (Head.Transform.Basis * new Vector3(inputDir.X, 0, inputDir.Y)).Normalized(); + Vector3 direction = Head.Transform.Basis * _inputMove; if (isPlayerDead) { diff --git a/systems/inputs/input_system.gd b/systems/inputs/input_system.gd index 994ec2b..ac19097 100644 --- a/systems/inputs/input_system.gd +++ b/systems/inputs/input_system.gd @@ -1,12 +1,44 @@ extends Node3D -@export var move:GUIDEAction -@export var rotate_player:GUIDEAction +@export_group("Mapping contexts") @export var walk_mode:GUIDEMappingContext +@export_group("Move actions") +@export var move:GUIDEAction +@export var rotate_y:GUIDEAction +@export var rotate_floorplane:GUIDEAction + +@export_group("Trigger actions") +@export var aim_pressed:GUIDEAction +@export var aim_released:GUIDEAction +@export var aim_canceled:GUIDEAction + +signal input_move(value: Vector3) +signal input_rotate_y(value: float) +signal input_rotate_floorplane(value: float) + +signal input_aim_pressed +signal input_aim_released +signal input_aim_canceled + func _ready() -> void: GUIDE.enable_mapping_context(walk_mode) + + aim_pressed.triggered.connect(on_input_aim_pressed) + aim_released.triggered.connect(on_input_aim_released) + aim_canceled.triggered.connect(on_input_aim_canceled) + -func _process(delta: float) -> void: - # print(move.value_axis_3d) - pass +func on_input_aim_pressed(): + input_aim_pressed.emit() + +func on_input_aim_released(): + input_aim_released.emit() + +func on_input_aim_canceled(): + input_aim_canceled.emit() + +func _process(_delta: float) -> void: + input_move.emit(move.value_axis_3d) + input_rotate_y.emit(rotate_y.value_axis_1d) + input_rotate_floorplane.emit(rotate_floorplane.value_axis_1d) diff --git a/systems/inputs/walk_mode/aim.tres b/systems/inputs/walk_mode/aim.tres new file mode 100644 index 0000000..e948626 --- /dev/null +++ b/systems/inputs/walk_mode/aim.tres @@ -0,0 +1,14 @@ +[gd_resource type="Resource" script_class="GUIDEAction" load_steps=2 format=3 uid="uid://dgfww8118d8gj"] + +[ext_resource type="Script" uid="uid://cluhc11vixkf1" path="res://addons/guide/guide_action.gd" id="1_tm2gl"] + +[resource] +script = ExtResource("1_tm2gl") +name = &"" +action_value_type = 0 +block_lower_priority_actions = true +emit_as_godot_actions = false +is_remappable = false +display_name = "" +display_category = "" +metadata/_custom_type_script = "uid://cluhc11vixkf1" diff --git a/systems/inputs/walk_mode/aim_cancel.tres b/systems/inputs/walk_mode/aim_cancel.tres new file mode 100644 index 0000000..bee7164 --- /dev/null +++ b/systems/inputs/walk_mode/aim_cancel.tres @@ -0,0 +1,14 @@ +[gd_resource type="Resource" script_class="GUIDEAction" load_steps=2 format=3 uid="uid://7wm8ywvujwf"] + +[ext_resource type="Script" uid="uid://cluhc11vixkf1" path="res://addons/guide/guide_action.gd" id="1_36r6u"] + +[resource] +script = ExtResource("1_36r6u") +name = &"" +action_value_type = 0 +block_lower_priority_actions = true +emit_as_godot_actions = false +is_remappable = false +display_name = "" +display_category = "" +metadata/_custom_type_script = "uid://cluhc11vixkf1" diff --git a/systems/inputs/walk_mode/aim_release.tres b/systems/inputs/walk_mode/aim_release.tres new file mode 100644 index 0000000..5988e83 --- /dev/null +++ b/systems/inputs/walk_mode/aim_release.tres @@ -0,0 +1,14 @@ +[gd_resource type="Resource" script_class="GUIDEAction" load_steps=2 format=3 uid="uid://j1o5ud0plk4"] + +[ext_resource type="Script" uid="uid://cluhc11vixkf1" path="res://addons/guide/guide_action.gd" id="1_8q4sr"] + +[resource] +script = ExtResource("1_8q4sr") +name = &"" +action_value_type = 0 +block_lower_priority_actions = true +emit_as_godot_actions = false +is_remappable = false +display_name = "" +display_category = "" +metadata/_custom_type_script = "uid://cluhc11vixkf1" diff --git a/systems/inputs/walk_mode/walk_mode.tres b/systems/inputs/walk_mode/walk_mode.tres index 90f9fb4..1d14136 100644 --- a/systems/inputs/walk_mode/walk_mode.tres +++ b/systems/inputs/walk_mode/walk_mode.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="GUIDEMappingContext" load_steps=49 format=3 uid="uid://dijkqkltwkrfe"] +[gd_resource type="Resource" script_class="GUIDEMappingContext" load_steps=74 format=3 uid="uid://dijkqkltwkrfe"] [ext_resource type="Script" uid="uid://cpplm41b5bt6m" path="res://addons/guide/guide_action_mapping.gd" id="1_gh445"] [ext_resource type="Resource" uid="uid://htqvokm8mufq" path="res://systems/inputs/walk_mode/move.tres" id="2_h1oqo"] @@ -15,7 +15,16 @@ [ext_resource type="Script" uid="uid://cgy4anjdob2tp" path="res://addons/guide/modifiers/guide_modifier_window_relative.gd" id="12_xnlyn"] [ext_resource type="Script" uid="uid://bjm4myqxg4phm" path="res://addons/guide/modifiers/guide_modifier_scale.gd" id="13_dlt74"] [ext_resource type="Script" uid="uid://bbhoxsiqwo07l" path="res://addons/guide/inputs/guide_input_joy_axis_1d.gd" id="14_74dxk"] +[ext_resource type="Script" uid="uid://c47lkb48itd6l" path="res://addons/guide/modifiers/guide_modifier_deadzone.gd" id="15_6cen8"] [ext_resource type="Resource" uid="uid://ccrb5xsnphc8" path="res://systems/inputs/walk_mode/rotate_floorplane.tres" id="15_xnlyn"] +[ext_resource type="Resource" uid="uid://dgfww8118d8gj" path="res://systems/inputs/walk_mode/aim.tres" id="17_1l8ly"] +[ext_resource type="Script" uid="uid://b52rqq28tuqpg" path="res://addons/guide/triggers/guide_trigger_pressed.gd" id="18_1l8ly"] +[ext_resource type="Script" uid="uid://b4cdrn4paoj3i" path="res://addons/guide/triggers/guide_trigger_down.gd" id="18_qctwy"] +[ext_resource type="Resource" uid="uid://j1o5ud0plk4" path="res://systems/inputs/walk_mode/aim_release.tres" id="19_xq5tv"] +[ext_resource type="Script" uid="uid://biiggjw6tv4uq" path="res://addons/guide/triggers/guide_trigger_released.gd" id="20_lh6n3"] +[ext_resource type="Resource" uid="uid://7wm8ywvujwf" path="res://systems/inputs/walk_mode/aim_cancel.tres" id="21_5y4tx"] +[ext_resource type="Script" uid="uid://rvttn472ix6v" path="res://addons/guide/inputs/guide_input_joy_button.gd" id="22_81iec"] +[ext_resource type="Script" uid="uid://brsxcrai2te83" path="res://addons/guide/triggers/guide_trigger_chorded_action.gd" id="23_w6gvf"] [sub_resource type="Resource" id="Resource_dlt74"] script = ExtResource("4_t5475") @@ -124,6 +133,11 @@ joy_index = -1 script = ExtResource("7_54nr4") order = 2 +[sub_resource type="Resource" id="Resource_6cen8"] +script = ExtResource("15_6cen8") +lower_threshold = 0.1 +upper_threshold = 1.0 + [sub_resource type="Resource" id="Resource_5sx4a"] script = ExtResource("3_pgmnb") override_action_settings = false @@ -131,13 +145,14 @@ is_remappable = false display_name = "" display_category = "" input = SubResource("Resource_r2gek") -modifiers = Array[ExtResource("5_dts0n")]([SubResource("Resource_t5475")]) +modifiers = Array[ExtResource("5_dts0n")]([SubResource("Resource_t5475"), SubResource("Resource_6cen8")]) triggers = Array[ExtResource("8_tlno4")]([]) [sub_resource type="Resource" id="Resource_nd8wu"] script = ExtResource("1_gh445") action = ExtResource("2_h1oqo") input_mappings = Array[ExtResource("3_pgmnb")]([SubResource("Resource_vagbc"), SubResource("Resource_nt051"), SubResource("Resource_1g8ta"), SubResource("Resource_0avlp"), SubResource("Resource_5sx4a")]) +metadata/_guide_input_mappings_collapsed = true [sub_resource type="Resource" id="Resource_7dbe7"] script = ExtResource("11_tlno4") @@ -172,6 +187,11 @@ script = ExtResource("14_74dxk") axis = 2 joy_index = -1 +[sub_resource type="Resource" id="Resource_posty"] +script = ExtResource("15_6cen8") +lower_threshold = 0.1 +upper_threshold = 1.0 + [sub_resource type="Resource" id="Resource_a5vma"] script = ExtResource("3_pgmnb") override_action_settings = false @@ -179,13 +199,14 @@ is_remappable = false display_name = "" display_category = "" input = SubResource("Resource_agr80") -modifiers = Array[ExtResource("5_dts0n")]([]) +modifiers = Array[ExtResource("5_dts0n")]([SubResource("Resource_posty")]) triggers = Array[ExtResource("8_tlno4")]([]) [sub_resource type="Resource" id="Resource_fnf72"] script = ExtResource("1_gh445") action = ExtResource("10_tlno4") input_mappings = Array[ExtResource("3_pgmnb")]([SubResource("Resource_lhbic"), SubResource("Resource_a5vma")]) +metadata/_guide_input_mappings_collapsed = true [sub_resource type="Resource" id="Resource_q3p6c"] script = ExtResource("11_tlno4") @@ -220,6 +241,11 @@ script = ExtResource("14_74dxk") axis = 3 joy_index = -1 +[sub_resource type="Resource" id="Resource_tfgyj"] +script = ExtResource("15_6cen8") +lower_threshold = 0.1 +upper_threshold = 1.0 + [sub_resource type="Resource" id="Resource_1hcnu"] script = ExtResource("3_pgmnb") override_action_settings = false @@ -227,16 +253,96 @@ is_remappable = false display_name = "" display_category = "" input = SubResource("Resource_oov4j") -modifiers = Array[ExtResource("5_dts0n")]([]) +modifiers = Array[ExtResource("5_dts0n")]([SubResource("Resource_tfgyj")]) triggers = Array[ExtResource("8_tlno4")]([]) [sub_resource type="Resource" id="Resource_der0j"] script = ExtResource("1_gh445") action = ExtResource("15_xnlyn") input_mappings = Array[ExtResource("3_pgmnb")]([SubResource("Resource_kyrsw"), SubResource("Resource_1hcnu")]) +metadata/_guide_input_mappings_collapsed = true + +[sub_resource type="Resource" id="Resource_o8dy0"] +script = ExtResource("14_74dxk") +axis = 4 +joy_index = -1 + +[sub_resource type="Resource" id="Resource_qctwy"] +script = ExtResource("18_qctwy") +actuation_threshold = 0.5 + +[sub_resource type="Resource" id="Resource_umy6c"] +script = ExtResource("3_pgmnb") +override_action_settings = false +is_remappable = false +display_name = "" +display_category = "" +input = SubResource("Resource_o8dy0") +modifiers = Array[ExtResource("5_dts0n")]([]) +triggers = Array[ExtResource("8_tlno4")]([SubResource("Resource_qctwy")]) + +[sub_resource type="Resource" id="Resource_ug3gn"] +script = ExtResource("1_gh445") +action = ExtResource("17_1l8ly") +input_mappings = Array[ExtResource("3_pgmnb")]([SubResource("Resource_umy6c")]) + +[sub_resource type="Resource" id="Resource_jjjri"] +script = ExtResource("14_74dxk") +axis = 4 +joy_index = -1 + +[sub_resource type="Resource" id="Resource_stt4v"] +script = ExtResource("20_lh6n3") +actuation_threshold = 0.5 + +[sub_resource type="Resource" id="Resource_wrn13"] +script = ExtResource("3_pgmnb") +override_action_settings = false +is_remappable = false +display_name = "" +display_category = "" +input = SubResource("Resource_jjjri") +modifiers = Array[ExtResource("5_dts0n")]([]) +triggers = Array[ExtResource("8_tlno4")]([SubResource("Resource_stt4v")]) + +[sub_resource type="Resource" id="Resource_ake3v"] +script = ExtResource("1_gh445") +action = ExtResource("19_xq5tv") +input_mappings = Array[ExtResource("3_pgmnb")]([SubResource("Resource_wrn13")]) + +[sub_resource type="Resource" id="Resource_y46dx"] +script = ExtResource("22_81iec") +button = 2 +joy_index = -1 + +[sub_resource type="Resource" id="Resource_xq5tv"] +script = ExtResource("23_w6gvf") +action = ExtResource("17_1l8ly") +actuation_threshold = 0.5 + +[sub_resource type="Resource" id="Resource_1l8ly"] +script = ExtResource("18_1l8ly") +actuation_threshold = 0.5 + +[sub_resource type="Resource" id="Resource_s03q7"] +script = ExtResource("3_pgmnb") +override_action_settings = false +is_remappable = false +display_name = "" +display_category = "" +input = SubResource("Resource_y46dx") +modifiers = Array[ExtResource("5_dts0n")]([]) +triggers = Array[ExtResource("8_tlno4")]([SubResource("Resource_xq5tv"), SubResource("Resource_1l8ly")]) +metadata/_guide_triggers_collapsed = false + +[sub_resource type="Resource" id="Resource_1qg80"] +script = ExtResource("1_gh445") +action = ExtResource("21_5y4tx") +input_mappings = Array[ExtResource("3_pgmnb")]([SubResource("Resource_s03q7")]) [resource] script = ExtResource("2_vcm25") display_name = "" -mappings = Array[ExtResource("1_gh445")]([SubResource("Resource_nd8wu"), SubResource("Resource_fnf72"), SubResource("Resource_der0j")]) +mappings = Array[ExtResource("1_gh445")]([SubResource("Resource_nd8wu"), SubResource("Resource_fnf72"), SubResource("Resource_der0j"), SubResource("Resource_ug3gn"), SubResource("Resource_ake3v"), SubResource("Resource_1qg80")]) metadata/_custom_type_script = "uid://dsa1dnifd6w32" +metadata/_guide_action_mappings_collapsed = false