diff --git a/scenes/elevator.tscn b/scenes/elevator.tscn new file mode 100644 index 0000000..8686a81 --- /dev/null +++ b/scenes/elevator.tscn @@ -0,0 +1,104 @@ +[gd_scene format=3 uid="uid://brd3iponame0e"] + +[ext_resource type="PackedScene" uid="uid://8ybwrid1vk4j" path="res://scenes/elevator_door.tscn" id="1_uuuf0"] + +[sub_resource type="Animation" id="Animation_8o2wm"] +length = 0.001 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("ElevatorDoorRight:position") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector3(1.1535625, 2.9802322e-08, 0.0001654625)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("ElevatorDoorLeft:position") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector3(-1.25, 0, 0)] +} + +[sub_resource type="Animation" id="Animation_8lbij"] +resource_name = "elevator_close" +length = 3.0 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("ElevatorDoorRight:position") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 3), +"transitions": PackedFloat32Array(0.5, 1), +"update": 0, +"values": [Vector3(1.1535625, 2.9802322e-08, 0.0001654625), Vector3(0.7, 0, 0)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("ElevatorDoorLeft:position") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0, 3), +"transitions": PackedFloat32Array(0.5, 1), +"update": 0, +"values": [Vector3(-1.25, 0, 0), Vector3(-0.7, 0, 0)] +} + +[sub_resource type="Animation" id="Animation_jmdsd"] +resource_name = "elevator_open" +length = 3.0 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("ElevatorDoorRight:position") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 3), +"transitions": PackedFloat32Array(0.5, 1), +"update": 0, +"values": [Vector3(0.7, 0, 0), Vector3(1.154, 0, 0)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("ElevatorDoorLeft:position") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0, 3), +"transitions": PackedFloat32Array(0.5, 1), +"update": 0, +"values": [Vector3(-0.7, 0, 0), Vector3(-1.154, 0, 0)] +} + +[sub_resource type="AnimationLibrary" id="AnimationLibrary_jmdsd"] +_data = { +&"RESET": SubResource("Animation_8o2wm"), +&"elevator_close": SubResource("Animation_8lbij"), +&"elevator_open": SubResource("Animation_jmdsd") +} + +[node name="Elevator" type="Node3D" unique_id=242258467] + +[node name="ElevatorDoorLeft" parent="." unique_id=1751198646 instance=ExtResource("1_uuuf0")] +transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, -1.25, 0, 0) + +[node name="ElevatorDoorRight" parent="." unique_id=1811985699 instance=ExtResource("1_uuuf0")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.1535625, 2.9802322e-08, 0.0001654625) + +[node name="AnimationPlayer" type="AnimationPlayer" parent="." unique_id=373384447] +libraries/ = SubResource("AnimationLibrary_jmdsd") diff --git a/scenes/robot.gd b/scenes/robot.gd index c8a793b..9e14cae 100644 --- a/scenes/robot.gd +++ b/scenes/robot.gd @@ -5,7 +5,7 @@ var robot_ready: bool = false var robot_win: bool = false var speed: int = 3.5 -@onready var safety_zone = get_node("/root/Game/World/ElevatorDoors/ElevatorSafeZone") +@onready var safety_zone = get_node("/root/Game/World/ElevatorSafeZone") func _ready() -> void: diff --git a/scenes/robot.tscn b/scenes/robot.tscn index c3e7271..0a9c5ee 100644 --- a/scenes/robot.tscn +++ b/scenes/robot.tscn @@ -25,6 +25,5 @@ disabled = true [node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D" unique_id=273523738] transform = Transform3D(1.25, 0, 0, 0, 1.25, 0, 0, 0, 1.25, 0, 0.29987764, 0) shape = SubResource("CylinderShape3D_ykvnc") -disabled = true [connection signal="area_entered" from="Area3D" to="." method="_on_area_3d_area_entered"] diff --git a/scenes/survivor.gd b/scenes/survivor.gd index 253e79f..5b40d05 100644 --- a/scenes/survivor.gd +++ b/scenes/survivor.gd @@ -10,7 +10,7 @@ static var _last_chase: AudioStream = null var speed: int = 3 var clumsiness: int = 0 -@onready var safety_zone = get_node("/root/Game/World/ElevatorDoors/ElevatorSafeZone") +@onready var safety_zone = get_node("/root/Game/World/ElevatorSafeZone") #func start(xform): diff --git a/scenes/world.tscn b/scenes/world.tscn index af5b481..76f6b6b 100644 --- a/scenes/world.tscn +++ b/scenes/world.tscn @@ -3,10 +3,10 @@ [ext_resource type="PackedScene" uid="uid://dowvqakiqkvk5" path="res://scenes/camera_3d.tscn" id="1_f3sb7"] [ext_resource type="PackedScene" uid="uid://cxnocjdotkl5e" path="res://scenes/hall_block.tscn" id="1_tlwt5"] [ext_resource type="PackedScene" uid="uid://b8q1mk8ub3dwm" path="res://scenes/robot.tscn" id="3_71j4m"] -[ext_resource type="PackedScene" uid="uid://8ybwrid1vk4j" path="res://scenes/elevator_door.tscn" id="3_k0juu"] +[ext_resource type="PackedScene" uid="uid://brd3iponame0e" path="res://scenes/elevator.tscn" id="4_k0juu"] [sub_resource type="BoxShape3D" id="BoxShape3D_k0juu"] -size = Vector3(9.291687, 1, 1.9597168) +size = Vector3(9.291687, 6.6328125, 0.8612671) [node name="World" type="Node3D" unique_id=831374579] @@ -32,21 +32,17 @@ transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 0, 0 [node name="Robot" parent="." unique_id=985954885 instance=ExtResource("3_71j4m")] transform = Transform3D(3.5, 0, 0, 0, 3.5, 0, 0, 0, 3.5, 0, 2.5, 11.970772) -[node name="ElevatorDoors" type="Node3D" parent="." unique_id=351419432] - -[node name="ElevatorSafeZone" type="Area3D" parent="ElevatorDoors" unique_id=1186678129] +[node name="ElevatorSafeZone" type="Area3D" parent="." unique_id=1186678129] unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -8.351522) -[node name="CollisionShape3D" type="CollisionShape3D" parent="ElevatorDoors/ElevatorSafeZone" unique_id=264489586] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.36001587, 2.5895514, -8.097411) +[node name="Elevator" parent="ElevatorSafeZone" unique_id=242258467 instance=ExtResource("4_k0juu")] +transform = Transform3D(4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 3, 0) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="ElevatorSafeZone" unique_id=264489586] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.8164063, -0.30373383) shape = SubResource("BoxShape3D_k0juu") -[node name="DoorLeft" parent="ElevatorDoors" unique_id=1751198646 instance=ExtResource("3_k0juu")] -transform = Transform3D(4, 0, 0, 0, 4, 0, 0, 0, 4, 4.5, 2.9909716, -8.27242) - -[node name="DoorRight" parent="ElevatorDoors" unique_id=551316937 instance=ExtResource("3_k0juu")] -transform = Transform3D(-4, 0, 3.496911e-07, 0, 4, 0, -3.496911e-07, 0, -4, -4.4, 2.9909716, -8.27242) - [node name="SuvivorSpawn" type="Marker3D" parent="." unique_id=1095768768] unique_name_in_owner = true transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.9181392, 13.711893)