diff --git a/Zennysoft.Game.Ma/src/items/3D Render Icons/Mask of Zeal.png b/Zennysoft.Game.Ma/src/items/3D Render Icons/Mask of Zeal.png new file mode 100644 index 000000000..d9345cefd Binary files /dev/null and b/Zennysoft.Game.Ma/src/items/3D Render Icons/Mask of Zeal.png differ diff --git a/Zennysoft.Game.Ma/src/items/3D Render Icons/Mask of Zeal.png.import b/Zennysoft.Game.Ma/src/items/3D Render Icons/Mask of Zeal.png.import new file mode 100644 index 000000000..7828ad2f9 --- /dev/null +++ b/Zennysoft.Game.Ma/src/items/3D Render Icons/Mask of Zeal.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cy7qvpjahblv3" +path.bptc="res://.godot/imported/Mask of Zeal.png-27ba6e23bb2ecd6acedb6fdbc3423aee.bptc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://src/items/3D Render Icons/Mask of Zeal.png" +dest_files=["res://.godot/imported/Mask of Zeal.png-27ba6e23bb2ecd6acedb6fdbc3423aee.bptc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=true +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/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/Zennysoft.Game.Ma/src/items/3D Render Icons/health item placeholder.png b/Zennysoft.Game.Ma/src/items/3D Render Icons/health item placeholder.png new file mode 100644 index 000000000..2b5b16309 Binary files /dev/null and b/Zennysoft.Game.Ma/src/items/3D Render Icons/health item placeholder.png differ diff --git a/Zennysoft.Game.Ma/src/items/3D Render Icons/health item placeholder.png.import b/Zennysoft.Game.Ma/src/items/3D Render Icons/health item placeholder.png.import new file mode 100644 index 000000000..a13b9cae9 --- /dev/null +++ b/Zennysoft.Game.Ma/src/items/3D Render Icons/health item placeholder.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cy5bd7f37fi35" +path.bptc="res://.godot/imported/health item placeholder.png-d6e3fd30b79c4ebf810d66504d813903.bptc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://src/items/3D Render Icons/health item placeholder.png" +dest_files=["res://.godot/imported/health item placeholder.png-d6e3fd30b79c4ebf810d66504d813903.bptc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=true +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/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/Zennysoft.Game.Ma/src/items/3D Render Icons/mask placeholder.png b/Zennysoft.Game.Ma/src/items/3D Render Icons/mask placeholder.png new file mode 100644 index 000000000..3a4b0043c Binary files /dev/null and b/Zennysoft.Game.Ma/src/items/3D Render Icons/mask placeholder.png differ diff --git a/Zennysoft.Game.Ma/src/items/3D Render Icons/mask placeholder.png.import b/Zennysoft.Game.Ma/src/items/3D Render Icons/mask placeholder.png.import new file mode 100644 index 000000000..be8fa6c54 --- /dev/null +++ b/Zennysoft.Game.Ma/src/items/3D Render Icons/mask placeholder.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://m0f8xmp8l2fe" +path.bptc="res://.godot/imported/mask placeholder.png-214c6109a019a6bad1f6bd77ac323bd3.bptc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://src/items/3D Render Icons/mask placeholder.png" +dest_files=["res://.godot/imported/mask placeholder.png-214c6109a019a6bad1f6bd77ac323bd3.bptc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=true +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/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/Zennysoft.Game.Ma/src/items/VT Crystal/FRAME 2.png b/Zennysoft.Game.Ma/src/items/VT Crystal/FRAME 2.png new file mode 100644 index 000000000..9af5be0b9 Binary files /dev/null and b/Zennysoft.Game.Ma/src/items/VT Crystal/FRAME 2.png differ diff --git a/Zennysoft.Game.Ma/src/items/VT Crystal/FRAME 2.png.import b/Zennysoft.Game.Ma/src/items/VT Crystal/FRAME 2.png.import new file mode 100644 index 000000000..af3d3178e --- /dev/null +++ b/Zennysoft.Game.Ma/src/items/VT Crystal/FRAME 2.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d3g5l5x5crrcy" +path.bptc="res://.godot/imported/FRAME 2.png-229cea0e1e02f919f524c9941094cf2b.bptc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://src/items/VT Crystal/FRAME 2.png" +dest_files=["res://.godot/imported/FRAME 2.png-229cea0e1e02f919f524c9941094cf2b.bptc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=true +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/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/Zennysoft.Game.Ma/src/items/VT Crystal/FRAME 3.png b/Zennysoft.Game.Ma/src/items/VT Crystal/FRAME 3.png new file mode 100644 index 000000000..856d9ce6d Binary files /dev/null and b/Zennysoft.Game.Ma/src/items/VT Crystal/FRAME 3.png differ diff --git a/Zennysoft.Game.Ma/src/items/VT Crystal/FRAME 3.png.import b/Zennysoft.Game.Ma/src/items/VT Crystal/FRAME 3.png.import new file mode 100644 index 000000000..9d7141e1f --- /dev/null +++ b/Zennysoft.Game.Ma/src/items/VT Crystal/FRAME 3.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://evb7fqb01tm5" +path.bptc="res://.godot/imported/FRAME 3.png-d7f1ced39fbde420333fb73302a64991.bptc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://src/items/VT Crystal/FRAME 3.png" +dest_files=["res://.godot/imported/FRAME 3.png-d7f1ced39fbde420333fb73302a64991.bptc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=true +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/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/Zennysoft.Game.Ma/src/items/VT Crystal/FRAME1.png b/Zennysoft.Game.Ma/src/items/VT Crystal/FRAME1.png new file mode 100644 index 000000000..074f53cb2 Binary files /dev/null and b/Zennysoft.Game.Ma/src/items/VT Crystal/FRAME1.png differ diff --git a/Zennysoft.Game.Ma/src/items/VT Crystal/FRAME1.png.import b/Zennysoft.Game.Ma/src/items/VT Crystal/FRAME1.png.import new file mode 100644 index 000000000..e0b4c193c --- /dev/null +++ b/Zennysoft.Game.Ma/src/items/VT Crystal/FRAME1.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b36xqrykgtdkw" +path.bptc="res://.godot/imported/FRAME1.png-2a41a5e2a774e029a8c5614fdd3304e6.bptc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://src/items/VT Crystal/FRAME1.png" +dest_files=["res://.godot/imported/FRAME1.png-2a41a5e2a774e029a8c5614fdd3304e6.bptc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=true +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/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/Zennysoft.Game.Ma/src/map/dungeon/code/FinalFloor.cs b/Zennysoft.Game.Ma/src/map/dungeon/code/FinalFloor.cs index 8346a3a0c..08d1c056d 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/code/FinalFloor.cs +++ b/Zennysoft.Game.Ma/src/map/dungeon/code/FinalFloor.cs @@ -18,16 +18,16 @@ public partial class FinalFloor : SpecialFloor public void OnReady() { - Exit.AreaEntered += Exit_AreaEntered; + Exit.AreaEntered += Exit_AreaEntered; } private void Exit_AreaEntered(Area3D area) { - _player.Die(); + _player.Die(); } public void OnExitTree() { - Exit.AreaEntered -= Exit_AreaEntered; + Exit.AreaEntered -= Exit_AreaEntered; } } diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/36. Final Floor.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/36. Final Floor.tscn index dee7730ce..2040b7d65 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/36. Final Floor.tscn +++ b/Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/36. Final Floor.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=11 format=3 uid="uid://cyrrhoarhxlhg"] +[gd_scene load_steps=13 format=3 uid="uid://cyrrhoarhxlhg"] [ext_resource type="Script" uid="uid://r8mpxyum31ds" path="res://src/map/dungeon/code/FinalFloor.cs" id="1_b2jrf"] [ext_resource type="PackedScene" uid="uid://dpd2y8evtea1t" path="res://src/map/dungeon/models/Special Floors & Rooms/36. Final Floor/36_A2_FINAL_FLOOR_VER.0.1.glb" id="2_b2jrf"] @@ -10,10 +10,10 @@ size = Vector3(0.0974121, 15.1811, 23.3886) size = Vector3(0.0974121, 15.1811, 27.7427) [sub_resource type="BoxShape3D" id="BoxShape3D_s4mfk"] -size = Vector3(187.628, 118.514, 12.5598) +size = Vector3(234.085, 118.514, 12.5598) [sub_resource type="BoxShape3D" id="BoxShape3D_170vw"] -size = Vector3(187.874, 144.552, 13.4706) +size = Vector3(235.028, 144.552, 13.4706) [sub_resource type="BoxShape3D" id="BoxShape3D_ajpkj"] size = Vector3(281.18, 0.081543, 80.3693) @@ -27,6 +27,23 @@ size = Vector3(19.394, 30.059, 2.88283) [sub_resource type="BoxShape3D" id="BoxShape3D_b2jrf"] size = Vector3(12.9663, 20.8418, 50.175) +[sub_resource type="Environment" id="Environment_b2jrf"] +background_mode = 1 +ambient_light_energy = 0.0 +sdfgi_enabled = true +glow_enabled = true +glow_intensity = 1.57 +glow_strength = 1.36 +glow_bloom = 1.0 +glow_blend_mode = 0 +volumetric_fog_enabled = true +volumetric_fog_albedo = Color(0.830335, 0.830335, 0.830335, 1) + +[sub_resource type="CameraAttributesPractical" id="CameraAttributesPractical_hojso"] +exposure_multiplier = 1.354 +dof_blur_far_enabled = true +dof_blur_far_distance = 371.47 + [node name="Final Floor" type="Node3D"] script = ExtResource("1_b2jrf") @@ -53,12 +70,12 @@ transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -3.576 shape = SubResource("BoxShape3D_djk74") [node name="CollisionShape3D4" type="CollisionShape3D" parent="Collisions/StaticBody3D"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -110.065, -2.28188, -12.327) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -133.294, -2.28188, -12.327) shape = SubResource("BoxShape3D_s4mfk") debug_color = Color(0, 0.6, 0.701961, 1) [node name="CollisionShape3D5" type="CollisionShape3D" parent="Collisions/StaticBody3D"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -110.065, -15.2228, 10.4977) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -133.642, -15.2228, 10.4977) shape = SubResource("BoxShape3D_170vw") [node name="CollisionShape3D6" type="CollisionShape3D" parent="Collisions/StaticBody3D"] @@ -66,7 +83,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -110.065, -3.09368, -8.33632) shape = SubResource("BoxShape3D_ajpkj") [node name="CollisionShape3D7" type="CollisionShape3D" parent="Collisions/StaticBody3D"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -226.104, -1.21697, -3.54719) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -255.62, -1.21697, -3.54719) shape = SubResource("BoxShape3D_pdgpv") [node name="CollisionShape3D8" type="CollisionShape3D" parent="Collisions/StaticBody3D"] @@ -91,5 +108,17 @@ collision_layer = 0 collision_mask = 64 [node name="CollisionShape3D" type="CollisionShape3D" parent="Room/Exit"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -222.237, -3.35156, 3.78481) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -257.108, -3.35156, 3.78481) shape = SubResource("BoxShape3D_b2jrf") + +[node name="WorldEnvironment" type="WorldEnvironment" parent="."] +environment = SubResource("Environment_b2jrf") +camera_attributes = SubResource("CameraAttributesPractical_hojso") + +[node name="DirectionalLight3D" type="DirectionalLight3D" parent="WorldEnvironment"] +transform = Transform3D(0.85896, -0.300971, 0.414251, 0, -0.809017, -0.587785, 0.512043, 0.504884, -0.694913, 0, 0, 0) +light_color = Color(0.204372, 0.420196, 1, 1) +light_energy = 4.435 +shadow_enabled = true + +[editable path="Model/36_A2_FINAL_FLOOR_VER_0_2"] diff --git a/Zennysoft.Game.Ma/src/map/dungeon/models/Special Floors & Rooms/36. Final Floor/36_A2_FINAL_FLOOR_VER.0.1.glb b/Zennysoft.Game.Ma/src/map/dungeon/models/Special Floors & Rooms/36. Final Floor/36_A2_FINAL_FLOOR_VER.0.1.glb index f75fd5f3a..434c3251f 100644 Binary files a/Zennysoft.Game.Ma/src/map/dungeon/models/Special Floors & Rooms/36. Final Floor/36_A2_FINAL_FLOOR_VER.0.1.glb and b/Zennysoft.Game.Ma/src/map/dungeon/models/Special Floors & Rooms/36. Final Floor/36_A2_FINAL_FLOOR_VER.0.1.glb differ diff --git a/Zennysoft.Game.Ma/src/map/dungeon/models/Special Floors & Rooms/36. Final Floor/36_A2_FINAL_FLOOR_VER.0_normal_opengl.png b/Zennysoft.Game.Ma/src/map/dungeon/models/Special Floors & Rooms/36. Final Floor/36_A2_FINAL_FLOOR_VER.0_normal_opengl.png new file mode 100644 index 000000000..3f99f3013 Binary files /dev/null and b/Zennysoft.Game.Ma/src/map/dungeon/models/Special Floors & Rooms/36. Final Floor/36_A2_FINAL_FLOOR_VER.0_normal_opengl.png differ diff --git a/Zennysoft.Game.Ma/src/map/dungeon/models/Special Floors & Rooms/36. Final Floor/36_A2_FINAL_FLOOR_VER.0_normal_opengl.png.import b/Zennysoft.Game.Ma/src/map/dungeon/models/Special Floors & Rooms/36. Final Floor/36_A2_FINAL_FLOOR_VER.0_normal_opengl.png.import new file mode 100644 index 000000000..81793578f --- /dev/null +++ b/Zennysoft.Game.Ma/src/map/dungeon/models/Special Floors & Rooms/36. Final Floor/36_A2_FINAL_FLOOR_VER.0_normal_opengl.png.import @@ -0,0 +1,38 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c1eip3nh46fy0" +path.bptc="res://.godot/imported/36_A2_FINAL_FLOOR_VER.0_normal_opengl.png-19d807bda1d6515f9683734aa2231482.bptc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} +generator_parameters={ +"md5": "00b94bfeae1634510fa43553cce9c0fb" +} + +[deps] + +source_file="res://src/map/dungeon/models/Special Floors & Rooms/36. Final Floor/36_A2_FINAL_FLOOR_VER.0_normal_opengl.png" +dest_files=["res://.godot/imported/36_A2_FINAL_FLOOR_VER.0_normal_opengl.png-19d807bda1d6515f9683734aa2231482.bptc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=true +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=1 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=1 +roughness/src_normal="res://src/map/dungeon/models/Special Floors & Rooms/36. Final Floor/36_A2_FINAL_FLOOR_VER.0_normal_opengl.png" +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/Zennysoft.Game.Ma/src/map/dungeon/models/Special Floors & Rooms/36. Final Floor/36_A2_FINAL_FLOOR_VER.0_roughness.png b/Zennysoft.Game.Ma/src/map/dungeon/models/Special Floors & Rooms/36. Final Floor/36_A2_FINAL_FLOOR_VER.0_roughness.png new file mode 100644 index 000000000..8b3e3f7e4 Binary files /dev/null and b/Zennysoft.Game.Ma/src/map/dungeon/models/Special Floors & Rooms/36. Final Floor/36_A2_FINAL_FLOOR_VER.0_roughness.png differ diff --git a/Zennysoft.Game.Ma/src/map/dungeon/models/Special Floors & Rooms/36. Final Floor/36_A2_FINAL_FLOOR_VER.0_roughness.png.import b/Zennysoft.Game.Ma/src/map/dungeon/models/Special Floors & Rooms/36. Final Floor/36_A2_FINAL_FLOOR_VER.0_roughness.png.import new file mode 100644 index 000000000..3189a37fc --- /dev/null +++ b/Zennysoft.Game.Ma/src/map/dungeon/models/Special Floors & Rooms/36. Final Floor/36_A2_FINAL_FLOOR_VER.0_roughness.png.import @@ -0,0 +1,38 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ch4cjvuay2edg" +path.bptc="res://.godot/imported/36_A2_FINAL_FLOOR_VER.0_roughness.png-03b3a9d966651fcef8eae7c32f126fae.bptc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} +generator_parameters={ +"md5": "634f7d6ce3b2d5f17052a0abff3585b5" +} + +[deps] + +source_file="res://src/map/dungeon/models/Special Floors & Rooms/36. Final Floor/36_A2_FINAL_FLOOR_VER.0_roughness.png" +dest_files=["res://.godot/imported/36_A2_FINAL_FLOOR_VER.0_roughness.png-03b3a9d966651fcef8eae7c32f126fae.bptc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=true +compress/lossy_quality=0.7 +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/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