From 28dcf54dba3e0a2b255fbc4bddfac08ae03f0b12 Mon Sep 17 00:00:00 2001 From: TechRunner Date: Tue, 11 Jun 2024 13:47:28 -0500 Subject: [PATCH] Changed Vape and player to corresponding physics layer --- Assets/Objects/vape.tscn | 2 + Assets/components/player.tscn | 109 ++++++++++++++++++++++++++++++---- 2 files changed, 100 insertions(+), 11 deletions(-) diff --git a/Assets/Objects/vape.tscn b/Assets/Objects/vape.tscn index 827760f..2a603b3 100644 --- a/Assets/Objects/vape.tscn +++ b/Assets/Objects/vape.tscn @@ -9,6 +9,8 @@ data = PackedVector3Array(-0.0614, 0.0296, 0.1, 0.0614, 0.0296, 0.1, -0.0614, 0. [node name="Vape" instance=ExtResource("1_vwmr2")] [node name="StaticBody3D" type="StaticBody3D" parent="Plane" index="0" groups=["Interactable"]] +collision_layer = 4 +collision_mask = 0 script = ExtResource("2_l43bx") [node name="CollisionShape3D" type="CollisionShape3D" parent="Plane/StaticBody3D" index="0"] diff --git a/Assets/components/player.tscn b/Assets/components/player.tscn index ca19f0d..9ed2948 100644 --- a/Assets/components/player.tscn +++ b/Assets/components/player.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=8 format=3 uid="uid://bcjijcf8br8t4"] +[gd_scene load_steps=14 format=3 uid="uid://bcjijcf8br8t4"] [ext_resource type="Script" path="res://Assets/scripts/player.gd" id="1_b2ij4"] [ext_resource type="Script" path="res://Assets/scripts/Head.gd" id="2_is0vo"] @@ -9,7 +9,87 @@ [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_lm3xc"] +[sub_resource type="Animation" id="Animation_icsrn"] +resource_name = "Vape_In" +tracks/0/type = "bezier" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".:light_energy") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"handle_modes": PackedInt32Array(0, 0), +"points": PackedFloat32Array(0, -0.25, 0, 0.25, 0, 1, -0.25, 0, 0.25, 0), +"times": PackedFloat32Array(0, 1) +} + +[sub_resource type="Animation" id="Animation_g057e"] +length = 0.001 +tracks/0/type = "bezier" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".:light_energy") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"handle_modes": PackedInt32Array(0), +"points": PackedFloat32Array(0, -0.25, 0, 0.25, 0), +"times": PackedFloat32Array(0) +} + +[sub_resource type="Animation" id="Animation_n82gw"] +resource_name = "Vape_Out" +tracks/0/type = "bezier" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".:light_energy") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"handle_modes": PackedInt32Array(0, 0), +"points": PackedFloat32Array(1, -0.25, 0, 0.25, 0, 0, -0.25, 0, 0.25, 0), +"times": PackedFloat32Array(0, 1) +} + +[sub_resource type="Animation" id="Animation_4dcnk"] +resource_name = "Vape_Off" +tracks/0/type = "bezier" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".:light_energy") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"handle_modes": PackedInt32Array(0), +"points": PackedFloat32Array(0, -0.25, 0, 0.25, 0), +"times": PackedFloat32Array(0) +} + +[sub_resource type="Animation" id="Animation_5r807"] +resource_name = "Vape_On" +tracks/0/type = "bezier" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".:light_energy") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"handle_modes": PackedInt32Array(0), +"points": PackedFloat32Array(1, -0.25, 0, 0.25, 0), +"times": PackedFloat32Array(0) +} + +[sub_resource type="AnimationLibrary" id="AnimationLibrary_i7hvx"] +_data = { +"RESET": SubResource("Animation_g057e"), +"Vape_In": SubResource("Animation_icsrn"), +"Vape_Off": SubResource("Animation_4dcnk"), +"Vape_On": SubResource("Animation_5r807"), +"Vape_Out": SubResource("Animation_n82gw") +} + [node name="Player" type="CharacterBody3D" groups=["Player"]] +collision_layer = 2 script = ExtResource("1_b2ij4") [node name="CollisionShape3D" type="CollisionShape3D" parent="."] @@ -23,18 +103,9 @@ script = ExtResource("2_is0vo") [node name="Camera" type="Camera3D" parent="Head"] current = true -[node name="VapeLight" type="SpotLight3D" parent="Head"] -transform = Transform3D(1, 0, 0, 0, 0.934826, 0.355107, 0, -0.355107, 0.934826, 0, -0.19053, -0.105637) -light_color = Color(0.247059, 0.407843, 0.603922, 1) -shadow_enabled = true -spot_range = 5.368 -spot_attenuation = 0.847127 -spot_angle = 62.91 -spot_angle_attenuation = 1.38495 -script = ExtResource("2_ndvgb") - [node name="RayCast3D" type="RayCast3D" parent="Head"] target_position = Vector3(0, 0, -4) +collision_mask = 4 script = ExtResource("4_x7epo") [node name="Prompt" type="Label" parent="Head/RayCast3D"] @@ -67,6 +138,22 @@ grow_vertical = 2 texture = ExtResource("5_4upch") stretch_mode = 2 +[node name="VapeLight" type="SpotLight3D" parent="Head"] +transform = Transform3D(1, 0, 0, 0, 0.934826, 0.355107, 0, -0.355107, 0.934826, 0, -0.19053, -0.105637) +light_color = Color(0.247059, 0.407843, 0.603922, 1) +light_energy = 0.0 +shadow_enabled = true +spot_range = 5.368 +spot_attenuation = 0.847127 +spot_angle = 62.91 +spot_angle_attenuation = 1.38495 +script = ExtResource("2_ndvgb") + +[node name="AnimationPlayer" type="AnimationPlayer" parent="Head/VapeLight"] +libraries = { +"": SubResource("AnimationLibrary_i7hvx") +} + [node name="Severe Coughing Timer" type="Timer" parent="."] wait_time = 10.0