From 52a9c3f120eab33355487ac26450586f74d19fb2 Mon Sep 17 00:00:00 2001 From: Minimata Date: Mon, 12 Jan 2026 14:58:43 +0100 Subject: [PATCH] Remapped some inputs and added slide, slam and parry mappings --- player_controller/PlayerController.tscn | 6 +- player_controller/Scripts/PlayerController.cs | 6 +- systems/inputs/base_mode/base_mode.tres | 100 ++++++++++-------- systems/inputs/base_mode/parry.tres | 7 ++ systems/inputs/base_mode/slam.tres | 7 ++ .../{empower_down.tres => slide_down.tres} | 0 ...mpower_release.tres => slide_release.tres} | 0 7 files changed, 76 insertions(+), 50 deletions(-) create mode 100644 systems/inputs/base_mode/parry.tres create mode 100644 systems/inputs/base_mode/slam.tres rename systems/inputs/base_mode/{empower_down.tres => slide_down.tres} (100%) rename systems/inputs/base_mode/{empower_release.tres => slide_release.tres} (100%) diff --git a/player_controller/PlayerController.tscn b/player_controller/PlayerController.tscn index 0015c438..4349c003 100644 --- a/player_controller/PlayerController.tscn +++ b/player_controller/PlayerController.tscn @@ -18,9 +18,9 @@ [ext_resource type="Resource" uid="uid://bebstkm608wxx" path="res://systems/inputs/base_mode/aim_pressed.tres" id="9_nob5r"] [ext_resource type="Resource" uid="uid://bdit2jy5gbpts" path="res://systems/inputs/base_mode/jump.tres" id="10_4u7i3"] [ext_resource type="Script" uid="uid://g8idirw62qe0" path="res://player_controller/Scripts/Bobbing.cs" id="10_7wk1w"] -[ext_resource type="Resource" uid="uid://b334rau1yxmm7" path="res://systems/inputs/base_mode/empower_down.tres" id="10_nodcl"] +[ext_resource type="Resource" uid="uid://b334rau1yxmm7" path="res://systems/inputs/base_mode/slide_down.tres" id="10_nodcl"] [ext_resource type="Resource" uid="uid://b5gx3q8nvu72e" path="res://systems/inputs/base_mode/hit.tres" id="11_cresl"] -[ext_resource type="Resource" uid="uid://bbce5wfwxpns1" path="res://systems/inputs/base_mode/empower_release.tres" id="11_ruloh"] +[ext_resource type="Resource" uid="uid://bbce5wfwxpns1" path="res://systems/inputs/base_mode/slide_release.tres" id="11_ruloh"] [ext_resource type="PackedScene" uid="uid://0ysqmqphq6mq" path="res://systems/head/head_system.tscn" id="11_rxwoh"] [ext_resource type="Resource" uid="uid://d2r0ur8k3cuu3" path="res://systems/inputs/base_mode/dash.tres" id="12_34snm"] [ext_resource type="Script" uid="uid://b6k73aj5povgv" path="res://player_controller/Scripts/FieldOfView.cs" id="12_m2mxi"] @@ -92,8 +92,6 @@ PostDashSpeed = 30.0 WallHugGravityLesseningFactor = 15.0 WallHugDownwardMaxSpeed = 8.0 WallHugHorizontalDeceleration = 0.5 -WallRunAltitudeLossSpeed = 12.0 -WallRunSpeedThreshold = 10.0 [node name="WallRunSnapper" type="RayCast3D" parent="."] unique_name_in_owner = true diff --git a/player_controller/Scripts/PlayerController.cs b/player_controller/Scripts/PlayerController.cs index 7598dcff..ef85e7c6 100644 --- a/player_controller/Scripts/PlayerController.cs +++ b/player_controller/Scripts/PlayerController.cs @@ -670,16 +670,14 @@ public partial class PlayerController : CharacterBody3D // Adapt vertical speed var verticalSpeed = Velocity.Y - WallRunAltitudeLossSpeed * delta; Velocity = finalHVel + Vector3.Up*verticalSpeed; - Velocity *= 0.995f; + Velocity *= 0.999f; _currentWallContactPoint = WallHugSystem.WallHugLocation.UnwrapOr(Vector3.Zero); if (isOnFloorCustom()) _playerState.SendEvent("grounded"); - if (!WallHugSystem.IsWallHugging() || Velocity.Length() < WallRunSpeedThreshold) - { + if (!WallHugSystem.IsWallHugging()) _playerState.SendEvent("start_falling"); - } } public void WallHug(float delta) diff --git a/systems/inputs/base_mode/base_mode.tres b/systems/inputs/base_mode/base_mode.tres index d2475978..5cf937f9 100644 --- a/systems/inputs/base_mode/base_mode.tres +++ b/systems/inputs/base_mode/base_mode.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="GUIDEMappingContext" load_steps=155 format=3 uid="uid://bl5crtu1gkrtr"] +[gd_resource type="Resource" script_class="GUIDEMappingContext" load_steps=159 format=3 uid="uid://bl5crtu1gkrtr"] [ext_resource type="Script" uid="uid://cpplm41b5bt6m" path="res://addons/guide/guide_action_mapping.gd" id="1_qmhk6"] [ext_resource type="Resource" uid="uid://htqvokm8mufq" path="res://systems/inputs/base_mode/move.tres" id="2_g6bbx"] @@ -18,22 +18,22 @@ [ext_resource type="Script" uid="uid://b52rqq28tuqpg" path="res://addons/guide/triggers/guide_trigger_pressed.gd" id="15_fykw6"] [ext_resource type="Script" uid="uid://b4cdrn4paoj3i" path="res://addons/guide/triggers/guide_trigger_down.gd" id="15_g6bbx"] [ext_resource type="Script" uid="uid://cgy4anjdob2tp" path="res://addons/guide/modifiers/guide_modifier_window_relative.gd" id="15_rvpjj"] -[ext_resource type="Resource" uid="uid://b334rau1yxmm7" path="res://systems/inputs/base_mode/empower_down.tres" id="16_0qat1"] [ext_resource type="Resource" uid="uid://bebstkm608wxx" path="res://systems/inputs/base_mode/aim_pressed.tres" id="16_li5ak"] [ext_resource type="Resource" uid="uid://j1o5ud0plk4" path="res://systems/inputs/base_mode/aim_release.tres" id="16_rvpjj"] [ext_resource type="Script" uid="uid://vgjlx6p007lp" path="res://addons/guide/inputs/guide_input_mouse_button.gd" id="17_kxb2c"] [ext_resource type="Script" uid="uid://biiggjw6tv4uq" path="res://addons/guide/triggers/guide_trigger_released.gd" id="17_s8kjn"] -[ext_resource type="Resource" uid="uid://7wm8ywvujwf" path="res://systems/inputs/base_mode/aim_cancel.tres" id="18_vibkn"] -[ext_resource type="Resource" uid="uid://bbce5wfwxpns1" path="res://systems/inputs/base_mode/empower_release.tres" id="19_li5ak"] +[ext_resource type="Resource" uid="uid://bbce5wfwxpns1" path="res://systems/inputs/base_mode/slide_release.tres" id="19_li5ak"] [ext_resource type="Script" uid="uid://rvttn472ix6v" path="res://addons/guide/inputs/guide_input_joy_button.gd" id="19_qkgmj"] [ext_resource type="Resource" uid="uid://bdit2jy5gbpts" path="res://systems/inputs/base_mode/jump.tres" id="21_818lq"] [ext_resource type="Resource" uid="uid://b5gx3q8nvu72e" path="res://systems/inputs/base_mode/hit.tres" id="22_2hs2y"] [ext_resource type="Resource" uid="uid://d2r0ur8k3cuu3" path="res://systems/inputs/base_mode/dash.tres" id="23_g6bbx"] [ext_resource type="Script" uid="uid://dsa1dnifd6w32" path="res://addons/guide/guide_mapping_context.gd" id="23_llfhp"] -[ext_resource type="Resource" uid="uid://bw5k2gsv3jqcv" path="res://systems/inputs/base_mode/throw.tres" id="24_yp12v"] +[ext_resource type="Resource" uid="uid://b334rau1yxmm7" path="res://systems/inputs/base_mode/slide_down.tres" id="23_rvpjj"] [ext_resource type="Resource" uid="uid://55b0dsvioj08" path="res://systems/inputs/base_mode/jump_pressed.tres" id="25_si4d4"] [ext_resource type="Resource" uid="uid://dgluj0ql5vth7" path="res://systems/inputs/base_mode/pause.tres" id="29_q86qg"] [ext_resource type="Script" uid="uid://cw71o87tvdx3q" path="res://addons/guide/inputs/guide_input_key.gd" id="30_cvxqo"] +[ext_resource type="Resource" uid="uid://spo3pbqjx0eb" path="res://systems/inputs/base_mode/parry.tres" id="30_rvpjj"] +[ext_resource type="Resource" uid="uid://dxy0071ic1wdj" path="res://systems/inputs/base_mode/slam.tres" id="32_s8kjn"] [ext_resource type="Resource" uid="uid://s1l0n1iitc6m" path="res://systems/inputs/base_mode/move_back.tres" id="33_fykw6"] [ext_resource type="Resource" uid="uid://brswsknpgwal2" path="res://systems/inputs/base_mode/move_front.tres" id="34_rvpjj"] [ext_resource type="Resource" uid="uid://f3vs6l4m623s" path="res://systems/inputs/base_mode/move_left.tres" id="35_s8kjn"] @@ -244,7 +244,7 @@ metadata/_guide_triggers_collapsed = false [sub_resource type="Resource" id="Resource_vibkn"] script = ExtResource("1_qmhk6") -action = ExtResource("16_0qat1") +action = ExtResource("23_rvpjj") input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_s8kjn")]) [sub_resource type="Resource" id="Resource_qkgmj"] @@ -264,23 +264,6 @@ script = ExtResource("1_qmhk6") action = ExtResource("19_li5ak") input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_818lq")]) -[sub_resource type="Resource" id="Resource_lfx76"] -script = ExtResource("19_qkgmj") -button = 2 - -[sub_resource type="Resource" id="Resource_oruo7"] -script = ExtResource("15_fykw6") - -[sub_resource type="Resource" id="Resource_4ee3d"] -script = ExtResource("3_yp12v") -input = SubResource("Resource_lfx76") -triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_oruo7")]) - -[sub_resource type="Resource" id="Resource_0s4kt"] -script = ExtResource("1_qmhk6") -action = ExtResource("18_vibkn") -input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_4ee3d")]) - [sub_resource type="Resource" id="Resource_1fkas"] script = ExtResource("19_qkgmj") @@ -359,6 +342,35 @@ script = ExtResource("1_qmhk6") action = ExtResource("22_2hs2y") input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_500v3"), SubResource("Resource_a8sqk")]) +[sub_resource type="Resource" id="Resource_kx31q"] +script = ExtResource("19_qkgmj") +button = 9 + +[sub_resource type="Resource" id="Resource_oux88"] +script = ExtResource("15_fykw6") + +[sub_resource type="Resource" id="Resource_b7w5s"] +script = ExtResource("3_yp12v") +input = SubResource("Resource_kx31q") +triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_oux88")]) + +[sub_resource type="Resource" id="Resource_f3pn5"] +script = ExtResource("17_kxb2c") +button = 2 + +[sub_resource type="Resource" id="Resource_y7p41"] +script = ExtResource("15_fykw6") + +[sub_resource type="Resource" id="Resource_3uxou"] +script = ExtResource("3_yp12v") +input = SubResource("Resource_f3pn5") +triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_y7p41")]) + +[sub_resource type="Resource" id="Resource_3frwi"] +script = ExtResource("1_qmhk6") +action = ExtResource("30_rvpjj") +input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_b7w5s"), SubResource("Resource_3uxou")]) + [sub_resource type="Resource" id="Resource_g6bbx"] script = ExtResource("19_qkgmj") button = 1 @@ -395,40 +407,44 @@ script = ExtResource("3_yp12v") input = SubResource("Resource_jk2g8") triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_wcvib")]) -[sub_resource type="Resource" id="Resource_kx31q"] -script = ExtResource("30_cvxqo") -key = 4194326 - -[sub_resource type="Resource" id="Resource_oux88"] -script = ExtResource("15_fykw6") - -[sub_resource type="Resource" id="Resource_b7w5s"] -script = ExtResource("3_yp12v") -input = SubResource("Resource_kx31q") -triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_oux88")]) - [sub_resource type="Resource" id="Resource_0qat1"] script = ExtResource("1_qmhk6") action = ExtResource("23_g6bbx") -input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_1rw8g"), SubResource("Resource_hj46p"), SubResource("Resource_imjft"), SubResource("Resource_b7w5s")]) +input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_1rw8g"), SubResource("Resource_hj46p"), SubResource("Resource_imjft")]) metadata/_guide_input_mappings_collapsed = false -[sub_resource type="Resource" id="Resource_j3axn"] +[sub_resource type="Resource" id="Resource_o5yys"] script = ExtResource("19_qkgmj") -button = 3 +button = 2 [sub_resource type="Resource" id="Resource_kxb2c"] script = ExtResource("15_fykw6") [sub_resource type="Resource" id="Resource_v2ywt"] script = ExtResource("3_yp12v") -input = SubResource("Resource_j3axn") +input = SubResource("Resource_o5yys") triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_kxb2c")]) +[sub_resource type="Resource" id="Resource_qksfw"] +script = ExtResource("30_cvxqo") +key = 69 + +[sub_resource type="Resource" id="Resource_woy8j"] +script = ExtResource("3_yp12v") +input = SubResource("Resource_qksfw") + +[sub_resource type="Resource" id="Resource_qpgnj"] +script = ExtResource("30_cvxqo") +key = 4194326 + +[sub_resource type="Resource" id="Resource_s6d3g"] +script = ExtResource("3_yp12v") +input = SubResource("Resource_qpgnj") + [sub_resource type="Resource" id="Resource_vtk18"] script = ExtResource("1_qmhk6") -action = ExtResource("24_yp12v") -input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_v2ywt")]) +action = ExtResource("32_s8kjn") +input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_v2ywt"), SubResource("Resource_woy8j"), SubResource("Resource_s6d3g")]) [sub_resource type="Resource" id="Resource_s4bc4"] script = ExtResource("30_cvxqo") @@ -526,5 +542,5 @@ input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_7io5e")]) [resource] script = ExtResource("23_llfhp") -mappings = Array[ExtResource("1_qmhk6")]([SubResource("Resource_88x08"), SubResource("Resource_tgr2g"), SubResource("Resource_iarn8"), SubResource("Resource_cvxqo"), SubResource("Resource_tb8ii"), SubResource("Resource_iihs4"), SubResource("Resource_vibkn"), SubResource("Resource_2hs2y"), SubResource("Resource_0s4kt"), SubResource("Resource_d2r0d"), SubResource("Resource_xt1x5"), SubResource("Resource_ew1hw"), SubResource("Resource_0qat1"), SubResource("Resource_vtk18"), SubResource("Resource_weyro"), SubResource("Resource_fjku4"), SubResource("Resource_odnhd"), SubResource("Resource_0eff7"), SubResource("Resource_gt77e")]) +mappings = Array[ExtResource("1_qmhk6")]([SubResource("Resource_88x08"), SubResource("Resource_tgr2g"), SubResource("Resource_iarn8"), SubResource("Resource_cvxqo"), SubResource("Resource_tb8ii"), SubResource("Resource_iihs4"), SubResource("Resource_vibkn"), SubResource("Resource_2hs2y"), SubResource("Resource_d2r0d"), SubResource("Resource_xt1x5"), SubResource("Resource_ew1hw"), SubResource("Resource_3frwi"), SubResource("Resource_0qat1"), SubResource("Resource_vtk18"), SubResource("Resource_weyro"), SubResource("Resource_fjku4"), SubResource("Resource_odnhd"), SubResource("Resource_0eff7"), SubResource("Resource_gt77e")]) metadata/_custom_type_script = "uid://dsa1dnifd6w32" diff --git a/systems/inputs/base_mode/parry.tres b/systems/inputs/base_mode/parry.tres new file mode 100644 index 00000000..8a001363 --- /dev/null +++ b/systems/inputs/base_mode/parry.tres @@ -0,0 +1,7 @@ +[gd_resource type="Resource" script_class="GUIDEAction" load_steps=2 format=3 uid="uid://spo3pbqjx0eb"] + +[ext_resource type="Script" uid="uid://cluhc11vixkf1" path="res://addons/guide/guide_action.gd" id="1_hlutc"] + +[resource] +script = ExtResource("1_hlutc") +metadata/_custom_type_script = "uid://cluhc11vixkf1" diff --git a/systems/inputs/base_mode/slam.tres b/systems/inputs/base_mode/slam.tres new file mode 100644 index 00000000..dc9cf00b --- /dev/null +++ b/systems/inputs/base_mode/slam.tres @@ -0,0 +1,7 @@ +[gd_resource type="Resource" script_class="GUIDEAction" load_steps=2 format=3 uid="uid://dxy0071ic1wdj"] + +[ext_resource type="Script" uid="uid://cluhc11vixkf1" path="res://addons/guide/guide_action.gd" id="1_6evmc"] + +[resource] +script = ExtResource("1_6evmc") +metadata/_custom_type_script = "uid://cluhc11vixkf1" diff --git a/systems/inputs/base_mode/empower_down.tres b/systems/inputs/base_mode/slide_down.tres similarity index 100% rename from systems/inputs/base_mode/empower_down.tres rename to systems/inputs/base_mode/slide_down.tres diff --git a/systems/inputs/base_mode/empower_release.tres b/systems/inputs/base_mode/slide_release.tres similarity index 100% rename from systems/inputs/base_mode/empower_release.tres rename to systems/inputs/base_mode/slide_release.tres