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

export_presets.cfg

@@ -0,0 +1,49 @@
+[preset.0]
+
+name="Web"
+platform="Web"
+runnable=true
+dedicated_server=false
+custom_features=""
+export_filter="all_resources"
+include_filter=""
+exclude_filter=""
+export_path=""
+patches=PackedStringArray()
+patch_delta_encoding=false
+patch_delta_compression_level_zstd=19
+patch_delta_min_reduction=0.1
+patch_delta_include_filters="*"
+patch_delta_exclude_filters=""
+encryption_include_filters=""
+encryption_exclude_filters=""
+seed=0
+encrypt_pck=false
+encrypt_directory=false
+script_export_mode=2
+
+[preset.0.options]
+
+custom_template/debug=""
+custom_template/release=""
+variant/extensions_support=false
+variant/thread_support=false
+vram_texture_compression/for_desktop=true
+vram_texture_compression/for_mobile=false
+html/export_icon=true
+html/custom_html_shell=""
+html/head_include=""
+html/canvas_resize_policy=2
+html/focus_canvas_on_start=true
+html/experimental_virtual_keyboard=false
+progressive_web_app/enabled=false
+progressive_web_app/ensure_cross_origin_isolation_headers=true
+progressive_web_app/offline_page=""
+progressive_web_app/display=1
+progressive_web_app/orientation=0
+progressive_web_app/icon_144x144=""
+progressive_web_app/icon_180x180=""
+progressive_web_app/icon_512x512=""
+progressive_web_app/background_color=Color(0, 0, 0, 1)
+threads/emscripten_pool_size=8
+threads/godot_pool_size=4

images/survivor.png.import

@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://c24xx8ghsyijg"
+path="res://.godot/imported/survivor.png-d003bc37ed2641d35a5778b597459fde.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://images/survivor.png"
+dest_files=["res://.godot/imported/survivor.png-d003bc37ed2641d35a5778b597459fde.ctex"]
+
+[params]
+
+compress/mode=0
+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=false
+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_door.tscn

@@ -10,6 +10,7 @@ size = Vector3(0.94641113, 1.4300561, 0.018554688)
 [node name="CollisionShape3D" type="CollisionShape3D" parent="." unique_id=461678032]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0018920898, 0.0053675175, 0.0034179688)
 shape = SubResource("BoxShape3D_2ktk7")
+disabled = true
 
 [node name="Panel" type="Sprite3D" parent="." unique_id=1889832031]
 transform = Transform3D(1, 0, 3.9750646e-15, 0, 1, 0, -3.9750646e-15, 0, 1, 0, 0, 0)

scenes/game.tscn

@@ -13,6 +13,7 @@
 script = ExtResource("1_lbhrr")
 
 [node name="World" parent="." unique_id=831374579 instance=ExtResource("1_uwrxv")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.004168272, 1.1920929e-07, -0.0019803047)
 
 [node name="CanvasHud" type="CanvasLayer" parent="." unique_id=369977201]
 
@@ -22,6 +23,10 @@ script = ExtResource("1_lbhrr")
 
 [node name="ElevatorPanel" parent="CanvasPanel" unique_id=574176994 instance=ExtResource("3_lnu2h")]
 
+<<<<<<< HEAD
+[node name="ComponentSpawn" parent="." unique_id=649225939 instance=ExtResource("5_iywne")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.004472971, 0)
+=======
 [node name="SfxDing" type="AudioStreamPlayer3D" parent="CanvasPanel/ElevatorPanel" unique_id=529226129]
 stream = ExtResource("4_p57ef")
 
@@ -34,3 +39,4 @@ stream = ExtResource("6_gee14")
 [node name="SfxChase" type="AudioStreamPlayer3D" parent="CanvasPanel/ElevatorPanel" unique_id=812445001]
 
 [node name="ComponentSpawn" parent="." unique_id=649225939 instance=ExtResource("9_0tnpc")]
+>>>>>>> f2b176c978c80dee71e2e640451aa7b607238400

scenes/survivor.tscn

@@ -1,28 +1,58 @@
 [gd_scene format=3 uid="uid://bedp5mlcbielu"]
 
-[ext_resource type="Texture2D" uid="uid://btgh55yxpq1tq" path="res://images/henry_wave_still.png" id="1_dvhww"]
 [ext_resource type="Script" uid="uid://ewsu4jeim8jy" path="res://scenes/survivor.gd" id="1_q7pxf"]
+[ext_resource type="Texture2D" uid="uid://c24xx8ghsyijg" path="res://images/survivor.png" id="2_q7pxf"]
 
-[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_q7pxf"]
+[sub_resource type="BoxShape3D" id="BoxShape3D_q7pxf"]
+size = Vector3(0.70355225, 1, 0.5317383)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_7yc2n"]
+atlas = ExtResource("2_q7pxf")
+region = Rect2(0, 0, 16, 29)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_v4jtw"]
+atlas = ExtResource("2_q7pxf")
+region = Rect2(16, 0, 16, 29)
+
+[sub_resource type="SpriteFrames" id="SpriteFrames_t26pv"]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_7yc2n")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_v4jtw")
+}],
+"loop": true,
+"name": &"default",
+"speed": 10.0
+}]
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_7yc2n"]
+size = Vector3(1, 1.2099609, 0.59033203)
 
 [node name="Survivor" type="CharacterBody3D" unique_id=1192836658]
+transform = Transform3D(3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0)
 script = ExtResource("1_q7pxf")
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="." unique_id=1830691958]
-transform = Transform3D(1.4, 0, 0, 0, 1.4, 0, 0, 0, 1.4, 0, 0, 0)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.013031006, 0, -0.06518555)
-shape = SubResource("CapsuleShape3D_q7pxf")
+shape = SubResource("BoxShape3D_q7pxf")
 
-[node name="Sprite3D" type="Sprite3D" parent="." unique_id=2107037495]
+[node name="Sprite3D" type="AnimatedSprite3D" parent="." unique_id=4297452]
-transform = Transform3D(3.5, 0, 0, 0, 3.5, 0, 0, 0, 1.59, 0, 0, 0)
+transform = Transform3D(4.5, 0, 0, 0, 4.5, 0, 0, 0, 2.044, 0, 0, 0)
+gi_mode = 0
 billboard = 1
 double_sided = false
 texture_filter = 0
-texture = ExtResource("1_dvhww")
+sprite_frames = SubResource("SpriteFrames_t26pv")
+autoplay = "default"
+frame_progress = 0.99938977
 
 [node name="Area3D" type="Area3D" parent="." unique_id=1121777394]
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D" unique_id=1505010263]
-transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, 0, 0, 0)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.080844045, -0.14428711)
-shape = SubResource("CapsuleShape3D_q7pxf")
+shape = SubResource("BoxShape3D_7yc2n")
 
 [connection signal="area_entered" from="Area3D" to="." method="_on_area_3d_area_entered"]

scenes/world.tscn

@@ -2,7 +2,6 @@
 
 [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://bedp5mlcbielu" path="res://scenes/survivor.tscn" id="3_4wyf3"]
 [ext_resource type="PackedScene" uid="uid://8ybwrid1vk4j" path="res://scenes/elevator_door.tscn" id="3_k0juu"]
 
 [sub_resource type="CapsuleMesh" id="CapsuleMesh_tlwt5"]
@@ -60,9 +59,6 @@ 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="Survivor" parent="." unique_id=510103859 instance=ExtResource("3_4wyf3")]
-transform = Transform3D(1.5, 0, 0, 0, 1.5, 0, 0, 0, 1.5, 0.9680804, 1.8453895, 5.186021)
-
 [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)