blujai831/stick-the-quick
blujai831
/
stick-the-quick
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement untested springboard launch state for character. Fix coyote time too short on wall slide state.

This commit is contained in:
blujai831 2025-03-30 13:33:34 -07:00
parent 49260483e9
commit fae190fc53
No known key found for this signature in database
GPG Key ID: DDC31A0363AA5E66
8 changed files with 225 additions and 746 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
characters/base/base_character.tscn
View File

@ -1,4 +1,4 @@
[gd_scene load_steps=30 format=3 uid="uid://blpbgwklc21k5"]
[gd_scene load_steps=32 format=3 uid="uid://blpbgwklc21k5"]
[ext_resource type="Script" uid="uid://jshmfmeoj28y" path="res://characters/base/character.gd" id="1_f78fl"]
[ext_resource type="Script" uid="uid://vogde76hsl0j" path="res://characters/base/character_state_properties.gd" id="2_cchsv"]
@ -29,6 +29,8 @@
[ext_resource type="Resource" uid="uid://dc346050qtltb" path="res://characters/base/template_csp_swim.tres" id="24_0pfk6"]
[ext_resource type="Resource" uid="uid://mgefvwuayfk4" path="res://characters/base/template_csp_swim_while_holding.tres" id="25_hpxkk"]
[ext_resource type="Resource" uid="uid://bgunca0v4g3jg" path="res://characters/base/template_csp_throw.tres" id="26_5etud"]
[ext_resource type="Resource" uid="uid://5u0uvge5bmyh" path="res://characters/base/template_csp_launch.tres" id="27_j1rrh"]
[ext_resource type="Resource" uid="uid://cwky3x2b6rqq0" path="res://characters/base/template_csp_launch_while_holding.tres" id="28_hhowv"]
[node name="BaseCharacter" type="RigidBody3D" node_paths=PackedStringArray("_audio_player", "_property_save_restore_stack", "_state_machine")]
mass = 60.0
@ -46,6 +48,8 @@ _state_properties = Dictionary[StringName, ExtResource("2_cchsv")]({
&"idle-while-holding": ExtResource("19_euyh3"),
&"jump": ExtResource("7_q5w5h"),
&"jump-while-holding": ExtResource("23_hhowv"),
&"launch": ExtResource("27_j1rrh"),
&"launch-while-holding": ExtResource("28_hhowv"),
&"pick-up": ExtResource("17_0mnbh"),
&"pull-up": ExtResource("12_5etud"),
&"put-down": ExtResource("18_lyvph"),

20
characters/base/character.gd
View File

@ -1040,6 +1040,7 @@ func _make_state_handler_descriptors() -> Dictionary[StringName, Variant]:
&'ticked': _on_jump_state_tick
},
&'fall': _on_fall_state_tick,
&'launch': _on_launch_state_tick,
&'skid': _on_skid_state_tick,
&'wall-slide': _on_wall_slide_state_tick,
&'swim': _on_swim_state_tick,
@ -1064,6 +1065,7 @@ func _make_state_handler_descriptors() -> Dictionary[StringName, Variant]:
&'ticked': _on_jump_while_holding_state_tick
},
&'fall-while-holding': _on_fall_while_holding_state_tick,
&'launch-while-holding': _on_launch_while_holding_state_tick,
&'swim-while-holding': _on_swim_while_holding_state_tick
}
@ -1303,6 +1305,24 @@ func _on_jump_while_holding_state_tick(delta: float) -> void:
elif action1_impetus || action2_impetus || interact_impetus:
state = &'throw'
func _on_launch_state_tick(delta: float) -> void:
_do_standard_motion(delta)
if is_really_grounded() && !state_coyote_time_active():
play_sound(_landing_sound, _landing_sound_volume_db)
state = &'run'
elif linear_velocity.dot(ground_normal) <= -0.25:
state = &'fall'
func _on_launch_while_holding_state_tick(delta: float) -> void:
_do_standard_motion(delta)
if is_really_grounded() && !state_coyote_time_active():
play_sound(_landing_sound, _landing_sound_volume_db)
state = &'run-while-holding'
elif linear_velocity.dot(ground_normal) <= -0.25:
state = &'fall-while-holding'
elif action1_impetus || action2_impetus || interact_impetus:
state = &'throw'
func _on_fall_while_holding_state_tick(delta: float) -> void:
_do_standard_motion(delta)
if is_really_grounded() && !state_coyote_time_active():

