| … | … | @@ -60,7 +60,7 @@ params_billboard_mode = 1 |
| 60 | 60 | material = SubResource( 2 ) |
| 61 | 61 | |
| 62 | 62 | [node name="Particles" type="Particles"] |
| 63 | transform = Transform( 1.20264, 0, 0, 0, 1.20264, 0, 0, 0, 1.20264, 0, 0, 0 ) | |
| 63 | transform = Transform( 1.20264, 0, 0, 0, 1.20264, 0, 0, 0, 1.20264, 0, 0.157076, 0 ) | |
| 64 | 64 | material_override = SubResource( 10 ) |
| 65 | 65 | amount = 200 |
| 66 | 66 | lifetime = 4.0 |
| … | … | @@ -29,11 +29,13 @@ onready var clippedCameraPivot : Spatial = $CameraHead/CameraPivot |
| 29 | 29 | onready var meshCollisionShape : CollisionShape = $CollisionShape |
| 30 | 30 | |
| 31 | 31 | onready var grappleHookCast : RayCast = $CameraHead/CameraPivot/GrappleHookCast |
| 32 | #onready var grappleVisualPoint : CSGSphere = $GrapplingHook/GrappleVisualPoint | |
| 33 | onready var grappleVisualPoint : Sprite3D = $GrapplingHook/GrappleVisualPoint_2 | |
| 32 | #onready var grappleVisualPoint : CSGSphere = $GrapplingHook/GrappleVisualPoint_1 | |
| 33 | #onready var grappleVisualPoint : Sprite3D = $GrapplingHook/GrappleVisualPoint_2 | |
| 34 | onready var grappleVisualPoint : Spatial = $GrapplingHook/GrappleVisualPoint | |
| 34 | 35 | onready var grappleLineHelper : Spatial = $Model/LineHelper |
| 35 | 36 | # onready var grappleVisualLine : CSGCylinder = $GrapplingHook/LineHelper/GrappleVisualLine |
| 36 | 37 | onready var grappleVisualLine : CSGCylinder = $Model/LineHelper/GrappleVisualLine |
| 38 | #onready var grappleVisualLine : Spatial = $Model/LineHelper/GrappleVisualLine_1 | |
| 37 | 39 | |
| 38 | 40 | var grapplingHook_GrapplePosition : Vector3 = Vector3.ZERO |
| 39 | 41 | var grapplingHook_IsHooked : bool = false |
| … | … | @@ -123,7 +125,7 @@ func grapplingHook_CheckActivation(): |
| 123 | 125 | grapplingHook_IsHooked = true |
| 124 | 126 | # grapplingHook_GrapplePosition = grappleHookCast.get_collision_point() |
| 125 | 127 | grappleVisualLine.show() |
| 126 | $Model/Sound_Shoot_GrapplingHook.play() | |
| 128 | $Model/Sound_Shoot_GrapplingHook_1.play() | |
| 127 | 129 | elif(playerWantsToReleaseGrapplingHook): |
| 128 | 130 | # Stop grappling |
| 129 | 131 | grapplingHook_IsHooked = false |
| … | … | @@ -1,10 +1,14 @@ |
| 1 | [gd_scene load_steps=7 format=2] | |
| 1 | [gd_scene load_steps=11 format=2] | |
| 2 | 2 | |
| 3 | 3 | [ext_resource path="res://game/player/player_core.tscn" type="PackedScene" id=1] |
| 4 | 4 | [ext_resource path="res://game/player/player_core_local_input.gd" type="Script" id=2] |
| 5 | 5 | [ext_resource path="res://game/player/player_core_local_input_special.gd" type="Script" id=3] |
| 6 | 6 | [ext_resource path="res://assets/sprites/grad_red_dot.png" type="Texture" id=4] |
| 7 | 7 | [ext_resource path="res://game/player/player_core_local_debugui.tscn" type="PackedScene" id=5] |
| 8 | [ext_resource path="res://assets/models/tumble/tumble_hand.glb" type="PackedScene" id=6] | |
| 9 | [ext_resource path="res://assets/shaders/electric/electric_grapple.tscn" type="PackedScene" id=7] | |
| 10 | [ext_resource path="res://assets/shaders/electric/Shield.tres" type="Material" id=8] | |
| 11 | [ext_resource path="res://assets/sounds/player/fire_grapplinghook1.mp3" type="AudioStream" id=9] | |
| 8 | 12 | |
| 9 | 13 | [sub_resource type="SpatialMaterial" id=1] |
| 10 | 14 | flags_unshaded = true |
| … | … | @@ -19,6 +23,23 @@ albedo_color = Color( 0.407843, 0, 0, 1 ) |
| 19 | 23 | [node name="Sound_Jump" parent="Model" index="2"] |
| 20 | 24 | transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 ) |
| 21 | 25 | |
| 26 | [node name="Sound_Shoot_GrapplingHook_1" type="AudioStreamPlayer3D" parent="Model" index="7"] | |
| 27 | transform = Transform( 1.53846, 0, 0, 0, 1.53846, 0, 0, 0, 1.53846, 0, 0, 0 ) | |
| 28 | stream = ExtResource( 9 ) | |
| 29 | ||
| 30 | [node name="Sound_Shoot_GrapplingHook" parent="Model" index="8"] | |
| 31 | stream = ExtResource( 9 ) | |
| 32 | ||
| 33 | [node name="GrappleVisualLine_1" parent="Model/LineHelper" index="0" instance=ExtResource( 7 )] | |
| 34 | transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0.753, 0 ) | |
| 35 | visible = false | |
| 36 | ||
| 37 | [node name="GrappleVisualLine" parent="Model/LineHelper" index="1"] | |
| 38 | material = ExtResource( 8 ) | |
| 39 | ||
| 40 | [node name="AnimationTree" parent="." index="3"] | |
| 41 | active = true | |
| 42 | ||
| 22 | 43 | [node name="Input" type="Node" parent="." index="4"] |
| 23 | 44 | script = ExtResource( 2 ) |
| 24 | 45 | |
| … | … | @@ -26,7 +47,7 @@ script = ExtResource( 2 ) |
| 26 | 47 | script = ExtResource( 3 ) |
| 27 | 48 | |
| 28 | 49 | [node name="CameraHead" type="Spatial" parent="." index="6"] |
| 29 | transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.5, 0 ) | |
| 50 | transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.5, 1.5, 0 ) | |
| 30 | 51 | |
| 31 | 52 | [node name="CameraPivot" type="Spatial" parent="CameraHead" index="0"] |
| 32 | 53 | |
| … | … | @@ -36,7 +57,7 @@ enabled = true |
| 36 | 57 | cast_to = Vector3( 0, 0, -400 ) |
| 37 | 58 | collision_mask = 2 |
| 38 | 59 | debug_shape_custom_color = Color( 1, 0, 0, 1 ) |
| 39 | debug_shape_thickness = 5 | |
| 60 | debug_shape_thickness = 5.0 | |
| 40 | 61 | |
| 41 | 62 | [node name="ClippedCamera" type="ClippedCamera" parent="CameraHead/CameraPivot" index="1"] |
| 42 | 63 | transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 2.5 ) |
| … | … | @@ -44,14 +65,19 @@ fov = 90.0 |
| 44 | 65 | |
| 45 | 66 | [node name="PlayerDebugUI" parent="." index="7" instance=ExtResource( 5 )] |
| 46 | 67 | |
| 47 | [node name="GrappleVisualPoint" type="CSGSphere" parent="GrapplingHook" index="0"] | |
| 68 | [node name="GrappleVisualPoint" parent="GrapplingHook" index="0" instance=ExtResource( 6 )] | |
| 69 | transform = Transform( 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0 ) | |
| 70 | ||
| 71 | [node name="GrappleVisualPoint_1" type="CSGSphere" parent="GrapplingHook" index="1"] | |
| 72 | visible = false | |
| 48 | 73 | cast_shadow = 0 |
| 49 | 74 | radius = 0.025 |
| 50 | 75 | radial_segments = 22 |
| 51 | 76 | rings = 22 |
| 52 | 77 | material = SubResource( 1 ) |
| 53 | 78 | |
| 54 | [node name="GrappleVisualPoint_2" type="Sprite3D" parent="GrapplingHook" index="1"] | |
| 79 | [node name="GrappleVisualPoint_2" type="Sprite3D" parent="GrapplingHook" index="2"] | |
| 80 | visible = false | |
| 55 | 81 | cast_shadow = 0 |
| 56 | 82 | billboard = 1 |
| 57 | 83 | texture = ExtResource( 4 ) |
| … | … | @@ -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", "Blend2", 0, "Animation 8", "Blend2", 1, "Animation 9", "run_scale", 0, "Animation 4", "TimeScale 3", 0, "strafe", "aim_transition", 0, "TimeScale 3", "aim_transition", 1, "iwr_blend", "falling_scale", 0, "Animation 6", "walk_scale", 0, "Animation 3", "roll_scale", 0, "Animation", "roll", 0, "air_transition", "roll", 1, "roll_scale", "wall_run", 0, "Blend2", "wall_run", 1, "Blend2 2", "wall_run", 2, "roll", "iwr_blend", 0, "Animation 2", "iwr_blend", 1, "walk_scale", "iwr_blend", 2, "run_scale", "Blend2 2", 0, "Animation 11", "Blend2 2", 1, "Animation 10", "landing_scale", 0, "Animation 7", "air_blend", 0, "jump_scale", "air_blend", 1, "falling_scale", "air_blend", 2, "landing_scale", "air_transition", 0, "air_blend", "air_transition", 1, "aim_transition", "jump_scale", 0, "jump" ] | |
| 190 | node_connections = [ "output", 0, "wall_run", "Blend2", 0, "Animation 8", "Blend2", 1, "Animation 9", "Blend2 2", 0, "Animation 11", "Blend2 2", 1, "Animation 10", "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", "air_transition", 0, "air_blend", "air_transition", 1, "aim_transition", "falling_scale", 0, "Animation 6", "iwr_blend", 0, "Animation 2", "iwr_blend", 1, "walk_scale", "iwr_blend", 2, "run_scale", "jump_scale", 0, "jump", "landing_scale", 0, "Animation 7", "roll", 0, "air_transition", "roll", 1, "roll_scale", "roll_scale", 0, "Animation", "run_scale", 0, "Animation 4", "walk_scale", 0, "Animation 3", "wall_run", 0, "Blend2", "wall_run", 1, "Blend2 2", "wall_run", 2, "roll" ] |