From 92b39c1ee91bba09bb1617f2e9a002217d10a4d7 Mon Sep 17 00:00:00 2001 From: Pal Date: Wed, 21 Jan 2026 14:46:48 -0800 Subject: [PATCH] Lighting for new rooms etc --- Zennysoft.Game.Ma/Ma.csproj | 2 +- Zennysoft.Game.Ma/Ma.csproj.old.5 | 38 +++++ .../map/dungeon/floors/Floor03/Floor 3A.tscn | 4 +- .../dungeon/models/Area 2/Donut/A2 Donut.glb | Bin 10843052 -> 10843052 bytes .../models/Area 2/Donut/A2 Donut.glb.import | 2 +- .../models/Area 2/Donut/A2 Donut_8.png.import | 2 +- .../Area 2/Donut/A2 Donut_CC302614.png.import | 2 +- .../Area 2/Donut/A2 Donut_IMG0031.png.import | 2 +- .../Area 2/Donut/A2 Donut_JUPITER2.jpg.import | 2 +- .../Area 2/Donut/A2 Donut_NEWDONE.jpg.import | 2 +- .../Area 2/Donut/A2 Donut_PLATEOX2.jpg.import | 2 +- .../Area 2/Donut/A2 Donut_TXTR0004.png.import | 2 +- .../Area 2/Donut/A2 Donut_a1maerb.jpg.import | 2 +- .../Area 2/Donut/A2 Donut_mottled.png.import | 2 +- .../dungeon/rooms/Set A/05. Pit Room A.tscn | 45 +++--- .../rooms/Set A/06. Balcony Room A.tscn | 8 +- .../rooms/Set A/12. Jump Scare Room.tscn | 11 +- .../map/dungeon/rooms/Set A/Circle Room.tscn | 137 +++++++++++++++++- .../map/dungeon/rooms/Set A/Gallery A1.tscn | 115 ++++++++++++++- .../rooms/Set B/40. Donut Gallery.tscn | 80 +++++++++- .../map/dungeon/rooms/Set B/41. Circle.tscn | 22 +++ 21 files changed, 435 insertions(+), 47 deletions(-) create mode 100644 Zennysoft.Game.Ma/Ma.csproj.old.5 diff --git a/Zennysoft.Game.Ma/Ma.csproj b/Zennysoft.Game.Ma/Ma.csproj index 853d610d..0ca2470c 100644 --- a/Zennysoft.Game.Ma/Ma.csproj +++ b/Zennysoft.Game.Ma/Ma.csproj @@ -1,4 +1,4 @@ - + net8.0 true diff --git a/Zennysoft.Game.Ma/Ma.csproj.old.5 b/Zennysoft.Game.Ma/Ma.csproj.old.5 new file mode 100644 index 00000000..853d610d --- /dev/null +++ b/Zennysoft.Game.Ma/Ma.csproj.old.5 @@ -0,0 +1,38 @@ + + + net8.0 + true + CS9057 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor03/Floor 3A.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor03/Floor 3A.tscn index 3f218f51..3d7a2953 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor03/Floor 3A.tscn +++ b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor03/Floor 3A.tscn @@ -15,7 +15,7 @@ script = ExtResource("1_x62lg") [node name="Balcony Room A" parent="." instance=ExtResource("1_op53i")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 17.1836, 133, 14.7066) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -59.1591, 4.31337, 24.3275) [node name="Statue Room" parent="." instance=ExtResource("2_e824x")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -19.7716, 0, 8.6137) @@ -24,7 +24,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -19.7716, 0, 8.6137) transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 64.2092, 0, 12.4445) [node name="Node3D" parent="." instance=ExtResource("4_j1a5r")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -11.7721, 0, 14.5442) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -27.7721, 0, 21.5442) [node name="A1CircleRoom" parent="." instance=ExtResource("5_i84xt")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 17, 11, -30) diff --git a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut.glb b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut.glb index 2706d971dc11532c9c5378f1f63bd594bf99d8ef..0808ddfe7cdc1035294cd52b8c61e5d1cd4132e9 100644 GIT binary patch delta 16199 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 delta 16098 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 TwtUD=unXK%UOr^^S84wZSMzl! diff --git a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut.glb.import b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut.glb.import index c51cd526..2685f056 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut.glb.import +++ b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut.glb.import @@ -3,7 +3,7 @@ importer="scene" importer_version=1 type="PackedScene" -uid="uid://dw56jlwkmqktu" +uid="uid://bqvkbpfsuu0d4" path="res://.godot/imported/A2 Donut.glb-364282a3e11d05e1247cc2f510ee59b0.scn" [deps] diff --git a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_8.png.import b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_8.png.import index 8dce3696..f11dcd59 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_8.png.import +++ b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_8.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cas2st4gn8h7x" +uid="uid://dmewkutmd4j6d" path="res://.godot/imported/A2 Donut_8.png-aec6535ede840504c051951579426130.ctex" metadata={ "vram_texture": false diff --git a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_CC302614.png.import b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_CC302614.png.import index 75a74a73..67bd8260 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_CC302614.png.import +++ b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_CC302614.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://qr8aj73f2r68" +uid="uid://b33d74elnba3e" path="res://.godot/imported/A2 Donut_CC302614.png-7204606554b131bceb852c1f216b3c05.ctex" metadata={ "vram_texture": false diff --git a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_IMG0031.png.import b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_IMG0031.png.import index 499b306c..87a8c897 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_IMG0031.png.import +++ b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_IMG0031.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://h5h2eg44tsfv" +uid="uid://dd0aed3be44w5" path="res://.godot/imported/A2 Donut_IMG0031.png-4a76d53036973834d0fa2f07143287d1.ctex" metadata={ "vram_texture": false diff --git a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_JUPITER2.jpg.import b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_JUPITER2.jpg.import index 47a24d5b..2ff9db69 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_JUPITER2.jpg.import +++ b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_JUPITER2.jpg.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dyvao7sy1tiax" +uid="uid://caqchdb37mwq6" path="res://.godot/imported/A2 Donut_JUPITER2.jpg-6efa91a78f40a7822efa6641bd4a8f4d.ctex" metadata={ "vram_texture": false diff --git a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_NEWDONE.jpg.import b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_NEWDONE.jpg.import index 04b785f7..baf32de0 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_NEWDONE.jpg.import +++ b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_NEWDONE.jpg.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://3jpsgr2jf8n" +uid="uid://c7t1jtyhfmn7m" path="res://.godot/imported/A2 Donut_NEWDONE.jpg-017fb92f5f4e6f5b0efe0b41ea290a0b.ctex" metadata={ "vram_texture": false diff --git a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_PLATEOX2.jpg.import b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_PLATEOX2.jpg.import index 2f13eb7c..124a0204 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_PLATEOX2.jpg.import +++ b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_PLATEOX2.jpg.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://byubg3tok4ro3" +uid="uid://d1wgynu5sfwqj" path="res://.godot/imported/A2 Donut_PLATEOX2.jpg-bd99891df35aa7f8ec164bbb018d8553.ctex" metadata={ "vram_texture": false diff --git a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_TXTR0004.png.import b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_TXTR0004.png.import index 6264ed84..098dfd22 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_TXTR0004.png.import +++ b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_TXTR0004.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://da07qqny2xhrv" +uid="uid://bog6kb64afid2" path="res://.godot/imported/A2 Donut_TXTR0004.png-36ae2c51fcd11bd5d251438cdce3f520.ctex" metadata={ "vram_texture": false diff --git a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_a1maerb.jpg.import b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_a1maerb.jpg.import index b0c3d821..995c288e 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_a1maerb.jpg.import +++ b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_a1maerb.jpg.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://eg4aw8puvwdd" +uid="uid://qoxljnf8oqib" path="res://.godot/imported/A2 Donut_a1maerb.jpg-5a54684a66cf092067b123d29cd8d995.ctex" metadata={ "vram_texture": false diff --git a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_mottled.png.import b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_mottled.png.import index a23e374b..77354d72 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_mottled.png.import +++ b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_mottled.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://6o6e3f6ssv8q" +uid="uid://dfhwsno17dbf8" path="res://.godot/imported/A2 Donut_mottled.png-b73d9621b00241d3b3aab5127b5074f3.ctex" metadata={ "vram_texture": false diff --git a/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/05. Pit Room A.tscn b/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/05. Pit Room A.tscn index be6ea835..09ffdc41 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/05. Pit Room A.tscn +++ b/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/05. Pit Room A.tscn @@ -73,7 +73,7 @@ subdivide_depth = 1 script = ExtResource("1_5ni02") [node name="OmniLight3D11" type="OmniLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 60.7801, 5.13098, -26.3464) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 18.4186, 5.13098, -17.8153) light_color = Color(1.97336e-06, 0.703962, 0.150021, 1) light_energy = 0.155 light_cull_mask = 4294967293 @@ -82,7 +82,7 @@ omni_range = 11.236 omni_attenuation = -0.343 [node name="OmniLight3D12" type="OmniLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 79.5466, 5.13098, -25.1778) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 37.1851, 5.13098, -16.6467) light_color = Color(1.97336e-06, 0.703962, 0.150021, 1) light_energy = 0.155 light_cull_mask = 4294967293 @@ -91,7 +91,7 @@ omni_range = 11.236 omni_attenuation = -0.343 [node name="OmniLight3D13" type="OmniLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 78.886, 5.13098, -45.2653) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 36.5245, 5.13098, -36.7342) light_color = Color(1.97336e-06, 0.703962, 0.150021, 1) light_energy = 0.155 light_cull_mask = 4294967293 @@ -100,7 +100,7 @@ omni_range = 11.236 omni_attenuation = -0.343 [node name="OmniLight3D14" type="OmniLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 61.2028, 5.13098, -44.5032) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 18.8413, 5.13098, -35.9721) light_color = Color(1.97336e-06, 0.703962, 0.150021, 1) light_energy = 0.155 light_cull_mask = 4294967293 @@ -109,14 +109,13 @@ omni_range = 11.236 omni_attenuation = -0.343 [node name="A1-Pit2" parent="." instance=ExtResource("2_ial2h")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 43.4707, -1.67631, -8.80541) - -[node name="Model" type="Node3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.10919, -1.67631, -0.274271) [node name="Collision" type="Node3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.02876, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1.15117, 0) [node name="StaticBody3D" type="StaticBody3D" parent="Collision"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -41.479, 0, 8.23696) [node name="CollisionShape3D" type="CollisionShape3D" parent="Collision/StaticBody3D"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 42.8897, 7.58684, -49.2063) @@ -215,7 +214,7 @@ transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 83.817 shape = SubResource("BoxShape3D_ueomb") [node name="Spawn Points" type="Node3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.02876, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.02876, -28.8813) visible = false [node name="ItemSpawnPoints" type="Node3D" parent="Spawn Points"] @@ -247,7 +246,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9.23212, -1.76654, 7.753) [node name="Room" type="Node3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.77516, 0) -visible = false [node name="Room" type="Area3D" parent="Room"] unique_name_in_owner = true @@ -256,10 +254,11 @@ collision_layer = 0 collision_mask = 10 [node name="CollisionShape3D" type="CollisionShape3D" parent="Room/Room"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 18.0457, -13.6094, 18) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 28.8392, -13.6094, -27.7034) shape = SubResource("BoxShape3D_c4wqw") [node name="Minimap" type="Node3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -35.0071) [node name="Minimap" type="MeshInstance3D" parent="Minimap"] unique_name_in_owner = true @@ -269,7 +268,7 @@ layers = 2 mesh = SubResource("PlaneMesh_gx7da") [node name="GPUParticles3D2" type="GPUParticles3D" parent="."] -transform = Transform3D(0.869, 0, 0, 0, 0.332, 0, 0, 0, 0.967, 69.7365, 4.51225, -35.39) +transform = Transform3D(0.869, 0, 0, 0, 0.332, 0, 0, 0, 0.967, 27.375, 4.51225, -26.8589) amount = 20 lifetime = 41.19 local_coords = true @@ -277,7 +276,7 @@ process_material = SubResource("ParticleProcessMaterial_hisav") draw_pass_1 = SubResource("QuadMesh_1b53s") [node name="OmniLight3D2" type="OmniLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 74.5118, 1.72011, -35.2162) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 32.1503, 1.72011, -26.6851) light_color = Color(0.288422, 0.532296, 0.224511, 1) light_energy = 1.875 light_cull_mask = 4294967293 @@ -285,7 +284,7 @@ shadow_enabled = true omni_range = 16.104 [node name="OmniLight3D3" type="OmniLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 64.9303, 1.72011, -34.9767) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 22.5688, 1.72011, -26.4456) light_color = Color(0.288422, 0.532296, 0.224511, 1) light_energy = 1.875 light_cull_mask = 4294967293 @@ -293,7 +292,7 @@ shadow_enabled = true omni_range = 16.104 [node name="OmniLight3D4" type="OmniLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 66.2649, 1.72011, -38.3302) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 23.9034, 1.72011, -29.7991) light_color = Color(0.288422, 0.532296, 0.224511, 1) light_energy = 1.875 light_cull_mask = 4294967293 @@ -301,7 +300,7 @@ shadow_enabled = true omni_range = 16.104 [node name="OmniLight3D5" type="OmniLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 66.3162, 1.72011, -31.5548) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 23.9547, 1.72011, -23.0237) light_color = Color(0.288422, 0.532296, 0.224511, 1) light_energy = 1.875 light_cull_mask = 4294967293 @@ -309,7 +308,7 @@ shadow_enabled = true omni_range = 16.104 [node name="OmniLight3D6" type="OmniLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 69.8066, 1.72011, -30.2544) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 27.4451, 1.72011, -21.7233) light_color = Color(0.288422, 0.532296, 0.224511, 1) light_energy = 1.875 light_cull_mask = 4294967293 @@ -317,7 +316,7 @@ shadow_enabled = true omni_range = 16.104 [node name="OmniLight3D7" type="OmniLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 73.2286, 1.72011, -31.7087) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 30.8671, 1.72011, -23.1776) light_color = Color(0.288422, 0.532296, 0.224511, 1) light_energy = 1.875 light_cull_mask = 4294967293 @@ -325,7 +324,7 @@ shadow_enabled = true omni_range = 16.104 [node name="OmniLight3D8" type="OmniLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 69.5671, 1.72011, -39.7846) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 27.2056, 1.72011, -31.2535) light_color = Color(0.288422, 0.532296, 0.224511, 1) light_energy = 1.875 light_cull_mask = 4294967293 @@ -333,7 +332,7 @@ shadow_enabled = true omni_range = 16.104 [node name="OmniLight3D9" type="OmniLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 73.0404, 1.72011, -38.604) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 30.6789, 1.72011, -30.0729) light_color = Color(0.288422, 0.532296, 0.224511, 1) light_energy = 1.875 light_cull_mask = 4294967293 @@ -341,7 +340,7 @@ shadow_enabled = true omni_range = 16.104 [node name="OmniLight3D10" type="OmniLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 73.3483, 1.72011, -31.7259) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 30.9868, 1.72011, -23.1948) light_color = Color(0.288422, 0.532296, 0.224511, 1) light_energy = 1.875 light_cull_mask = 4294967293 @@ -349,7 +348,7 @@ shadow_enabled = true omni_range = 16.104 [node name="OmniLight3D" type="OmniLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 69.9855, 0.166375, -34.501) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 27.624, 0.166375, -25.9699) light_color = Color(0.288422, 0.532296, 0.224511, 1) light_energy = 1.875 light_cull_mask = 4294967293 @@ -358,5 +357,5 @@ omni_range = 7.598 omni_attenuation = 1.969 [node name="FogVolume" type="FogVolume" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 70.1695, -2.75744, -33.8206) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 27.808, -2.75744, -25.2895) size = Vector3(32.3798, 5.64899, 29.6947) diff --git a/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/06. Balcony Room A.tscn b/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/06. Balcony Room A.tscn index 834572f1..6e275dd0 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/06. Balcony Room A.tscn +++ b/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/06. Balcony Room A.tscn @@ -97,10 +97,11 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 18.1836, 0, 15.8193) script = ExtResource("2_fedas") [node name="A1-Balcony2" parent="." instance=ExtResource("2_ybo5h")] -transform = Transform3D(1.5, 0, 0, 0, 1.5, 0, 0, 0, 1.5, 1.18503, -8.69354, -1.29919) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.18503, -8.69354, -1.29919) [node name="Model" type="Node3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0) +visible = false [node name="OmniLight3D" type="OmniLight3D" parent="Model"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0243759, 1.6988, -1.89605) @@ -120,6 +121,7 @@ draw_pass_1 = SubResource("QuadMesh_sasor") [node name="Collision" type="Node3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0) +visible = false [node name="StaticBody3D" type="StaticBody3D" parent="Collision"] @@ -227,6 +229,7 @@ shape = SubResource("BoxShape3D_mefsp") [node name="Spawn Points" type="Node3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0) +visible = false [node name="PlayerSpawn" type="Marker3D" parent="Spawn Points"] unique_name_in_owner = true @@ -248,6 +251,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.346, -0.5, -3.546) [node name="Room" type="Node3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -2, 0) +visible = false [node name="Room" type="Area3D" parent="Room"] unique_name_in_owner = true @@ -260,10 +264,12 @@ shape = SubResource("BoxShape3D_1up8d") [node name="FogVolume" type="FogVolume" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.171951, -9.55431, 0.18298) +visible = false size = Vector3(39.9, 16.6792, 34.6) [node name="Minimap" type="Node3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.171951, -10.2003, -1.80546) +visible = false [node name="Minimap" type="MeshInstance3D" parent="Minimap"] unique_name_in_owner = true diff --git a/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/12. Jump Scare Room.tscn b/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/12. Jump Scare Room.tscn index dcbe0147..bfc164cb 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/12. Jump Scare Room.tscn +++ b/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/12. Jump Scare Room.tscn @@ -30,7 +30,7 @@ _limits = [-2.0, 2.0, 0.0, 1.0] _data = [Vector2(0.00358423, 0.230769), 0.0, 0.0, 0, 0, Vector2(0.982079, -1.03846), 0.0, 0.0, 0, 0] point_count = 2 -[sub_resource type="CurveTexture" id="CurveTexture_312b8"] +[sub_resource type="CurveTexture" id="CurveTexture_fgt65"] curve = SubResource("Curve_umqhi") [sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_307bl"] @@ -41,12 +41,12 @@ angle_min = -245.3 angle_max = 417.9 orbit_velocity_min = -0.0269999 orbit_velocity_max = 0.0400001 -orbit_velocity_curve = SubResource("CurveTexture_312b8") +orbit_velocity_curve = SubResource("CurveTexture_fgt65") gravity = Vector3(0, -0.07, 0) scale_min = 0.0 scale_max = 0.0 -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_jig7d"] +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_5m2h2"] transparency = 1 cull_mode = 2 shading_mode = 0 @@ -55,7 +55,7 @@ albedo_texture = ExtResource("5_5m2h2") billboard_mode = 2 [sub_resource type="QuadMesh" id="QuadMesh_lyv8e"] -material = SubResource("StandardMaterial3D_jig7d") +material = SubResource("StandardMaterial3D_5m2h2") size = Vector2(0.1, 0.1) subdivide_width = 1 subdivide_depth = 1 @@ -65,7 +65,7 @@ transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, -8.509, -3.41755, -8.60795) script = ExtResource("1_5m2h2") [node name="A1-Jumpscare" parent="." instance=ExtResource("2_umqhi")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.0246, 0, 7.9943) +transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, 11.5401, 0, 7.30243) [node name="Collision" type="Node3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.0246, 2, 7.9943) @@ -105,7 +105,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.0246, 0, 7.9943) [node name="Minimap" type="MeshInstance3D" parent="Minimap"] unique_name_in_owner = true -visible = false layers = 2 mesh = SubResource("PlaneMesh_lyv8e") surface_material_override/0 = SubResource("StandardMaterial3D_woljn") diff --git a/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/Circle Room.tscn b/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/Circle Room.tscn index 7330749c..8e4987fa 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/Circle Room.tscn +++ b/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/Circle Room.tscn @@ -1,7 +1,142 @@ -[gd_scene load_steps=2 format=3 uid="uid://b8u3sfhexlhfu"] +[gd_scene load_steps=17 format=3 uid="uid://b8u3sfhexlhfu"] [ext_resource type="PackedScene" uid="uid://cvajnig5nw537" path="res://src/map/dungeon/models/Area 1/WaterCircle/A1-WateryCircle.glb" id="1_1t1ov"] +[ext_resource type="Texture2D" uid="uid://dw50ys561j8no" path="res://src/map/assets/DUST_1.png" id="2_yramv"] +[ext_resource type="Shader" uid="uid://blrcjqdo7emhs" path="res://src/map/overworld/Models/water.gdshader" id="3_k4n66"] +[ext_resource type="CompressedTexture2DArray" uid="uid://c0kjnbpgaa6bs" path="res://src/map/assets/caustics.png" id="4_qjvxm"] +[ext_resource type="Texture2D" uid="uid://cbsdc4uthojov" path="res://src/map/assets/waternormal2.jpg" id="5_j6fpi"] + +[sub_resource type="Curve" id="Curve_vo6nb"] +_limits = [-2.0, 2.0, 0.0, 1.0] +_data = [Vector2(0.00358423, 0.230769), 0.0, 0.0, 0, 0, Vector2(0.982079, -1.03846), 0.0, 0.0, 0, 0] +point_count = 2 + +[sub_resource type="CurveTexture" id="CurveTexture_312b8"] +curve = SubResource("Curve_vo6nb") + +[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_hsxad"] +lifetime_randomness = 0.05 +emission_shape = 3 +emission_box_extents = Vector3(22.2, 22.505, 22) +angle_min = -245.3 +angle_max = 417.9 +orbit_velocity_min = -0.0269999 +orbit_velocity_max = 0.0400001 +orbit_velocity_curve = SubResource("CurveTexture_312b8") +gravity = Vector3(0, -0.07, 0) +scale_min = 0.0 +scale_max = 0.0 + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_jig7d"] +transparency = 1 +cull_mode = 2 +shading_mode = 0 +albedo_color = Color(1, 1, 1, 0.0862745) +albedo_texture = ExtResource("2_yramv") +billboard_mode = 2 + +[sub_resource type="QuadMesh" id="QuadMesh_fel6n"] +material = SubResource("StandardMaterial3D_jig7d") +size = Vector2(0.1, 0.1) +subdivide_width = 1 +subdivide_depth = 1 + +[sub_resource type="FastNoiseLite" id="FastNoiseLite_d8mjt"] +noise_type = 3 +frequency = 0.051 +fractal_type = 0 +domain_warp_enabled = true + +[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_goigl"] +seamless = true +noise = SubResource("FastNoiseLite_d8mjt") + +[sub_resource type="FastNoiseLite" id="FastNoiseLite_7im4w"] + +[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_8c3x1"] +seamless = true +noise = SubResource("FastNoiseLite_7im4w") + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_ou4jy"] +render_priority = 0 +shader = ExtResource("3_k4n66") +shader_parameter/wave_1 = Vector4(0.3, 4, 0.2, 0.6) +shader_parameter/wave_2 = Vector4(-0.26, -0.19, 0.01, 0.47) +shader_parameter/wave_3 = Vector4(-7.67, 5.63, 0.1, 0.38) +shader_parameter/wave_4 = Vector4(-0.42, -1.63, 0.1, 0.28) +shader_parameter/wave_5 = Vector4(1.66, 0.07, 0.15, 1.81) +shader_parameter/wave_6 = Vector4(1.2, 1.14, 0.01, 0.33) +shader_parameter/wave_7 = Vector4(-1.6, 7.3, 0.11, 0.73) +shader_parameter/wave_8 = Vector4(-0.42, -1.63, 0.15, 1.52) +shader_parameter/time_factor = 2.5 +shader_parameter/noise_zoom = 2.0 +shader_parameter/noise_amp = 1.0 +shader_parameter/base_water_color = Color(0, 0.592828, 0.515505, 1) +shader_parameter/fresnel_water_color = Color(0.457416, 0.678852, 0.519402, 1) +shader_parameter/deep_water_color = Color(0.732793, 0.968719, 0.655931, 1) +shader_parameter/shallow_water_color = Color(0.406848, 0.699941, 0.470216, 1) +shader_parameter/beers_law = 0.495 +shader_parameter/depth_offset = -1.2 +shader_parameter/near = 7.0 +shader_parameter/far = 10000.0 +shader_parameter/edge_texture_scale = 3.5 +shader_parameter/edge_texture_offset = 1.0 +shader_parameter/edge_texture_speed = 0.1 +shader_parameter/edge_foam_intensity = 2.0 +shader_parameter/edge_fade_start = -3.0 +shader_parameter/edge_fade_end = 6.6 +shader_parameter/peak_height_threshold = 1.0 +shader_parameter/peak_color = Vector3(1, 1, 1) +shader_parameter/peak_intensity = 1.0 +shader_parameter/foam_intensity = 1.0 +shader_parameter/foam_scale = 1.0 +shader_parameter/metallic = 0.6 +shader_parameter/roughness = 0.54 +shader_parameter/uv_scale_text_a = 0.1 +shader_parameter/uv_speed_text_a = Vector2(1.18, 1.52) +shader_parameter/uv_scale_text_b = 0.6 +shader_parameter/uv_speed_text_b = Vector2(0.15, 0.1) +shader_parameter/normal_strength = 1.0 +shader_parameter/uv_sampler_scale = 0.3 +shader_parameter/blend_factor = 0.03 +shader_parameter/perturbation_strength = 1.0 +shader_parameter/perturbation_time = 0.3 +shader_parameter/normalmap_a = ExtResource("5_j6fpi") +shader_parameter/normalmap_b = SubResource("NoiseTexture2D_goigl") +shader_parameter/uv_sampler = SubResource("NoiseTexture2D_8c3x1") +shader_parameter/caustic_sampler = ExtResource("4_qjvxm") +shader_parameter/num_caustic_layers = 1.0 +shader_parameter/caustic_distortion_strength = 0.001 + +[sub_resource type="PlaneMesh" id="PlaneMesh_wbtug"] +lightmap_size_hint = Vector2i(1003, 753) +material = SubResource("ShaderMaterial_ou4jy") +uv2_padding = 3.49 +size = Vector2(33.455, 31.71) +subdivide_width = 100 +subdivide_depth = 100 [node name="A1CircleRoom" type="Node3D"] [node name="A1-WateryCircle" parent="." instance=ExtResource("1_1t1ov")] + +[node name="GPUParticles3D2" type="GPUParticles3D" parent="."] +transform = Transform3D(0.464, 0, 0, 0, 0.227, 0, 0, 0, 0.462, -0.206923, -1.16501, -0.808931) +amount = 20 +lifetime = 41.19 +local_coords = true +process_material = SubResource("ParticleProcessMaterial_hsxad") +draw_pass_1 = SubResource("QuadMesh_fel6n") + +[node name="OmniLight3D" type="OmniLight3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.116278, 2.29578, -0.0767513) +light_energy = 1.375 +shadow_enabled = true +omni_range = 14.008 +omni_attenuation = 1.157 + +[node name="Top Water" type="MeshInstance3D" parent="."] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.169727, -3.1, 0.0638962) +mesh = SubResource("PlaneMesh_wbtug") +skeleton = NodePath("../..") diff --git a/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/Gallery A1.tscn b/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/Gallery A1.tscn index 1fca8285..43e3e104 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/Gallery A1.tscn +++ b/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/Gallery A1.tscn @@ -1,7 +1,120 @@ -[gd_scene load_steps=2 format=3 uid="uid://d2fbbjlkiqlao"] +[gd_scene load_steps=14 format=3 uid="uid://d2fbbjlkiqlao"] [ext_resource type="PackedScene" uid="uid://c72vrk43ky2y0" path="res://src/map/dungeon/models/Area 1/Gallery/A1Gallery.glb" id="1_4yixp"] +[ext_resource type="Shader" uid="uid://dj3ut2w0lnwq2" path="res://src/map/map shaders/Overworld God Rays.gdshader" id="2_5pjpw"] +[ext_resource type="Texture2D" uid="uid://dw50ys561j8no" path="res://src/map/assets/DUST_1.png" id="3_wk80w"] + +[sub_resource type="Gradient" id="Gradient_w4hfg"] + +[sub_resource type="GradientTexture2D" id="GradientTexture2D_wbbo3"] +gradient = SubResource("Gradient_w4hfg") + +[sub_resource type="FastNoiseLite" id="FastNoiseLite_sh6pj"] +noise_type = 3 +frequency = 0.0769 +domain_warp_enabled = true + +[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_d1qcb"] +noise = SubResource("FastNoiseLite_sh6pj") + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_q8qa6"] +render_priority = 0 +shader = ExtResource("2_5pjpw") +shader_parameter/alpha = 0.848 +shader_parameter/rim_power = 1.507 +shader_parameter/texture_emission = SubResource("NoiseTexture2D_d1qcb") +shader_parameter/gradient = SubResource("GradientTexture2D_wbbo3") +shader_parameter/emission = Color(1, 1, 1, 1) +shader_parameter/emission_energy = 0.33 +shader_parameter/uv1_scale = Vector3(5, 0, 0) +shader_parameter/uv1_offset = Vector3(0, 1, 0) + +[sub_resource type="Curve" id="Curve_y6syt"] +_limits = [-2.0, 2.0, 0.0, 1.0] +_data = [Vector2(0.00358423, 0.230769), 0.0, 0.0, 0, 0, Vector2(0.982079, -1.03846), 0.0, 0.0, 0, 0] +point_count = 2 + +[sub_resource type="CurveTexture" id="CurveTexture_k51ab"] +curve = SubResource("Curve_y6syt") + +[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_y0fmo"] +lifetime_randomness = 0.05 +emission_shape = 3 +emission_box_extents = Vector3(22.2, 22.505, 22) +angle_min = -245.3 +angle_max = 417.9 +orbit_velocity_min = -0.0269999 +orbit_velocity_max = 0.0400001 +orbit_velocity_curve = SubResource("CurveTexture_k51ab") +gravity = Vector3(0, -0.07, 0) +scale_min = 0.0 +scale_max = 0.0 + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_23rrv"] +transparency = 1 +cull_mode = 2 +shading_mode = 0 +albedo_color = Color(1, 1, 1, 0.0862745) +albedo_texture = ExtResource("3_wk80w") +billboard_mode = 2 + +[sub_resource type="QuadMesh" id="QuadMesh_sxgxx"] +material = SubResource("StandardMaterial3D_23rrv") +size = Vector2(0.1, 0.1) +subdivide_width = 1 +subdivide_depth = 1 [node name="GalleryA1" type="Node3D"] [node name="A1Gallery" parent="." instance=ExtResource("1_4yixp")] + +[node name="FogVolume" type="FogVolume" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0433044, 9.99786, 4.00772) +size = Vector3(3.72614, 8.79425, 24.0038) + +[node name="OmniLight3D" type="OmniLight3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 6.768, -5.27914) +light_energy = 4.394 +light_indirect_energy = 1.772 +light_specular = 0.0 +shadow_enabled = true +omni_range = 10.2 + +[node name="OmniLight3D2" type="OmniLight3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 6.768, 1.33011) +light_energy = 4.394 +light_indirect_energy = 1.772 +light_specular = 0.0 +shadow_enabled = true +omni_range = 10.2 + +[node name="OmniLight3D3" type="OmniLight3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 6.768, 6.69178) +light_energy = 4.394 +light_indirect_energy = 1.772 +light_specular = 0.0 +shadow_enabled = true +omni_range = 10.2 + +[node name="OmniLight3D4" type="OmniLight3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 6.768, 11.0079) +light_energy = 4.394 +light_indirect_energy = 1.772 +light_specular = 0.0 +shadow_enabled = true +omni_range = 10.2 + +[node name="Altar Godrays" type="CSGCylinder3D" parent="."] +transform = Transform3D(0.238656, -0.489364, -20.1776, -0.180127, 20.1781, -0.491485, 20.1828, 0.185877, 0.234199, -0.00122181, 7.10086, 1.28416) +radius = 0.0800781 +height = 0.955955 +cone = true +material = SubResource("ShaderMaterial_q8qa6") + +[node name="GPUParticles3D2" type="GPUParticles3D" parent="."] +transform = Transform3D(0.864, 0, 0, 0, 1.107, 0, 0, 0, 2.557, 0.110992, 2.59235, 4.00648) +amount = 20 +lifetime = 41.19 +local_coords = true +process_material = SubResource("ParticleProcessMaterial_y0fmo") +draw_pass_1 = SubResource("QuadMesh_sxgxx") diff --git a/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set B/40. Donut Gallery.tscn b/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set B/40. Donut Gallery.tscn index b4512d0d..9ece735d 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set B/40. Donut Gallery.tscn +++ b/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set B/40. Donut Gallery.tscn @@ -1,7 +1,83 @@ -[gd_scene load_steps=2 format=3 uid="uid://boonyo0b1q1ad"] +[gd_scene load_steps=8 format=3 uid="uid://boonyo0b1q1ad"] -[ext_resource type="PackedScene" uid="uid://dw56jlwkmqktu" path="res://src/map/dungeon/models/Area 2/Donut/A2 Donut.glb" id="1_8nndw"] +[ext_resource type="PackedScene" uid="uid://bqvkbpfsuu0d4" path="res://src/map/dungeon/models/Area 2/Donut/A2 Donut.glb" id="1_8nndw"] +[ext_resource type="Texture2D" uid="uid://dw50ys561j8no" path="res://src/map/assets/DUST_1.png" id="1_ewwkl"] + +[sub_resource type="Curve" id="Curve_v0m5w"] +_limits = [-2.0, 2.0, 0.0, 1.0] +_data = [Vector2(0.00358423, 0.230769), 0.0, 0.0, 0, 0, Vector2(0.982079, -1.03846), 0.0, 0.0, 0, 0] +point_count = 2 + +[sub_resource type="CurveTexture" id="CurveTexture_gxo8h"] +curve = SubResource("Curve_v0m5w") + +[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_roqqs"] +lifetime_randomness = 0.05 +emission_shape = 3 +emission_box_extents = Vector3(22.2, 22.505, 22) +angle_min = -245.3 +angle_max = 417.9 +orbit_velocity_min = -0.0269999 +orbit_velocity_max = 0.0400001 +orbit_velocity_curve = SubResource("CurveTexture_gxo8h") +gravity = Vector3(0, -0.07, 0) +scale_min = 0.0 +scale_max = 0.0 + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_7m5cm"] +transparency = 1 +cull_mode = 2 +shading_mode = 0 +albedo_color = Color(1, 1, 1, 0.0862745) +albedo_texture = ExtResource("1_ewwkl") +billboard_mode = 2 + +[sub_resource type="QuadMesh" id="QuadMesh_gmwua"] +material = SubResource("StandardMaterial3D_7m5cm") +size = Vector2(0.1, 0.1) +subdivide_width = 1 +subdivide_depth = 1 [node name="40_DonutGallery" type="Node3D"] +[node name="GPUParticles3D2" type="GPUParticles3D" parent="."] +transform = Transform3D(5.169, 0, 0, 0, 2.932, 0, 0, 0, 5.667, 0.112471, 4.29823, -0.0744419) +amount = 20 +lifetime = 41.19 +local_coords = true +process_material = SubResource("ParticleProcessMaterial_roqqs") +draw_pass_1 = SubResource("QuadMesh_gmwua") + +[node name="OmniLight3D" type="OmniLight3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.26678, -23.6828) +omni_range = 11.2655 + +[node name="OmniLight3D2" type="OmniLight3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 9.09179, 11.647) +light_energy = 4.963 +shadow_enabled = true +omni_range = 17.759 + +[node name="OmniLight3D3" type="OmniLight3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 9.09179, -11.6382) +light_energy = 4.963 +shadow_enabled = true +omni_range = 17.759 + +[node name="OmniLight3D4" type="OmniLight3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -11.3707, 9.09179, 0.127988) +light_energy = 4.963 +shadow_enabled = true +omni_range = 17.759 + +[node name="OmniLight3D5" type="OmniLight3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 12.0628, 9.09179, 0.127988) +light_energy = 4.963 +shadow_enabled = true +omni_range = 17.759 + +[node name="FogVolume" type="FogVolume" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00845337, 15.2848, -6.46941) +size = Vector3(35.5961, 7.12933, 48.7726) + [node name="A2 Donut" parent="." instance=ExtResource("1_8nndw")] diff --git a/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set B/41. Circle.tscn b/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set B/41. Circle.tscn index 32840e79..2b881322 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set B/41. Circle.tscn +++ b/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set B/41. Circle.tscn @@ -5,3 +5,25 @@ [node name="40_DonutGallery" type="Node3D"] [node name="A2 Circular Water Room" parent="." instance=ExtResource("1_wyllr")] + +[node name="FogVolume" type="FogVolume" parent="A2 Circular Water Room"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0890198, -27.6868, 0.0737915) +size = Vector3(27.5767, 24.041, 28.1017) + +[node name="FogVolume2" type="FogVolume" parent="A2 Circular Water Room"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0890198, 20.9393, 0.0737915) +size = Vector3(27.5767, 11.1167, 28.1017) + +[node name="SpotLight3D" type="SpotLight3D" parent="."] +transform = Transform3D(0.955335, -1.29178e-08, 0.295525, -0.295525, -4.1759e-08, 0.955335, 0, -1, -4.37114e-08, 5.51394, 14.0044, 0) +light_energy = 9.242 +shadow_enabled = true +shadow_opacity = 0.93 +spot_range = 48.914 + +[node name="OmniLight3D" type="OmniLight3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 8.403, 0) +light_energy = 1.762 +shadow_enabled = true +omni_range = 17.759 +omni_attenuation = 0.81