Merge branch 'master' of https://git.ghostguild.org/henry/tojam20-elevator

images/button_door_controlst.png.import

@@ -0,0 +1,41 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dhpru87ff8hpx"
+path.s3tc="res://.godot/imported/button_door_controlst.png-3985e3fb82f0b92828940986b35d41a3.s3tc.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc"],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://images/button_door_controlst.png"
+dest_files=["res://.godot/imported/button_door_controlst.png-3985e3fb82f0b92828940986b35d41a3.s3tc.ctex"]
+
+[params]
+
+compress/mode=2
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=true
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=0

scenes/elevator_button.tscn

@@ -1,8 +1,10 @@
 [gd_scene format=3 uid="uid://cwwexawpj46hk"]
 
-[ext_resource type="Texture2D" uid="uid://ckg5b7xtyk4nc" path="res://images/elevator_button.png" id="1_sy1b3"]
+[ext_resource type="Texture2D" uid="uid://dhpru87ff8hpx" path="res://images/button_door_controlst.png" id="1_sy1b3"]
 
 [node name="ElevatorButton" type="Sprite3D" unique_id=1758559173]
 billboard = 1
 texture_filter = 0
 texture = ExtResource("1_sy1b3")
+hframes = 2
+vframes = 2

scenes/floor_button.tscn

@@ -15,5 +15,4 @@ hframes = 10
 vframes = 2
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="." unique_id=1160314093]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.361)
 shape = SubResource("BoxShape3D_4clxj")

scenes/world.tscn

@@ -39,10 +39,14 @@ unique_name_in_owner = true
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -8.351522)
 
 [node name="VirtuaHand" parent="ElevatorSafeZone" unique_id=1811028460 instance=ExtResource("5_71j4m")]
-transform = Transform3D(3, 0, 0, 0, 3, 0, 0, 0, 3, -2.798057, 0.5557984, -0.674366)
+transform = Transform3D(3, 0, 0, 0, 3, 0, 0, 0, 3, -2.61384, 0.554309, -0.67426205)
 
-[node name="ElevatorButton" parent="ElevatorSafeZone" unique_id=1758559173 instance=ExtResource("5_qfnet")]
+[node name="DoorOpen" parent="ElevatorSafeZone" unique_id=1758559173 instance=ExtResource("5_qfnet")]
-transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, -3.267, 2.258, -0.39)
+transform = Transform3D(0.35, 0, 0, 0, 0.35, 0, 0, 0, 0.35, -3.082784, 2.258, -0.39000034)
+
+[node name="DoorClose" parent="ElevatorSafeZone" unique_id=513173058 instance=ExtResource("5_qfnet")]
+transform = Transform3D(0.35, 0, 0, 0, 0.35, 0, 0, 0, 0.35, -3.6393127, 2.258, -0.39000034)
+frame = 1
 
 [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.061756134)