Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e32dac9e6e | |||
| 30b4d1a2eb | |||
| 2fa4ce68e7 | |||
| 80e533d98e | |||
| 0e3e258fd3 | |||
| c7991198ea |
@@ -133,6 +133,21 @@ material = ExtResource("3_vvhq3")
|
|||||||
transform = Transform3D(5, 0, 0, 0, -2.18557e-07, 5, 0, -5, -2.18557e-07, 1, 0.1, -9.5)
|
transform = Transform3D(5, 0, 0, 0, -2.18557e-07, 5, 0, -5, -2.18557e-07, 1, 0.1, -9.5)
|
||||||
text = "10m"
|
text = "10m"
|
||||||
|
|
||||||
|
[node name="Label3D6" type="Label3D" parent="Greybox/RunningTrack"]
|
||||||
|
transform = Transform3D(5, 0, 0, 0, -2.18557e-07, 5, 0, -5, -2.18557e-07, 27.5, 0.1, 1)
|
||||||
|
text = "10deg
|
||||||
|
"
|
||||||
|
|
||||||
|
[node name="Label3D7" type="Label3D" parent="Greybox/RunningTrack"]
|
||||||
|
transform = Transform3D(5, 0, 0, 0, -2.18557e-07, 5, 0, -5, -2.18557e-07, 30.5, 0.1, 1)
|
||||||
|
text = "20deg
|
||||||
|
"
|
||||||
|
|
||||||
|
[node name="Label3D8" type="Label3D" parent="Greybox/RunningTrack"]
|
||||||
|
transform = Transform3D(5, 0, 0, 0, -2.18557e-07, 5, 0, -5, -2.18557e-07, 33.5, 0.1, 1)
|
||||||
|
text = "30deg
|
||||||
|
"
|
||||||
|
|
||||||
[node name="Label3D2" type="Label3D" parent="Greybox/RunningTrack"]
|
[node name="Label3D2" type="Label3D" parent="Greybox/RunningTrack"]
|
||||||
transform = Transform3D(5, 0, 0, 0, -2.18557e-07, 5, 0, -5, -2.18557e-07, 1, 0.1, -19.5)
|
transform = Transform3D(5, 0, 0, 0, -2.18557e-07, 5, 0, -5, -2.18557e-07, 1, 0.1, -19.5)
|
||||||
text = "20m"
|
text = "20m"
|
||||||
@@ -367,6 +382,60 @@ use_collision = true
|
|||||||
size = Vector3(7.5, 20, 10)
|
size = Vector3(7.5, 20, 10)
|
||||||
material = ExtResource("3_vvhq3")
|
material = ExtResource("3_vvhq3")
|
||||||
|
|
||||||
|
[node name="CSGBox3D41" type="CSGBox3D" parent="Greybox/JumpHeights"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 22.75, 5, -1.5)
|
||||||
|
use_collision = true
|
||||||
|
size = Vector3(12.5, 10, 3)
|
||||||
|
material = ExtResource("3_vvhq3")
|
||||||
|
|
||||||
|
[node name="CSGBox3D47" type="CSGBox3D" parent="Greybox/JumpHeights"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 0.9848078, 0.17364816, 0, -0.17364816, 0.9848078, 22.75, 0.03095889, -30.695885)
|
||||||
|
use_collision = true
|
||||||
|
size = Vector3(12.5, 10, 58)
|
||||||
|
material = ExtResource("3_vvhq3")
|
||||||
|
|
||||||
|
[node name="CSGBox3D48" type="CSGBox3D" parent="Greybox/JumpHeights"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 0.9396926, 0.34202012, 0, -0.34202012, 0.9396926, 30.5, 1.5878377, -16.713436)
|
||||||
|
use_collision = true
|
||||||
|
size = Vector3(3, 6.5, 31.5)
|
||||||
|
material = ExtResource("3_vvhq3")
|
||||||
|
|
||||||
|
[node name="CSGBox3D49" type="CSGBox3D" parent="Greybox/JumpHeights"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 0.86602545, 0.5, 0, -0.5, 0.86602545, 33.5, 2.5053406, -10.524445)
|
||||||
|
use_collision = true
|
||||||
|
size = Vector3(3, 5.5, 20.5)
|
||||||
|
material = ExtResource("3_vvhq3")
|
||||||
|
|
||||||
|
[node name="CSGBox3D42" type="CSGBox3D" parent="Greybox/JumpHeights"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 30.5, 5, -1.5)
|
||||||
|
use_collision = true
|
||||||
|
size = Vector3(3, 10, 3)
|
||||||
|
material = ExtResource("3_vvhq3")
|
||||||
|
|
||||||
|
[node name="CSGBox3D43" type="CSGBox3D" parent="Greybox/JumpHeights"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 33.5, 5, -1.5)
|
||||||
|
use_collision = true
|
||||||
|
size = Vector3(3, 10, 3)
|
||||||
|
material = ExtResource("3_vvhq3")
|
||||||
|
|
||||||
|
[node name="CSGBox3D44" type="CSGBox3D" parent="Greybox/JumpHeights"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 36.5, 5, -1.5)
|
||||||
|
use_collision = true
|
||||||
|
size = Vector3(3, 10, 3)
|
||||||
|
material = ExtResource("3_vvhq3")
|
||||||
|
|
||||||
|
[node name="CSGBox3D45" type="CSGBox3D" parent="Greybox/JumpHeights"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 39.5, 5, -1.5)
|
||||||
|
use_collision = true
|
||||||
|
size = Vector3(3, 10, 3)
|
||||||
|
material = ExtResource("3_vvhq3")
|
||||||
|
|
||||||
|
[node name="CSGBox3D46" type="CSGBox3D" parent="Greybox/JumpHeights"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 42.5, 5, -1.5)
|
||||||
|
use_collision = true
|
||||||
|
size = Vector3(3, 10, 3)
|
||||||
|
material = ExtResource("3_vvhq3")
|
||||||
|
|
||||||
[node name="CSGBox3D34" type="CSGBox3D" parent="Greybox/JumpHeights"]
|
[node name="CSGBox3D34" type="CSGBox3D" parent="Greybox/JumpHeights"]
|
||||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -24.5, 10, -15)
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -24.5, 10, -15)
|
||||||
use_collision = true
|
use_collision = true
|
||||||
|
|||||||
@@ -24,7 +24,7 @@
|
|||||||
[ext_resource type="Resource" uid="uid://55b0dsvioj08" path="res://systems/inputs/base_mode/jump_pressed.tres" id="13_nob5r"]
|
[ext_resource type="Resource" uid="uid://55b0dsvioj08" path="res://systems/inputs/base_mode/jump_pressed.tres" id="13_nob5r"]
|
||||||
[ext_resource type="Shape3D" uid="uid://keseacdcooot" path="res://player_controller/resources/PlayerShape.tres" id="13_r7i3q"]
|
[ext_resource type="Shape3D" uid="uid://keseacdcooot" path="res://player_controller/resources/PlayerShape.tres" id="13_r7i3q"]
|
||||||
[ext_resource type="Script" uid="uid://b5nk6ntlps3x0" path="res://systems/inputs/input_system.gd" id="16_v31n3"]
|
[ext_resource type="Script" uid="uid://b5nk6ntlps3x0" path="res://systems/inputs/input_system.gd" id="16_v31n3"]
|
||||||
[ext_resource type="Resource" uid="uid://b334rau1yxmm7" path="res://systems/inputs/base_mode/slide.tres" id="17_6lejt"]
|
[ext_resource type="Resource" uid="uid://b334rau1yxmm7" path="res://systems/inputs/base_mode/slide_released.tres" id="17_6lejt"]
|
||||||
[ext_resource type="Resource" uid="uid://htqvokm8mufq" path="res://systems/inputs/base_mode/move.tres" id="17_h6vvl"]
|
[ext_resource type="Resource" uid="uid://htqvokm8mufq" path="res://systems/inputs/base_mode/move.tres" id="17_h6vvl"]
|
||||||
[ext_resource type="PackedScene" uid="uid://cqduhd4opgwvm" path="res://systems/dash/dash_system.tscn" id="18_q5h8a"]
|
[ext_resource type="PackedScene" uid="uid://cqduhd4opgwvm" path="res://systems/dash/dash_system.tscn" id="18_q5h8a"]
|
||||||
[ext_resource type="Resource" uid="uid://bbce5wfwxpns1" path="res://systems/inputs/base_mode/slide_pressed.tres" id="18_q14ux"]
|
[ext_resource type="Resource" uid="uid://bbce5wfwxpns1" path="res://systems/inputs/base_mode/slide_pressed.tres" id="18_q14ux"]
|
||||||
@@ -84,12 +84,23 @@ DoubleJumpHangTimeInFrames = 3
|
|||||||
DoubleJumpGravityLesseningFactor = 1.5
|
DoubleJumpGravityLesseningFactor = 1.5
|
||||||
WallJumpStartVelocity = 8.0
|
WallJumpStartVelocity = 8.0
|
||||||
MaxNumberOfEmpoweredActions = 3
|
MaxNumberOfEmpoweredActions = 3
|
||||||
SimpleDashStrength = 15.0
|
SimpleDashStrength = 18.0
|
||||||
|
SimpleDashTime = 0.2
|
||||||
AimedDashTime = 0.2
|
AimedDashTime = 0.2
|
||||||
PostDashSpeed = 30.0
|
PostDashSpeed = 30.0
|
||||||
|
SlamSpeed = 80.0
|
||||||
|
GroundSlideJumpMultiplier = 0.1
|
||||||
|
GroundSlideJumpSpeedFactor = 0.1
|
||||||
|
GroundSlideDownSlopeAcceleration = 0.2
|
||||||
|
GroundSlideDownSlopeMaxSpeed = 30.0
|
||||||
|
AirGlideVSpeed = 4.0
|
||||||
|
AccelerationAirGlide = 0.4
|
||||||
|
AirGlideVerticalAcceleration = 8.0
|
||||||
|
AirGlideJumpMultiplier = 0.1
|
||||||
|
AirGlideJumpSpeedFactor = 0.05
|
||||||
WallHugGravityLesseningFactor = 15.0
|
WallHugGravityLesseningFactor = 15.0
|
||||||
WallHugDownwardMaxSpeed = 8.0
|
WallHugDownwardMaxSpeed = 4.0
|
||||||
WallHugHorizontalDeceleration = 0.5
|
WallHugHorizontalDeceleration = 1.0
|
||||||
|
|
||||||
[node name="WallRunSnapper" type="RayCast3D" parent="."]
|
[node name="WallRunSnapper" type="RayCast3D" parent="."]
|
||||||
unique_name_in_owner = true
|
unique_name_in_owner = true
|
||||||
@@ -112,8 +123,8 @@ aim_pressed = ExtResource("9_nob5r")
|
|||||||
aim_released = ExtResource("8_lhb11")
|
aim_released = ExtResource("8_lhb11")
|
||||||
jump = ExtResource("10_4u7i3")
|
jump = ExtResource("10_4u7i3")
|
||||||
jump_pressed = ExtResource("13_nob5r")
|
jump_pressed = ExtResource("13_nob5r")
|
||||||
slide = ExtResource("17_6lejt")
|
|
||||||
slide_pressed = ExtResource("18_q14ux")
|
slide_pressed = ExtResource("18_q14ux")
|
||||||
|
slide_released = ExtResource("17_6lejt")
|
||||||
hit = ExtResource("11_cresl")
|
hit = ExtResource("11_cresl")
|
||||||
parry = ExtResource("18_ruloh")
|
parry = ExtResource("18_ruloh")
|
||||||
dash = ExtResource("12_34snm")
|
dash = ExtResource("12_34snm")
|
||||||
@@ -480,6 +491,33 @@ to = NodePath("../OnWall/Hanging")
|
|||||||
event = &"to_planted"
|
event = &"to_planted"
|
||||||
delay_in_seconds = "0.0"
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
|
[node name="Grounded" type="Node" parent="StateChart/Root/Movement"]
|
||||||
|
script = ExtResource("27_34snm")
|
||||||
|
|
||||||
|
[node name="OnDash" type="Node" parent="StateChart/Root/Movement/Grounded"]
|
||||||
|
script = ExtResource("28_n7qhm")
|
||||||
|
to = NodePath("../../Dashing/Dash")
|
||||||
|
event = &"dash"
|
||||||
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
|
[node name="OnJump" type="Node" parent="StateChart/Root/Movement/Grounded"]
|
||||||
|
script = ExtResource("28_n7qhm")
|
||||||
|
to = NodePath("../../Jump/SimpleJump")
|
||||||
|
event = &"jump"
|
||||||
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
|
[node name="OnAirborne" type="Node" parent="StateChart/Root/Movement/Grounded"]
|
||||||
|
script = ExtResource("28_n7qhm")
|
||||||
|
to = NodePath("../../Airborne/CoyoteEnabled")
|
||||||
|
event = &"start_falling"
|
||||||
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
|
[node name="OnSlide" type="Node" parent="StateChart/Root/Movement/Grounded"]
|
||||||
|
script = ExtResource("28_n7qhm")
|
||||||
|
to = NodePath("../../Sliding/GroundSlide")
|
||||||
|
event = &"slide"
|
||||||
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
[node name="Mantling" type="Node" parent="StateChart/Root/Movement"]
|
[node name="Mantling" type="Node" parent="StateChart/Root/Movement"]
|
||||||
script = ExtResource("27_34snm")
|
script = ExtResource("27_34snm")
|
||||||
|
|
||||||
@@ -495,6 +533,15 @@ to = NodePath("../../OnWall/Hugging")
|
|||||||
event = &"on_wall"
|
event = &"on_wall"
|
||||||
delay_in_seconds = "0.0"
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
|
[node name="Slamming" type="Node" parent="StateChart/Root/Movement"]
|
||||||
|
script = ExtResource("27_34snm")
|
||||||
|
|
||||||
|
[node name="OnSlamEnded" type="Node" parent="StateChart/Root/Movement/Slamming"]
|
||||||
|
script = ExtResource("28_n7qhm")
|
||||||
|
to = NodePath("../../Grounded")
|
||||||
|
event = &"grounded"
|
||||||
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
[node name="Jump" type="Node" parent="StateChart/Root/Movement"]
|
[node name="Jump" type="Node" parent="StateChart/Root/Movement"]
|
||||||
script = ExtResource("26_infe6")
|
script = ExtResource("26_infe6")
|
||||||
initial_state = NodePath("SimpleJump")
|
initial_state = NodePath("SimpleJump")
|
||||||
@@ -514,10 +561,10 @@ to = NodePath("../../../Airborne/DoubleJumpEnabled")
|
|||||||
event = &"jump_ended"
|
event = &"jump_ended"
|
||||||
delay_in_seconds = "0.0"
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
[node name="OnMegajump" type="Node" parent="StateChart/Root/Movement/Jump/SimpleJump"]
|
[node name="OnSlide" type="Node" parent="StateChart/Root/Movement/Jump/SimpleJump"]
|
||||||
script = ExtResource("28_n7qhm")
|
script = ExtResource("28_n7qhm")
|
||||||
to = NodePath("../../MegaJump")
|
to = NodePath("../../../Sliding/AirGlideDoubleJumpEnabled")
|
||||||
event = &"megajump"
|
event = &"slide"
|
||||||
delay_in_seconds = "0.0"
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
[node name="DoubleJump" type="Node" parent="StateChart/Root/Movement/Jump"]
|
[node name="DoubleJump" type="Node" parent="StateChart/Root/Movement/Jump"]
|
||||||
@@ -529,15 +576,12 @@ to = NodePath("../../../Airborne/Falling")
|
|||||||
event = &"jump_ended"
|
event = &"jump_ended"
|
||||||
delay_in_seconds = "0.0"
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
[node name="OnMegajump" type="Node" parent="StateChart/Root/Movement/Jump/DoubleJump"]
|
[node name="OnSlide" type="Node" parent="StateChart/Root/Movement/Jump/DoubleJump"]
|
||||||
script = ExtResource("28_n7qhm")
|
script = ExtResource("28_n7qhm")
|
||||||
to = NodePath("../../MegaJump")
|
to = NodePath("../../../Sliding/AirGlide")
|
||||||
event = &"megajump"
|
event = &"slide"
|
||||||
delay_in_seconds = "0.0"
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
[node name="MegaJump" type="Node" parent="StateChart/Root/Movement/Jump"]
|
|
||||||
script = ExtResource("27_34snm")
|
|
||||||
|
|
||||||
[node name="Dashing" type="Node" parent="StateChart/Root/Movement"]
|
[node name="Dashing" type="Node" parent="StateChart/Root/Movement"]
|
||||||
script = ExtResource("26_infe6")
|
script = ExtResource("26_infe6")
|
||||||
initial_state = NodePath("Dash")
|
initial_state = NodePath("Dash")
|
||||||
@@ -566,31 +610,77 @@ script = ExtResource("27_34snm")
|
|||||||
[node name="ToWeaponDash" type="Node" parent="StateChart/Root/Movement/Dashing"]
|
[node name="ToWeaponDash" type="Node" parent="StateChart/Root/Movement/Dashing"]
|
||||||
script = ExtResource("27_34snm")
|
script = ExtResource("27_34snm")
|
||||||
|
|
||||||
[node name="Grounded" type="Node" parent="StateChart/Root/Movement"]
|
[node name="Sliding" type="Node" parent="StateChart/Root/Movement"]
|
||||||
script = ExtResource("27_34snm")
|
script = ExtResource("26_infe6")
|
||||||
|
initial_state = NodePath("GroundSlide")
|
||||||
|
|
||||||
[node name="OnDash" type="Node" parent="StateChart/Root/Movement/Grounded"]
|
[node name="OnDash" type="Node" parent="StateChart/Root/Movement/Sliding"]
|
||||||
script = ExtResource("28_n7qhm")
|
script = ExtResource("28_n7qhm")
|
||||||
to = NodePath("../../Dashing/Dash")
|
to = NodePath("../../Dashing/Dash")
|
||||||
event = &"dash"
|
event = &"actually_no_dash"
|
||||||
delay_in_seconds = "0.0"
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
[node name="OnJump" type="Node" parent="StateChart/Root/Movement/Grounded"]
|
[node name="OnMantle" type="Node" parent="StateChart/Root/Movement/Sliding"]
|
||||||
script = ExtResource("28_n7qhm")
|
script = ExtResource("28_n7qhm")
|
||||||
to = NodePath("../../Jump/SimpleJump")
|
to = NodePath("../../Mantling")
|
||||||
|
event = &"mantle"
|
||||||
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
|
[node name="GroundSlide" type="Node" parent="StateChart/Root/Movement/Sliding"]
|
||||||
|
script = ExtResource("27_34snm")
|
||||||
|
|
||||||
|
[node name="OnSlideReleased" type="Node" parent="StateChart/Root/Movement/Sliding/GroundSlide"]
|
||||||
|
script = ExtResource("28_n7qhm")
|
||||||
|
to = NodePath("../../../Grounded")
|
||||||
|
event = &"slide_released"
|
||||||
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
|
[node name="OnAirborne" type="Node" parent="StateChart/Root/Movement/Sliding/GroundSlide"]
|
||||||
|
script = ExtResource("28_n7qhm")
|
||||||
|
to = NodePath("../../AirGlideDoubleJumpEnabled")
|
||||||
|
event = &"start_falling"
|
||||||
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
|
[node name="OnJump" type="Node" parent="StateChart/Root/Movement/Sliding/GroundSlide"]
|
||||||
|
script = ExtResource("28_n7qhm")
|
||||||
|
to = NodePath("../../../Jump/SimpleJump")
|
||||||
event = &"jump"
|
event = &"jump"
|
||||||
delay_in_seconds = "0.0"
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
[node name="OnMegajump" type="Node" parent="StateChart/Root/Movement/Grounded"]
|
[node name="AirGlideDoubleJumpEnabled" type="Node" parent="StateChart/Root/Movement/Sliding"]
|
||||||
|
script = ExtResource("27_34snm")
|
||||||
|
|
||||||
|
[node name="OnSlideReleased" type="Node" parent="StateChart/Root/Movement/Sliding/AirGlideDoubleJumpEnabled"]
|
||||||
script = ExtResource("28_n7qhm")
|
script = ExtResource("28_n7qhm")
|
||||||
to = NodePath("../../Jump/MegaJump")
|
to = NodePath("../../../Airborne/Reset")
|
||||||
event = &"megajump"
|
event = &"slide_released"
|
||||||
delay_in_seconds = "0.0"
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
[node name="OnAirborne" type="Node" parent="StateChart/Root/Movement/Grounded"]
|
[node name="OnGrounded" type="Node" parent="StateChart/Root/Movement/Sliding/AirGlideDoubleJumpEnabled"]
|
||||||
script = ExtResource("28_n7qhm")
|
script = ExtResource("28_n7qhm")
|
||||||
to = NodePath("../../Airborne/CoyoteEnabled")
|
to = NodePath("../../GroundSlide")
|
||||||
event = &"start_falling"
|
event = &"grounded"
|
||||||
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
|
[node name="OnJump" type="Node" parent="StateChart/Root/Movement/Sliding/AirGlideDoubleJumpEnabled"]
|
||||||
|
script = ExtResource("28_n7qhm")
|
||||||
|
to = NodePath("../../../Jump/DoubleJump")
|
||||||
|
event = &"jump"
|
||||||
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
|
[node name="AirGlide" type="Node" parent="StateChart/Root/Movement/Sliding"]
|
||||||
|
script = ExtResource("27_34snm")
|
||||||
|
|
||||||
|
[node name="OnSlideReleased" type="Node" parent="StateChart/Root/Movement/Sliding/AirGlide"]
|
||||||
|
script = ExtResource("28_n7qhm")
|
||||||
|
to = NodePath("../../../Airborne/Reset")
|
||||||
|
event = &"slide_released"
|
||||||
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
|
[node name="OnGrounded" type="Node" parent="StateChart/Root/Movement/Sliding/AirGlide"]
|
||||||
|
script = ExtResource("28_n7qhm")
|
||||||
|
to = NodePath("../../GroundSlide")
|
||||||
|
event = &"grounded"
|
||||||
delay_in_seconds = "0.0"
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
[node name="Airborne" type="Node" parent="StateChart/Root/Movement"]
|
[node name="Airborne" type="Node" parent="StateChart/Root/Movement"]
|
||||||
@@ -619,13 +709,19 @@ to = NodePath("../../Grounded")
|
|||||||
event = &"grounded"
|
event = &"grounded"
|
||||||
delay_in_seconds = "0.0"
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
|
[node name="OnSlam" type="Node" parent="StateChart/Root/Movement/Airborne"]
|
||||||
|
script = ExtResource("28_n7qhm")
|
||||||
|
to = NodePath("../../Slamming")
|
||||||
|
event = &"slam"
|
||||||
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
[node name="CoyoteEnabled" type="Node" parent="StateChart/Root/Movement/Airborne"]
|
[node name="CoyoteEnabled" type="Node" parent="StateChart/Root/Movement/Airborne"]
|
||||||
script = ExtResource("27_34snm")
|
script = ExtResource("27_34snm")
|
||||||
|
|
||||||
[node name="OnMegajump" type="Node" parent="StateChart/Root/Movement/Airborne/CoyoteEnabled"]
|
[node name="OnSlide" type="Node" parent="StateChart/Root/Movement/Airborne/CoyoteEnabled"]
|
||||||
script = ExtResource("28_n7qhm")
|
script = ExtResource("28_n7qhm")
|
||||||
to = NodePath("../../../Jump/MegaJump")
|
to = NodePath("../../../Sliding/AirGlideDoubleJumpEnabled")
|
||||||
event = &"megajump"
|
event = &"slide"
|
||||||
delay_in_seconds = "0.0"
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
[node name="OnJump" type="Node" parent="StateChart/Root/Movement/Airborne/CoyoteEnabled"]
|
[node name="OnJump" type="Node" parent="StateChart/Root/Movement/Airborne/CoyoteEnabled"]
|
||||||
@@ -643,15 +739,16 @@ delay_in_seconds = "0.0"
|
|||||||
[node name="DoubleJumpEnabled" type="Node" parent="StateChart/Root/Movement/Airborne"]
|
[node name="DoubleJumpEnabled" type="Node" parent="StateChart/Root/Movement/Airborne"]
|
||||||
script = ExtResource("27_34snm")
|
script = ExtResource("27_34snm")
|
||||||
|
|
||||||
[node name="OnWallHug" type="Node" parent="StateChart/Root/Movement/Airborne/DoubleJumpEnabled"]
|
[node name="OnSlide" type="Node" parent="StateChart/Root/Movement/Airborne/DoubleJumpEnabled"]
|
||||||
script = ExtResource("28_n7qhm")
|
script = ExtResource("28_n7qhm")
|
||||||
event = &"wall_hug"
|
to = NodePath("../../../Sliding/AirGlideDoubleJumpEnabled")
|
||||||
|
event = &"slide"
|
||||||
delay_in_seconds = "0.0"
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
[node name="OnMegajump" type="Node" parent="StateChart/Root/Movement/Airborne/DoubleJumpEnabled"]
|
[node name="OnWallHug" type="Node" parent="StateChart/Root/Movement/Airborne/DoubleJumpEnabled"]
|
||||||
script = ExtResource("28_n7qhm")
|
script = ExtResource("28_n7qhm")
|
||||||
to = NodePath("../../../Jump/MegaJump")
|
to = NodePath("../../../OnWall/Hugging")
|
||||||
event = &"megajump"
|
event = &"wall_hug"
|
||||||
delay_in_seconds = "0.0"
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
[node name="OnJump" type="Node" parent="StateChart/Root/Movement/Airborne/DoubleJumpEnabled"]
|
[node name="OnJump" type="Node" parent="StateChart/Root/Movement/Airborne/DoubleJumpEnabled"]
|
||||||
@@ -663,6 +760,12 @@ delay_in_seconds = "0.0"
|
|||||||
[node name="Falling" type="Node" parent="StateChart/Root/Movement/Airborne"]
|
[node name="Falling" type="Node" parent="StateChart/Root/Movement/Airborne"]
|
||||||
script = ExtResource("27_34snm")
|
script = ExtResource("27_34snm")
|
||||||
|
|
||||||
|
[node name="OnSlide" type="Node" parent="StateChart/Root/Movement/Airborne/Falling"]
|
||||||
|
script = ExtResource("28_n7qhm")
|
||||||
|
to = NodePath("../../../Sliding/AirGlide")
|
||||||
|
event = &"slide"
|
||||||
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
[node name="OnWallHug" type="Node" parent="StateChart/Root/Movement/Airborne/Falling"]
|
[node name="OnWallHug" type="Node" parent="StateChart/Root/Movement/Airborne/Falling"]
|
||||||
script = ExtResource("28_n7qhm")
|
script = ExtResource("28_n7qhm")
|
||||||
to = NodePath("../../../OnWall/Hugging")
|
to = NodePath("../../../OnWall/Hugging")
|
||||||
@@ -675,6 +778,12 @@ to = NodePath("../../DoubleJumpEnabled")
|
|||||||
event = &"enable_double_jump"
|
event = &"enable_double_jump"
|
||||||
delay_in_seconds = "0.0"
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
|
[node name="OnWallJump" type="Node" parent="StateChart/Root/Movement/Airborne/Falling"]
|
||||||
|
script = ExtResource("28_n7qhm")
|
||||||
|
to = NodePath("../../../Jump/DoubleJump")
|
||||||
|
event = &"wall_jump"
|
||||||
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
[node name="OnWall" type="Node" parent="StateChart/Root/Movement"]
|
[node name="OnWall" type="Node" parent="StateChart/Root/Movement"]
|
||||||
script = ExtResource("26_infe6")
|
script = ExtResource("26_infe6")
|
||||||
initial_state = NodePath("Hugging")
|
initial_state = NodePath("Hugging")
|
||||||
@@ -685,12 +794,6 @@ to = NodePath("../../Grounded")
|
|||||||
event = &"grounded"
|
event = &"grounded"
|
||||||
delay_in_seconds = "0.0"
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
[node name="OnMegajump" type="Node" parent="StateChart/Root/Movement/OnWall"]
|
|
||||||
script = ExtResource("28_n7qhm")
|
|
||||||
to = NodePath("../../Jump/MegaJump")
|
|
||||||
event = &"megajump"
|
|
||||||
delay_in_seconds = "0.0"
|
|
||||||
|
|
||||||
[node name="OnLeaveWall" type="Node" parent="StateChart/Root/Movement/OnWall"]
|
[node name="OnLeaveWall" type="Node" parent="StateChart/Root/Movement/OnWall"]
|
||||||
script = ExtResource("28_n7qhm")
|
script = ExtResource("28_n7qhm")
|
||||||
to = NodePath("../../Airborne/Reset")
|
to = NodePath("../../Airborne/Reset")
|
||||||
@@ -705,7 +808,7 @@ delay_in_seconds = "0.0"
|
|||||||
|
|
||||||
[node name="OnJump" type="Node" parent="StateChart/Root/Movement/OnWall"]
|
[node name="OnJump" type="Node" parent="StateChart/Root/Movement/OnWall"]
|
||||||
script = ExtResource("28_n7qhm")
|
script = ExtResource("28_n7qhm")
|
||||||
to = NodePath("../../Jump/DoubleJump")
|
to = NodePath("../../Jump/SimpleJump")
|
||||||
event = &"jump"
|
event = &"jump"
|
||||||
delay_in_seconds = "0.0"
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
@@ -752,6 +855,5 @@ delay_in_seconds = "0.0"
|
|||||||
[connection signal="input_rotate_y" from="InputController" to="." method="OnInputRotateY"]
|
[connection signal="input_rotate_y" from="InputController" to="." method="OnInputRotateY"]
|
||||||
[connection signal="input_slam" from="InputController" to="." method="OnInputSlamPressed"]
|
[connection signal="input_slam" from="InputController" to="." method="OnInputSlamPressed"]
|
||||||
[connection signal="input_slide_ended" from="InputController" to="." method="OnInputSlideEnded"]
|
[connection signal="input_slide_ended" from="InputController" to="." method="OnInputSlideEnded"]
|
||||||
[connection signal="input_slide_ongoing" from="InputController" to="." method="OnInputSlideOngoing"]
|
|
||||||
[connection signal="input_slide_started" from="InputController" to="." method="OnInputSlideStarted"]
|
[connection signal="input_slide_started" from="InputController" to="." method="OnInputSlideStarted"]
|
||||||
[connection signal="WallDetected" from="WallHugSystem" to="." method="OnWallDetected"]
|
[connection signal="WallDetected" from="WallHugSystem" to="." method="OnWallDetected"]
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -1,4 +1,4 @@
|
|||||||
[gd_resource type="Resource" script_class="GUIDEMappingContext" load_steps=157 format=3 uid="uid://bl5crtu1gkrtr"]
|
[gd_resource type="Resource" script_class="GUIDEMappingContext" load_steps=161 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="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"]
|
[ext_resource type="Resource" uid="uid://htqvokm8mufq" path="res://systems/inputs/base_mode/move.tres" id="2_g6bbx"]
|
||||||
@@ -28,7 +28,7 @@
|
|||||||
[ext_resource type="Resource" uid="uid://d2r0ur8k3cuu3" path="res://systems/inputs/base_mode/dash.tres" id="23_g6bbx"]
|
[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="Script" uid="uid://dsa1dnifd6w32" path="res://addons/guide/guide_mapping_context.gd" id="23_llfhp"]
|
||||||
[ext_resource type="Resource" uid="uid://bbce5wfwxpns1" path="res://systems/inputs/base_mode/slide_pressed.tres" id="23_rvpjj"]
|
[ext_resource type="Resource" uid="uid://bbce5wfwxpns1" path="res://systems/inputs/base_mode/slide_pressed.tres" id="23_rvpjj"]
|
||||||
[ext_resource type="Resource" uid="uid://b334rau1yxmm7" path="res://systems/inputs/base_mode/slide.tres" id="25_s8kjn"]
|
[ext_resource type="Resource" uid="uid://b334rau1yxmm7" path="res://systems/inputs/base_mode/slide_released.tres" id="25_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://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="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="Script" uid="uid://cw71o87tvdx3q" path="res://addons/guide/inputs/guide_input_key.gd" id="30_cvxqo"]
|
||||||
@@ -234,7 +234,7 @@ script = ExtResource("10_cvxqo")
|
|||||||
axis = 5
|
axis = 5
|
||||||
|
|
||||||
[sub_resource type="Resource" id="Resource_st2ej"]
|
[sub_resource type="Resource" id="Resource_st2ej"]
|
||||||
script = ExtResource("15_fykw6")
|
script = ExtResource("15_g6bbx")
|
||||||
|
|
||||||
[sub_resource type="Resource" id="Resource_s8kjn"]
|
[sub_resource type="Resource" id="Resource_s8kjn"]
|
||||||
script = ExtResource("3_yp12v")
|
script = ExtResource("3_yp12v")
|
||||||
@@ -246,10 +246,13 @@ metadata/_guide_triggers_collapsed = false
|
|||||||
script = ExtResource("30_cvxqo")
|
script = ExtResource("30_cvxqo")
|
||||||
key = 4194326
|
key = 4194326
|
||||||
|
|
||||||
|
[sub_resource type="Resource" id="Resource_8ifoc"]
|
||||||
|
script = ExtResource("15_g6bbx")
|
||||||
|
|
||||||
[sub_resource type="Resource" id="Resource_imjft"]
|
[sub_resource type="Resource" id="Resource_imjft"]
|
||||||
script = ExtResource("3_yp12v")
|
script = ExtResource("3_yp12v")
|
||||||
input = SubResource("Resource_wcvib")
|
input = SubResource("Resource_wcvib")
|
||||||
triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_st2ej")])
|
triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_8ifoc")])
|
||||||
metadata/_guide_triggers_collapsed = false
|
metadata/_guide_triggers_collapsed = false
|
||||||
|
|
||||||
[sub_resource type="Resource" id="Resource_vibkn"]
|
[sub_resource type="Resource" id="Resource_vibkn"]
|
||||||
@@ -261,21 +264,29 @@ input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_s8kjn"), S
|
|||||||
script = ExtResource("10_cvxqo")
|
script = ExtResource("10_cvxqo")
|
||||||
axis = 5
|
axis = 5
|
||||||
|
|
||||||
|
[sub_resource type="Resource" id="Resource_rvpjj"]
|
||||||
|
script = ExtResource("17_s8kjn")
|
||||||
|
|
||||||
[sub_resource type="Resource" id="Resource_818lq"]
|
[sub_resource type="Resource" id="Resource_818lq"]
|
||||||
script = ExtResource("3_yp12v")
|
script = ExtResource("3_yp12v")
|
||||||
input = SubResource("Resource_f3pn5")
|
input = SubResource("Resource_f3pn5")
|
||||||
|
triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_rvpjj")])
|
||||||
|
|
||||||
[sub_resource type="Resource" id="Resource_qksfw"]
|
[sub_resource type="Resource" id="Resource_qksfw"]
|
||||||
script = ExtResource("30_cvxqo")
|
script = ExtResource("30_cvxqo")
|
||||||
key = 4194326
|
key = 4194326
|
||||||
|
|
||||||
|
[sub_resource type="Resource" id="Resource_bhf7o"]
|
||||||
|
script = ExtResource("17_s8kjn")
|
||||||
|
|
||||||
[sub_resource type="Resource" id="Resource_woy8j"]
|
[sub_resource type="Resource" id="Resource_woy8j"]
|
||||||
script = ExtResource("3_yp12v")
|
script = ExtResource("3_yp12v")
|
||||||
input = SubResource("Resource_qksfw")
|
input = SubResource("Resource_qksfw")
|
||||||
|
triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_bhf7o")])
|
||||||
|
|
||||||
[sub_resource type="Resource" id="Resource_2hs2y"]
|
[sub_resource type="Resource" id="Resource_2hs2y"]
|
||||||
script = ExtResource("1_qmhk6")
|
script = ExtResource("1_qmhk6")
|
||||||
action = ExtResource("25_s8kjn")
|
action = ExtResource("25_rvpjj")
|
||||||
input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_818lq"), SubResource("Resource_woy8j")])
|
input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_818lq"), SubResource("Resource_woy8j")])
|
||||||
|
|
||||||
[sub_resource type="Resource" id="Resource_1fkas"]
|
[sub_resource type="Resource" id="Resource_1fkas"]
|
||||||
@@ -419,21 +430,25 @@ metadata/_guide_input_mappings_collapsed = false
|
|||||||
script = ExtResource("19_qkgmj")
|
script = ExtResource("19_qkgmj")
|
||||||
button = 2
|
button = 2
|
||||||
|
|
||||||
[sub_resource type="Resource" id="Resource_kxb2c"]
|
[sub_resource type="Resource" id="Resource_06f1o"]
|
||||||
script = ExtResource("15_fykw6")
|
script = ExtResource("15_g6bbx")
|
||||||
|
|
||||||
[sub_resource type="Resource" id="Resource_v2ywt"]
|
[sub_resource type="Resource" id="Resource_v2ywt"]
|
||||||
script = ExtResource("3_yp12v")
|
script = ExtResource("3_yp12v")
|
||||||
input = SubResource("Resource_o5yys")
|
input = SubResource("Resource_o5yys")
|
||||||
triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_kxb2c")])
|
triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_06f1o")])
|
||||||
|
|
||||||
[sub_resource type="Resource" id="Resource_qpgnj"]
|
[sub_resource type="Resource" id="Resource_qpgnj"]
|
||||||
script = ExtResource("30_cvxqo")
|
script = ExtResource("30_cvxqo")
|
||||||
key = 69
|
key = 69
|
||||||
|
|
||||||
|
[sub_resource type="Resource" id="Resource_g5tel"]
|
||||||
|
script = ExtResource("15_g6bbx")
|
||||||
|
|
||||||
[sub_resource type="Resource" id="Resource_s6d3g"]
|
[sub_resource type="Resource" id="Resource_s6d3g"]
|
||||||
script = ExtResource("3_yp12v")
|
script = ExtResource("3_yp12v")
|
||||||
input = SubResource("Resource_qpgnj")
|
input = SubResource("Resource_qpgnj")
|
||||||
|
triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_g5tel")])
|
||||||
|
|
||||||
[sub_resource type="Resource" id="Resource_vtk18"]
|
[sub_resource type="Resource" id="Resource_vtk18"]
|
||||||
script = ExtResource("1_qmhk6")
|
script = ExtResource("1_qmhk6")
|
||||||
|
|||||||
@@ -22,8 +22,8 @@ class_name InputController
|
|||||||
@export var jump:GUIDEAction
|
@export var jump:GUIDEAction
|
||||||
@export var jump_pressed:GUIDEAction
|
@export var jump_pressed:GUIDEAction
|
||||||
@export_subgroup("Slide")
|
@export_subgroup("Slide")
|
||||||
@export var slide:GUIDEAction
|
|
||||||
@export var slide_pressed:GUIDEAction
|
@export var slide_pressed:GUIDEAction
|
||||||
|
@export var slide_released:GUIDEAction
|
||||||
@export_subgroup("Other")
|
@export_subgroup("Other")
|
||||||
@export var hit:GUIDEAction
|
@export var hit:GUIDEAction
|
||||||
@export var parry:GUIDEAction
|
@export var parry:GUIDEAction
|
||||||
@@ -48,7 +48,6 @@ signal input_aim_down
|
|||||||
signal input_aim_released
|
signal input_aim_released
|
||||||
|
|
||||||
signal input_slide_started
|
signal input_slide_started
|
||||||
signal input_slide_ongoing
|
|
||||||
signal input_slide_ended
|
signal input_slide_ended
|
||||||
|
|
||||||
signal input_hit
|
signal input_hit
|
||||||
@@ -68,8 +67,7 @@ func _ready() -> void:
|
|||||||
jump.completed.connect(on_input_jump_ended)
|
jump.completed.connect(on_input_jump_ended)
|
||||||
|
|
||||||
slide_pressed.triggered.connect(on_input_slide_started)
|
slide_pressed.triggered.connect(on_input_slide_started)
|
||||||
slide.triggered.connect(on_input_slide_ongoing)
|
slide_released.triggered.connect(on_input_slide_ended)
|
||||||
slide.completed.connect(on_input_slide_ended)
|
|
||||||
|
|
||||||
hit.triggered.connect(on_input_hit)
|
hit.triggered.connect(on_input_hit)
|
||||||
parry.triggered.connect(on_input_parry)
|
parry.triggered.connect(on_input_parry)
|
||||||
@@ -102,8 +100,6 @@ func on_input_aim_released():
|
|||||||
|
|
||||||
func on_input_slide_started():
|
func on_input_slide_started():
|
||||||
input_slide_started.emit()
|
input_slide_started.emit()
|
||||||
func on_input_slide_ongoing():
|
|
||||||
input_slide_ongoing.emit()
|
|
||||||
func on_input_slide_ended():
|
func on_input_slide_ended():
|
||||||
input_slide_ended.emit()
|
input_slide_ended.emit()
|
||||||
|
|
||||||
|
|||||||
@@ -81,19 +81,6 @@ public partial class MantleSystem: Node3D
|
|||||||
// Got to the other side of the wall, we stop there
|
// Got to the other side of the wall, we stop there
|
||||||
if (!wallProfileShapecast.IsColliding())
|
if (!wallProfileShapecast.IsColliding())
|
||||||
{
|
{
|
||||||
/*EndedOnOtherSideOfWall = true;
|
|
||||||
|
|
||||||
var origin = globalTargetPosition;
|
|
||||||
var end = origin + Vector3.Down*0.51f; // We check for the ground a bit below our target
|
|
||||||
var groundQuery = PhysicsRayQueryParameters3D.Create(origin, end, wallProfileShapecast.CollisionMask);
|
|
||||||
var groundResult = spaceState.IntersectRay(groundQuery);
|
|
||||||
if (groundResult.Count > 0)
|
|
||||||
{
|
|
||||||
// We found the ground, this is our final location
|
|
||||||
FoundGround = true;
|
|
||||||
Vector3 position = (Vector3) groundResult["position"];
|
|
||||||
MantleCurve.AddPoint(ToLocal(position));
|
|
||||||
}*/
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ public partial class WallHugSystem : Node3D
|
|||||||
{
|
{
|
||||||
foreach (RayCast3D raycast in _raycasts)
|
foreach (RayCast3D raycast in _raycasts)
|
||||||
{
|
{
|
||||||
if (raycast.IsColliding())
|
if (raycast.IsColliding() && Math.Abs(raycast.GetCollisionNormal().Y) < 0.3f)
|
||||||
{
|
{
|
||||||
WallHugLocation = raycast.GetCollisionPoint().Some();
|
WallHugLocation = raycast.GetCollisionPoint().Some();
|
||||||
WallHugNormal = raycast.GetCollisionNormal().Some();
|
WallHugNormal = raycast.GetCollisionNormal().Some();
|
||||||
|
|||||||
Reference in New Issue
Block a user