33
characters/base/template_csp_launch.tres Normal file
View File

@ -0,0 +1,33 @@
[gd_resource type="Resource" script_class="CharacterStateProperties" load_steps=3 format=3 uid="uid://5u0uvge5bmyh"]
[ext_resource type="AudioStream" uid="uid://dujgina4at6ef" path="res://audio/springboard.ogg" id="1_aqc60"]
[ext_resource type="Script" uid="uid://vogde76hsl0j" path="res://characters/base/character_state_properties.gd" id="1_xmpfh"]
[resource]
script = ExtResource("1_xmpfh")
use_coyote_time = true
coyote_time = 0.25
uninterruptible = false
is_carrying_state = false
equivalent_carrying_state = &"launch-while-holding"
animation_name = &"launch"
animation_alt_name = &""
animation_base_speed = 1.0
animation_blend_time = 0.25
animation_speedup_with_velocity = 0.0
audio = ExtResource("1_aqc60")
audio_volume_db = 0.0
collider_length = 1.0
collider_radius = 0.5
collider_horizontal = false
yaw_orientation = 0
pitch_orientation = 3
orientation_speed = 600.0
counts_as_grounded = false
physics_mode = 0
is_attack = false
attack_base_damage = 0.0
attack_base_knockback = 0.0
invulnerable = false
etc = Dictionary[String, Variant]({})
metadata/_custom_type_script = "uid://vogde76hsl0j"

33
characters/base/template_csp_launch_while_holding.tres Normal file
View File

@ -0,0 +1,33 @@
[gd_resource type="Resource" script_class="CharacterStateProperties" load_steps=3 format=3 uid="uid://cwky3x2b6rqq0"]
[ext_resource type="Script" uid="uid://vogde76hsl0j" path="res://characters/base/character_state_properties.gd" id="1_h66oa"]
[ext_resource type="AudioStream" uid="uid://dujgina4at6ef" path="res://audio/springboard.ogg" id="1_maygx"]
[resource]
script = ExtResource("1_h66oa")
use_coyote_time = true
coyote_time = 0.25
uninterruptible = false
is_carrying_state = true
equivalent_carrying_state = &""
animation_name = &"launch-while-holding"
animation_alt_name = &""
animation_base_speed = 1.0
animation_blend_time = 0.25
animation_speedup_with_velocity = 0.0
audio = ExtResource("1_maygx")
audio_volume_db = 0.0
collider_length = 1.0
collider_radius = 0.5
collider_horizontal = false
yaw_orientation = 0
pitch_orientation = 3
orientation_speed = 600.0
counts_as_grounded = false
physics_mode = 0
is_attack = false
attack_base_damage = 0.0
attack_base_knockback = 0.0
invulnerable = false
etc = Dictionary[String, Variant]({})
metadata/_custom_type_script = "uid://vogde76hsl0j"

2
characters/base/template_csp_wall_slide.tres
View File

@ -6,7 +6,7 @@
[resource]
script = ExtResource("1_gklf8")
use_coyote_time = true
coyote_time = 0.25
coyote_time = 0.5
uninterruptible = false
is_carrying_state = false
equivalent_carrying_state = &""

731
test/blender_test_map.tscn
View File

File diff suppressed because one or more lines are too long

145
test/test_stick.tscn
View File

