From c08173dd06a5e6eabfd8cc785969062cd414e7b1 Mon Sep 17 00:00:00 2001 From: betalars Date: Thu, 13 Jul 2023 20:59:10 +0200 Subject: [PATCH] cleaining up player animation and ladder behavior --- .../youth_room/youth_room.tscn | 24 +- .../player_controller/player_controller.tscn | 261 +----------------- 2 files changed, 16 insertions(+), 269 deletions(-) diff --git a/src/base-environments/youth_room/youth_room.tscn b/src/base-environments/youth_room/youth_room.tscn index a91a563..64d1b5f 100644 --- a/src/base-environments/youth_room/youth_room.tscn +++ b/src/base-environments/youth_room/youth_room.tscn @@ -69,6 +69,7 @@ size = Vector3(0.56931, 1.23778, 1.62664) [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_f1g8m"] radius = 0.156739 +height = 1.0 [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_kewqg"] radius = 0.787239 @@ -76,7 +77,7 @@ height = 3.19663 [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_k4x40"] radius = 1.0352 -height = 2.55391 +height = 2.3319 [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_4q8vc"] radius = 1.14469 @@ -91,12 +92,14 @@ script/source = "extends StaticBody3D var risen:bool = false var start_position:Vector3 = position -func raise(_discard): - if risen: - position = start_position - var raiser = create_tween() - raiser.tween_property(self, \"position\", position + Vector3(0,1.1,0), 1) - risen = true +func raise(entering_player): + if not entering_player.on_crouch_cooldown: + if risen: + position = start_position + var raiser = create_tween() + raiser.tween_property(self, \"position\", position + Vector3(0,1.1,0), 1) + risen = true + func reset(_discard): risen = false @@ -107,7 +110,7 @@ func reset(_discard): size = Vector3(1.63347, 0.305693, 0.775269) [sub_resource type="BoxShape3D" id="BoxShape3D_bq15k"] -size = Vector3(0.375967, 1, 0.245859) +size = Vector3(0.244565, 1, 0.245859) [sub_resource type="Animation" id="Animation_nwry8"] length = 0.001 @@ -1569,11 +1572,11 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.336261, -0.199846, 0.054946 shape = SubResource("BoxShape3D_gim5a") [node name="CollisionShape3D2" type="CollisionShape3D" parent="logic/Bed and Ladders/ladder"] -transform = Transform3D(0.833085, 0, -0.553144, 0, 1, 0, 0.553144, 0, 0.833085, -0.0238513, 0, -0.359131) +transform = Transform3D(0.833085, 0, -0.553144, 0, 1, 0, 0.553144, 0, 0.833085, 0.0114179, 0, -0.412249) shape = SubResource("BoxShape3D_bq15k") [node name="CollisionShape3D3" type="CollisionShape3D" parent="logic/Bed and Ladders/ladder"] -transform = Transform3D(0.707304, 0, 0.706909, 0, 1, 0, -0.706909, 0, 0.707304, 0.188369, 0, 0.502213) +transform = Transform3D(0.707304, 0, 0.706909, 0, 1, 0, -0.706909, 0, 0.707304, 0.240986, 0, 0.539403) shape = SubResource("BoxShape3D_bq15k") [node name="UI" type="Control" parent="logic"] @@ -1817,7 +1820,6 @@ layout_mode = 2 size_flags_horizontal = 4 size_flags_vertical = 4 mouse_filter = 2 -scroll_vertical = 638 horizontal_scroll_mode = 0 vertical_scroll_mode = 3 diff --git a/src/logic-scenes/player_controller/player_controller.tscn b/src/logic-scenes/player_controller/player_controller.tscn index f2fd71a..d898027 100644 --- a/src/logic-scenes/player_controller/player_controller.tscn +++ b/src/logic-scenes/player_controller/player_controller.tscn @@ -1,18 +1,10 @@ -[gd_scene load_steps=11 format=3 uid="uid://mkccbig41bqb"] +[gd_scene load_steps=8 format=3 uid="uid://mkccbig41bqb"] [ext_resource type="Script" path="res://logic-scenes/player_controller/player_controller.gd" id="1_0b4mi"] -[ext_resource type="ArrayMesh" uid="uid://bfc3d4g40n0wy" path="res://logic-scenes/collectable/import/old-mask.res" id="2_vnej0"] [sub_resource type="PhysicsMaterial" id="10"] friction = 0.0 -[sub_resource type="GDScript" id="GDScript_r0b38"] -script/source = "extends MeshInstance3D - -func _process(delta): - rotate_y(delta/3) -" - [sub_resource type="SphereShape3D" id="8"] radius = 0.307047 @@ -42,114 +34,6 @@ tracks/1/keys = { "update": 0, "values": [Vector3(0, 0, 0)] } -tracks/2/type = "value" -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/path = NodePath("Yaw/Pitch/Mount/Camera3D/memory mount/old_mask2:rotation") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [Vector3(5.96046e-08, 1.74846e-07, -7.10543e-15)] -} -tracks/3/type = "value" -tracks/3/imported = false -tracks/3/enabled = true -tracks/3/path = NodePath("Yaw/Pitch/Mount/Camera3D/memory mount:position") -tracks/3/interp = 1 -tracks/3/loop_wrap = true -tracks/3/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [Vector3(0.11067, -0.0251684, -0.309266)] -} -tracks/4/type = "value" -tracks/4/imported = false -tracks/4/enabled = true -tracks/4/path = NodePath("Yaw/Pitch/Mount/Camera3D/memory mount:rotation") -tracks/4/interp = 1 -tracks/4/loop_wrap = true -tracks/4/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [Vector3(1.49012e-07, 0, 0)] -} -tracks/5/type = "value" -tracks/5/imported = false -tracks/5/enabled = true -tracks/5/path = NodePath("Yaw/Pitch/Mount/Camera3D/SpotLight3D:light_energy") -tracks/5/interp = 1 -tracks/5/loop_wrap = true -tracks/5/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [0.4] -} -tracks/6/type = "value" -tracks/6/imported = false -tracks/6/enabled = true -tracks/6/path = NodePath("Yaw/Pitch/Mount/Camera3D/SpotLight3D2:light_energy") -tracks/6/interp = 1 -tracks/6/loop_wrap = true -tracks/6/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [1.5] -} -tracks/7/type = "value" -tracks/7/imported = false -tracks/7/enabled = true -tracks/7/path = NodePath("Yaw/Pitch/Mount/Camera3D/SpotLight3D:visible") -tracks/7/interp = 1 -tracks/7/loop_wrap = true -tracks/7/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [false] -} -tracks/8/type = "value" -tracks/8/imported = false -tracks/8/enabled = true -tracks/8/path = NodePath("Yaw/Pitch/Mount/Camera3D/SpotLight3D2:layers") -tracks/8/interp = 1 -tracks/8/loop_wrap = true -tracks/8/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [1] -} -tracks/9/type = "value" -tracks/9/imported = false -tracks/9/enabled = true -tracks/9/path = NodePath("Yaw/Pitch/Mount/Camera3D/SpotLight3D2:visible") -tracks/9/interp = 1 -tracks/9/loop_wrap = true -tracks/9/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [false] -} -tracks/10/type = "value" -tracks/10/imported = false -tracks/10/enabled = true -tracks/10/path = NodePath("Yaw/Pitch/Mount/Camera3D/memory mount/old_mask2:visible") -tracks/10/interp = 1 -tracks/10/loop_wrap = true -tracks/10/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [false] -} [sub_resource type="Animation" id="12"] resource_name = "crouch" @@ -179,106 +63,6 @@ tracks/1/keys = { "values": [Vector3(0, 0, 0), Vector3(-30, 0, -10), Vector3(-20, 0, 3), Vector3(0, 0, 0), Vector3(0, 0, 0)] } -[sub_resource type="Animation" id="Animation_5o0sk"] -resource_name = "mask_reveal" -length = 3.0 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Yaw/Pitch/Mount/Camera3D/memory mount:position") -tracks/0/interp = 2 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0, 3), -"transitions": PackedFloat32Array(0.366021, 1), -"update": 0, -"values": [Vector3(0.376781, -0.521269, -0.513588), Vector3(0.18, -0.025, -0.309)] -} -tracks/1/type = "value" -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/path = NodePath("Yaw/Pitch/Mount/Camera3D/memory mount:rotation") -tracks/1/interp = 2 -tracks/1/loop_wrap = true -tracks/1/keys = { -"times": PackedFloat32Array(0, 3), -"transitions": PackedFloat32Array(1, 0.378929), -"update": 0, -"values": [Vector3(0, -0.698132, 0), Vector3(1.49012e-07, 0, 0)] -} -tracks/2/type = "value" -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/path = NodePath("Yaw/Pitch/Mount/Camera3D/SpotLight3D:light_energy") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/keys = { -"times": PackedFloat32Array(0.8, 3), -"transitions": PackedFloat32Array(1, 1), -"update": 0, -"values": [0.0, 0.4] -} -tracks/3/type = "value" -tracks/3/imported = false -tracks/3/enabled = true -tracks/3/path = NodePath("Yaw/Pitch/Mount/Camera3D/SpotLight3D2:light_energy") -tracks/3/interp = 1 -tracks/3/loop_wrap = true -tracks/3/keys = { -"times": PackedFloat32Array(0.2, 3), -"transitions": PackedFloat32Array(1, 1), -"update": 0, -"values": [0.0, 1.5] -} -tracks/4/type = "value" -tracks/4/imported = false -tracks/4/enabled = true -tracks/4/path = NodePath("Yaw/Pitch/Mount/Camera3D/SpotLight3D:visible") -tracks/4/interp = 1 -tracks/4/loop_wrap = true -tracks/4/keys = { -"times": PackedFloat32Array(0, 0.1), -"transitions": PackedFloat32Array(1, 1), -"update": 1, -"values": [false, true] -} -tracks/5/type = "value" -tracks/5/imported = false -tracks/5/enabled = true -tracks/5/path = NodePath("Yaw/Pitch/Mount/Camera3D/SpotLight3D2:layers") -tracks/5/interp = 1 -tracks/5/loop_wrap = true -tracks/5/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [1] -} -tracks/6/type = "value" -tracks/6/imported = false -tracks/6/enabled = true -tracks/6/path = NodePath("Yaw/Pitch/Mount/Camera3D/SpotLight3D2:visible") -tracks/6/interp = 1 -tracks/6/loop_wrap = true -tracks/6/keys = { -"times": PackedFloat32Array(0, 0.1), -"transitions": PackedFloat32Array(1, 1), -"update": 1, -"values": [false, true] -} -tracks/7/type = "value" -tracks/7/imported = false -tracks/7/enabled = true -tracks/7/path = NodePath("Yaw/Pitch/Mount/Camera3D/memory mount/old_mask2:visible") -tracks/7/interp = 1 -tracks/7/loop_wrap = true -tracks/7/keys = { -"times": PackedFloat32Array(0, 0.1), -"transitions": PackedFloat32Array(1, 1), -"update": 1, -"values": [false, true] -} - [sub_resource type="Animation" id="14"] resource_name = "stand_up" length = 3.0 @@ -289,10 +73,10 @@ tracks/0/path = NodePath("Yaw:position") tracks/0/interp = 2 tracks/0/loop_wrap = true tracks/0/keys = { -"times": PackedFloat32Array(0, 0.9, 1.7, 3), +"times": PackedFloat32Array(0, 0.9, 1.8, 3), "transitions": PackedFloat32Array(1, 1, 1, 1), "update": 0, -"values": [Vector3(0, 0.327816, 0), Vector3(0, 0.331, 0), Vector3(0, 1.3, 0), Vector3(0, 1.22534, 0)] +"values": [Vector3(0, 0.327816, 0), Vector3(0, 0.331, 0), Vector3(0, 1, 0), Vector3(0, 1.22534, 0)] } tracks/1/type = "value" tracks/1/imported = false @@ -311,7 +95,6 @@ tracks/1/keys = { _data = { "RESET": SubResource("11"), "crouch": SubResource("12"), -"mask_reveal": SubResource("Animation_5o0sk"), "stand_up": SubResource("14") } @@ -343,44 +126,6 @@ collision_mask = 17 collide_with_areas = true collide_with_bodies = false -[node name="memory mount" type="Node3D" parent="Yaw/Pitch/Mount/Camera3D"] -transform = Transform3D(0.8, 0, 0, 0, 0.8, -7.15258e-08, 0, 1.1921e-07, 0.48, 0.11067, -0.0251684, -0.309266) - -[node name="old_mask2" type="MeshInstance3D" parent="Yaw/Pitch/Mount/Camera3D/memory mount"] -transform = Transform3D(1, 1.75271e-14, 1.74846e-07, -7.10543e-15, 1, -5.96046e-08, -1.74846e-07, 5.96046e-08, 1, 0.0250661, 0, 0) -visible = false -mesh = ExtResource("2_vnej0") -skeleton = NodePath("") -script = SubResource("GDScript_r0b38") - -[node name="OmniLight3D" type="OmniLight3D" parent="Yaw/Pitch/Mount/Camera3D/memory mount/old_mask2"] -transform = Transform3D(1, -3.8743e-07, 5.96046e-08, 3.57628e-07, 1, 8.9407e-08, -5.96046e-08, -8.9407e-08, 1, 0.083235, -0.219628, 0.176047) -light_color = Color(0.972549, 0.752941, 0.592157, 1) -light_energy = 0.1 -light_specular = 0.0 -omni_range = 0.457129 -omni_attenuation = 0.659754 - -[node name="SpotLight3D" type="SpotLight3D" parent="Yaw/Pitch/Mount/Camera3D"] -transform = Transform3D(0.584488, 0.621177, -0.522028, 0.363951, 0.374307, 0.852897, 0.725199, -0.688501, -0.00729993, 0.0601956, 0.21754, -0.271749) -visible = false -light_color = Color(0.97599, 0.669299, 0.509314, 1) -light_energy = 0.4 -light_size = 0.1 -shadow_enabled = true -spot_range = 0.394683 -spot_angle = 27.7927 - -[node name="SpotLight3D2" type="SpotLight3D" parent="Yaw/Pitch/Mount/Camera3D"] -transform = Transform3D(0.456583, 0.0747244, 0.886537, 0.819566, -0.423063, -0.386432, 0.346185, 0.903014, -0.254405, 0.475638, -0.147216, -0.329875) -visible = false -light_color = Color(0.317647, 0.427451, 1, 1) -light_energy = 1.5 -light_size = 0.1 -shadow_enabled = true -spot_range = 0.624277 -spot_angle = 22.1657 - [node name="PlayerCollision" type="CollisionShape3D" parent="."] transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0.322255, 0) shape = SubResource("8")