diff --git a/Assets/Lobby_underground.glb b/Assets/Lobby_underground.glb index a978260..8fcecb9 100644 Binary files a/Assets/Lobby_underground.glb and b/Assets/Lobby_underground.glb differ diff --git a/Assets/Lobby_underground_rock.png b/Assets/Lobby_underground_rock.png index b6a82c9..8844db8 100644 Binary files a/Assets/Lobby_underground_rock.png and b/Assets/Lobby_underground_rock.png differ diff --git a/Assets/Lobby_underground_rock.png.import b/Assets/Lobby_underground_rock.png.import index 74d16c3..b5bf5ef 100644 --- a/Assets/Lobby_underground_rock.png.import +++ b/Assets/Lobby_underground_rock.png.import @@ -10,7 +10,7 @@ metadata={ "vram_texture": true } generator_parameters={ -"md5": "e89dd8d46d98857bacd09c77bcd8a005" +"md5": "de3796fe2c1123ae5ba27a0532fda6bd" } [deps] diff --git a/Assets/Lobby_underground_rock_B.png b/Assets/Lobby_underground_rock_B.png new file mode 100644 index 0000000..4592866 Binary files /dev/null and b/Assets/Lobby_underground_rock_B.png differ diff --git a/Assets/Lobby_underground_rock_B.png.import b/Assets/Lobby_underground_rock_B.png.import new file mode 100644 index 0000000..380d7cd --- /dev/null +++ b/Assets/Lobby_underground_rock_B.png.import @@ -0,0 +1,45 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dcy7fdio5k84j" +path.s3tc="res://.godot/imported/Lobby_underground_rock_B.png-3133a2540f4e1417fb5588bad79e38c8.s3tc.ctex" +path.etc2="res://.godot/imported/Lobby_underground_rock_B.png-3133a2540f4e1417fb5588bad79e38c8.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} +generator_parameters={ +"md5": "16ea5e4b01e9b3952b950ff65535e5d5" +} + +[deps] + +source_file="res://Assets/Lobby_underground_rock_B.png" +dest_files=["res://.godot/imported/Lobby_underground_rock_B.png-3133a2540f4e1417fb5588bad79e38c8.s3tc.ctex", "res://.godot/imported/Lobby_underground_rock_B.png-3133a2540f4e1417fb5588bad79e38c8.etc2.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 diff --git a/Materials/M_fire.tres b/Materials/M_fire.tres new file mode 100644 index 0000000..1a0aae7 --- /dev/null +++ b/Materials/M_fire.tres @@ -0,0 +1,5 @@ +[gd_resource type="StandardMaterial3D" format=3 uid="uid://dgmk764033feq"] + +[resource] +emission_enabled = true +emission = Color(0.7096375, 0.3347874, 0.09943161, 1) diff --git a/addons/rider-plugin/bin/windows/~rider-gdextension.windows.editor.x86_64.dll b/addons/rider-plugin/bin/windows/~rider-gdextension.windows.editor.x86_64.dll deleted file mode 100644 index 31e7384..0000000 Binary files a/addons/rider-plugin/bin/windows/~rider-gdextension.windows.editor.x86_64.dll and /dev/null differ diff --git a/levels/arena_level.tscn b/levels/arena_level.tscn index bf5d4bd..c81d859 100644 --- a/levels/arena_level.tscn +++ b/levels/arena_level.tscn @@ -79,6 +79,11 @@ light_energy = 0.106 shadow_enabled = true shadow_blur = 10.0 +[node name="DirectionalLight3D2" type="DirectionalLight3D" parent="Lights" unique_id=1111896461] +transform = Transform3D(0.6177694, 0, 0.7863593, 0, 1, 0, -0.7863593, 0, 0.6177694, 0, 26.991016, 0) +light_color = Color(0.80501384, 0.8787135, 1, 1) +light_energy = 0.157 + [node name="WorldEnvironment" type="WorldEnvironment" parent="." unique_id=1750284504] environment = SubResource("Environment_73fnb") diff --git a/levels/lobby_level.tscn b/levels/lobby_level.tscn index e8a50df..0fb1a0d 100644 --- a/levels/lobby_level.tscn +++ b/levels/lobby_level.tscn @@ -1,5 +1,6 @@ [gd_scene format=3 uid="uid://32nyipcwrab5"] +[ext_resource type="PackedScene" uid="uid://bbfvwolhomilp" path="res://tscn_s/torch.tscn" id="1_w7uyf"] [ext_resource type="PackedScene" uid="uid://bd56iuttyiypv" path="res://tscn_s/BarrelSimple.tscn" id="2_3o0md"] [ext_resource type="PackedScene" uid="uid://dctmlh4hnuux1" path="res://Assets/Lobby_underground.glb" id="2_w7uyf"] @@ -39,6 +40,34 @@ shadow_enabled = true shadow_reverse_cull_face = true spot_range = 22.312231 +[node name="Torches" type="Node3D" parent="Lights" unique_id=1105190110] + +[node name="Torch" parent="Lights/Torches" unique_id=1280811583 instance=ExtResource("1_w7uyf")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -24.207214, -0.26246262, 0) + +[node name="OmniLight3D" type="OmniLight3D" parent="Lights/Torches/Torch" unique_id=657957966] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9.096397, 6.2542057, -15.77264) +light_color = Color(0.92773837, 0.6304423, 0, 1) +shadow_enabled = true +omni_range = 13.657384 + +[node name="Torch2" parent="Lights/Torches" unique_id=472577842 instance=ExtResource("1_w7uyf")] + +[node name="OmniLight3D" type="OmniLight3D" parent="Lights/Torches/Torch2" unique_id=1032256451] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9.096397, 6.2542057, -15.77264) +light_color = Color(0.92773837, 0.6304423, 0, 1) +shadow_enabled = true +omni_range = 13.657384 + +[node name="Torch3" parent="Lights/Torches" unique_id=207127049 instance=ExtResource("1_w7uyf")] +transform = Transform3D(0.0026565322, 0, 0.9999965, 0, 1, 0, -0.9999965, 0, 0.0026565322, -0.39351654, 1.9073486e-06, 20.053785) + +[node name="OmniLight3D" type="OmniLight3D" parent="Lights/Torches/Torch3" unique_id=1415372954] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9.096397, 6.2542057, -15.77264) +light_color = Color(0.92773837, 0.6304423, 0, 1) +shadow_enabled = true +omni_range = 13.657384 + [node name="WorldEnvironment" type="WorldEnvironment" parent="." unique_id=939963056] environment = SubResource("Environment_lobby") @@ -179,7 +208,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.1928787, 0.11255789, 2.8063 [node name="Lobby_underground" parent="." unique_id=1313381882 instance=ExtResource("2_w7uyf")] transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 0, 0, 0) -[node name="Plane" parent="Lobby_underground" index="1" unique_id=1698432361] +[node name="Plane" parent="Lobby_underground" index="1" unique_id=1962555538] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.2352347, 0) [editable path="Lobby_underground"] diff --git a/project.godot b/project.godot index 6235d87..2134610 100644 --- a/project.godot +++ b/project.godot @@ -135,3 +135,4 @@ rendering_device/driver.windows="opengl3" renderer/rendering_method="gl_compatibility" textures/vram_compression/import_s3tc_bptc=true textures/vram_compression/import_etc2_astc=true +environment/defaults/default_clear_color=Color(0, 0, 0, 1) diff --git a/tscn_s/torch.gd b/tscn_s/torch.gd new file mode 100644 index 0000000..8ba6fe1 --- /dev/null +++ b/tscn_s/torch.gd @@ -0,0 +1,12 @@ +extends Node3D + + +# Called when the node enters the scene tree for the first time. +func _ready() -> void: + # Sets a random speed multiplier between 0.8 and 1.3 + $AnimationPlayer.speed_scale = randf_range(0.8, 1.3) + $AnimationPlayer.play("fire_loop") + + + + diff --git a/tscn_s/torch.gd.uid b/tscn_s/torch.gd.uid new file mode 100644 index 0000000..33b76b5 --- /dev/null +++ b/tscn_s/torch.gd.uid @@ -0,0 +1 @@ +uid://bndqjwmcvq4v3 diff --git a/tscn_s/torch.tscn b/tscn_s/torch.tscn new file mode 100644 index 0000000..0a4dc87 --- /dev/null +++ b/tscn_s/torch.tscn @@ -0,0 +1,151 @@ +[gd_scene format=3 uid="uid://bbfvwolhomilp"] + +[ext_resource type="Script" uid="uid://bndqjwmcvq4v3" path="res://tscn_s/torch.gd" id="1_4o8fq"] +[ext_resource type="Material" uid="uid://b73nb47y8ppt" path="res://Materials/M_Barrel_metal.tres" id="1_exefa"] +[ext_resource type="Material" uid="uid://dgmk764033feq" path="res://Materials/M_fire.tres" id="2_4o8fq"] + +[sub_resource type="BoxMesh" id="BoxMesh_73452"] +size = Vector3(0.9326782, 0.6335449, 0.9626465) + +[sub_resource type="BoxMesh" id="BoxMesh_6j2sa"] +size = Vector3(0.2644806, 2.468628, 0.3805542) + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_jmi3x"] +albedo_color = Color(0.26098922, 0.27367952, 0.27059656, 1) +metallic = 1.0 + +[sub_resource type="PrismMesh" id="PrismMesh_6j2sa"] + +[sub_resource type="Animation" id="Animation_exefa"] +length = 0.001 +tracks/0/type = "position_3d" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("MeshInstance3D/fireA") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = PackedFloat32Array(0, 1, -0.1567688, 0.75041616, -1.4901161e-08) +tracks/1/type = "position_3d" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("MeshInstance3D/fireB") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = PackedFloat32Array(0, 1, 0, 0, 0) +tracks/2/type = "position_3d" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("MeshInstance3D/fireC") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = PackedFloat32Array(0, 1, 0, 0, 0) +tracks/3/type = "position_3d" +tracks/3/imported = false +tracks/3/enabled = true +tracks/3/path = NodePath("MeshInstance3D/fireD") +tracks/3/interp = 1 +tracks/3/loop_wrap = true +tracks/3/keys = PackedFloat32Array(0, 1, 0, 0, 0) + +[sub_resource type="Animation" id="Animation_3vdjf"] +resource_name = "fire_loop" +length = 0.93333334 +loop_mode = 1 +tracks/0/type = "position_3d" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("MeshInstance3D/fireA") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = PackedFloat32Array(0, 1, 0.04148674, 0.7504161, 0.05269016, 0.33333334, 1, -0.13482475, 0.48584715, -0.22755396, 0.9, 1, 0.04148674, 0.7504161, 0.05269016) +tracks/1/type = "position_3d" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("MeshInstance3D/fireB") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = PackedFloat32Array(0, 1, 0, 0, 0, 0.3, 1, -0.22119996, 0.3059624, 0.04474123, 0.9, 1, 0, 0, 0) +tracks/2/type = "position_3d" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("MeshInstance3D/fireC") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = PackedFloat32Array(0, 1, 0, 0, 0, 0.26666668, 1, 0.19170284, 0.5448218, -1.735554e-07, 0.9, 1, 0, 0, 0) +tracks/3/type = "position_3d" +tracks/3/imported = false +tracks/3/enabled = true +tracks/3/path = NodePath("MeshInstance3D/fireD") +tracks/3/interp = 1 +tracks/3/loop_wrap = true +tracks/3/keys = PackedFloat32Array(0, 1, 0, 0, 0, 0.33333334, 1, 0.02864173, 0.34877536, 0.17983711, 0.9, 1, 0, 0, 0) +tracks/4/type = "scale_3d" +tracks/4/imported = false +tracks/4/enabled = true +tracks/4/path = NodePath("MeshInstance3D/fireA") +tracks/4/interp = 1 +tracks/4/loop_wrap = true +tracks/4/keys = PackedFloat32Array(0, 1, -0.42311662, -1.0000002, -0.41596806, 0.033333335, 1, -0.42311668, -1.0000002, -0.41596806, 0.33333334, 1, -0.43980896, -0.57847893, -0.41597286, 0.9, 1, -0.42311668, -1.0000002, -0.41596806) +tracks/5/type = "scale_3d" +tracks/5/imported = false +tracks/5/enabled = true +tracks/5/path = NodePath("MeshInstance3D/fireB") +tracks/5/interp = 1 +tracks/5/loop_wrap = true +tracks/5/keys = PackedFloat32Array(0, 1, -0.42311662, -1.0000002, -0.41596806, 0.33333334, 1, -0.42311668, -1.0000002, -0.41596806, 0.9, 1, -0.42311662, -1.0000002, -0.41596806) +tracks/6/type = "scale_3d" +tracks/6/imported = false +tracks/6/enabled = true +tracks/6/path = NodePath("MeshInstance3D/fireC") +tracks/6/interp = 1 +tracks/6/loop_wrap = true +tracks/6/keys = PackedFloat32Array(0, 1, -0.42311662, -1.0000002, -0.41596806, 0.3, 1, -0.42311668, -1.0000002, -0.41596806, 0.9, 1, -0.42311662, -1.0000002, -0.41596806) +tracks/7/type = "scale_3d" +tracks/7/imported = false +tracks/7/enabled = true +tracks/7/path = NodePath("MeshInstance3D/fireD") +tracks/7/interp = 1 +tracks/7/loop_wrap = true +tracks/7/keys = PackedFloat32Array(0, 1, -0.42311662, -1.0000002, -0.41596806, 0.3, 1, -0.42311668, -1.0000002, -0.41596806, 0.9, 1, -0.42311662, -1.0000002, -0.41596806) + +[sub_resource type="AnimationLibrary" id="AnimationLibrary_k6xdh"] +_data = { +&"RESET": SubResource("Animation_exefa"), +&"fire_loop": SubResource("Animation_3vdjf") +} + +[node name="Torch" type="Node3D" unique_id=1280811583] +script = ExtResource("1_4o8fq") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="." unique_id=930681948] +transform = Transform3D(1, 0, 0, 0, 0.9695923, -0.24472608, 0, 0.24472608, 0.9695923, 8.852822, 4.506134, -16.936087) +mesh = SubResource("BoxMesh_73452") +surface_material_override/0 = ExtResource("1_exefa") + +[node name="MeshInstance3D2" type="MeshInstance3D" parent="MeshInstance3D" unique_id=1900476513] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.06278229, -1.0842056, 0.0013141632) +mesh = SubResource("BoxMesh_6j2sa") +surface_material_override/0 = SubResource("StandardMaterial3D_jmi3x") + +[node name="fireA" type="MeshInstance3D" parent="MeshInstance3D" unique_id=36577239] +transform = Transform3D(0.42311668, 1.5099585e-07, 0, -6.388884e-08, 1.0000002, 0, 0, 0, -0.41596806, -0.1567688, 0.75041616, -1.4901161e-08) +mesh = SubResource("PrismMesh_6j2sa") +surface_material_override/0 = ExtResource("2_4o8fq") + +[node name="fireB" type="MeshInstance3D" parent="MeshInstance3D" unique_id=1142692438] +transform = Transform3D(0.42311668, 1.5099585e-07, 0, -6.388884e-08, 1.0000002, 0, 0, 0, -0.41596806, 0, 0, 0) +mesh = SubResource("PrismMesh_6j2sa") +surface_material_override/0 = ExtResource("2_4o8fq") + +[node name="fireC" type="MeshInstance3D" parent="MeshInstance3D" unique_id=1159139608] +transform = Transform3D(0.42311668, 1.5099585e-07, 0, -6.388884e-08, 1.0000002, 0, 0, 0, -0.41596806, 0, 0, 0) +mesh = SubResource("PrismMesh_6j2sa") +surface_material_override/0 = ExtResource("2_4o8fq") + +[node name="fireD" type="MeshInstance3D" parent="MeshInstance3D" unique_id=889000684] +transform = Transform3D(0.42311668, 1.5099585e-07, 0, -6.388884e-08, 1.0000002, 0, 0, 0, -0.41596806, 0, 0, 0) +mesh = SubResource("PrismMesh_6j2sa") +surface_material_override/0 = ExtResource("2_4o8fq") + +[node name="AnimationPlayer" type="AnimationPlayer" parent="." unique_id=505242559] +libraries/ = SubResource("AnimationLibrary_k6xdh")