diff --git a/Game/Assets/Maps/DM1.tscn b/Game/Assets/Maps/DM1.tscn index 2e16c34..45ad85f 100644 --- a/Game/Assets/Maps/DM1.tscn +++ b/Game/Assets/Maps/DM1.tscn @@ -1,8 +1,23 @@ -[gd_scene load_steps=13 format=3 uid="uid://b7txmrrvh1q4e"] +[gd_scene load_steps=28 format=3 uid="uid://b7txmrrvh1q4e"] [ext_resource type="PackedScene" uid="uid://cbh6i7mi0aqjs" path="res://Map.tscn" id="1_5amr5"] [ext_resource type="PackedScene" uid="uid://k4alrsehhfbc" path="res://Assets/Maps/DM1/DM1.glb" id="2_ov63e"] +[ext_resource type="Material" path="res://Assets/Materials/Maps/Dev/Dev_Gray.tres" id="3_d54x7"] [ext_resource type="Texture2D" uid="uid://bus2g2qhtpwjj" path="res://Assets/Effects/NoiseBlurredHorizontally.png" id="3_yx2bu"] +[ext_resource type="Material" uid="uid://cx53mnq3gateb" path="res://Assets/Materials/Maps/Dev/Dev_LightGray.tres" id="4_2kc7n"] +[ext_resource type="Material" path="res://Assets/Materials/Maps/Dev/Dev_Orange.tres" id="5_6x3po"] +[ext_resource type="Material" path="res://Assets/Materials/Maps/Dev/Dev_Red.tres" id="6_75ykk"] +[ext_resource type="Material" uid="uid://57yq8q50rrni" path="res://Assets/Materials/Maps/Dev/Dev_Blue.tres" id="7_onkmw"] +[ext_resource type="Material" path="res://Assets/Materials/Maps/Dev/Dev_Black.tres" id="8_5hi88"] +[ext_resource type="Material" path="res://Assets/Materials/Maps/Dev/Dev_DarkBlue.tres" id="8_h54t0"] +[ext_resource type="Material" path="res://Assets/Materials/Maps/Dev/Dev_DarkPink.tres" id="9_ocotl"] +[ext_resource type="Material" path="res://Assets/Materials/Maps/Dev/Dev_Green.tres" id="10_i7pha"] +[ext_resource type="Material" path="res://Assets/Materials/Maps/Dev/Dev_DarkGrey.tres" id="11_pw6k3"] +[ext_resource type="Material" path="res://Assets/Materials/Maps/Dev/Dev_Yellow.tres" id="12_mxexg"] +[ext_resource type="Material" path="res://Assets/Materials/Maps/Dev/Dev_Violet.tres" id="13_sstni"] +[ext_resource type="Material" path="res://Assets/Materials/Maps/Dev/Dev_DarkRed.tres" id="14_n7ied"] +[ext_resource type="Material" path="res://Assets/Materials/Maps/Dev/Dev_Brown.tres" id="15_m803q"] +[ext_resource type="Material" path="res://Assets/Materials/Maps/Dev/Dev_DarkViolet.tres" id="16_kkkke"] [ext_resource type="Texture2D" uid="uid://pnh872qjk0oy" path="res://Assets/Effects/Flame.png" id="19_irh18"] [sub_resource type="FogMaterial" id="FogMaterial_xa7nn"] @@ -190,123 +205,123 @@ __meta__ = { } [node name="Main 022" parent="Geometry/DM1" index="0"] -surface_material_override/0 = null -surface_material_override/1 = null -surface_material_override/2 = null -surface_material_override/3 = null +surface_material_override/0 = ExtResource( "3_d54x7" ) +surface_material_override/1 = ExtResource( "4_2kc7n" ) +surface_material_override/2 = ExtResource( "5_6x3po" ) +surface_material_override/3 = ExtResource( "6_75ykk" ) [node name="Main 031" parent="Geometry/DM1" index="1"] -surface_material_override/0 = null +surface_material_override/0 = ExtResource( "4_2kc7n" ) [node name="Main 032" parent="Geometry/DM1" index="2"] -surface_material_override/0 = null -surface_material_override/1 = null -surface_material_override/2 = null +surface_material_override/0 = ExtResource( "13_sstni" ) +surface_material_override/1 = ExtResource( "8_h54t0" ) +surface_material_override/2 = ExtResource( "7_onkmw" ) [node name="Main 033" parent="Geometry/DM1" index="3"] -surface_material_override/0 = null +surface_material_override/0 = ExtResource( "9_ocotl" ) [node name="Main 034" parent="Geometry/DM1" index="4"] -surface_material_override/0 = null -surface_material_override/1 = null +surface_material_override/0 = ExtResource( "4_2kc7n" ) +surface_material_override/1 = ExtResource( "5_6x3po" ) [node name="QBlock002" parent="Geometry/DM1" index="5"] -surface_material_override/0 = null -surface_material_override/1 = null +surface_material_override/0 = ExtResource( "10_i7pha" ) +surface_material_override/1 = ExtResource( "3_d54x7" ) [node name="Main 035" parent="Geometry/DM1" index="6"] -surface_material_override/0 = null -surface_material_override/1 = null -surface_material_override/2 = null -surface_material_override/3 = null -surface_material_override/4 = null +surface_material_override/0 = ExtResource( "6_75ykk" ) +surface_material_override/1 = ExtResource( "11_pw6k3" ) +surface_material_override/2 = ExtResource( "7_onkmw" ) +surface_material_override/3 = ExtResource( "4_2kc7n" ) +surface_material_override/4 = ExtResource( "3_d54x7" ) [node name="Main 040" parent="Geometry/DM1" index="7"] -surface_material_override/0 = null +surface_material_override/0 = ExtResource( "3_d54x7" ) [node name="Main 047" parent="Geometry/DM1" index="8"] -surface_material_override/0 = null +surface_material_override/0 = ExtResource( "10_i7pha" ) [node name="Main 048" parent="Geometry/DM1" index="9"] -surface_material_override/0 = null +surface_material_override/0 = ExtResource( "3_d54x7" ) [node name="Main 049" parent="Geometry/DM1" index="10"] -surface_material_override/0 = null +surface_material_override/0 = ExtResource( "9_ocotl" ) [node name="Main 050" parent="Geometry/DM1" index="11"] -surface_material_override/0 = null -surface_material_override/1 = null -surface_material_override/2 = null -surface_material_override/3 = null +surface_material_override/0 = ExtResource( "4_2kc7n" ) +surface_material_override/1 = ExtResource( "3_d54x7" ) +surface_material_override/2 = ExtResource( "8_5hi88" ) +surface_material_override/3 = ExtResource( "12_mxexg" ) [node name="Main 051" parent="Geometry/DM1" index="12"] -surface_material_override/0 = null -surface_material_override/1 = null +surface_material_override/0 = ExtResource( "5_6x3po" ) +surface_material_override/1 = ExtResource( "3_d54x7" ) [node name="Main 052" parent="Geometry/DM1" index="13"] -surface_material_override/0 = null +surface_material_override/0 = ExtResource( "11_pw6k3" ) [node name="Main 053" parent="Geometry/DM1" index="14"] -surface_material_override/0 = null +surface_material_override/0 = ExtResource( "4_2kc7n" ) [node name="Main 054" parent="Geometry/DM1" index="15"] -surface_material_override/0 = null +surface_material_override/0 = ExtResource( "13_sstni" ) [node name="Main 058" parent="Geometry/DM1" index="16"] -surface_material_override/0 = null +surface_material_override/0 = ExtResource( "4_2kc7n" ) [node name="Main 059" parent="Geometry/DM1" index="17"] -surface_material_override/0 = null +surface_material_override/0 = ExtResource( "3_d54x7" ) [node name="Main 060" parent="Geometry/DM1" index="18"] -surface_material_override/0 = null +surface_material_override/0 = ExtResource( "4_2kc7n" ) [node name="Main 061" parent="Geometry/DM1" index="19"] -surface_material_override/0 = null +surface_material_override/0 = ExtResource( "4_2kc7n" ) [node name="Main 062" parent="Geometry/DM1" index="20"] -surface_material_override/0 = null -surface_material_override/1 = null -surface_material_override/2 = null -surface_material_override/3 = null -surface_material_override/4 = null -surface_material_override/5 = null +surface_material_override/0 = ExtResource( "5_6x3po" ) +surface_material_override/1 = ExtResource( "3_d54x7" ) +surface_material_override/2 = ExtResource( "12_mxexg" ) +surface_material_override/3 = ExtResource( "6_75ykk" ) +surface_material_override/4 = ExtResource( "14_n7ied" ) +surface_material_override/5 = ExtResource( "15_m803q" ) [node name="Main 063" parent="Geometry/DM1" index="21"] -surface_material_override/0 = null +surface_material_override/0 = ExtResource( "16_kkkke" ) [node name="Main 064" parent="Geometry/DM1" index="22"] -surface_material_override/0 = null +surface_material_override/0 = ExtResource( "3_d54x7" ) [node name="QBlock003" parent="Geometry/DM1" index="23"] -surface_material_override/0 = null +surface_material_override/0 = ExtResource( "7_onkmw" ) [node name="QBlock005" parent="Geometry/DM1" index="24"] -surface_material_override/0 = null +surface_material_override/0 = ExtResource( "7_onkmw" ) [node name="Main 065" parent="Geometry/DM1" index="25"] -surface_material_override/0 = null -surface_material_override/1 = null -surface_material_override/2 = null +surface_material_override/0 = ExtResource( "4_2kc7n" ) +surface_material_override/1 = ExtResource( "3_d54x7" ) +surface_material_override/2 = ExtResource( "11_pw6k3" ) [node name="Main 066" parent="Geometry/DM1" index="26"] -surface_material_override/0 = null +surface_material_override/0 = ExtResource( "5_6x3po" ) [node name="Main 067" parent="Geometry/DM1" index="27"] -surface_material_override/0 = null +surface_material_override/0 = ExtResource( "12_mxexg" ) [node name="Main 068" parent="Geometry/DM1" index="28"] -surface_material_override/0 = null +surface_material_override/0 = ExtResource( "3_d54x7" ) [node name="Main 069" parent="Geometry/DM1" index="29"] -surface_material_override/0 = null -surface_material_override/1 = null +surface_material_override/0 = ExtResource( "3_d54x7" ) +surface_material_override/1 = ExtResource( "4_2kc7n" ) [node name="Main 070" parent="Geometry/DM1" index="30"] -surface_material_override/0 = null +surface_material_override/0 = ExtResource( "4_2kc7n" ) [node name="Main 072" parent="Geometry/DM1" index="31"] -surface_material_override/0 = null +surface_material_override/0 = ExtResource( "12_mxexg" ) [node name="Collision" parent="Geometry/DM1" index="32"] visible = false @@ -342,13 +357,14 @@ shadow_enabled = true spot_range = 100.0 spot_attenuation = 0.63728 -[node name="OmniLight3D2" type="OmniLight3D" parent="Lights" index="3"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 16, -6, 28) -light_energy = 7.0 -light_size = 1.0 -light_specular = 1.0 +[node name="OmniLight3D2" type="SpotLight3D" parent="Lights" index="3"] +transform = Transform3D(1, 0, 0, 0, 0.642788, 0.766044, 0, -0.766044, 0.642788, 16, 58, 86) +light_energy = 80.0 +light_specular = 0.0 shadow_enabled = true -omni_range = 66.0 +shadow_blur = 8.0 +spot_range = 175.0 +spot_angle = 21.6724 [node name="SpotLight3D" type="SpotLight3D" parent="Lights" index="4"] transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -24, 8, 0) @@ -371,10 +387,51 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -34, -21.4, 0) light_color = Color(1, 0.588235, 0.164706, 1) light_energy = 15.0 light_projector = ExtResource( "3_yx2bu" ) -light_size = 1.5 shadow_enabled = true omni_range = 65.0 +[node name="SpotLight3D3" type="SpotLight3D" parent="Lights" index="7"] +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -1, -18, -30) +light_energy = 15.0 +shadow_enabled = true +spot_range = 30.0 +spot_angle = 70.9598 + +[node name="SpotLight3D4" type="SpotLight3D" parent="Lights" index="8"] +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -22, -18, -23) +light_energy = 15.0 +shadow_enabled = true +spot_range = 30.0 +spot_angle = 70.9598 + +[node name="SpotLight3D5" type="SpotLight3D" parent="Lights" index="9"] +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 19.5, -23, -23) +light_energy = 15.0 +shadow_enabled = true +spot_range = 30.0 +spot_angle = 70.9598 + +[node name="SpotLight3D6" type="SpotLight3D" parent="Lights" index="10"] +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 29.5, -15, -16) +light_energy = 15.0 +shadow_enabled = true +spot_range = 30.0 +spot_angle = 70.9598 + +[node name="SpotLight3D7" type="SpotLight3D" parent="Lights" index="11"] +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 2.5, -30, -21) +light_energy = 15.0 +shadow_enabled = true +spot_range = 30.0 +spot_angle = 70.9598 + +[node name="SpotLight3D8" type="SpotLight3D" parent="Lights" index="12"] +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -3.5, -29.6, 3) +light_energy = 15.0 +shadow_enabled = true +spot_range = 30.0 +spot_angle = 70.9598 + [node name="GPUParticles3D" type="GPUParticles3D" parent="Particles" index="0"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -34, -21.9, 0) amount = 128