diff --git a/Assets/Lobby_underground.glb b/Assets/Lobby_underground.glb new file mode 100644 index 0000000..a978260 Binary files /dev/null and b/Assets/Lobby_underground.glb differ diff --git a/Assets/Lobby_underground.glb.import b/Assets/Lobby_underground.glb.import new file mode 100644 index 0000000..ca6ddb4 --- /dev/null +++ b/Assets/Lobby_underground.glb.import @@ -0,0 +1,45 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://dctmlh4hnuux1" +path="res://.godot/imported/Lobby_underground.glb-55ed49331d7074ef560bfa0a498b89a7.scn" + +[deps] + +source_file="res://Assets/Lobby_underground.glb" +dest_files=["res://.godot/imported/Lobby_underground.glb-55ed49331d7074ef560bfa0a498b89a7.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/root_script=null +mesh_library/use_node_names_as_mesh_names=false +array_mesh/deduplicate_surfaces=true +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +materials/extract=0 +materials/extract_format=0 +materials/extract_path="" +_subresources={} +gltf/naming_version=2 +gltf/embedded_image_handling=1 +gltf/texture_map_mode=1 diff --git a/Assets/Lobby_underground_rock.png b/Assets/Lobby_underground_rock.png new file mode 100644 index 0000000..b6a82c9 Binary files /dev/null and b/Assets/Lobby_underground_rock.png differ diff --git a/Assets/Lobby_underground_rock.png.import b/Assets/Lobby_underground_rock.png.import new file mode 100644 index 0000000..74d16c3 --- /dev/null +++ b/Assets/Lobby_underground_rock.png.import @@ -0,0 +1,45 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dc4gf36fgsabp" +path.s3tc="res://.godot/imported/Lobby_underground_rock.png-76733dc5212e6c79a91e71ce008ebf6f.s3tc.ctex" +path.etc2="res://.godot/imported/Lobby_underground_rock.png-76733dc5212e6c79a91e71ce008ebf6f.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} +generator_parameters={ +"md5": "e89dd8d46d98857bacd09c77bcd8a005" +} + +[deps] + +source_file="res://Assets/Lobby_underground_rock.png" +dest_files=["res://.godot/imported/Lobby_underground_rock.png-76733dc5212e6c79a91e71ce008ebf6f.s3tc.ctex", "res://.godot/imported/Lobby_underground_rock.png-76733dc5212e6c79a91e71ce008ebf6f.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/Assets/Lobby_underground_rock_B.jpg b/Assets/Lobby_underground_rock_B.jpg new file mode 100644 index 0000000..e21ef16 Binary files /dev/null and b/Assets/Lobby_underground_rock_B.jpg differ diff --git a/Assets/Lobby_underground_rock_B.jpg.import b/Assets/Lobby_underground_rock_B.jpg.import new file mode 100644 index 0000000..5298665 --- /dev/null +++ b/Assets/Lobby_underground_rock_B.jpg.import @@ -0,0 +1,45 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://v0hdo12xule3" +path.s3tc="res://.godot/imported/Lobby_underground_rock_B.jpg-c5e86461201f99688c8146fff239a62b.s3tc.ctex" +path.etc2="res://.godot/imported/Lobby_underground_rock_B.jpg-c5e86461201f99688c8146fff239a62b.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} +generator_parameters={ +"md5": "335b739e743244a64c47e2564a9a3652" +} + +[deps] + +source_file="res://Assets/Lobby_underground_rock_B.jpg" +dest_files=["res://.godot/imported/Lobby_underground_rock_B.jpg-c5e86461201f99688c8146fff239a62b.s3tc.ctex", "res://.godot/imported/Lobby_underground_rock_B.jpg-c5e86461201f99688c8146fff239a62b.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/Intro_MENU.tscn b/Intro_MENU.tscn index 54263db..1a9cee1 100644 --- a/Intro_MENU.tscn +++ b/Intro_MENU.tscn @@ -3,7 +3,6 @@ [ext_resource type="PackedScene" uid="uid://eu2lqjhowj4t" path="res://Assets/Matador.glb" id="1_eicjn"] [ext_resource type="Script" uid="uid://dycnoiadljbb1" path="res://Assets/matador_intro_menu.gd" id="2_5jr0i"] [ext_resource type="PackedScene" uid="uid://dio67r8ambe7h" path="res://Assets/arena_placeholder_v01.glb" id="3_1v6n4"] -[ext_resource type="PackedScene" uid="uid://dxe72ig8gfbcg" path="res://Assets/arena model2026.glb" id="3_5jr0i"] [ext_resource type="PackedScene" uid="uid://crtm0xtiql3r8" path="res://Player.tscn" id="4_eicjn"] [ext_resource type="Texture2D" uid="uid://3syhacswepyj" path="res://HDRI/kloppenheim_06_puresky_4k.hdr" id="6_1v6n4"] @@ -51,7 +50,7 @@ dof_blur_near_transition = 5.0 transform = Transform3D(-0.56715536, 0, -0.8236109, 0, 1, 0, 0.8236109, 0, -0.56715536, 5.2114463, -0.08998108, 1.8927763) script = ExtResource("2_5jr0i") -[node name="Skeleton3D" parent="Matador/Armature" parent_id_path=PackedInt32Array(166852612, 1447304122) index="0" unique_id=357848305] +[node name="Skeleton3D" parent="Matador/Armature" parent_id_path=PackedInt32Array(166852612, 626127017) index="0" unique_id=509437022] bones/0/position = Vector3(0.056660548, 0.6424767, -0.0167365) bones/0/rotation = Quaternion(0.013179442, -0.2660563, 0.073319815, 0.9610747) bones/1/rotation = Quaternion(0.06234612, 0.049236443, 0.08183311, 0.99347484) @@ -81,10 +80,10 @@ bones/23/rotation = Quaternion(0.9993525, -0.0021175682, 0.03502641, -0.00795782 bones/24/rotation = Quaternion(0.08874816, -0.018719967, -0.04671622, 0.99478185) bones/25/rotation = Quaternion(0.09634846, -0.0268489, -0.04050248, 0.9941608) -[node name="matador" parent="Matador/Armature/Skeleton3D" index="0" unique_id=593562242] +[node name="matador" parent="Matador/Armature/Skeleton3D" index="0" unique_id=771504528] transform = Transform3D(0.8642424, 0, 0.50307554, 0, 1, 0, -0.50307554, 0, 0.8642424, 0, 0, 0) -[node name="Muleta" parent="Matador/Armature/Skeleton3D" index="1" unique_id=978680467] +[node name="Muleta" parent="Matador/Armature/Skeleton3D" index="1" unique_id=2110992297] cast_shadow = 0 [node name="Camera3D" type="Camera3D" parent="." unique_id=1531255459] @@ -92,7 +91,7 @@ transform = Transform3D(0.42176014, 0.2362673, 0.8753835, -0.10687317, 0.9716769 fov = 41.6 near = 0.001 -[node name="arena model2026" parent="." unique_id=179544183 instance=ExtResource("3_5jr0i")] +[node name="arena model2026" parent="." unique_id=179544183] transform = Transform3D(-0.83746713, 0, 0.54648757, 0, 0.99999994, 0, -0.54648757, 0, -0.83746713, 3.8733478, -0.6, -1.1080065) [node name="arena_placeholder_v01" parent="." unique_id=1343590504 instance=ExtResource("3_1v6n4")] diff --git a/Materials/M_Barrel_wood.tres b/Materials/M_Barrel_wood.tres index 9666351..881f5d4 100644 --- a/Materials/M_Barrel_wood.tres +++ b/Materials/M_Barrel_wood.tres @@ -1,4 +1,4 @@ [gd_resource type="StandardMaterial3D" format=3 uid="uid://isrp2y47xs5x"] [resource] -albedo_color = Color(0.32957706, 0.20283183, 0.1294336, 1) +albedo_color = Color(0.55783796, 0.36362514, 0.24893412, 1) diff --git a/levels/lobby_level.tscn b/levels/lobby_level.tscn index e20935f..e8a50df 100644 --- a/levels/lobby_level.tscn +++ b/levels/lobby_level.tscn @@ -1,26 +1,43 @@ [gd_scene format=3 uid="uid://32nyipcwrab5"] -[ext_resource type="PackedScene" uid="uid://cwmo5vh738x6w" path="res://Assets/Lobby_level.glb" id="1_lobby"] [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"] [sub_resource type="Environment" id="Environment_lobby"] [node name="lobby_level" type="Node3D" unique_id=1511255302] -[node name="Lobby_level" parent="." unique_id=1119577247 instance=ExtResource("1_lobby")] - [node name="Lights" type="Node3D" parent="." unique_id=562527333] -[node name="DirectionalLight3D" type="DirectionalLight3D" parent="Lights" unique_id=837461706] -transform = Transform3D(1, 0, 0, 0, 0.7071067, 0.70710677, 0, -0.70710677, 0.7071067, 0, 36.945946, 70) -light_color = Color(1, 0.9137255, 0.827451, 1) -light_energy = 1.6 +[node name="DirectionalLight3D" type="DirectionalLight3D" parent="Lights" unique_id=955995990] +transform = Transform3D(-0.502238, -0.82287306, 0.26577574, 0.36594617, 0.07621761, 0.9275096, -0.78347975, 0.5630903, 0.26284787, 0, 0, 0) +light_color = Color(0.78431374, 0.8117647, 1, 1) +light_energy = 0.228 shadow_enabled = true -[node name="DirectionalLight3D2" type="DirectionalLight3D" parent="Lights" unique_id=513226199] -transform = Transform3D(1, 0, 0, 0, -0.8660254, 0.49999994, 0, -0.49999994, -0.8660254, 0, 112.56815, 93.37274) -light_color = Color(0.4784314, 0.6156863, 0.8, 1) -light_energy = 0.45 +[node name="SpotLight3D" type="SpotLight3D" parent="Lights" unique_id=1783040386] +transform = Transform3D(-0.9926004, -0.101570696, 0.06654498, -0.08617279, 0.9753173, 0.20329961, -0.08555172, 0.19606102, -0.9768528, -2.86597, 1.7488484, -31.233114) +light_color = Color(0.51629305, 0.20273978, 0.034483083, 1) +light_energy = 1000.0 +shadow_enabled = true +shadow_reverse_cull_face = true +spot_range = 22.312231 + +[node name="SpotLight3D3" type="SpotLight3D" parent="Lights" unique_id=30670834] +transform = Transform3D(-0.94000536, -0.14085309, 0.31072634, 0.3218794, -0.064308055, 0.94459444, -0.11306689, 0.9879399, 0.105787426, 11.072751, 38.325985, 6.519638) +light_color = Color(0.31635508, 0.2876817, 0.44758296, 1) +light_energy = 17.27 +shadow_enabled = true +shadow_reverse_cull_face = true +spot_range = 4095.795 + +[node name="SpotLight3D2" type="SpotLight3D" parent="Lights" unique_id=748351326] +transform = Transform3D(-0.0064023333, 0.48097554, -0.8767107, 0.0041269795, 0.87673384, 0.48095813, 0.99997103, -0.00053891214, -0.0075981184, -30.750355, 6.77676, -0.61776364) +light_color = Color(0.1254902, 0.37254903, 0.16078432, 1) +light_energy = 1000.0 +shadow_enabled = true +shadow_reverse_cull_face = true +spot_range = 22.312231 [node name="WorldEnvironment" type="WorldEnvironment" parent="." unique_id=939963056] environment = SubResource("Environment_lobby") @@ -28,169 +45,141 @@ environment = SubResource("Environment_lobby") [node name="Barrels" type="Node3D" parent="." unique_id=1740830546] [node name="BarrelSimple" parent="Barrels" unique_id=771860903 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -22.373299, 0.056278944, -4.466549) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.276957, 0.056278944, -13.151918) -[node name="BarrelSimple2" parent="Barrels" unique_id=1339845856 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -22.373299, 0.056278944, -9.046058) +[node name="BarrelSimple2" parent="Barrels" unique_id=609563864 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.8753104, 0.11255789, -14.810173) -[node name="BarrelSimple3" parent="Barrels" unique_id=2000490348 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -22.373299, 0.056278944, -14.540598) +[node name="BarrelSimple3" parent="Barrels" unique_id=2089803156 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.758999, 0.11255789, -14.810173) -[node name="BarrelSimple4" parent="Barrels" unique_id=793999938 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -22.373299, 0.056278944, -0.26565266) +[node name="BarrelSimple4" parent="Barrels" unique_id=223671996 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 14.40292, 0.11255789, -14.810173) -[node name="BarrelSimple5" parent="Barrels" unique_id=212358879 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 0.99995756, -0.009215782, 0, 0.009215782, 0.99995756, -22.373299, 0.056278944, 5.3367405) +[node name="BarrelSimple5" parent="Barrels" unique_id=1643056602 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.8811536, 0.11255789, -10.928238) -[node name="BarrelSimple6" parent="Barrels" unique_id=1014439133 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -22.373299, 0.056278944, 10.210146) +[node name="BarrelSimple6" parent="Barrels" unique_id=1861324204 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.764843, 0.11255789, -10.928238) -[node name="BarrelSimple7" parent="Barrels" unique_id=1123670636 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -22.373299, 0.056278944, 14.542604) +[node name="BarrelSimple7" parent="Barrels" unique_id=1662505485 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 14.597986, 0.11255789, -11.120108) -[node name="BarrelSimple8" parent="Barrels" unique_id=832214052 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -22.373299, 0.056278944, 18.809439) +[node name="BarrelSimple8" parent="Barrels" unique_id=711949884 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.686088, 0.11255789, -6.599861) -[node name="BarrelSimple9" parent="Barrels" unique_id=1722156417 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -12.291735, 0.056278944, 4.458378) +[node name="BarrelSimple9" parent="Barrels" unique_id=633001295 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.569777, 0.11255789, -6.599861) -[node name="BarrelSimple10" parent="Barrels" unique_id=1682130884 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -12.291735, 0.056278944, -0.12113094) +[node name="BarrelSimple10" parent="Barrels" unique_id=1460426434 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 14.40292, 0.11255789, -6.791731) -[node name="BarrelSimple11" parent="Barrels" unique_id=1418096466 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -12.291735, 0.056278944, -5.615671) +[node name="BarrelSimple11" parent="Barrels" unique_id=1660531493 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.210243, 0.056278944, 12.913824) -[node name="BarrelSimple12" parent="Barrels" unique_id=51690537 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -12.291735, 0.056278944, 8.659274) +[node name="BarrelSimple12" parent="Barrels" unique_id=1652485637 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.8753104, 0.11255789, 6.3396435) -[node name="BarrelSimple13" parent="Barrels" unique_id=586437561 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 0.99995756, -0.009215782, 0, 0.009215782, 0.99995756, -12.291735, 0.056278944, 14.261667) +[node name="BarrelSimple13" parent="Barrels" unique_id=590613985 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.758999, 0.11255789, 6.3396435) -[node name="BarrelSimple14" parent="Barrels" unique_id=1528269935 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -12.291735, 0.056278944, 19.135073) +[node name="BarrelSimple14" parent="Barrels" unique_id=176616372 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 14.40292, 0.11255789, 6.3396435) -[node name="BarrelSimple15" parent="Barrels" unique_id=559448439 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -12.291735, 0.056278944, 23.467531) +[node name="BarrelSimple15" parent="Barrels" unique_id=465036756 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 7.070376, 0.11255789, 10.029709) -[node name="BarrelSimple16" parent="Barrels" unique_id=43755332 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -12.291735, 0.056278944, 27.734365) +[node name="BarrelSimple16" parent="Barrels" unique_id=224566162 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.954065, 0.11255789, 10.029709) -[node name="BarrelSimple17" parent="Barrels" unique_id=1115091250 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.252749, 0.056278944, 4.458378) +[node name="BarrelSimple17" parent="Barrels" unique_id=1512161234 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 14.597986, 0.11255789, 10.029709) -[node name="BarrelSimple18" parent="Barrels" unique_id=1969795518 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.252749, 0.056278944, -0.12113094) +[node name="BarrelSimple18" parent="Barrels" unique_id=1113697629 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.8753104, 0.11255789, 14.358086) -[node name="BarrelSimple19" parent="Barrels" unique_id=1364173502 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.252749, 0.056278944, -5.615671) +[node name="BarrelSimple19" parent="Barrels" unique_id=1224035347 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.758999, 0.11255789, 14.358086) -[node name="BarrelSimple20" parent="Barrels" unique_id=1055924327 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.252749, 0.056278944, 8.659274) +[node name="BarrelSimple20" parent="Barrels" unique_id=249931770 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 14.40292, 0.11255789, 14.358086) -[node name="BarrelSimple21" parent="Barrels" unique_id=368194560 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 0.99995756, -0.009215782, 0, 0.009215782, 0.99995756, -9.252749, 0.056278944, 14.261667) +[node name="BarrelSimple21" parent="Barrels" unique_id=1893459330 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.3384705, 0.056278944, 15.129177) -[node name="BarrelSimple22" parent="Barrels" unique_id=1471500429 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.252749, 0.056278944, 19.135073) +[node name="BarrelSimple22" parent="Barrels" unique_id=1386374345 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -14.883017, 0.11255789, 6.7661877) -[node name="BarrelSimple23" parent="Barrels" unique_id=1081781785 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.252749, 0.056278944, 23.467531) +[node name="BarrelSimple23" parent="Barrels" unique_id=1508934681 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.999329, 0.11255789, 6.7661877) -[node name="BarrelSimple24" parent="Barrels" unique_id=798941529 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.252749, 0.056278944, 27.734365) +[node name="BarrelSimple24" parent="Barrels" unique_id=1567182843 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.3554077, 0.11255789, 6.7661877) -[node name="BarrelSimple25" parent="Barrels" unique_id=1558135054 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.317894, 0.056278944, 4.458378) +[node name="BarrelSimple25" parent="Barrels" unique_id=2023488949 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -14.687952, 0.11255789, 10.456253) -[node name="BarrelSimple26" parent="Barrels" unique_id=713295844 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.317894, 0.056278944, -0.12113094) +[node name="BarrelSimple26" parent="Barrels" unique_id=918952214 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.804262, 0.11255789, 10.456253) -[node name="BarrelSimple27" parent="Barrels" unique_id=1198133558 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.317894, 0.056278944, -5.615671) +[node name="BarrelSimple27" parent="Barrels" unique_id=1651601809 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.1603413, 0.11255789, 10.456253) -[node name="BarrelSimple28" parent="Barrels" unique_id=506991673 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.317894, 0.056278944, 8.659274) +[node name="BarrelSimple28" parent="Barrels" unique_id=1526224674 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -14.883017, 0.11255789, 14.78463) -[node name="BarrelSimple29" parent="Barrels" unique_id=1295514477 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 0.99995756, -0.009215782, 0, 0.009215782, 0.99995756, -6.317894, 0.056278944, 14.261667) +[node name="BarrelSimple29" parent="Barrels" unique_id=212191494 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.999329, 0.11255789, 14.78463) -[node name="BarrelSimple30" parent="Barrels" unique_id=1255664854 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.317894, 0.056278944, 19.135073) +[node name="BarrelSimple30" parent="Barrels" unique_id=625425940 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.3554077, 0.11255789, 14.78463) -[node name="BarrelSimple31" parent="Barrels" unique_id=136916821 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.317894, 0.056278944, 23.467531) +[node name="BarrelSimple31" parent="Barrels" unique_id=1216255698 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.165121, 0.056277037, -13.43729) -[node name="BarrelSimple32" parent="Barrels" unique_id=479801912 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.317894, 0.056278944, 27.734365) +[node name="BarrelSimple32" parent="Barrels" unique_id=1511816190 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -15.938013, 0.11255789, -14.810173) -[node name="BarrelSimple33" parent="Barrels" unique_id=873994333 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.1608963, 0.056278944, 4.458378) +[node name="BarrelSimple33" parent="Barrels" unique_id=592677866 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -12.054325, 0.11255789, -14.810173) -[node name="BarrelSimple34" parent="Barrels" unique_id=304404611 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.1608963, 0.056278944, -0.12113094) +[node name="BarrelSimple34" parent="Barrels" unique_id=855289598 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.410404, 0.11255789, -14.810173) -[node name="BarrelSimple35" parent="Barrels" unique_id=1947508207 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.1608963, 0.056278944, -5.615671) +[node name="BarrelSimple35" parent="Barrels" unique_id=521586989 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -15.742949, 0.11255789, -11.120108) -[node name="BarrelSimple36" parent="Barrels" unique_id=1218170051 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.1608963, 0.056278944, 8.659274) +[node name="BarrelSimple36" parent="Barrels" unique_id=841067379 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -11.859259, 0.11255789, -11.120108) -[node name="BarrelSimple37" parent="Barrels" unique_id=1958223589 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 0.99995756, -0.009215782, 0, 0.009215782, 0.99995756, -3.1608963, 0.056278944, 14.261667) +[node name="BarrelSimple37" parent="Barrels" unique_id=1167528508 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.215338, 0.11255789, -11.120108) -[node name="BarrelSimple38" parent="Barrels" unique_id=592343708 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.1608963, 0.056278944, 19.135073) +[node name="BarrelSimple38" parent="Barrels" unique_id=2081881340 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -15.938013, 0.11255789, -6.791731) -[node name="BarrelSimple39" parent="Barrels" unique_id=460923026 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.1608963, 0.056278944, 23.467531) +[node name="BarrelSimple39" parent="Barrels" unique_id=716196812 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -12.054325, 0.11255789, -6.791731) -[node name="BarrelSimple40" parent="Barrels" unique_id=1189124109 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.1608963, 0.056278944, 27.734365) +[node name="BarrelSimple40" parent="Barrels" unique_id=1689907554 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.410404, 0.11255789, -6.791731) -[node name="BarrelSimple41" parent="Barrels" unique_id=1222633692 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.24084282, 0.056278944, 4.458378) +[node name="BarrelSimple41" parent="Barrels" unique_id=1885522518 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.4957442, 0.11255789, -1.522007) -[node name="BarrelSimple42" parent="Barrels" unique_id=1867707725 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.24084282, 0.056278944, -0.12113094) +[node name="BarrelSimple42" parent="Barrels" unique_id=138543996 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.3879452, 0.11255789, -1.522007) -[node name="BarrelSimple43" parent="Barrels" unique_id=1947849832 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.24084282, 0.056278944, -5.615671) +[node name="BarrelSimple43" parent="Barrels" unique_id=1456059567 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.6908097, 0.11255789, 2.8063698) -[node name="BarrelSimple44" parent="Barrels" unique_id=1449173872 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.24084282, 0.056278944, 8.659274) +[node name="BarrelSimple44" parent="Barrels" unique_id=1888973294 instance=ExtResource("2_3o0md")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.1928787, 0.11255789, 2.8063698) -[node name="BarrelSimple45" parent="Barrels" unique_id=1861722059 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 0.99995756, -0.009215782, 0, 0.009215782, 0.99995756, 0.24084282, 0.056278944, 14.261667) +[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="BarrelSimple46" parent="Barrels" unique_id=1812733408 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.24084282, 0.056278944, 19.135073) +[node name="Plane" parent="Lobby_underground" index="1" unique_id=1698432361] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.2352347, 0) -[node name="BarrelSimple47" parent="Barrels" unique_id=781570539 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.24084282, 0.056278944, 23.467531) - -[node name="BarrelSimple48" parent="Barrels" unique_id=168204364 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.24084282, 0.056278944, 27.734365) - -[node name="BarrelSimple49" parent="Barrels" unique_id=206818228 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.8727226, 0.056278944, 4.815792) - -[node name="BarrelSimple50" parent="Barrels" unique_id=536047838 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.8727226, 0.056278944, 0.2362833) - -[node name="BarrelSimple51" parent="Barrels" unique_id=183031641 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.8727226, 0.056278944, -5.258257) - -[node name="BarrelSimple52" parent="Barrels" unique_id=1262709499 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.8727226, 0.056278944, 9.016688) - -[node name="BarrelSimple53" parent="Barrels" unique_id=496356713 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 0.99995756, -0.009215782, 0, 0.009215782, 0.99995756, 6.8727226, 0.056278944, 14.6190815) - -[node name="BarrelSimple54" parent="Barrels" unique_id=1898913348 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.8727226, 0.056278944, 19.492487) - -[node name="BarrelSimple55" parent="Barrels" unique_id=1993030878 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.8727226, 0.056278944, 23.824945) - -[node name="BarrelSimple56" parent="Barrels" unique_id=1662572818 instance=ExtResource("2_3o0md")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.8727226, 0.056278944, 28.09178) +[editable path="Lobby_underground"] diff --git a/project.godot b/project.godot index 336f0de..6235d87 100644 --- a/project.godot +++ b/project.godot @@ -12,7 +12,7 @@ config_version=5 config/name="Bullosseum" config/version="0.2.0" -run/main_scene="res://MainMenu.tscn" +run/main_scene="uid://bmnmenu0intr1" config/features=PackedStringArray("4.7", "GL Compatibility") boot_splash/bg_color=Color(0, 0, 0, 1) boot_splash/image="res://Assets/loading_screen.png" diff --git a/scene.tscn b/scene.tscn index 663619e..ae7336c 100644 --- a/scene.tscn +++ b/scene.tscn @@ -30,7 +30,7 @@ script = ExtResource("13_shell") [node name="Player" parent="." unique_id=332720469 instance=ExtResource("1_ulcgi")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.2416196, 5.1711025, -4.841382) -[node name="Camera3D" parent="Player" index="3" unique_id=1120161087] +[node name="Camera3D" parent="Player" index="1" unique_id=1120161087] attributes = SubResource("CameraAttributesPractical_73fnb") fov = 50.0 near = 2.636