diff --git a/Models/Furniture/ShowroomChair.glb b/Models/Furniture/ShowroomChair.glb index 63fcc5b..3bd479a 100644 Binary files a/Models/Furniture/ShowroomChair.glb and b/Models/Furniture/ShowroomChair.glb differ diff --git a/Models/Furniture/ShowroomChairRed.glb b/Models/Furniture/ShowroomChairRed.glb index fbaca10..8eff2ae 100644 Binary files a/Models/Furniture/ShowroomChairRed.glb and b/Models/Furniture/ShowroomChairRed.glb differ diff --git a/Scenes/FreeRoam/Generic/Generic1Stage.tscn b/Scenes/FreeRoam/Generic/Generic1Stage.tscn index f5e7501..450715d 100644 --- a/Scenes/FreeRoam/Generic/Generic1Stage.tscn +++ b/Scenes/FreeRoam/Generic/Generic1Stage.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=37 format=3 uid="uid://b6rem1te85htp"] +[gd_scene load_steps=35 format=3 uid="uid://b6rem1te85htp"] [ext_resource type="PackedScene" uid="uid://ddqduheks5ltu" path="res://Models/GenericRooms/1-Stage/1StageGenericRoom.glb" id="1_8m4fm"] [ext_resource type="PackedScene" uid="uid://bf4aq55iy3yey" path="res://Models/Stages/1-Stage/1StageGeneric.glb" id="2_ncqi6"] @@ -27,8 +27,6 @@ [ext_resource type="Texture2D" uid="uid://c3orc2ig7n2rc" path="res://Models/Props/CECGOBO.png" id="22_1oq0m"] [ext_resource type="PackedScene" uid="uid://b4vtklfq8r861" path="res://Models/Props/Wink.glb" id="26_6rkbs"] [ext_resource type="Script" uid="uid://bu68w4jnh0n2b" path="res://Scripts/AnimatronicController.gd" id="27_xpgff"] -[ext_resource type="PackedScene" uid="uid://dwv4f6bls2btr" path="res://Scenes/Props/StaticFurniture/90sShowroomBoothDouble.tscn" id="28_xsano"] -[ext_resource type="PackedScene" uid="uid://b3y3v2k05s3qx" path="res://Scenes/Props/StaticFurniture/90sShowroomBoothSingle.tscn" id="29_xsano"] [sub_resource type="Environment" id="Environment_0tsrs"] ambient_light_source = 1 @@ -502,10 +500,4 @@ script = ExtResource("27_xpgff") [node name="Booths" type="Node3D" parent="."] -[node name="90sShowroomBoothDouble" parent="Booths" instance=ExtResource("28_xsano")] -transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 9, 0, 1.5) - -[node name="90sShowroomBoothDouble2" parent="Booths" instance=ExtResource("29_xsano")] -transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 9, 0, 0) - [editable path="StageModel"] diff --git a/Scenes/Props/Physics/ShowroomChair.tscn b/Scenes/Props/Physics/ShowroomChair.tscn index a880b5c..202c25c 100644 --- a/Scenes/Props/Physics/ShowroomChair.tscn +++ b/Scenes/Props/Physics/ShowroomChair.tscn @@ -6,10 +6,10 @@ friction = 0.5 [sub_resource type="BoxShape3D" id="BoxShape3D_lbe82"] -size = Vector3(0.55, 0.6, 0.55) +size = Vector3(0.45, 0.5, 0.45) [sub_resource type="BoxShape3D" id="BoxShape3D_domyf"] -size = Vector3(0.05, 0.6, 0.55) +size = Vector3(0.05, 0.5, 0.45) [node name="ShowroomChair" type="Node3D"] @@ -21,9 +21,9 @@ physics_material_override = SubResource("PhysicsMaterial_lbe82") transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.5, 0) [node name="CollisionShape3D5" type="CollisionShape3D" parent="RigidBody3D"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.2, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.25, 0) shape = SubResource("BoxShape3D_lbe82") [node name="CollisionShape3D6" type="CollisionShape3D" parent="RigidBody3D"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.3, 0.4, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.25, 0.25, 0) shape = SubResource("BoxShape3D_domyf") diff --git a/Scenes/Props/Physics/ShowroomChairRed.tscn b/Scenes/Props/Physics/ShowroomChairRed.tscn index d5f1104..97be38c 100644 --- a/Scenes/Props/Physics/ShowroomChairRed.tscn +++ b/Scenes/Props/Physics/ShowroomChairRed.tscn @@ -5,11 +5,11 @@ [sub_resource type="PhysicsMaterial" id="PhysicsMaterial_lbe82"] friction = 0.5 -[sub_resource type="BoxShape3D" id="BoxShape3D_lbe82"] -size = Vector3(0.55, 0.6, 0.55) +[sub_resource type="BoxShape3D" id="BoxShape3D_mq1py"] +size = Vector3(0.45, 0.5, 0.45) -[sub_resource type="BoxShape3D" id="BoxShape3D_domyf"] -size = Vector3(0.05, 0.6, 0.55) +[sub_resource type="BoxShape3D" id="BoxShape3D_2odyp"] +size = Vector3(0.05, 0.5, 0.45) [node name="ShowroomChairRed" type="Node3D"] @@ -20,10 +20,10 @@ physics_material_override = SubResource("PhysicsMaterial_lbe82") [node name="ShowroomChairRed" parent="RigidBody3D" instance=ExtResource("1_mq1py")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.5, 0) -[node name="CollisionShape3D5" type="CollisionShape3D" parent="RigidBody3D"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.2, 0) -shape = SubResource("BoxShape3D_lbe82") +[node name="CollisionShape3D7" type="CollisionShape3D" parent="RigidBody3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.25, 0) +shape = SubResource("BoxShape3D_mq1py") -[node name="CollisionShape3D6" type="CollisionShape3D" parent="RigidBody3D"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.3, 0.4, 0) -shape = SubResource("BoxShape3D_domyf") +[node name="CollisionShape3D8" type="CollisionShape3D" parent="RigidBody3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.25, 0.25, 0) +shape = SubResource("BoxShape3D_2odyp") diff --git a/Scripts/Player/Player.gd b/Scripts/Player/Player.gd index f2ae11e..e2bbe8e 100644 --- a/Scripts/Player/Player.gd +++ b/Scripts/Player/Player.gd @@ -133,8 +133,8 @@ func _physics_process(delta: float) -> void: jump_height = JUMP_HEIGHT_CROUCHED crouched = true elif Input.is_action_just_released(&"freeroam_crouch"): - $CShape.shape.height = 1.8 - $Camera.position.y = 1.7 + $CShape.shape.height = 1.6 + $Camera.position.y = 1.5 if (running): speed = SPEED_RUNNING jump_height = JUMP_HEIGHT_RUNNING diff --git a/Scripts/Player/Player.tscn b/Scripts/Player/Player.tscn index b018dee..39956c6 100644 --- a/Scripts/Player/Player.tscn +++ b/Scripts/Player/Player.tscn @@ -11,18 +11,18 @@ [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_ejydr"] radius = 0.3 -height = 1.8 +height = 1.6 [node name="Player" type="CharacterBody3D"] script = ExtResource("1_2f8j2") [node name="CShape" type="CollisionShape3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.9, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.8, 0) shape = SubResource("CapsuleShape3D_ejydr") debug_color = Color(0.141176, 0.427451, 0.92549, 0.784314) [node name="Camera" type="Camera3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.7, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.5, 0) fov = 80.0 [node name="Flashlight" type="SpotLight3D" parent="Camera"]