| … | … | @@ -22,10 +22,12 @@ export var cameraLerpAmount : float = 40 |
| 22 | 22 | export var currentSpeed : float = 0 |
| 23 | 23 | |
| 24 | 24 | onready var meshNode : Spatial = $Model |
| 25 | onready var meshSkeletonNode : Skeleton = $Model/Armature/Skeleton | |
| 26 | onready var meshSkeletonHiddenHand : MeshInstance = $Model/Armature/Skeleton/player001 | |
| 27 | onready var meshHandBone : int = meshSkeletonNode.find_bone("DEF-hand.R") | |
| 28 | onready var meshHandBonePos : Transform = meshSkeletonNode.get_bone_pose(meshHandBone) | |
| 25 | ||
| 26 | # Skeleton-specific VARs | |
| 27 | #onready var meshSkeletonNode : Skeleton = $Model/Armature/Skeleton | |
| 28 | #onready var meshSkeletonHiddenHand : MeshInstance = $Model/Armature/Skeleton/player001 | |
| 29 | #onready var meshHandBone : int = meshSkeletonNode.find_bone("DEF-hand.R") | |
| 30 | #onready var meshHandBonePos : Transform = meshSkeletonNode.get_bone_pose(meshHandBone) | |
| 29 | 31 | |
| 30 | 32 | onready var clippedCamera : Spatial = $CameraHead/CameraPivot/ClippedCamera |
| 31 | 33 | onready var clippedCameraHead : Spatial = $CameraHead |
| … | … | @@ -1,6 +1,6 @@ |
| 1 | 1 | [gd_scene load_steps=36 format=2] |
| 2 | 2 | |
| 3 | [ext_resource path="res://assets/models/tumble/model_tumble.tscn" type="PackedScene" id=1] | |
| 3 | [ext_resource path="res://assets/models/night_ghost/night_ghost.scn" type="PackedScene" id=1] | |
| 4 | 4 | [ext_resource path="res://assets/models/tumble/tumble/sprint-loop.tres" type="Animation" id=2] |
| 5 | 5 | [ext_resource path="res://assets/models/tumble/tumble/run-loop.tres" type="Animation" id=3] |
| 6 | 6 | [ext_resource path="res://assets/models/tumble/tumble/landing.tres" type="Animation" id=4] |
| … | … | @@ -37,37 +37,31 @@ |
| 37 | 37 | |
| 38 | 38 | [sub_resource type="CylinderShape" id=1] |
| 39 | 39 | radius = 0.3 |
| 40 | height = 1.58 | |
| 41 | 40 | |
| 42 | 41 | [node name="PlayerCore" type="KinematicBody"] |
| 43 | 42 | script = ExtResource( 24 ) |
| 44 | 43 | |
| 45 | 44 | [node name="CollisionShape" type="CollisionShape" parent="."] |
| 46 | transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.788, 0 ) | |
| 45 | transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0 ) | |
| 47 | 46 | shape = SubResource( 1 ) |
| 48 | 47 | |
| 49 | 48 | [node name="Model" parent="." instance=ExtResource( 1 )] |
| 50 | 49 | |
| 51 | 50 | [node name="Sound_Jump" type="AudioStreamPlayer3D" parent="Model"] |
| 52 | transform = Transform( 1.53846, 0, 0, 0, 1.53846, 0, 0, 0, 1.53846, 0, 0, 0 ) | |
| 53 | 51 | stream = ExtResource( 25 ) |
| 54 | 52 | attenuation_filter_cutoff_hz = 20500.0 |
| 55 | 53 | |
| 56 | 54 | [node name="Sound_Land" type="AudioStreamPlayer3D" parent="Model"] |
| 57 | transform = Transform( 1.53846, 0, 0, 0, 1.53846, 0, 0, 0, 1.53846, 0, 0, 0 ) | |
| 58 | 55 | stream = ExtResource( 31 ) |
| 59 | 56 | attenuation_filter_cutoff_hz = 20500.0 |
| 60 | 57 | |
| 61 | 58 | [node name="Sound_Metal_Footstep_1" type="AudioStreamPlayer3D" parent="Model"] |
| 62 | transform = Transform( 1.53846, 0, 0, 0, 1.53846, 0, 0, 0, 1.53846, 0, 0, 0 ) | |
| 63 | 59 | stream = ExtResource( 28 ) |
| 64 | 60 | |
| 65 | 61 | [node name="Sound_Metal_Footstep_2" type="AudioStreamPlayer3D" parent="Model"] |
| 66 | transform = Transform( 1.53846, 0, 0, 0, 1.53846, 0, 0, 0, 1.53846, 0, 0, 0 ) | |
| 67 | 62 | stream = ExtResource( 27 ) |
| 68 | 63 | |
| 69 | 64 | [node name="Sound_Metal_Footstep_3" type="AudioStreamPlayer3D" parent="Model"] |
| 70 | transform = Transform( 1.53846, 0, 0, 0, 1.53846, 0, 0, 0, 1.53846, 0, 0, 0 ) | |
| 71 | 65 | stream = ExtResource( 26 ) |
| 72 | 66 | |
| 73 | 67 | [node name="Sound_Shoot_GrapplingHook_1" type="AudioStreamPlayer3D" parent="Model"] |
| … | … | @@ -83,12 +77,10 @@ stream = ExtResource( 30 ) |
| 83 | 77 | attenuation_filter_cutoff_hz = 20500.0 |
| 84 | 78 | |
| 85 | 79 | [node name="Sound_Teleport_1" type="AudioStreamPlayer3D" parent="Model"] |
| 86 | transform = Transform( 1.53846, 0, 0, 0, 1.53846, 0, 0, 0, 1.53846, 0, 0, 0 ) | |
| 87 | 80 | stream = ExtResource( 33 ) |
| 88 | 81 | attenuation_filter_cutoff_hz = 20500.0 |
| 89 | 82 | |
| 90 | 83 | [node name="Sound_ToggleLight_1" type="AudioStreamPlayer3D" parent="Model"] |
| 91 | transform = Transform( 1.53846, 0, 0, 0, 1.53846, 0, 0, 0, 1.53846, 0, 0, 0 ) | |
| 92 | 84 | stream = ExtResource( 35 ) |
| 93 | 85 | attenuation_filter_cutoff_hz = 20500.0 |
| 94 | 86 | |
| … | … | @@ -119,7 +111,6 @@ anims/wall_run_r-loop = ExtResource( 22 ) |
| 119 | 111 | [node name="AnimationTree" type="AnimationTree" parent="."] |
| 120 | 112 | tree_root = ExtResource( 5 ) |
| 121 | 113 | anim_player = NodePath("../AnimationPlayer") |
| 122 | active = true | |
| 123 | 114 | parameters/Blend2/blend_amount = 0 |
| 124 | 115 | "parameters/Blend2 2/blend_amount" = 0 |
| 125 | 116 | "parameters/TimeScale 3/scale" = 1.0 |
| … | … | @@ -8,10 +8,7 @@ |
| 8 | 8 | |
| 9 | 9 | [node name="PlayerCoreLocal" instance=ExtResource( 1 )] |
| 10 | 10 | |
| 11 | [node name="Sound_Jump" parent="Model" index="2"] | |
| 12 | transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 ) | |
| 13 | ||
| 14 | [node name="Sound_Shoot_GrapplingHook_1" parent="Model" index="7"] | |
| 11 | [node name="Sound_Shoot_GrapplingHook_1" parent="Model" index="8"] | |
| 15 | 12 | transform = Transform( 1.53846, 0, 0, 0, 1.53846, 0, 0, 0, 1.53846, 0, 0, 0 ) |
| 16 | 13 | stream = ExtResource( 9 ) |
| 17 | 14 | attenuation_filter_cutoff_hz = 5000.0 |
| … | … | @@ -23,7 +20,7 @@ script = ExtResource( 2 ) |
| 23 | 20 | script = ExtResource( 3 ) |
| 24 | 21 | |
| 25 | 22 | [node name="CameraHead" type="Spatial" parent="." index="6"] |
| 26 | transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.5, 1.5, 0 ) | |
| 23 | transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.494363, 3.1564, 0.988551 ) | |
| 27 | 24 | |
| 28 | 25 | [node name="CameraPivot" type="Spatial" parent="CameraHead" index="0"] |
| 29 | 26 |
| … | … | @@ -187,4 +187,4 @@ nodes/walk_scale/node = SubResource( 23 ) |
| 187 | 187 | nodes/walk_scale/position = Vector2( -640, 360 ) |
| 188 | 188 | nodes/wall_run/node = SubResource( 50 ) |
| 189 | 189 | nodes/wall_run/position = Vector2( 720, -60 ) |
| 190 | node_connections = [ "output", 0, "wall_run", "air_blend", 0, "jump_scale", "air_blend", 1, "falling_scale", "air_blend", 2, "landing_scale", "run_scale", 0, "Animation 4", "landing_scale", 0, "Animation 7", "walk_scale", 0, "Animation 3", "wall_run", 0, "Blend2", "wall_run", 1, "Blend2 2", "wall_run", 2, "roll", "air_transition", 0, "air_blend", "air_transition", 1, "aim_transition", "iwr_blend", 0, "Animation 2", "iwr_blend", 1, "walk_scale", "iwr_blend", 2, "run_scale", "aim_transition", 0, "TimeScale 3", "aim_transition", 1, "iwr_blend", "roll_scale", 0, "Animation", "falling_scale", 0, "Animation 6", "Blend2", 0, "Animation 8", "Blend2", 1, "Animation 9", "roll", 0, "air_transition", "roll", 1, "roll_scale", "TimeScale 3", 0, "strafe", "jump_scale", 0, "jump", "Blend2 2", 0, "Animation 11", "Blend2 2", 1, "Animation 10" ] | |
| 190 | node_connections = [ "output", 0, "wall_run", "landing_scale", 0, "Animation 7", "iwr_blend", 0, "Animation 2", "iwr_blend", 1, "walk_scale", "iwr_blend", 2, "run_scale", "run_scale", 0, "Animation 4", "jump_scale", 0, "jump", "falling_scale", 0, "Animation 6", "walk_scale", 0, "Animation 3", "Blend2", 0, "Animation 8", "Blend2", 1, "Animation 9", "air_transition", 0, "air_blend", "air_transition", 1, "aim_transition", "TimeScale 3", 0, "strafe", "aim_transition", 0, "TimeScale 3", "aim_transition", 1, "iwr_blend", "air_blend", 0, "jump_scale", "air_blend", 1, "falling_scale", "air_blend", 2, "landing_scale", "Blend2 2", 0, "Animation 11", "Blend2 2", 1, "Animation 10", "roll", 0, "air_transition", "roll", 1, "roll_scale", "roll_scale", 0, "Animation", "wall_run", 0, "Blend2", "wall_run", 1, "Blend2 2", "wall_run", 2, "roll" ] |