Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b792e8721c | |||
| 2e2df4ff50 |
@@ -50,7 +50,7 @@ collision_layer = 3
|
|||||||
collision_mask = 5
|
collision_mask = 5
|
||||||
|
|
||||||
[node name="CSGBox3D" type="CSGBox3D" parent="Greybox"]
|
[node name="CSGBox3D" type="CSGBox3D" parent="Greybox"]
|
||||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.09619, -0.472656, -46.3293)
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.096, -0.5, -46.329)
|
||||||
use_collision = true
|
use_collision = true
|
||||||
size = Vector3(100, 1, 190.741)
|
size = Vector3(100, 1, 190.741)
|
||||||
material = ExtResource("3_vvhq3")
|
material = ExtResource("3_vvhq3")
|
||||||
@@ -400,3 +400,205 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 12, 4.5, -11.5)
|
|||||||
use_collision = true
|
use_collision = true
|
||||||
size = Vector3(1, 0.5, 5)
|
size = Vector3(1, 0.5, 5)
|
||||||
material = ExtResource("3_vvhq3")
|
material = ExtResource("3_vvhq3")
|
||||||
|
|
||||||
|
[node name="Mantles" type="CSGCombiner3D" parent="Greybox"]
|
||||||
|
|
||||||
|
[node name="Label3D22" type="Label3D" parent="Greybox/Mantles"]
|
||||||
|
transform = Transform3D(-5, 4.3711395e-07, 1.9106861e-14, 0, -2.18557e-07, 5, 4.3711395e-07, 5, 2.18557e-07, -5.5, 0.1, 11)
|
||||||
|
text = "0.5m"
|
||||||
|
|
||||||
|
[node name="Label3D35" type="Label3D" parent="Greybox/Mantles"]
|
||||||
|
transform = Transform3D(-5, 4.3711395e-07, 1.9106861e-14, 0, -2.18557e-07, 5, 4.3711395e-07, 5, 2.18557e-07, -8.5, 0.1, 11)
|
||||||
|
text = "0.25m"
|
||||||
|
|
||||||
|
[node name="Label3D23" type="Label3D" parent="Greybox/Mantles"]
|
||||||
|
transform = Transform3D(-5, 4.3711395e-07, 1.9106861e-14, 0, -2.18557e-07, 5, 4.3711395e-07, 5, 2.18557e-07, -2, 0.1, 11)
|
||||||
|
text = "1m"
|
||||||
|
|
||||||
|
[node name="Label3D27" type="Label3D" parent="Greybox/Mantles"]
|
||||||
|
transform = Transform3D(-5, 4.3711395e-07, 1.9106861e-14, 0, -2.18557e-07, 5, 4.3711395e-07, 5, 2.18557e-07, -11, 0.1, 12.5)
|
||||||
|
text = "1m"
|
||||||
|
|
||||||
|
[node name="Label3D28" type="Label3D" parent="Greybox/Mantles"]
|
||||||
|
transform = Transform3D(-5, 4.3711395e-07, 1.9106861e-14, 0, -2.18557e-07, 5, 4.3711395e-07, 5, 2.18557e-07, 13, 0.1, 12.5)
|
||||||
|
text = "1m"
|
||||||
|
|
||||||
|
[node name="Label3D29" type="Label3D" parent="Greybox/Mantles"]
|
||||||
|
transform = Transform3D(-5, 4.3711395e-07, 1.9106861e-14, 0, -2.18557e-07, 5, 4.3711395e-07, 5, 2.18557e-07, 13, 0.1, 21)
|
||||||
|
text = "2m"
|
||||||
|
|
||||||
|
[node name="Label3D30" type="Label3D" parent="Greybox/Mantles"]
|
||||||
|
transform = Transform3D(-5, 4.3711395e-07, 1.9106861e-14, 0, -2.18557e-07, 5, 4.3711395e-07, 5, 2.18557e-07, 13, 0.1, 28.5)
|
||||||
|
text = "3m"
|
||||||
|
|
||||||
|
[node name="Label3D31" type="Label3D" parent="Greybox/Mantles"]
|
||||||
|
transform = Transform3D(-5, 4.3711395e-07, 1.9106861e-14, 0, -2.18557e-07, 5, 4.3711395e-07, 5, 2.18557e-07, -11, 0.1, 21)
|
||||||
|
text = "2m"
|
||||||
|
|
||||||
|
[node name="Label3D32" type="Label3D" parent="Greybox/Mantles"]
|
||||||
|
transform = Transform3D(-5, 4.3711395e-07, 1.9106861e-14, 0, -2.18557e-07, 5, 4.3711395e-07, 5, 2.18557e-07, -11, 0.1, 28.5)
|
||||||
|
text = "3m"
|
||||||
|
|
||||||
|
[node name="Label3D24" type="Label3D" parent="Greybox/Mantles"]
|
||||||
|
transform = Transform3D(-5, 4.3711395e-07, 1.9106861e-14, 0, -2.18557e-07, 5, 4.3711395e-07, 5, 2.18557e-07, 2, 0.1, 11)
|
||||||
|
text = "1.5m"
|
||||||
|
|
||||||
|
[node name="Label3D25" type="Label3D" parent="Greybox/Mantles"]
|
||||||
|
transform = Transform3D(-5, 4.3711395e-07, 1.9106861e-14, 0, -2.18557e-07, 5, 4.3711395e-07, 5, 2.18557e-07, 6, 0.1, 11)
|
||||||
|
text = "2m"
|
||||||
|
|
||||||
|
[node name="Label3D26" type="Label3D" parent="Greybox/Mantles"]
|
||||||
|
transform = Transform3D(-5, 4.3711395e-07, 1.9106861e-14, 0, -2.18557e-07, 5, 4.3711395e-07, 5, 2.18557e-07, 10, 0.1, 11)
|
||||||
|
text = "4m"
|
||||||
|
|
||||||
|
[node name="CSGBox3D33" type="CSGBox3D" parent="Greybox/Mantles"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 0.5, 12.5)
|
||||||
|
use_collision = true
|
||||||
|
size = Vector3(4, 1, 1)
|
||||||
|
material = ExtResource("3_vvhq3")
|
||||||
|
|
||||||
|
[node name="CSGBox3D34" type="CSGBox3D" parent="Greybox/Mantles"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.5, 0.5, 12.25)
|
||||||
|
use_collision = true
|
||||||
|
size = Vector3(3, 1, 0.5)
|
||||||
|
material = ExtResource("3_vvhq3")
|
||||||
|
|
||||||
|
[node name="CSGBox3D35" type="CSGBox3D" parent="Greybox/Mantles"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 0.5, 12.75)
|
||||||
|
use_collision = true
|
||||||
|
size = Vector3(4, 1, 1.5)
|
||||||
|
material = ExtResource("3_vvhq3")
|
||||||
|
|
||||||
|
[node name="CSGBox3D36" type="CSGBox3D" parent="Greybox/Mantles"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6, 0.5, 13)
|
||||||
|
use_collision = true
|
||||||
|
size = Vector3(4, 1, 2)
|
||||||
|
material = ExtResource("3_vvhq3")
|
||||||
|
|
||||||
|
[node name="CSGBox3D37" type="CSGBox3D" parent="Greybox/Mantles"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10, 0.5, 14)
|
||||||
|
use_collision = true
|
||||||
|
size = Vector3(4, 1, 4)
|
||||||
|
material = ExtResource("3_vvhq3")
|
||||||
|
|
||||||
|
[node name="CSGBox3D38" type="CSGBox3D" parent="Greybox/Mantles"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 1, 20.5)
|
||||||
|
use_collision = true
|
||||||
|
size = Vector3(4, 2, 1)
|
||||||
|
material = ExtResource("3_vvhq3")
|
||||||
|
|
||||||
|
[node name="CSGBox3D39" type="CSGBox3D" parent="Greybox/Mantles"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.5, 1, 20.25)
|
||||||
|
use_collision = true
|
||||||
|
size = Vector3(3, 2, 0.5)
|
||||||
|
material = ExtResource("3_vvhq3")
|
||||||
|
|
||||||
|
[node name="CSGBox3D40" type="CSGBox3D" parent="Greybox/Mantles"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 1, 20.75)
|
||||||
|
use_collision = true
|
||||||
|
size = Vector3(4, 2, 1.5)
|
||||||
|
material = ExtResource("3_vvhq3")
|
||||||
|
|
||||||
|
[node name="CSGBox3D41" type="CSGBox3D" parent="Greybox/Mantles"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6, 1, 21)
|
||||||
|
use_collision = true
|
||||||
|
size = Vector3(4, 2, 2)
|
||||||
|
material = ExtResource("3_vvhq3")
|
||||||
|
|
||||||
|
[node name="CSGBox3D42" type="CSGBox3D" parent="Greybox/Mantles"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10, 1, 22)
|
||||||
|
use_collision = true
|
||||||
|
size = Vector3(4, 2, 4)
|
||||||
|
material = ExtResource("3_vvhq3")
|
||||||
|
|
||||||
|
[node name="CSGBox3D43" type="CSGBox3D" parent="Greybox/Mantles"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 1.5, 28.5)
|
||||||
|
use_collision = true
|
||||||
|
size = Vector3(4, 3, 1)
|
||||||
|
material = ExtResource("3_vvhq3")
|
||||||
|
|
||||||
|
[node name="CSGBox3D44" type="CSGBox3D" parent="Greybox/Mantles"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.5, 1.5, 28.25)
|
||||||
|
use_collision = true
|
||||||
|
size = Vector3(3, 3, 0.5)
|
||||||
|
material = ExtResource("3_vvhq3")
|
||||||
|
|
||||||
|
[node name="CSGBox3D45" type="CSGBox3D" parent="Greybox/Mantles"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 1.5, 28.75)
|
||||||
|
use_collision = true
|
||||||
|
size = Vector3(4, 3, 1.5)
|
||||||
|
material = ExtResource("3_vvhq3")
|
||||||
|
|
||||||
|
[node name="CSGBox3D46" type="CSGBox3D" parent="Greybox/Mantles"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6, 1.5, 29)
|
||||||
|
use_collision = true
|
||||||
|
size = Vector3(4, 3, 2)
|
||||||
|
material = ExtResource("3_vvhq3")
|
||||||
|
|
||||||
|
[node name="CSGBox3D47" type="CSGBox3D" parent="Greybox/Mantles"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10, 1.5, 30)
|
||||||
|
use_collision = true
|
||||||
|
size = Vector3(4, 3, 4)
|
||||||
|
material = ExtResource("3_vvhq3")
|
||||||
|
|
||||||
|
[node name="Label3D33" type="Label3D" parent="Greybox/Mantles"]
|
||||||
|
transform = Transform3D(-5, 4.3711395e-07, 1.9106861e-14, 0, -2.18557e-07, 5, 4.3711395e-07, 5, 2.18557e-07, 13, 0.1, 36.5)
|
||||||
|
text = "4m"
|
||||||
|
|
||||||
|
[node name="Label3D34" type="Label3D" parent="Greybox/Mantles"]
|
||||||
|
transform = Transform3D(-5, 4.3711395e-07, 1.9106861e-14, 0, -2.18557e-07, 5, 4.3711395e-07, 5, 2.18557e-07, -11, 0.1, 36.5)
|
||||||
|
text = "4m"
|
||||||
|
|
||||||
|
[node name="CSGBox3D48" type="CSGBox3D" parent="Greybox/Mantles"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 2, 36.5)
|
||||||
|
use_collision = true
|
||||||
|
size = Vector3(4, 4, 1)
|
||||||
|
material = ExtResource("3_vvhq3")
|
||||||
|
|
||||||
|
[node name="CSGBox3D49" type="CSGBox3D" parent="Greybox/Mantles"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.5, 2, 36.25)
|
||||||
|
use_collision = true
|
||||||
|
size = Vector3(3, 4, 0.5)
|
||||||
|
material = ExtResource("3_vvhq3")
|
||||||
|
|
||||||
|
[node name="CSGBox3D53" type="CSGBox3D" parent="Greybox/Mantles"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.5, 0.5, 12.125)
|
||||||
|
use_collision = true
|
||||||
|
size = Vector3(3, 1, 0.25)
|
||||||
|
material = ExtResource("3_vvhq3")
|
||||||
|
|
||||||
|
[node name="CSGBox3D54" type="CSGBox3D" parent="Greybox/Mantles"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.5, 1, 20.125)
|
||||||
|
use_collision = true
|
||||||
|
size = Vector3(3, 2, 0.25)
|
||||||
|
material = ExtResource("3_vvhq3")
|
||||||
|
|
||||||
|
[node name="CSGBox3D55" type="CSGBox3D" parent="Greybox/Mantles"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.5, 1.5, 28.125)
|
||||||
|
use_collision = true
|
||||||
|
size = Vector3(3, 3, 0.25)
|
||||||
|
material = ExtResource("3_vvhq3")
|
||||||
|
|
||||||
|
[node name="CSGBox3D56" type="CSGBox3D" parent="Greybox/Mantles"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.5, 2, 36.125)
|
||||||
|
use_collision = true
|
||||||
|
size = Vector3(3, 4, 0.25)
|
||||||
|
material = ExtResource("3_vvhq3")
|
||||||
|
|
||||||
|
[node name="CSGBox3D50" type="CSGBox3D" parent="Greybox/Mantles"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 2, 36.75)
|
||||||
|
use_collision = true
|
||||||
|
size = Vector3(4, 4, 1.5)
|
||||||
|
material = ExtResource("3_vvhq3")
|
||||||
|
|
||||||
|
[node name="CSGBox3D51" type="CSGBox3D" parent="Greybox/Mantles"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6, 2, 37)
|
||||||
|
use_collision = true
|
||||||
|
size = Vector3(4, 4, 2)
|
||||||
|
material = ExtResource("3_vvhq3")
|
||||||
|
|
||||||
|
[node name="CSGBox3D52" type="CSGBox3D" parent="Greybox/Mantles"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10, 2, 38)
|
||||||
|
use_collision = true
|
||||||
|
size = Vector3(4, 4, 4)
|
||||||
|
material = ExtResource("3_vvhq3")
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
[gd_scene load_steps=41 format=3 uid="uid://dmkw8cmalm5k"]
|
[gd_scene load_steps=40 format=3 uid="uid://dmkw8cmalm5k"]
|
||||||
|
|
||||||
[ext_resource type="PackedScene" uid="uid://bei4nhkf8lwdo" path="res://player_controller/PlayerController.tscn" id="1_2vsi6"]
|
[ext_resource type="PackedScene" uid="uid://bei4nhkf8lwdo" path="res://player_controller/PlayerController.tscn" id="1_2vsi6"]
|
||||||
[ext_resource type="Script" uid="uid://blenis2y55fmg" path="res://tools/city_helpers.gd" id="1_qwuk2"]
|
[ext_resource type="Script" uid="uid://blenis2y55fmg" path="res://tools/city_helpers.gd" id="1_qwuk2"]
|
||||||
[ext_resource type="Resource" uid="uid://bl5crtu1gkrtr" path="res://systems/inputs/base_mode/base_mode.tres" id="2_p287n"]
|
|
||||||
[ext_resource type="Texture2D" uid="uid://ca4kkq3w8cd4n" path="res://assets/sky/sky_15_2k.png" id="2_ruo5i"]
|
[ext_resource type="Texture2D" uid="uid://ca4kkq3w8cd4n" path="res://assets/sky/sky_15_2k.png" id="2_ruo5i"]
|
||||||
[ext_resource type="PackedScene" uid="uid://dkr80d2pi0d41" path="res://addons/guide/debugger/guide_debugger.tscn" id="2_uet8a"]
|
[ext_resource type="PackedScene" uid="uid://dkr80d2pi0d41" path="res://addons/guide/debugger/guide_debugger.tscn" id="2_uet8a"]
|
||||||
[ext_resource type="Script" uid="uid://cyh0d64pfygbl" path="res://addons/maaacks_game_template/base/scripts/pause_menu_controller.gd" id="7_ukfuy"]
|
[ext_resource type="Script" uid="uid://cyh0d64pfygbl" path="res://addons/maaacks_game_template/base/scripts/pause_menu_controller.gd" id="7_ukfuy"]
|
||||||
@@ -92,7 +91,6 @@ adjustment_enabled = true
|
|||||||
|
|
||||||
[node name="Main" type="Node3D"]
|
[node name="Main" type="Node3D"]
|
||||||
script = ExtResource("1_qwuk2")
|
script = ExtResource("1_qwuk2")
|
||||||
base_mode = ExtResource("2_p287n")
|
|
||||||
|
|
||||||
[node name="BackgroundMusicPlayer" parent="." instance=ExtResource("9_i2xii")]
|
[node name="BackgroundMusicPlayer" parent="." instance=ExtResource("9_i2xii")]
|
||||||
stream = ExtResource("10_eca4n")
|
stream = ExtResource("10_eca4n")
|
||||||
@@ -141,6 +139,7 @@ theme_override_constants/margin_bottom = 10
|
|||||||
|
|
||||||
[node name="TutoMoveAndLook" type="VBoxContainer" parent="TutorialController/PanelContainer/MarginContainer"]
|
[node name="TutoMoveAndLook" type="VBoxContainer" parent="TutorialController/PanelContainer/MarginContainer"]
|
||||||
unique_name_in_owner = true
|
unique_name_in_owner = true
|
||||||
|
visible = false
|
||||||
layout_mode = 2
|
layout_mode = 2
|
||||||
theme_override_constants/separation = 0
|
theme_override_constants/separation = 0
|
||||||
|
|
||||||
@@ -376,9 +375,10 @@ shadow_opacity = 0.95
|
|||||||
shadow_blur = 2.435
|
shadow_blur = 2.435
|
||||||
|
|
||||||
[node name="Player" parent="." node_paths=PackedStringArray("TutorialWeaponTarget") instance=ExtResource("1_2vsi6")]
|
[node name="Player" parent="." node_paths=PackedStringArray("TutorialWeaponTarget") instance=ExtResource("1_2vsi6")]
|
||||||
transform = Transform3D(0.054514527, 0, -0.9985129, 0, 1, 0, 0.9985129, 0, 0.054514527, 0, -132.75, 118)
|
transform = Transform3D(0.054514527, 0, -0.9985129, 0, 1, 0, 0.9985129, 0, 0.054514527, -6, 75.5, -13.5)
|
||||||
collision_layer = 17
|
collision_layer = 17
|
||||||
TutorialWeaponTarget = NodePath("../PlacedTutorialWeapon/WeaponLocationTarget")
|
TutorialWeaponTarget = NodePath("../PlacedTutorialWeapon/WeaponLocationTarget")
|
||||||
|
TutorialDone = true
|
||||||
AccelerationAir = 1.5
|
AccelerationAir = 1.5
|
||||||
|
|
||||||
[node name="DebugLayer" type="CanvasLayer" parent="."]
|
[node name="DebugLayer" type="CanvasLayer" parent="."]
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ WalkSpeed = 7.5
|
|||||||
AccelerationAir = 2.0
|
AccelerationAir = 2.0
|
||||||
DecelerationAir = 0.1
|
DecelerationAir = 0.1
|
||||||
Weight = 5.0
|
Weight = 5.0
|
||||||
MantleTime = 0.3
|
MantleTime = 0.2
|
||||||
CoyoteTime = 0.3
|
CoyoteTime = 0.3
|
||||||
SimpleJumpStartVelocity = 8.0
|
SimpleJumpStartVelocity = 8.0
|
||||||
SimpleJumpHangTimeInFrames = 1
|
SimpleJumpHangTimeInFrames = 1
|
||||||
@@ -133,6 +133,11 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.6, 0)
|
|||||||
CameraInclineAcceleration = 20.0
|
CameraInclineAcceleration = 20.0
|
||||||
GroundedCameraIncline = 3.0
|
GroundedCameraIncline = 3.0
|
||||||
|
|
||||||
|
[node name="MantleSystem" parent="HeadSystem" instance=ExtResource("8_qu4wy")]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1.6, 0)
|
||||||
|
MantleEndLocationDistanceFromWall = 0.3
|
||||||
|
MantleHeightCastStart = 2.5
|
||||||
|
|
||||||
[node name="StairsSystem" type="Node3D" parent="."]
|
[node name="StairsSystem" type="Node3D" parent="."]
|
||||||
script = ExtResource("7_bmt5a")
|
script = ExtResource("7_bmt5a")
|
||||||
|
|
||||||
@@ -143,10 +148,6 @@ target_position = Vector3(0, -0.55, 0)
|
|||||||
[node name="StairsBelowRayCast3D" type="RayCast3D" parent="."]
|
[node name="StairsBelowRayCast3D" type="RayCast3D" parent="."]
|
||||||
target_position = Vector3(0, -0.75, 0)
|
target_position = Vector3(0, -0.75, 0)
|
||||||
|
|
||||||
[node name="MantleSystem" parent="." instance=ExtResource("8_qu4wy")]
|
|
||||||
MantleEndLocationDistanceFromWall = 0.3
|
|
||||||
MantleHeightCastStart = 2.0
|
|
||||||
|
|
||||||
[node name="Bobbing" type="Node3D" parent="."]
|
[node name="Bobbing" type="Node3D" parent="."]
|
||||||
script = ExtResource("10_7wk1w")
|
script = ExtResource("10_7wk1w")
|
||||||
|
|
||||||
@@ -154,6 +155,7 @@ script = ExtResource("10_7wk1w")
|
|||||||
script = ExtResource("12_m2mxi")
|
script = ExtResource("12_m2mxi")
|
||||||
|
|
||||||
[node name="HeadCollisionDetectors" type="Node3D" parent="."]
|
[node name="HeadCollisionDetectors" type="Node3D" parent="."]
|
||||||
|
visible = false
|
||||||
|
|
||||||
[node name="HeadCollisionDetector0" type="RayCast3D" parent="HeadCollisionDetectors"]
|
[node name="HeadCollisionDetector0" type="RayCast3D" parent="HeadCollisionDetectors"]
|
||||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.4, -0.210707)
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.4, -0.210707)
|
||||||
@@ -174,6 +176,7 @@ target_position = Vector3(0, 1, 0)
|
|||||||
[node name="TweenQueueSystem" parent="." instance=ExtResource("22_rpwev")]
|
[node name="TweenQueueSystem" parent="." instance=ExtResource("22_rpwev")]
|
||||||
|
|
||||||
[node name="WallHugSystem" type="Node3D" parent="."]
|
[node name="WallHugSystem" type="Node3D" parent="."]
|
||||||
|
visible = false
|
||||||
script = ExtResource("27_n7qhm")
|
script = ExtResource("27_n7qhm")
|
||||||
|
|
||||||
[node name="back" type="RayCast3D" parent="WallHugSystem"]
|
[node name="back" type="RayCast3D" parent="WallHugSystem"]
|
||||||
@@ -243,7 +246,6 @@ one_shot = true
|
|||||||
ignore_time_scale = true
|
ignore_time_scale = true
|
||||||
|
|
||||||
[node name="StateChartDebugger" parent="." instance=ExtResource("24_q5h8a")]
|
[node name="StateChartDebugger" parent="." instance=ExtResource("24_q5h8a")]
|
||||||
visible = false
|
|
||||||
offset_left = 1524.0
|
offset_left = 1524.0
|
||||||
offset_top = 1.0
|
offset_top = 1.0
|
||||||
offset_right = -8.0
|
offset_right = -8.0
|
||||||
@@ -500,45 +502,45 @@ delay_in_seconds = "0.0"
|
|||||||
script = ExtResource("26_infe6")
|
script = ExtResource("26_infe6")
|
||||||
initial_state = NodePath("SimpleJump")
|
initial_state = NodePath("SimpleJump")
|
||||||
|
|
||||||
|
[node name="OnMantle" type="Node" parent="StateChart/Root/Movement/Jump"]
|
||||||
|
script = ExtResource("28_n7qhm")
|
||||||
|
to = NodePath("../../Mantling")
|
||||||
|
event = &"mantle"
|
||||||
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
[node name="SimpleJump" type="Node" parent="StateChart/Root/Movement/Jump"]
|
[node name="SimpleJump" type="Node" parent="StateChart/Root/Movement/Jump"]
|
||||||
script = ExtResource("27_34snm")
|
script = ExtResource("27_34snm")
|
||||||
|
|
||||||
[node name="OnMegajump" type="Node" parent="StateChart/Root/Movement/Jump/SimpleJump"]
|
|
||||||
script = ExtResource("28_n7qhm")
|
|
||||||
to = NodePath("../../MegaJump")
|
|
||||||
event = &"megajump"
|
|
||||||
delay_in_seconds = "0.0"
|
|
||||||
|
|
||||||
[node name="OnJumpEnded" type="Node" parent="StateChart/Root/Movement/Jump/SimpleJump"]
|
[node name="OnJumpEnded" type="Node" parent="StateChart/Root/Movement/Jump/SimpleJump"]
|
||||||
script = ExtResource("28_n7qhm")
|
script = ExtResource("28_n7qhm")
|
||||||
to = NodePath("../../../Airborne/DoubleJumpEnabled")
|
to = NodePath("../../../Airborne/DoubleJumpEnabled")
|
||||||
event = &"jump_ended"
|
event = &"jump_ended"
|
||||||
delay_in_seconds = "0.0"
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
[node name="DoubleJump" type="Node" parent="StateChart/Root/Movement/Jump"]
|
[node name="OnMegajump" type="Node" parent="StateChart/Root/Movement/Jump/SimpleJump"]
|
||||||
script = ExtResource("27_34snm")
|
|
||||||
|
|
||||||
[node name="OnMegajump" type="Node" parent="StateChart/Root/Movement/Jump/DoubleJump"]
|
|
||||||
script = ExtResource("28_n7qhm")
|
script = ExtResource("28_n7qhm")
|
||||||
to = NodePath("../../MegaJump")
|
to = NodePath("../../MegaJump")
|
||||||
event = &"megajump"
|
event = &"megajump"
|
||||||
delay_in_seconds = "0.0"
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
|
[node name="DoubleJump" type="Node" parent="StateChart/Root/Movement/Jump"]
|
||||||
|
script = ExtResource("27_34snm")
|
||||||
|
|
||||||
[node name="OnJumpEnded" type="Node" parent="StateChart/Root/Movement/Jump/DoubleJump"]
|
[node name="OnJumpEnded" type="Node" parent="StateChart/Root/Movement/Jump/DoubleJump"]
|
||||||
script = ExtResource("28_n7qhm")
|
script = ExtResource("28_n7qhm")
|
||||||
to = NodePath("../../../Airborne/Falling")
|
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"]
|
||||||
|
script = ExtResource("28_n7qhm")
|
||||||
|
to = NodePath("../../MegaJump")
|
||||||
|
event = &"megajump"
|
||||||
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
[node name="MegaJump" type="Node" parent="StateChart/Root/Movement/Jump"]
|
[node name="MegaJump" type="Node" parent="StateChart/Root/Movement/Jump"]
|
||||||
script = ExtResource("27_34snm")
|
script = ExtResource("27_34snm")
|
||||||
|
|
||||||
[node name="OnJumpEnded" type="Node" parent="StateChart/Root/Movement/Jump/MegaJump"]
|
|
||||||
script = ExtResource("28_n7qhm")
|
|
||||||
to = NodePath("../../../Airborne/Falling")
|
|
||||||
event = &"jump_ended"
|
|
||||||
delay_in_seconds = "0.0"
|
|
||||||
|
|
||||||
[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")
|
||||||
@@ -602,12 +604,6 @@ initial_state = NodePath("CoyoteEnabled")
|
|||||||
script = ExtResource("41_ruloh")
|
script = ExtResource("41_ruloh")
|
||||||
default_state = NodePath("../CoyoteEnabled")
|
default_state = NodePath("../CoyoteEnabled")
|
||||||
|
|
||||||
[node name="OnWallHug" type="Node" parent="StateChart/Root/Movement/Airborne"]
|
|
||||||
script = ExtResource("28_n7qhm")
|
|
||||||
to = NodePath("../../OnWall/HuggingCoyoteEnabled")
|
|
||||||
event = &"wall_hug"
|
|
||||||
delay_in_seconds = "0.0"
|
|
||||||
|
|
||||||
[node name="OnWallRun" type="Node" parent="StateChart/Root/Movement/Airborne"]
|
[node name="OnWallRun" type="Node" parent="StateChart/Root/Movement/Airborne"]
|
||||||
script = ExtResource("28_n7qhm")
|
script = ExtResource("28_n7qhm")
|
||||||
to = NodePath("../../OnWall/RunningCoyoteEnabled")
|
to = NodePath("../../OnWall/RunningCoyoteEnabled")
|
||||||
@@ -650,6 +646,12 @@ 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"]
|
||||||
|
script = ExtResource("28_n7qhm")
|
||||||
|
to = NodePath("../../../OnWall/HuggingCoyoteEnabled")
|
||||||
|
event = &"wall_hug"
|
||||||
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
[node name="OnMegajump" type="Node" parent="StateChart/Root/Movement/Airborne/DoubleJumpEnabled"]
|
[node name="OnMegajump" type="Node" parent="StateChart/Root/Movement/Airborne/DoubleJumpEnabled"]
|
||||||
script = ExtResource("28_n7qhm")
|
script = ExtResource("28_n7qhm")
|
||||||
to = NodePath("../../../Jump/MegaJump")
|
to = NodePath("../../../Jump/MegaJump")
|
||||||
@@ -665,6 +667,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="OnWallHug" type="Node" parent="StateChart/Root/Movement/Airborne/Falling"]
|
||||||
|
script = ExtResource("28_n7qhm")
|
||||||
|
to = NodePath("../../../OnWall/HuggingCoyoteEnabled")
|
||||||
|
event = &"wall_hug"
|
||||||
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
[node name="ToDoubleJump" type="Node" parent="StateChart/Root/Movement/Airborne/Falling"]
|
[node name="ToDoubleJump" type="Node" parent="StateChart/Root/Movement/Airborne/Falling"]
|
||||||
script = ExtResource("28_n7qhm")
|
script = ExtResource("28_n7qhm")
|
||||||
to = NodePath("../../DoubleJumpEnabled")
|
to = NodePath("../../DoubleJumpEnabled")
|
||||||
@@ -699,6 +707,12 @@ to = NodePath("../../Airborne/Reset")
|
|||||||
event = &"start_falling"
|
event = &"start_falling"
|
||||||
delay_in_seconds = "0.0"
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
|
[node name="OnMantle" type="Node" parent="StateChart/Root/Movement/OnWall"]
|
||||||
|
script = ExtResource("28_n7qhm")
|
||||||
|
to = NodePath("../../Mantling")
|
||||||
|
event = &"mantle"
|
||||||
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
[node name="HuggingCoyoteEnabled" type="Node" parent="StateChart/Root/Movement/OnWall"]
|
[node name="HuggingCoyoteEnabled" type="Node" parent="StateChart/Root/Movement/OnWall"]
|
||||||
script = ExtResource("27_34snm")
|
script = ExtResource("27_34snm")
|
||||||
|
|
||||||
@@ -708,6 +722,12 @@ to = NodePath("../../Hugging")
|
|||||||
event = &"coyote_expired"
|
event = &"coyote_expired"
|
||||||
delay_in_seconds = "0.0"
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
|
[node name="OnJump" type="Node" parent="StateChart/Root/Movement/OnWall/HuggingCoyoteEnabled"]
|
||||||
|
script = ExtResource("28_n7qhm")
|
||||||
|
to = NodePath("../../../Jump/DoubleJump")
|
||||||
|
event = &"jump"
|
||||||
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
[node name="Hugging" type="Node" parent="StateChart/Root/Movement/OnWall"]
|
[node name="Hugging" type="Node" parent="StateChart/Root/Movement/OnWall"]
|
||||||
script = ExtResource("27_34snm")
|
script = ExtResource("27_34snm")
|
||||||
|
|
||||||
@@ -729,6 +749,12 @@ delay_in_seconds = "0.0"
|
|||||||
[node name="RunningCoyoteEnabled" type="Node" parent="StateChart/Root/Movement/OnWall"]
|
[node name="RunningCoyoteEnabled" type="Node" parent="StateChart/Root/Movement/OnWall"]
|
||||||
script = ExtResource("27_34snm")
|
script = ExtResource("27_34snm")
|
||||||
|
|
||||||
|
[node name="OnJump" type="Node" parent="StateChart/Root/Movement/OnWall/RunningCoyoteEnabled"]
|
||||||
|
script = ExtResource("28_n7qhm")
|
||||||
|
to = NodePath("../../../Jump/DoubleJump")
|
||||||
|
event = &"jump"
|
||||||
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
[node name="OnExpiration" type="Node" parent="StateChart/Root/Movement/OnWall/RunningCoyoteEnabled"]
|
[node name="OnExpiration" type="Node" parent="StateChart/Root/Movement/OnWall/RunningCoyoteEnabled"]
|
||||||
script = ExtResource("28_n7qhm")
|
script = ExtResource("28_n7qhm")
|
||||||
to = NodePath("../../Running")
|
to = NodePath("../../Running")
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
|
||||||
using Godot;
|
using Godot;
|
||||||
using GodotStateCharts;
|
using GodotStateCharts;
|
||||||
using Movementtests.addons.godot_state_charts.csharp;
|
using Movementtests.addons.godot_state_charts.csharp;
|
||||||
@@ -15,7 +14,7 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
MoveCamera,
|
MoveCamera,
|
||||||
None,
|
None,
|
||||||
}
|
}
|
||||||
private bool _isUsingGamepad = false;
|
private bool _isUsingGamepad;
|
||||||
|
|
||||||
// User API to important child nodes.
|
// User API to important child nodes.
|
||||||
public HeadSystem HeadSystem;
|
public HeadSystem HeadSystem;
|
||||||
@@ -38,9 +37,11 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
|
|
||||||
private bool _movementEnabled = true;
|
private bool _movementEnabled = true;
|
||||||
|
|
||||||
|
private Vector3 _dashDirection = Vector3.Zero;
|
||||||
|
|
||||||
private bool _shouldMantle;
|
private bool _shouldMantle;
|
||||||
private Vector3 _mantleLocation = Vector3.Zero;
|
private Vector3 _mantleLocation = Vector3.Zero;
|
||||||
private Vector3 _dashDirection = Vector3.Zero;
|
private Vector3 _preMantleVelocity = Vector3.Zero;
|
||||||
|
|
||||||
private float _lastFrameWasOnFloor = -Mathf.Inf;
|
private float _lastFrameWasOnFloor = -Mathf.Inf;
|
||||||
|
|
||||||
@@ -80,6 +81,8 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
[ExportGroup("Mantle")]
|
[ExportGroup("Mantle")]
|
||||||
[Export(PropertyHint.Range, "0,1,0.01,or_greater")]
|
[Export(PropertyHint.Range, "0,1,0.01,or_greater")]
|
||||||
public float MantleTime { get; set; } = 0.1f;
|
public float MantleTime { get; set; } = 0.1f;
|
||||||
|
[Export]
|
||||||
|
public PackedScene MantlePath { get; set; } = GD.Load<PackedScene>("res://scenes/path/Path.tscn");
|
||||||
|
|
||||||
// Jump
|
// Jump
|
||||||
[ExportGroup("Jump")]
|
[ExportGroup("Jump")]
|
||||||
@@ -185,6 +188,11 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
private bool _canDash = true;
|
private bool _canDash = true;
|
||||||
private bool _shouldMantleOnDashEnded;
|
private bool _shouldMantleOnDashEnded;
|
||||||
|
|
||||||
|
private Vector3 _wallHugStartLocation = Vector3.Zero;
|
||||||
|
private Vector3 _wallHugStartNormal = Vector3.Zero;
|
||||||
|
private Vector3 _wallHugStartProjectedVelocity = Vector3.Zero;
|
||||||
|
private Vector3 _currentWallContactPoint = Vector3.Zero;
|
||||||
|
|
||||||
private StateChart _playerState;
|
private StateChart _playerState;
|
||||||
|
|
||||||
private StateChartState _aiming;
|
private StateChartState _aiming;
|
||||||
@@ -196,9 +204,11 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
private StateChartState _grounded;
|
private StateChartState _grounded;
|
||||||
private StateChartState _airborne;
|
private StateChartState _airborne;
|
||||||
private StateChartState _coyoteEnabled;
|
private StateChartState _coyoteEnabled;
|
||||||
|
// private StateChartState _doubleJumpEnabled;
|
||||||
private StateChartState _simpleJump;
|
private StateChartState _simpleJump;
|
||||||
private StateChartState _doubleJump;
|
private StateChartState _doubleJump;
|
||||||
private StateChartState _megaJump;
|
private StateChartState _megaJump;
|
||||||
|
private StateChartState _mantling;
|
||||||
private StateChartState _simpleDash;
|
private StateChartState _simpleDash;
|
||||||
private StateChartState _poweredDash;
|
private StateChartState _poweredDash;
|
||||||
private StateChartState _aimedDash;
|
private StateChartState _aimedDash;
|
||||||
@@ -208,7 +218,9 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
private StateChartState _onWallHanging;
|
private StateChartState _onWallHanging;
|
||||||
private StateChartState _onWallRunning;
|
private StateChartState _onWallRunning;
|
||||||
private StateChartState _onWallRunningCoyoteEnabled;
|
private StateChartState _onWallRunningCoyoteEnabled;
|
||||||
|
|
||||||
|
private Transition _onJumpFromWallCoyote;
|
||||||
|
private Transition _onJumpFromWallRunCoyote;
|
||||||
private Transition _onJumpFromWall1;
|
private Transition _onJumpFromWall1;
|
||||||
private Transition _onJumpFromWall2;
|
private Transition _onJumpFromWall2;
|
||||||
private Transition _onJumpFromWall3;
|
private Transition _onJumpFromWall3;
|
||||||
@@ -216,6 +228,7 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
|
|
||||||
private float _playerHeight;
|
private float _playerHeight;
|
||||||
private float _playerRadius;
|
private float _playerRadius;
|
||||||
|
private bool _isJumpInputPressed = false;
|
||||||
|
|
||||||
private float _lookSensitivityMultiplier = 1.0f;
|
private float _lookSensitivityMultiplier = 1.0f;
|
||||||
private float _mouseSensitivityMultiplier = 1.0f;
|
private float _mouseSensitivityMultiplier = 1.0f;
|
||||||
@@ -252,9 +265,9 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
Node3D cameraSmooth = GetNode<Node3D>("HeadSystem/CameraSmooth");
|
Node3D cameraSmooth = GetNode<Node3D>("HeadSystem/CameraSmooth");
|
||||||
|
|
||||||
// Movement stuff
|
// Movement stuff
|
||||||
WeaponRoot = GetNode<Node3D>("WeaponRoot");
|
WeaponRoot = GetNode<Node3D>("WeaponRoot");
|
||||||
WeaponSystem = GetNode<WeaponSystem>("WeaponRoot/WeaponSystem");
|
WeaponSystem = GetNode<WeaponSystem>("WeaponRoot/WeaponSystem");
|
||||||
MantleSystem = GetNode<MantleSystem>("MantleSystem");
|
MantleSystem = GetNode<MantleSystem>("HeadSystem/MantleSystem");
|
||||||
CapsuleCollider = GetNode<CapsuleCollider>("CapsuleCollider");
|
CapsuleCollider = GetNode<CapsuleCollider>("CapsuleCollider");
|
||||||
DashSystem = GetNode<DashSystem>("DashSystem");
|
DashSystem = GetNode<DashSystem>("DashSystem");
|
||||||
StairsSystem = GetNode<StairsSystem>("StairsSystem");
|
StairsSystem = GetNode<StairsSystem>("StairsSystem");
|
||||||
@@ -284,14 +297,18 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
_empowerOn = StateChartState.Of(GetNode("StateChart/Root/Empower/On"));
|
_empowerOn = StateChartState.Of(GetNode("StateChart/Root/Empower/On"));
|
||||||
_powerExpired = StateChartState.Of(GetNode("StateChart/Root/PowerReserve/Expired"));
|
_powerExpired = StateChartState.Of(GetNode("StateChart/Root/PowerReserve/Expired"));
|
||||||
_powerRecharging = StateChartState.Of(GetNode("StateChart/Root/PowerReserve/AtLeastOneCharge"));
|
_powerRecharging = StateChartState.Of(GetNode("StateChart/Root/PowerReserve/AtLeastOneCharge"));
|
||||||
_powerFull = StateChartState.Of(GetNode("StateChart/Root/PowerReserve/Full"));
|
_powerFull = StateChartState.Of(GetNode("StateChart/Root/PowerReserve/Full"));
|
||||||
|
|
||||||
_grounded = StateChartState.Of(GetNode("StateChart/Root/Movement/Grounded"));
|
_grounded = StateChartState.Of(GetNode("StateChart/Root/Movement/Grounded"));
|
||||||
_airborne = StateChartState.Of(GetNode("StateChart/Root/Movement/Airborne"));
|
_airborne = StateChartState.Of(GetNode("StateChart/Root/Movement/Airborne"));
|
||||||
_coyoteEnabled = StateChartState.Of(GetNode("StateChart/Root/Movement/Airborne/CoyoteEnabled"));
|
_coyoteEnabled = StateChartState.Of(GetNode("StateChart/Root/Movement/Airborne/CoyoteEnabled"));
|
||||||
|
// _doubleJumpEnabled = StateChartState.Of(GetNode("StateChart/Root/Movement/Airborne/DoubleJumpEnabled"));
|
||||||
_simpleJump = StateChartState.Of(GetNode("StateChart/Root/Movement/Jump/SimpleJump"));
|
_simpleJump = StateChartState.Of(GetNode("StateChart/Root/Movement/Jump/SimpleJump"));
|
||||||
_doubleJump = StateChartState.Of(GetNode("StateChart/Root/Movement/Jump/DoubleJump"));
|
_doubleJump = StateChartState.Of(GetNode("StateChart/Root/Movement/Jump/DoubleJump"));
|
||||||
_megaJump = StateChartState.Of(GetNode("StateChart/Root/Movement/Jump/MegaJump"));
|
_megaJump = StateChartState.Of(GetNode("StateChart/Root/Movement/Jump/MegaJump"));
|
||||||
|
_mantling = StateChartState.Of(GetNode("StateChart/Root/Movement/Mantling"));
|
||||||
|
_onJumpFromWallCoyote = Transition.Of(GetNode("StateChart/Root/Movement/OnWall/HuggingCoyoteEnabled/OnJump"));
|
||||||
|
_onJumpFromWallRunCoyote = Transition.Of(GetNode("StateChart/Root/Movement/OnWall/RunningCoyoteEnabled/OnJump"));
|
||||||
_onJumpFromWall1 = Transition.Of(GetNode("StateChart/Root/Movement/OnWall/Hugging/OnJump"));
|
_onJumpFromWall1 = Transition.Of(GetNode("StateChart/Root/Movement/OnWall/Hugging/OnJump"));
|
||||||
_onJumpFromWall2 = Transition.Of(GetNode("StateChart/Root/Movement/OnWall/Hanging/OnJump"));
|
_onJumpFromWall2 = Transition.Of(GetNode("StateChart/Root/Movement/OnWall/Hanging/OnJump"));
|
||||||
_onJumpFromWall3 = Transition.Of(GetNode("StateChart/Root/Movement/OnWall/Running/OnJump"));
|
_onJumpFromWall3 = Transition.Of(GetNode("StateChart/Root/Movement/OnWall/Running/OnJump"));
|
||||||
@@ -342,6 +359,7 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
_grounded.StateEntered += OnGrounded;
|
_grounded.StateEntered += OnGrounded;
|
||||||
_grounded.StatePhysicsProcessing += HandleGrounded;
|
_grounded.StatePhysicsProcessing += HandleGrounded;
|
||||||
_airborne.StatePhysicsProcessing += HandleAirborne;
|
_airborne.StatePhysicsProcessing += HandleAirborne;
|
||||||
|
_onWall.StatePhysicsProcessing += HandleOnWall;
|
||||||
|
|
||||||
_coyoteEnabled.StateEntered += StartCoyoteTime;
|
_coyoteEnabled.StateEntered += StartCoyoteTime;
|
||||||
_timeScaleAimInAirTimer.Timeout += ResetTimeScale;
|
_timeScaleAimInAirTimer.Timeout += ResetTimeScale;
|
||||||
@@ -362,6 +380,9 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
_megaJump.StateEntered += OnMegaJumpStarted;
|
_megaJump.StateEntered += OnMegaJumpStarted;
|
||||||
_megaJump.StatePhysicsProcessing += HandleMegaJump;
|
_megaJump.StatePhysicsProcessing += HandleMegaJump;
|
||||||
|
|
||||||
|
_mantling.StateEntered += OnMantleStarted;
|
||||||
|
_mantling.StatePhysicsProcessing += HandleMantling;
|
||||||
|
|
||||||
_simpleDash.StateEntered += OnSimpleDashStarted;
|
_simpleDash.StateEntered += OnSimpleDashStarted;
|
||||||
_simpleDash.StatePhysicsProcessing += HandleSimpleDash;
|
_simpleDash.StatePhysicsProcessing += HandleSimpleDash;
|
||||||
|
|
||||||
@@ -383,7 +404,9 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
_onWallRunningCoyoteEnabled.StateEntered += OnWallRunningStarted;
|
_onWallRunningCoyoteEnabled.StateEntered += OnWallRunningStarted;
|
||||||
_onWallRunningCoyoteEnabled.StatePhysicsProcessing += HandleWallRunning;
|
_onWallRunningCoyoteEnabled.StatePhysicsProcessing += HandleWallRunning;
|
||||||
_onWallRunning.StatePhysicsProcessing += HandleWallRunning;
|
_onWallRunning.StatePhysicsProcessing += HandleWallRunning;
|
||||||
|
|
||||||
|
_onJumpFromWallCoyote.Taken += OnJumpFromWallCoyote;
|
||||||
|
_onJumpFromWallRunCoyote.Taken += OnJumpFromWallCoyote;
|
||||||
_onJumpFromWall1.Taken += OnJumpFromWall;
|
_onJumpFromWall1.Taken += OnJumpFromWall;
|
||||||
_onJumpFromWall2.Taken += OnJumpFromWall;
|
_onJumpFromWall2.Taken += OnJumpFromWall;
|
||||||
_onJumpFromWall3.Taken += OnJumpFromWall;
|
_onJumpFromWall3.Taken += OnJumpFromWall;
|
||||||
@@ -440,20 +463,29 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
{
|
{
|
||||||
_canDash = true;
|
_canDash = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public bool IsTryingToMantle()
|
||||||
|
{
|
||||||
|
return MantleSystem.IsMantlePossible && GetMoveInput().Z < -0.5f && _isJumpInputPressed;
|
||||||
|
}
|
||||||
|
|
||||||
public void HandleGrounded(float delta)
|
public void HandleGrounded(float delta)
|
||||||
{
|
{
|
||||||
MoveOnGround(delta);
|
MoveOnGround(delta);
|
||||||
|
// if (IsTryingToMantle()) _playerState.SendEvent("mantle");
|
||||||
if (!isOnFloorCustom())
|
if (!isOnFloorCustom())
|
||||||
_playerState.SendEvent("start_falling");
|
_playerState.SendEvent("start_falling");
|
||||||
}
|
}
|
||||||
|
|
||||||
public void HandleAirborne(float delta)
|
public void HandleAirborne(float delta)
|
||||||
{
|
{
|
||||||
|
|
||||||
MoveInAir(delta);
|
MoveInAir(delta);
|
||||||
if (isOnFloorCustom())
|
if (isOnFloorCustom())
|
||||||
_playerState.SendEvent("grounded");
|
_playerState.SendEvent("grounded");
|
||||||
|
|
||||||
|
if (IsTryingToMantle()) _playerState.SendEvent("mantle");
|
||||||
|
|
||||||
if (!WallHugSystem.IsWallHugging())
|
if (!WallHugSystem.IsWallHugging())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@@ -478,9 +510,16 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
|
|
||||||
// If all else fail and we go down, we hug
|
// If all else fail and we go down, we hug
|
||||||
if (Velocity.Y < 0 && !_coyoteEnabled.Active)
|
if (Velocity.Y < 0 && !_coyoteEnabled.Active)
|
||||||
|
{
|
||||||
_playerState.SendEvent("wall_hug");
|
_playerState.SendEvent("wall_hug");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void HandleOnWall(float delta)
|
||||||
|
{
|
||||||
|
if (IsTryingToMantle()) _playerState.SendEvent("mantle");
|
||||||
|
}
|
||||||
|
|
||||||
public void OnWallHuggingStarted()
|
public void OnWallHuggingStarted()
|
||||||
{
|
{
|
||||||
GetTree().CreateTimer(CoyoteTime).Timeout += CoyoteExpired;
|
GetTree().CreateTimer(CoyoteTime).Timeout += CoyoteExpired;
|
||||||
@@ -491,11 +530,6 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
GetTree().CreateTimer(CoyoteTime).Timeout += CoyoteExpired;
|
GetTree().CreateTimer(CoyoteTime).Timeout += CoyoteExpired;
|
||||||
}
|
}
|
||||||
|
|
||||||
private Vector3 _wallHugStartLocation = Vector3.Zero;
|
|
||||||
private Vector3 _wallHugStartNormal = Vector3.Zero;
|
|
||||||
private Vector3 _wallHugStartProjectedVelocity = Vector3.Zero;
|
|
||||||
private Vector3 _currentWallContactPoint = Vector3.Zero;
|
|
||||||
|
|
||||||
public void OnWallDetected()
|
public void OnWallDetected()
|
||||||
{
|
{
|
||||||
FinishPoweredDash();
|
FinishPoweredDash();
|
||||||
@@ -509,6 +543,9 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
|
|
||||||
public void OnWallStarted()
|
public void OnWallStarted()
|
||||||
{
|
{
|
||||||
|
if (!WallHugSystem.IsWallHugging())
|
||||||
|
return;
|
||||||
|
|
||||||
_wallHugStartNormal = WallHugSystem.WallHugNormal.UnwrapOr(Vector3.Up);
|
_wallHugStartNormal = WallHugSystem.WallHugNormal.UnwrapOr(Vector3.Up);
|
||||||
_currentWallContactPoint = WallHugSystem.WallHugLocation.UnwrapOr(Vector3.Zero);
|
_currentWallContactPoint = WallHugSystem.WallHugLocation.UnwrapOr(Vector3.Zero);
|
||||||
_wallHugStartLocation = _currentWallContactPoint + _wallHugStartNormal * _playerRadius;
|
_wallHugStartLocation = _currentWallContactPoint + _wallHugStartNormal * _playerRadius;
|
||||||
@@ -517,10 +554,6 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
|
|
||||||
public void OnWallStopped()
|
public void OnWallStopped()
|
||||||
{
|
{
|
||||||
_wallHugStartLocation = Vector3.Zero;
|
|
||||||
_currentWallContactPoint = Vector3.Zero;
|
|
||||||
_wallHugStartNormal = Vector3.Zero;
|
|
||||||
_wallHugStartProjectedVelocity = Vector3.Zero;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void HandleWallHugging(float delta)
|
public void HandleWallHugging(float delta)
|
||||||
@@ -576,18 +609,14 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
Velocity = Vector3.Zero;
|
Velocity = Vector3.Zero;
|
||||||
GlobalPosition = _wallHugStartLocation;
|
GlobalPosition = _wallHugStartLocation;
|
||||||
}
|
}
|
||||||
|
|
||||||
private Option<Vector3> _plannedMantleLocation = Option<Vector3>.None;
|
|
||||||
|
|
||||||
// Jump
|
// Jump
|
||||||
public void OnInputJumpStarted()
|
public void OnInputJumpStarted()
|
||||||
{
|
{
|
||||||
if (CanMantle())
|
_isJumpInputPressed = true;
|
||||||
|
if (MantleSystem.IsMantlePossible)
|
||||||
{
|
{
|
||||||
var location = _plannedMantleLocation.UnwrapOr(Vector3.Zero);
|
_playerState.SendEvent("mantle");
|
||||||
if (location == Vector3.Zero)
|
|
||||||
return; // For some reason CanMantle can return an invalid location so fuck off I guess
|
|
||||||
MantleToLocation(location);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -596,7 +625,11 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
_playerState.SendEvent("megajump");
|
_playerState.SendEvent("megajump");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (_onWallHuggingCoyoteEnabled.Active || _onWallRunningCoyoteEnabled.Active)
|
||||||
|
{
|
||||||
|
if (!_isWallJumpAvailable) return;
|
||||||
|
}
|
||||||
_playerState.SendEvent("jump");
|
_playerState.SendEvent("jump");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -606,6 +639,7 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
|
|
||||||
public void OnInputJumpEnded()
|
public void OnInputJumpEnded()
|
||||||
{
|
{
|
||||||
|
_isJumpInputPressed = false;
|
||||||
_playerState.SendEvent("jump_ended");
|
_playerState.SendEvent("jump_ended");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -643,8 +677,14 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
var currentHorizontalVelocity = new Vector2(Velocity.X, Velocity.Z);
|
var currentHorizontalVelocity = new Vector2(Velocity.X, Velocity.Z);
|
||||||
var wallJumpHorizontalVelocity = new Vector2(jumpVector.X, jumpVector.Z);
|
var wallJumpHorizontalVelocity = new Vector2(jumpVector.X, jumpVector.Z);
|
||||||
|
|
||||||
SetHorizontalVelocity(currentHorizontalVelocity + wallJumpHorizontalVelocity);;
|
SetHorizontalVelocity(currentHorizontalVelocity + wallJumpHorizontalVelocity);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void OnJumpFromWallCoyote()
|
||||||
|
{
|
||||||
|
_isWallJumpAvailable = false;
|
||||||
|
}
|
||||||
|
|
||||||
public void OnJumpFromWall()
|
public void OnJumpFromWall()
|
||||||
{
|
{
|
||||||
ComputeJumpFromWallHSpeed(WallJumpStartVelocity);
|
ComputeJumpFromWallHSpeed(WallJumpStartVelocity);
|
||||||
@@ -705,8 +745,48 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
z: velocity.Y);
|
z: velocity.Y);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private Path _mantlePath;
|
||||||
|
public void OnMantleStarted()
|
||||||
|
{
|
||||||
|
HeadSystem.OnMantle();
|
||||||
|
|
||||||
|
_mantlePath = MantlePath.Instantiate() as Path;
|
||||||
|
if (_mantlePath == null)
|
||||||
|
{
|
||||||
|
GD.PrintErr("Failed to instantiate MantlePath");
|
||||||
|
return;
|
||||||
|
};
|
||||||
|
|
||||||
|
GetTree().GetRoot().AddChild(_mantlePath);
|
||||||
|
_mantlePath.Setup(MantleSystem.GlobalTransform, MantleSystem.MantleCurve);
|
||||||
|
|
||||||
|
var tween = GetTree().CreateTween();
|
||||||
|
tween.SetTrans(Tween.TransitionType.Linear);
|
||||||
|
tween.SetEase(Tween.EaseType.InOut);
|
||||||
|
tween.TweenProperty(_mantlePath.PathFollow, "progress_ratio", 1, MantleTime);
|
||||||
|
tween.Finished += MantleFinished;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void HandleMantling(float delta)
|
||||||
|
{
|
||||||
|
GlobalPosition = _mantlePath.Target.GlobalPosition;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void MantleFinished()
|
||||||
|
{
|
||||||
|
_mantlePath.Teardown();
|
||||||
|
var direction = GetInputGlobalHDirection();
|
||||||
|
if (direction.Length() > 0)
|
||||||
|
{
|
||||||
|
SetVelocity(direction * SimpleDashStrength);
|
||||||
|
}
|
||||||
|
_playerState.SendEvent("grounded");
|
||||||
|
}
|
||||||
|
|
||||||
public void HandleJump(float delta, float gravityFactor, int hangFrames)
|
public void HandleJump(float delta, float gravityFactor, int hangFrames)
|
||||||
{
|
{
|
||||||
|
if (IsTryingToMantle()) _playerState.SendEvent("mantle");
|
||||||
|
|
||||||
// Update horizontal velocity
|
// Update horizontal velocity
|
||||||
var horizontalVelocity = ComputeHVelocityAir(delta);
|
var horizontalVelocity = ComputeHVelocityAir(delta);
|
||||||
Velocity = new Vector3(horizontalVelocity.X, Velocity.Y, horizontalVelocity.Z);
|
Velocity = new Vector3(horizontalVelocity.X, Velocity.Y, horizontalVelocity.Z);
|
||||||
@@ -925,15 +1005,18 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
if (WeaponSystem.IsPlantedUnderPlatform())
|
if (WeaponSystem.IsPlantedUnderPlatform())
|
||||||
dashLocation += Vector3.Down * _playerHeight;
|
dashLocation += Vector3.Down * _playerHeight;
|
||||||
|
|
||||||
|
_wallHugStartNormal = WeaponSystem.PlantNormal;
|
||||||
|
_currentWallContactPoint = WeaponSystem.PlantLocation;
|
||||||
|
_wallHugStartLocation = dashLocation;
|
||||||
|
_wallHugStartProjectedVelocity = Velocity.Slide(_wallHugStartNormal);
|
||||||
|
|
||||||
var dashTween = CreatePositionTween(dashLocation, AimedDashTime);
|
var dashTween = CreatePositionTween(dashLocation, AimedDashTime);
|
||||||
dashTween.Finished += DashToPlantedWeaponTweenEnded;
|
dashTween.Finished += DashToPlantedWeaponTweenEnded;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void RecoverWeapon()
|
public void RecoverWeapon()
|
||||||
{
|
{
|
||||||
GetTree().GetRoot().RemoveChild(WeaponRoot);
|
RecoverChildNode(WeaponRoot);
|
||||||
AddChild(WeaponRoot);
|
|
||||||
WeaponRoot.SetGlobalPosition(GlobalPosition);
|
|
||||||
WeaponSystem.ResetWeapon();
|
WeaponSystem.ResetWeapon();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -946,7 +1029,7 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
|
|
||||||
RecoverWeapon();
|
RecoverWeapon();
|
||||||
|
|
||||||
var resultingEvent = shouldDashToHanging ? "to_planted" : "dash_finished";
|
var resultingEvent = shouldDashToHanging ? "dash_to_planted" : "dash_finished";
|
||||||
_playerState.SendEvent(resultingEvent);
|
_playerState.SendEvent(resultingEvent);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -996,14 +1079,25 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
WeaponRoot.CallDeferred(Node3D.MethodName.SetGlobalPosition, TutorialWeaponTarget.GlobalPosition);
|
WeaponRoot.CallDeferred(Node3D.MethodName.SetGlobalPosition, TutorialWeaponTarget.GlobalPosition);
|
||||||
WeaponSystem.CallDeferred(WeaponSystem.MethodName.PlaceWeaponForTutorial, TutorialWeaponTarget.GlobalPosition);
|
WeaponSystem.CallDeferred(WeaponSystem.MethodName.PlaceWeaponForTutorial, TutorialWeaponTarget.GlobalPosition);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void RemoveChildNode(Node3D node)
|
||||||
|
{
|
||||||
|
RemoveChild(node);
|
||||||
|
GetTree().GetRoot().AddChild(node);
|
||||||
|
node.SetGlobalPosition(GlobalPosition);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void RecoverChildNode(Node3D node)
|
||||||
|
{
|
||||||
|
GetTree().GetRoot().RemoveChild(node);
|
||||||
|
AddChild(node);
|
||||||
|
node.SetGlobalPosition(GlobalPosition);
|
||||||
|
}
|
||||||
|
|
||||||
public void ThrowWeapon()
|
public void ThrowWeapon()
|
||||||
{
|
{
|
||||||
_playerState.SendEvent("cancel_aim");
|
_playerState.SendEvent("cancel_aim");
|
||||||
|
RemoveChildNode(WeaponRoot);
|
||||||
RemoveChild(WeaponRoot);
|
|
||||||
GetTree().GetRoot().AddChild(WeaponRoot);
|
|
||||||
WeaponRoot.SetGlobalPosition(GlobalPosition);
|
|
||||||
|
|
||||||
var weaponTargetLocation = DashSystem.HasHit ? DashSystem.CollisionPoint : DashSystem.PlannedLocation;
|
var weaponTargetLocation = DashSystem.HasHit ? DashSystem.CollisionPoint : DashSystem.PlannedLocation;
|
||||||
WeaponSystem.ThrowWeapon(
|
WeaponSystem.ThrowWeapon(
|
||||||
@@ -1017,9 +1111,13 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
{
|
{
|
||||||
var postDashVelocity = _preDashVelocity.Length() > PostDashSpeed ? PostDashSpeed : _preDashVelocity.Length();
|
var postDashVelocity = _preDashVelocity.Length() > PostDashSpeed ? PostDashSpeed : _preDashVelocity.Length();
|
||||||
Velocity = _dashDirection * postDashVelocity;
|
Velocity = _dashDirection * postDashVelocity;
|
||||||
|
|
||||||
if (_shouldMantleOnDashEnded)
|
if (_shouldMantleOnDashEnded)
|
||||||
MantleToLocation(_mantleLocation);
|
{
|
||||||
|
// TODO update post dash mantle
|
||||||
|
// MantleToLocation(_mantleLocation);
|
||||||
|
GD.Print("update post dash mantle");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void OnSimpleDashStarted()
|
public void OnSimpleDashStarted()
|
||||||
@@ -1059,9 +1157,6 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
|
|
||||||
public void OnPoweredDashFinished()
|
public void OnPoweredDashFinished()
|
||||||
{
|
{
|
||||||
// Try mantling but don't know if this is useful
|
|
||||||
// if (CanMantle())
|
|
||||||
// MantleToLocation(MantleSystem.FindMantleForHeadRotation(HeadSystem.Rotation.Y).Unwrap());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void FinishPoweredDash()
|
public void FinishPoweredDash()
|
||||||
@@ -1099,28 +1194,6 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
_playerState.SendEvent("coyote_expired");
|
_playerState.SendEvent("coyote_expired");
|
||||||
}
|
}
|
||||||
|
|
||||||
// Mantling
|
|
||||||
public bool CanMantle()
|
|
||||||
{
|
|
||||||
var mantleLocationResult = MantleSystem.FindMantleForHeadRotation(HeadSystem.Rotation.Y);
|
|
||||||
return mantleLocationResult.IsSome(out _);
|
|
||||||
}
|
|
||||||
|
|
||||||
private Vector3 _preMantleVelocity = Vector3.Zero;
|
|
||||||
public void MantleToLocation(Vector3 location)
|
|
||||||
{
|
|
||||||
HeadSystem.OnMantle();
|
|
||||||
|
|
||||||
_preMantleVelocity = Velocity;
|
|
||||||
var mantleTween = CreatePositionTween(location, MantleTime);
|
|
||||||
mantleTween.Finished += MantleFinished;
|
|
||||||
}
|
|
||||||
public void MantleFinished()
|
|
||||||
{
|
|
||||||
Velocity = _preMantleVelocity;
|
|
||||||
_playerState.SendEvent("grounded");
|
|
||||||
}
|
|
||||||
|
|
||||||
///////////////////////////
|
///////////////////////////
|
||||||
// Stateless logic ////////
|
// Stateless logic ////////
|
||||||
///////////////////////////
|
///////////////////////////
|
||||||
@@ -1273,7 +1346,7 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
LookAround(delta);
|
LookAround(delta);
|
||||||
CameraModifications((float) delta);
|
CameraModifications((float) delta);
|
||||||
HandleStairs((float) delta);
|
HandleStairs((float) delta);
|
||||||
_plannedMantleLocation = MantleSystem.FindMantleForHeadRotation(HeadSystem.Rotation.Y);
|
MantleSystem.ProcessMantle(_grounded.Active);
|
||||||
|
|
||||||
if (WeaponSystem.InHandState.Active)
|
if (WeaponSystem.InHandState.Active)
|
||||||
RotateWeaponWithPlayer();
|
RotateWeaponWithPlayer();
|
||||||
|
|||||||
25
scenes/path/Path.cs
Normal file
25
scenes/path/Path.cs
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
using Godot;
|
||||||
|
|
||||||
|
public partial class Path : Path3D
|
||||||
|
{
|
||||||
|
public PathFollow3D PathFollow { get; private set; }
|
||||||
|
public Marker3D Target { get; private set; }
|
||||||
|
|
||||||
|
public override void _Ready()
|
||||||
|
{
|
||||||
|
PathFollow = GetNode<PathFollow3D>("PathFollow");
|
||||||
|
Target = GetNode<Marker3D>("PathFollow/Target");
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Setup(Transform3D globalTransform, Curve3D curve)
|
||||||
|
{
|
||||||
|
SetGlobalTransform(globalTransform);
|
||||||
|
SetCurve(curve);
|
||||||
|
PathFollow.ProgressRatio = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Teardown()
|
||||||
|
{
|
||||||
|
QueueFree();
|
||||||
|
}
|
||||||
|
}
|
||||||
1
scenes/path/Path.cs.uid
Normal file
1
scenes/path/Path.cs.uid
Normal file
@@ -0,0 +1 @@
|
|||||||
|
uid://djdr5bvfc8f0x
|
||||||
13
scenes/path/path.tscn
Normal file
13
scenes/path/path.tscn
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
[gd_scene load_steps=3 format=3 uid="uid://cf3rrgr1imvv4"]
|
||||||
|
|
||||||
|
[ext_resource type="Script" uid="uid://djdr5bvfc8f0x" path="res://scenes/path/Path.cs" id="1_kmlhi"]
|
||||||
|
|
||||||
|
[sub_resource type="Curve3D" id="Curve3D_u4rfr"]
|
||||||
|
|
||||||
|
[node name="Path" type="Path3D"]
|
||||||
|
curve = SubResource("Curve3D_u4rfr")
|
||||||
|
script = ExtResource("1_kmlhi")
|
||||||
|
|
||||||
|
[node name="PathFollow" type="PathFollow3D" parent="."]
|
||||||
|
|
||||||
|
[node name="Target" type="Marker3D" parent="PathFollow"]
|
||||||
@@ -33,6 +33,7 @@ debug_shape_custom_color = Color(0.863327, 0.636844, 0, 1)
|
|||||||
|
|
||||||
[node name="DashCast3D" type="ShapeCast3D" parent="."]
|
[node name="DashCast3D" type="ShapeCast3D" parent="."]
|
||||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.6, 0)
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.6, 0)
|
||||||
|
visible = false
|
||||||
shape = SubResource("SphereShape3D_jngg2")
|
shape = SubResource("SphereShape3D_jngg2")
|
||||||
target_position = Vector3(0, 0, -12)
|
target_position = Vector3(0, 0, -12)
|
||||||
max_results = 1
|
max_results = 1
|
||||||
@@ -41,6 +42,7 @@ debug_shape_custom_color = Color(0.911631, 0.11884, 0.656218, 1)
|
|||||||
|
|
||||||
[node name="DashCastDrop" type="ShapeCast3D" parent="."]
|
[node name="DashCastDrop" type="ShapeCast3D" parent="."]
|
||||||
transform = Transform3D(1, 0, 0, 0, -4.371139e-08, 1, 0, -1, -4.371139e-08, 0, 1.6, 0)
|
transform = Transform3D(1, 0, 0, 0, -4.371139e-08, 1, 0, -1, -4.371139e-08, 0, 1.6, 0)
|
||||||
|
visible = false
|
||||||
shape = SubResource("SphereShape3D_jngg2")
|
shape = SubResource("SphereShape3D_jngg2")
|
||||||
target_position = Vector3(0, 0, -50)
|
target_position = Vector3(0, 0, -50)
|
||||||
max_results = 1
|
max_results = 1
|
||||||
@@ -52,6 +54,7 @@ mesh = SubResource("SphereMesh_qu4wy")
|
|||||||
surface_material_override/0 = SubResource("StandardMaterial3D_v31n3")
|
surface_material_override/0 = SubResource("StandardMaterial3D_v31n3")
|
||||||
|
|
||||||
[node name="MantleSystem" parent="." instance=ExtResource("2_pff7b")]
|
[node name="MantleSystem" parent="." instance=ExtResource("2_pff7b")]
|
||||||
|
visible = false
|
||||||
MantleEndLocationDistanceFromWall = 0.25
|
MantleEndLocationDistanceFromWall = 0.25
|
||||||
MantleHeightCastStart = 2.0
|
MantleHeightCastStart = 2.0
|
||||||
|
|
||||||
|
|||||||
@@ -14,21 +14,88 @@ public partial class MantleSystem: Node3D
|
|||||||
|
|
||||||
private ShapeCast3D _wallInFrontCast3D;
|
private ShapeCast3D _wallInFrontCast3D;
|
||||||
private ShapeCast3D _mantleCast3D;
|
private ShapeCast3D _mantleCast3D;
|
||||||
private RayCast3D _mantleCheckCast3D;
|
|
||||||
|
private ShapeCast3D _inAirWallDetect;
|
||||||
|
private ShapeCast3D _groundedWallDetect;
|
||||||
|
public Curve3D MantleCurve { get; private set; }
|
||||||
|
|
||||||
|
public bool IsMantlePossible { get; private set; } = false;
|
||||||
|
public const int WallProfileCastCount = 7;
|
||||||
|
|
||||||
|
private ShapeCast3D[] _wallProfileShapecasts = new ShapeCast3D[WallProfileCastCount];
|
||||||
|
|
||||||
public void Init()
|
public void Init()
|
||||||
{
|
{
|
||||||
_wallInFrontCast3D = GetNode<ShapeCast3D>("WallInFrontCast3D");
|
_wallInFrontCast3D = GetNode<ShapeCast3D>("WallInFrontCast3D");
|
||||||
_mantleCast3D = GetNode<ShapeCast3D>("MantleCast3D");
|
_mantleCast3D = GetNode<ShapeCast3D>("MantleCast3D");
|
||||||
|
|
||||||
|
_inAirWallDetect = GetNode<ShapeCast3D>("InAirWallDetect");
|
||||||
|
_groundedWallDetect = GetNode<ShapeCast3D>("GroundedWallDetect");
|
||||||
|
for (int i = 0; i < _wallProfileShapecasts.Length; i++)
|
||||||
|
{
|
||||||
|
_wallProfileShapecasts[i] = GetNode<ShapeCast3D>($"WallProfileShapeCasts/ShapeCast{i + 1}");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public Option<Vector3> FindMantleForHeadRotation(float rotation)
|
private void SetCastsEnabled(bool enabled)
|
||||||
{
|
{
|
||||||
_wallInFrontCast3D.SetRotation(new Vector3(
|
foreach (var wallProfileShapecast in _wallProfileShapecasts)
|
||||||
_wallInFrontCast3D.Rotation.X,
|
{
|
||||||
rotation,
|
wallProfileShapecast.SetEnabled(enabled);
|
||||||
_wallInFrontCast3D.Rotation.Z));
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void ProcessMantle(bool isGrounded)
|
||||||
|
{
|
||||||
|
_inAirWallDetect.SetEnabled(!isGrounded);
|
||||||
|
_groundedWallDetect.SetEnabled(isGrounded);
|
||||||
|
var isColliding = _inAirWallDetect.IsColliding() || _groundedWallDetect.IsColliding();
|
||||||
|
SetCastsEnabled(isColliding);
|
||||||
|
|
||||||
|
// Reset state
|
||||||
|
IsMantlePossible = false;
|
||||||
|
if (!isColliding) return;
|
||||||
|
|
||||||
|
// Check if collide with wall
|
||||||
|
var collisionNormal = isGrounded ? _groundedWallDetect.GetCollisionNormal(0) : _inAirWallDetect.GetCollisionNormal(0);
|
||||||
|
if (collisionNormal.Y > 0.9f) return;
|
||||||
|
|
||||||
|
MantleCurve = new Curve3D();
|
||||||
|
MantleCurve.AddPoint(Vector3.Zero);
|
||||||
|
var hasFirstProfileHit = false;
|
||||||
|
foreach (var wallProfileShapecast in _wallProfileShapecasts)
|
||||||
|
{
|
||||||
|
// Haven't met the wall yet
|
||||||
|
if (!wallProfileShapecast.IsColliding() && !hasFirstProfileHit) continue;
|
||||||
|
|
||||||
|
var globalTargetPosition = wallProfileShapecast.GlobalPosition + wallProfileShapecast.TargetPosition;
|
||||||
|
|
||||||
|
// Got to the other side of the wall, we stop there
|
||||||
|
if (!wallProfileShapecast.IsColliding())
|
||||||
|
{
|
||||||
|
MantleCurve.AddPoint(ToLocal(globalTargetPosition));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
var profilePoint = wallProfileShapecast.GetCollisionPoint(0);
|
||||||
|
var profileNormal = wallProfileShapecast.GetCollisionNormal(0);
|
||||||
|
|
||||||
|
// Check if we collided parallel to a wall
|
||||||
|
var isCollisionSameAsTarget = globalTargetPosition.IsEqualApprox(profilePoint);
|
||||||
|
var isCollidingWithWall = profileNormal.Y < 0.1f;
|
||||||
|
if (isCollisionSameAsTarget || isCollidingWithWall) continue;
|
||||||
|
|
||||||
|
// We have a valid collision
|
||||||
|
hasFirstProfileHit = true;
|
||||||
|
MantleCurve.AddPoint(ToLocal(profilePoint));
|
||||||
|
}
|
||||||
|
if (MantleCurve.PointCount == 1) return;
|
||||||
|
|
||||||
|
IsMantlePossible = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Option<Vector3> FindMantle()
|
||||||
|
{
|
||||||
if (!_wallInFrontCast3D.IsColliding())
|
if (!_wallInFrontCast3D.IsColliding())
|
||||||
{
|
{
|
||||||
return Option<Vector3>.None;
|
return Option<Vector3>.None;
|
||||||
|
|||||||
4
systems/mantle/find_wall_shape.tres
Normal file
4
systems/mantle/find_wall_shape.tres
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
[gd_resource type="SphereShape3D" format=3 uid="uid://dp2p8v7demb5j"]
|
||||||
|
|
||||||
|
[resource]
|
||||||
|
radius = 0.25
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
[gd_scene load_steps=4 format=3 uid="uid://wq1okogkhc5l"]
|
[gd_scene load_steps=7 format=3 uid="uid://wq1okogkhc5l"]
|
||||||
|
|
||||||
[ext_resource type="Script" uid="uid://bja6tis1vaysu" path="res://systems/mantle/MantleSystem.cs" id="1_2oobp"]
|
[ext_resource type="Script" uid="uid://bja6tis1vaysu" path="res://systems/mantle/MantleSystem.cs" id="1_2oobp"]
|
||||||
|
|
||||||
@@ -8,12 +8,23 @@ height = 1.7
|
|||||||
[sub_resource type="SphereShape3D" id="SphereShape3D_2oobp"]
|
[sub_resource type="SphereShape3D" id="SphereShape3D_2oobp"]
|
||||||
radius = 0.75
|
radius = 0.75
|
||||||
|
|
||||||
|
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_2oobp"]
|
||||||
|
radius = 0.25
|
||||||
|
|
||||||
|
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_i32qj"]
|
||||||
|
radius = 0.25
|
||||||
|
height = 1.5
|
||||||
|
|
||||||
|
[sub_resource type="SphereShape3D" id="SphereShape3D_i32qj"]
|
||||||
|
radius = 0.125
|
||||||
|
|
||||||
[node name="MantleSystem" type="Node3D"]
|
[node name="MantleSystem" type="Node3D"]
|
||||||
script = ExtResource("1_2oobp")
|
script = ExtResource("1_2oobp")
|
||||||
MantleEndLocationDistanceFromWall = 0.2
|
MantleEndLocationDistanceFromWall = 0.2
|
||||||
MantleHeightCastStart = 3.0
|
MantleHeightCastStart = 3.0
|
||||||
|
|
||||||
[node name="MantleCast3D" type="ShapeCast3D" parent="."]
|
[node name="MantleCast3D" type="ShapeCast3D" parent="."]
|
||||||
|
visible = false
|
||||||
shape = SubResource("CapsuleShape3D_4coqe")
|
shape = SubResource("CapsuleShape3D_4coqe")
|
||||||
target_position = Vector3(0, 0, 0)
|
target_position = Vector3(0, 0, 0)
|
||||||
max_results = 1
|
max_results = 1
|
||||||
@@ -22,8 +33,72 @@ debug_shape_custom_color = Color(1, 0, 0, 1)
|
|||||||
|
|
||||||
[node name="WallInFrontCast3D" type="ShapeCast3D" parent="."]
|
[node name="WallInFrontCast3D" type="ShapeCast3D" parent="."]
|
||||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
|
||||||
|
visible = false
|
||||||
shape = SubResource("SphereShape3D_2oobp")
|
shape = SubResource("SphereShape3D_2oobp")
|
||||||
target_position = Vector3(0, 0, -1.5)
|
target_position = Vector3(0, 0, -1.5)
|
||||||
max_results = 1
|
max_results = 1
|
||||||
collision_mask = 2
|
collision_mask = 2
|
||||||
debug_shape_custom_color = Color(0.911631, 0.11884, 0.656218, 1)
|
debug_shape_custom_color = Color(0.911631, 0.11884, 0.656218, 1)
|
||||||
|
|
||||||
|
[node name="InAirWallDetect" type="ShapeCast3D" parent="."]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.01, 0)
|
||||||
|
shape = SubResource("CapsuleShape3D_2oobp")
|
||||||
|
target_position = Vector3(0, 0, -2)
|
||||||
|
collision_mask = 2
|
||||||
|
|
||||||
|
[node name="GroundedWallDetect" type="ShapeCast3D" parent="."]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.26, 0)
|
||||||
|
shape = SubResource("CapsuleShape3D_i32qj")
|
||||||
|
target_position = Vector3(0, 0, -2)
|
||||||
|
collision_mask = 2
|
||||||
|
|
||||||
|
[node name="WallProfileShapeCasts" type="Node3D" parent="."]
|
||||||
|
|
||||||
|
[node name="ShapeCast1" type="ShapeCast3D" parent="WallProfileShapeCasts"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.5, -0.5)
|
||||||
|
enabled = false
|
||||||
|
shape = SubResource("SphereShape3D_i32qj")
|
||||||
|
target_position = Vector3(0, -2.375, 0)
|
||||||
|
collision_mask = 2
|
||||||
|
|
||||||
|
[node name="ShapeCast2" type="ShapeCast3D" parent="WallProfileShapeCasts"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.5, -0.75)
|
||||||
|
enabled = false
|
||||||
|
shape = SubResource("SphereShape3D_i32qj")
|
||||||
|
target_position = Vector3(0, -2.375, 0)
|
||||||
|
collision_mask = 2
|
||||||
|
|
||||||
|
[node name="ShapeCast3" type="ShapeCast3D" parent="WallProfileShapeCasts"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.5, -1)
|
||||||
|
enabled = false
|
||||||
|
shape = SubResource("SphereShape3D_i32qj")
|
||||||
|
target_position = Vector3(0, -2.375, 0)
|
||||||
|
collision_mask = 2
|
||||||
|
|
||||||
|
[node name="ShapeCast4" type="ShapeCast3D" parent="WallProfileShapeCasts"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.5, -1.25)
|
||||||
|
enabled = false
|
||||||
|
shape = SubResource("SphereShape3D_i32qj")
|
||||||
|
target_position = Vector3(0, -2.375, 0)
|
||||||
|
collision_mask = 2
|
||||||
|
|
||||||
|
[node name="ShapeCast5" type="ShapeCast3D" parent="WallProfileShapeCasts"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.5, -1.5)
|
||||||
|
enabled = false
|
||||||
|
shape = SubResource("SphereShape3D_i32qj")
|
||||||
|
target_position = Vector3(0, -2.375, 0)
|
||||||
|
collision_mask = 2
|
||||||
|
|
||||||
|
[node name="ShapeCast6" type="ShapeCast3D" parent="WallProfileShapeCasts"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.5, -1.75)
|
||||||
|
enabled = false
|
||||||
|
shape = SubResource("SphereShape3D_i32qj")
|
||||||
|
target_position = Vector3(0, -2.375, 0)
|
||||||
|
collision_mask = 2
|
||||||
|
|
||||||
|
[node name="ShapeCast7" type="ShapeCast3D" parent="WallProfileShapeCasts"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.5, -2)
|
||||||
|
enabled = false
|
||||||
|
shape = SubResource("SphereShape3D_i32qj")
|
||||||
|
target_position = Vector3(0, -2.375, 0)
|
||||||
|
collision_mask = 2
|
||||||
|
|||||||
Reference in New Issue
Block a user