@ -1,4 +1,4 @@
[gd_scene load_steps=31 format=3 uid="uid://gis0gxap8i8t"]
[gd_scene load_steps=36 format=3 uid="uid://gis0gxap8i8t"]
[ext_resource type="PackedScene" uid="uid://blpbgwklc21k5" path="res://characters/base/base_character.tscn" id="1_xjtlb"]
[ext_resource type="Script" uid="uid://vogde76hsl0j" path="res://characters/base/character_state_properties.gd" id="2_skd7h"]
@ -6,6 +6,8 @@
[ext_resource type="AudioStream" uid="uid://gsdbpcl71gku" path="res://audio/knockback.ogg" id="3_pt5mk"]
[ext_resource type="AudioStream" uid="uid://b7c586tdidtlp" path="res://audio/jump.ogg" id="4_slt4y"]
[ext_resource type="AudioStream" uid="uid://cxv0o73if41v1" path="res://audio/slide.ogg" id="5_1n8td"]
[ext_resource type="AudioStream" uid="uid://b75p1mryrkduo" path="res://audio/small_whoosh.ogg" id="6_ta5u6"]
[ext_resource type="AudioStream" uid="uid://dujgina4at6ef" path="res://audio/springboard.ogg" id="7_gt4g8"]
[sub_resource type="Resource" id="Resource_2hlgv"]
script = ExtResource("2_skd7h")
@ -262,6 +264,64 @@ invulnerable = false
etc = Dictionary[String, Variant]({})
metadata/_custom_type_script = "uid://vogde76hsl0j"
[sub_resource type="Resource" id="Resource_qtt0v"]
script = ExtResource("2_skd7h")
use_coyote_time = true
coyote_time = 0.25
uninterruptible = false
is_carrying_state = false
equivalent_carrying_state = &"launch-while-holding"
animation_name = &"launch"
animation_alt_name = &""
animation_base_speed = 1.0
animation_blend_time = 0.25
animation_speedup_with_velocity = 0.0
audio = ExtResource("7_gt4g8")
audio_volume_db = 0.0
collider_length = 1.3
collider_radius = 0.18
collider_horizontal = false
yaw_orientation = 0
pitch_orientation = 3
orientation_speed = 600.0
counts_as_grounded = false
physics_mode = 0
is_attack = false
attack_base_damage = 0.0
attack_base_knockback = 0.0
invulnerable = false
etc = Dictionary[String, Variant]({})
metadata/_custom_type_script = "uid://vogde76hsl0j"
[sub_resource type="Resource" id="Resource_urjgs"]
script = ExtResource("2_skd7h")
use_coyote_time = true
coyote_time = 0.25
uninterruptible = false
is_carrying_state = true
equivalent_carrying_state = &""
animation_name = &"jump-while-holding"
animation_alt_name = &""
animation_base_speed = 1.0
animation_blend_time = 0.25
animation_speedup_with_velocity = 0.0
audio = ExtResource("7_gt4g8")
audio_volume_db = 0.0
collider_length = 1.0
collider_radius = 0.25
collider_horizontal = false
yaw_orientation = 0
pitch_orientation = 1
orientation_speed = 600.0
counts_as_grounded = false
physics_mode = 0
is_attack = false
attack_base_damage = 0.0
attack_base_knockback = 0.0
invulnerable = false
etc = Dictionary[String, Variant]({})
metadata/_custom_type_script = "uid://vogde76hsl0j"
[sub_resource type="Resource" id="Resource_mofui"]
script = ExtResource("2_skd7h")
use_coyote_time = false
@ -515,6 +575,35 @@ invulnerable = false
etc = Dictionary[String, Variant]({})
metadata/_custom_type_script = "uid://vogde76hsl0j"
[sub_resource type="Resource" id="Resource_gt4g8"]
script = ExtResource("2_skd7h")
use_coyote_time = false
coyote_time = 0.0
uninterruptible = true
is_carrying_state = true
equivalent_carrying_state = &""
animation_name = &"throw-equipped"
animation_alt_name = &""
animation_base_speed = 1.0
animation_blend_time = 0.25
animation_speedup_with_velocity = 0.0
audio = ExtResource("6_ta5u6")
audio_volume_db = 0.0
collider_length = 1.1
collider_radius = 0.35
collider_horizontal = false
yaw_orientation = 0
pitch_orientation = 3
orientation_speed = 600.0
counts_as_grounded = true
physics_mode = 2
is_attack = false
attack_base_damage = 0.0
attack_base_knockback = 0.0
invulnerable = false
etc = Dictionary[String, Variant]({})
metadata/_custom_type_script = "uid://vogde76hsl0j"
[sub_resource type="Resource" id="Resource_tp4uk"]
script = ExtResource("2_skd7h")
use_coyote_time = false
@ -630,7 +719,7 @@ metadata/_custom_type_script = "uid://vogde76hsl0j"
[sub_resource type="Resource" id="Resource_1oy2a"]
script = ExtResource("2_skd7h")
use_coyote_time = true
coyote_time = 0.25
coyote_time = 0.5
uninterruptible = false
is_carrying_state = false
equivalent_carrying_state = &""
@ -674,6 +763,8 @@ _state_properties = Dictionary[StringName, ExtResource("2_skd7h")]({
&"idle-while-holding": SubResource("Resource_slt4y"),
&"jump": SubResource("Resource_h0wc8"),
&"jump-while-holding": SubResource("Resource_op5jh"),
&"launch": SubResource("Resource_qtt0v"),
&"launch-while-holding": SubResource("Resource_urjgs"),
&"pick-up": SubResource("Resource_mofui"),
&"pull-up": SubResource("Resource_chbfi"),
&"put-down": SubResource("Resource_a20lq"),
@ -683,6 +774,7 @@ _state_properties = Dictionary[StringName, ExtResource("2_skd7h")]({
&"sprint": SubResource("Resource_s4iwp"),
&"swim": SubResource("Resource_o7tpm"),
&"swim-while-holding": SubResource("Resource_fqgwu"),
&"throw": SubResource("Resource_gt4g8"),
&"victory1": SubResource("Resource_tp4uk"),
&"victory2": SubResource("Resource_smtit"),
&"walk": SubResource("Resource_5i55i"),
@ -694,38 +786,43 @@ _state_properties = Dictionary[StringName, ExtResource("2_skd7h")]({
transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0)
[node name="Skeleton3D" parent="stick/Stick" index="0"]
bones/0/position = Vector3(0, 0.646973, 0)
bones/1/rotation = Quaternion(0.0003625, 1.19209e-07, -4.32134e-11, 1)
bones/0/position = Vector3(0, 0.545274, 0)
bones/0/rotation = Quaternion(0.287348, 0, 0, 0.957826)
bones/1/rotation = Quaternion(-0.32934, -0.29923, 0.0274798, 0.895121)
bones/2/rotation = Quaternion(0.0187621, 0.245726, 0.0737841, 0.966345)
bones/3/rotation = Quaternion(0.0536841, 0.0219084, 0.37721, 0.924311)
bones/4/rotation = Quaternion(0.0536841, -0.0219084, -0.37721, 0.924311)
bones/5/position = Vector3(-0.0532939, 0.230331, 0.0647434)
bones/5/rotation = Quaternion(0.571188, -0.0632699, 0.044224, 0.817181)
bones/5/scale = Vector3(1, 1, 1)
bones/6/position = Vector3(0.0532939, 0.230331, 0.0647434)
bones/6/position = Vector3(0.0532939, 0.230331, 0.0647435)
bones/6/rotation = Quaternion(0.571188, 0.0632699, -0.044224, 0.817181)
bones/6/scale = Vector3(1, 1, 1)
bones/7/scale = Vector3(1, 1, 1)
bones/8/scale = Vector3(1, 1, 1)
bones/9/rotation = Quaternion(0.696536, -0.121809, 0.696536, 0.121809)
bones/10/rotation = Quaternion(0.137446, 0.693669, 0.136943, 0.69367)
bones/9/rotation = Quaternion(-0.443256, -0.11822, 0.743045, 0.48727)
bones/10/rotation = Quaternion(-0.000421762, 0.707003, -0.000483696, 0.70721)
bones/11/rotation = Quaternion(-0.0559155, -0.704892, -0.0559155, 0.704893)
bones/12/rotation = Quaternion(0.314587, -0.188327, -0.650011, 0.665623)
bones/13/rotation = Quaternion(0.130504, 1.42832e-08, 1.18041e-08, 0.991448)
bones/14/position = Vector3(0.000918027, 0.0538679, 0.0506858)
bones/15/rotation = Quaternion(0.696536, 0.121809, -0.696536, 0.121809)
bones/16/rotation = Quaternion(0.137446, -0.693669, -0.136943, 0.69367)
bones/12/rotation = Quaternion(0.464263, -0.466886, -0.470836, 0.587189)
bones/13/rotation = Quaternion(0.448978, 9.19004e-09, -1.45132e-08, 0.893543)
bones/14/position = Vector3(0.000918059, 0.0538679, 0.0506858)
bones/14/rotation = Quaternion(0.0619432, 0.0505259, -0.700896, 0.70877)
bones/15/rotation = Quaternion(0.66322, 0.488152, -0.567275, 0.00680303)
bones/16/rotation = Quaternion(0.521514, -0.475287, 0.523548, 0.477518)
bones/17/rotation = Quaternion(-0.0559155, 0.704892, 0.0559155, 0.704893)
bones/18/rotation = Quaternion(0.314587, 0.188327, 0.650011, 0.665623)
bones/19/rotation = Quaternion(0.130504, -1.42851e-08, -1.18268e-08, 0.991448)
bones/20/position = Vector3(1.01205e-08, 0.0390958, -0.0424486)
bones/20/rotation = Quaternion(1.0863e-07, 0.745269, -0.666764, 5.62662e-08)
bones/21/rotation = Quaternion(1, 1.58454e-11, -4.37114e-08, 0.0003625)
bones/22/rotation = Quaternion(0.000725, 4.37114e-08, -3.16907e-11, 1)
bones/23/rotation = Quaternion(-0.526096, 2.5005e-07, -1.54437e-07, 0.850425)
bones/24/rotation = Quaternion(1, 1.58454e-11, -4.37114e-08, 0.0003625)
bones/25/rotation = Quaternion(0.000725, 4.37114e-08, -3.16907e-11, 1)
bones/26/rotation = Quaternion(-0.526096, 2.5005e-07, -1.54437e-07, 0.850425)
bones/27/rotation = Quaternion(-3.71988e-08, -0.130247, 0.991482, 6.56977e-08)
bones/28/rotation = Quaternion(-0.281594, -3.06002e-08, -8.61524e-09, 0.959534)
bones/29/rotation = Quaternion(-0.458315, 4.53554e-10, -9.05138e-10, 0.88879)
bones/19/rotation = Quaternion(0.130504, -2.44807e-08, 1.39259e-09, 0.991448)
bones/20/position = Vector3(4.48337e-09, 0.0406116, -0.0457293)
bones/20/rotation = Quaternion(1.08473e-07, 0.752824, -0.658222, 6.4503e-08)
bones/21/rotation = Quaternion(0.965812, 1.13319e-08, -4.2217e-08, 0.259243)
bones/22/rotation = Quaternion(0.687228, 3.17538e-08, -3.00397e-08, 0.726441)
bones/23/rotation = Quaternion(-0.497853, 2.44837e-07, -1.62574e-07, 0.867261)
bones/24/rotation = Quaternion(0.833811, 2.41309e-08, -3.6447e-08, 0.55205)
bones/25/rotation = Quaternion(0.574239, 3.5786e-08, -2.51008e-08, 0.818688)
bones/26/rotation = Quaternion(-0.740028, 2.8292e-07, -7.95717e-08, 0.672576)
bones/27/rotation = Quaternion(-0.00178495, -0.483897, 0.875119, -0.00264792)
bones/28/rotation = Quaternion(0.305628, 8.70715e-07, -0.000224888, 0.952151)
bones/29/rotation = Quaternion(-0.696746, 5.17551e-10, -6.31948e-10, 0.717318)
[node name="CollisionShape3D" type="CollisionShape3D" parent="." index="4"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.65, 0)

1
vfx/gameplay_camera.gd
View File

@ -55,6 +55,7 @@ func _handle_analog_input() -> void:
look_impetus.z += Input.get_axis(&'zoom_in', &'zoom_out')
func _respond_to_impetus(delta: float) -> void:
if !target: return
var gck: float = _gimbal_check()
if (
(look_impetus.y > 0.0 and gck < -gimbal_margin) ||