diff --git a/Characters/Player/Player.tscn b/Characters/Player/Player.tscn index d819dfc..21cd61c 100644 --- a/Characters/Player/Player.tscn +++ b/Characters/Player/Player.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=15 format=2] +[gd_scene load_steps=16 format=2] [ext_resource path="res://Characters/Player/Player.gd" type="Script" id=1] [ext_resource path="res://Characters/Player/PillCameras.gd" type="Script" id=2] @@ -8,23 +8,32 @@ [ext_resource path="res://Characters/Player/UI/UI.tscn" type="PackedScene" id=6] [ext_resource path="res://Characters/Player/PillTaker.gd" type="Script" id=7] -[sub_resource type="ViewportTexture" id=7] +[sub_resource type="ViewportTexture" id=1] viewport_path = NodePath("Body/PillCameras/MaskedView") -[sub_resource type="ViewportTexture" id=8] +[sub_resource type="ViewportTexture" id=2] viewport_path = NodePath("Body/PillCameras/TrueView") -[sub_resource type="ShaderMaterial" id=6] +[sub_resource type="ShaderMaterial" id=3] resource_local_to_scene = true shader = ExtResource( 3 ) shader_param/mask_factor = 0.5 -shader_param/true_view = SubResource( 8 ) -shader_param/masked_view = SubResource( 7 ) +shader_param/true_view = SubResource( 2 ) +shader_param/masked_view = SubResource( 1 ) -[sub_resource type="CylinderShape" id=1] +[sub_resource type="CylinderShape" id=4] -[sub_resource type="Animation" id=2] -resource_name = "Walk" +[sub_resource type="Animation" id=5] +resource_name = "PillTaking" +tracks/0/type = "transform" +tracks/0/path = NodePath("PillTaker/Pill") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = PoolRealArray( ) + +[sub_resource type="Animation" id=6] length = 0.8 loop = true tracks/0/type = "value" @@ -57,11 +66,11 @@ tracks/1/keys = { } ] } -[sub_resource type="AudioStreamRandomPitch" id=3] +[sub_resource type="AudioStreamRandomPitch" id=7] audio_stream = ExtResource( 5 ) random_pitch = 1.3 -[sub_resource type="CapsuleMesh" id=4] +[sub_resource type="CapsuleMesh" id=8] [node name="Player" type="KinematicBody" groups=[ "Player", @@ -82,7 +91,7 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0625, 1.85, 0 ) script = ExtResource( 2 ) [node name="LookingAt" type="RayCast" parent="Body/PillCameras"] -transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0 ) +transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 0, 0, 0 ) enabled = true cast_to = Vector3( 0, 0, 2 ) @@ -114,7 +123,7 @@ fov = 80.0 far = 2000.0 [node name="ScreenTexture" type="ColorRect" parent="Body/PillCameras"] -material = SubResource( 6 ) +material = SubResource( 3 ) anchor_right = 1.0 anchor_bottom = 1.0 mouse_filter = 2 @@ -127,18 +136,18 @@ remote_path = NodePath("../MaskedView/MaskedCamera") [node name="Collider" type="CollisionShape" parent="."] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0 ) -shape = SubResource( 1 ) +shape = SubResource( 4 ) [node name="AnimationPlayer" type="AnimationPlayer" parent="."] -autoplay = "Walk" -anims/Walk = SubResource( 2 ) +anims/PillTaking = SubResource( 5 ) +anims/Walk = SubResource( 6 ) [node name="Footsteps" type="Spatial" parent="."] script = ExtResource( 4 ) [node name="Footstep1" type="AudioStreamPlayer3D" parent="Footsteps"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1 ) -stream = SubResource( 3 ) +stream = SubResource( 7 ) unit_db = -25.0 pitch_scale = 1.5 @@ -151,8 +160,8 @@ script = ExtResource( 7 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -1 ) [node name="MeshInstance" type="MeshInstance" parent="PillTaker/Pill"] -transform = Transform( 0.1, 0, 0, 0, -4.37114e-09, -0.1, 0, 0.1, -4.37114e-09, 0, 0, 0 ) -mesh = SubResource( 4 ) +transform = Transform( 0.1, 0, 0, 0, -4.37114e-009, -0.1, 0, 0.1, -4.37114e-009, 0, 0, 0 ) +mesh = SubResource( 8 ) material/0 = null [editable path="HUD"]