From 0d4f06fee489c37f84ca7efee0f95a8398ecfb86 Mon Sep 17 00:00:00 2001 From: Techwizz Date: Fri, 7 Apr 2023 13:07:46 -0600 Subject: [PATCH] Decreased max size of cotton --- scenes/Teddy.tscn | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scenes/Teddy.tscn b/scenes/Teddy.tscn index aee0ff8..ebc0f0b 100644 --- a/scenes/Teddy.tscn +++ b/scenes/Teddy.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=7 format=3 uid="uid://dp1q51kvd8uow"] [ext_resource type="Script" path="res://characters/teddy/Teddy.gd" id="1_ywxo5"] -[ext_resource type="PackedScene" uid="uid://b3l10agcjfgdx" path="res://characters/teddy/model_glb/teddy.glb" id="2_xx41h"] [ext_resource type="Script" path="res://scripts/nameLabel.gd" id="3_1v4js"] -[ext_resource type="ArrayMesh" uid="uid://b26a54y2fd5n8" path="res://characters/teddy/cotton/cotton.obj" id="4_37tsh"] +[ext_resource type="ArrayMesh" uid="uid://b26a54y2fd5n8" path="res://characters/teddy/cotton/cotton.obj" id="3_qqxfy"] +[ext_resource type="PackedScene" uid="uid://b3l10agcjfgdx" path="res://characters/teddy/model_glb/teddy.glb" id="4_h6g7o"] [sub_resource type="BoxShape3D" id="BoxShape3D_rpt2n"] size = Vector3(1, 1.99126, 1) @@ -30,8 +30,8 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.859224, 0) [node name="BulletGenerator" type="Marker3D" parent="CollisionShape3D/Neck/Camera3D"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.104801, -0.858231) -[node name="Teddy" parent="CollisionShape3D/Neck" instance=ExtResource("2_xx41h")] -transform = Transform3D(-0.33293, 1.16122e-16, -2.91057e-08, 1.16122e-16, 0.33293, -1.16122e-16, 2.91057e-08, -1.16122e-16, -0.33293, 2.08165e-12, -1.93156, 2.08165e-12) +[node name="Teddy" parent="CollisionShape3D/Neck" instance=ExtResource("4_h6g7o")] +transform = Transform3D(-0.32125, 1.12048e-16, -2.80845e-08, 1.12048e-16, 0.32125, -1.12048e-16, 2.80845e-08, -1.12048e-16, -0.32125, 2.08165e-12, -1.85907, 2.08165e-12) [node name="sound" type="AudioStreamPlayer3D" parent="."] @@ -43,7 +43,7 @@ script = ExtResource("3_1v4js") [node name="CPUParticles3D" type="CPUParticles3D" parent="."] emitting = false amount = 3 -mesh = ExtResource("4_37tsh") +mesh = ExtResource("3_qqxfy") emission_shape = 1 emission_sphere_radius = 1.0 particle_flag_rotate_y = true @@ -58,4 +58,4 @@ damping_max = 3.27 angle_min = 7.3 angle_max = 29.1 scale_amount_min = 0.05 -scale_amount_max = 0.2 +scale_amount_max = 0.1