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/Altar.cs b/Zennysoft.Game.Ma/src/map/dungeon/code/Altar.cs index dfb73f2b8..1b5327052 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/code/Altar.cs +++ b/Zennysoft.Game.Ma/src/map/dungeon/code/Altar.cs @@ -25,33 +25,33 @@ public partial class Altar : SpecialFloor, IDungeonFloor public void OnResolved() { - Show(); - Exit.AreaEntered += Exit_AreaEntered; - NoExitArea.AreaEntered += NoExitArea_AreaEntered; - FloorIsLoaded = true; + Show(); + Exit.AreaEntered += Exit_AreaEntered; + NoExitArea.AreaEntered += NoExitArea_AreaEntered; + FloorIsLoaded = true; } private void _player_PointUpFinished() { - _player.Activate(); + _player.Activate(); } private void NoExitArea_AreaEntered(Area3D area) { - DialogueController.ShowDialogue(Dialogue, "no_exit"); + DialogueController.ShowDialogue(Dialogue, "no_exit"); } private void Exit_AreaEntered(Area3D area) { - if (area.GetOwner() is IPlayer) - ExitReached(); + if (area.GetOwner() is IPlayer) + ExitReached(); } public void ExitReached() => Game.FloorExitReached(); public void OnExitTree() { - Exit.AreaEntered -= Exit_AreaEntered; - NoExitArea.AreaEntered -= NoExitArea_AreaEntered; + Exit.AreaEntered -= Exit_AreaEntered; + NoExitArea.AreaEntered -= NoExitArea_AreaEntered; } } 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/00. Altar.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/00. Altar.tscn index e5160a3b3..5cfabdf5e 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/00. Altar.tscn +++ b/Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/00. Altar.tscn @@ -5,7 +5,7 @@ [ext_resource type="PackedScene" uid="uid://co0fmuno2pjc7" path="res://src/map/dungeon/models/Special Floors & Rooms/Altar/02_ALTAR_FLOOR_ZER0_VER.1.glb" id="2_xpi6o"] [ext_resource type="Script" uid="uid://cstc8tdapyrst" path="res://src/audio/AmbientSFXPlayer.cs" id="5_7xfp0"] [ext_resource type="Shader" uid="uid://c4a68uhm5o2h4" path="res://src/map/map shaders/Altar Sky Environment.gdshader" id="27_lb4gb"] -[ext_resource type="AudioStream" uid="uid://c4ud110da8efp" path="res://src/audio/AMB/amb_wind_loop_altar.wav" id="28_je2oh"] +[ext_resource type="AudioStream" uid="uid://bmiitw4fcs68e" path="res://src/audio/AMB/amb_wind_loop_altar.wav" id="28_je2oh"] [sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_aqomv"] data = PackedVector3Array(-3.3925, -0.4692, 0.404, -3.3925, 8.7018, 0.404, -2.2486, 8.7018, -2.8922, -3.3925, -0.4692, 0.404, -2.2486, 8.7018, -2.8922, -2.2486, -0.4692, -2.8922, -0.1133, -0.4692, -2.7502, -0.1133, 8.7018, -2.7502, 1.7984, 8.7018, -2.5918, -0.1133, -0.4692, -2.7502, 1.7984, 8.7018, -2.5918, 1.7984, -1.3386, -2.5918, 1.7984, -1.3386, -2.5918, 1.7984, 8.7018, -2.5918, 3.6849, 8.7018, 1.9957, 1.7984, -1.3386, -2.5918, 3.6849, 8.7018, 1.9957, 3.6849, -1.3386, 1.9957, 1.5401, -0.4692, 3.0749, 1.5401, 8.7018, 3.0749, -3.3925, 8.7018, 0.404, 1.5401, -0.4692, 3.0749, -3.3925, 8.7018, 0.404, -3.3925, -0.4692, 0.404, 3.6849, -1.3386, 1.9957, 3.6849, 8.7018, 1.9957, 1.5401, 8.7018, 3.0749, 3.6849, -1.3386, 1.9957, 1.5401, 8.7018, 3.0749, 1.5401, -0.4692, 3.0749, -2.2486, -0.4692, -2.8922, -2.2486, 8.7018, -2.8922, -0.1133, 8.7018, -2.7502, -2.2486, -0.4692, -2.8922, -0.1133, 8.7018, -2.7502, -0.1133, -0.4692, -2.7502, 28.9379, 7.7244, 15.9431, 28.9379, -1.3923, 15.9431, 48.2187, -1.3923, 15.9401, 28.9379, 7.7244, 15.9431, 48.2187, -1.3923, 15.9401, 48.2187, 7.7244, 15.9401, 48.2187, 7.7244, 15.9401, 48.2187, -1.3923, 15.9401, 99.6775, -1.3923, 15.9401, 48.2187, 7.7244, 15.9401, 99.6775, -1.3923, 15.9401, 99.6775, 7.7244, 15.9401, 99.6775, 7.7244, 15.9401, 99.6775, -1.3923, 15.9401, 106.285, -1.3923, 15.9255, 99.6775, 7.7244, 15.9401, 106.285, -1.3923, 15.9255, 106.285, 7.6793, 15.9255, 106.285, -1.3923, 15.9255, 106.285, 7.6793, 7.4851, 106.285, 7.6793, 15.9255, 106.285, -1.3923, 15.9255, 106.285, -1.3923, 7.4851, 106.285, 7.6793, 7.4851, 99.6775, -1.3923, 7.4705, 106.285, 7.6793, 7.4851, 106.285, -1.3923, 7.4851, 99.6775, -1.3923, 7.4705, 99.6775, 7.7244, 7.4705, 106.285, 7.6793, 7.4851, 48.2187, -1.3923, 7.4705, 99.6775, 7.7244, 7.4705, 99.6775, -1.3923, 7.4705, 48.2187, -1.3923, 7.4705, 48.2187, 7.7244, 7.4705, 99.6775, 7.7244, 7.4705, 28.9655, -1.3923, 7.3823, 48.2187, 7.7244, 7.4705, 48.2187, -1.3923, 7.4705, 28.9655, -1.3923, 7.3823, 28.9655, 7.7244, 7.3823, 48.2187, 7.7244, 7.4705, 15.064, -1.7563, 24.808, 15.96, 7.4601, 24.7014, 12.7212, 7.5296, 28.7235, 15.064, -1.7563, 24.808, 12.7212, 7.5296, 28.7235, 11.7712, -1.7681, 29.3285, 11.7712, -1.7681, 29.3285, 12.7212, 7.5296, 28.7235, 11.4389, 7.7088, 33.2736, 11.7712, -1.7681, 29.3285, 11.4389, 7.7088, 33.2736, 11.7145, -2.7115, 33.2538, 2.6504, -1.3923, 33.0209, 2.6504, 7.7244, 33.0209, -1.1454, 7.7244, 31.7354, 2.6504, -1.3923, 33.0209, -1.1454, 7.7244, 31.7354, -1.1454, -1.3923, 31.7354, 7.4643, -1.3923, 33.5284, 2.6504, 7.7244, 33.0209, 2.6504, -1.3923, 33.0209, -1.1454, -1.3923, 31.7354, -1.1454, 7.7244, 31.7354, -4.8429, 7.7244, 29.6798, 7.4643, -1.3923, 33.5284, 7.4643, 7.7244, 33.5284, 2.6504, 7.7244, 33.0209, 11.7145, -2.7115, 33.2538, 7.4643, 7.7244, 33.5284, 7.4643, -1.3923, 33.5284, 11.7145, -2.7115, 33.2538, 11.4389, 7.7088, 33.2736, 7.4643, 7.7244, 33.5284, -1.1454, -1.3923, 31.7354, -4.8429, 7.7244, 29.6798, -4.8429, -1.3923, 29.6798, -4.8429, -1.3923, 29.6798, -4.8429, 7.7244, 29.6798, -7.902, 7.7244, 27.0575, -4.8429, -1.3923, 29.6798, -7.902, 7.7244, 27.0575, -7.902, -1.3923, 27.0575, -7.902, -1.3923, 27.0575, -7.902, 7.7244, 27.0575, -10.8759, 7.7244, 23.6101, -7.902, -1.3923, 27.0575, -10.8759, 7.7244, 23.6101, -10.8759, -1.3923, 23.6101, -10.8759, -1.3923, 23.6101, -10.8759, 7.7244, 23.6101, -12.8775, 7.7244, 19.9487, -10.8759, -1.3923, 23.6101, -12.8775, 7.7244, 19.9487, -12.8775, -1.3923, 19.9487, -12.8775, -1.3923, 19.9487, -12.8775, 7.7244, 19.9487, -14.1277, 7.7244, 15.8222, -12.8775, -1.3923, 19.9487, -14.1277, 7.7244, 15.8222, -14.1277, -1.3923, 15.8222, -14.1277, -1.3923, 15.8222, -14.1277, 7.7244, 15.8222, -14.5688, 7.7244, 11.5878, -14.1277, -1.3923, 15.8222, -14.5688, 7.7244, 11.5878, -14.5688, -1.3923, 11.5878, -14.5688, -1.3923, 11.5878, -14.5688, 7.7244, 11.5878, -14.0407, 7.7244, 7.2613, -14.5688, -1.3923, 11.5878, -14.0407, 7.7244, 7.2613, -14.0407, -1.3923, 7.2613, -14.0407, -1.3923, 7.2613, -14.0407, 7.7244, 7.2613, -12.7306, 7.7244, 3.2389, -14.0407, -1.3923, 7.2613, -12.7306, 7.7244, 3.2389, -12.7306, -1.3923, 3.2389, -12.7306, -1.3923, 3.2389, -12.7306, 7.7244, 3.2389, -10.6617, 7.7244, -0.5608, -12.7306, -1.3923, 3.2389, -10.6617, 7.7244, -0.5608, -10.6617, -1.3923, -0.5608, -10.6617, -1.3923, -0.5608, -10.6617, 7.7244, -0.5608, -8.034, 7.7244, -3.8647, -10.6617, -1.3923, -0.5608, -8.034, 7.7244, -3.8647, -8.034, -1.3923, -3.8647, -8.034, -1.3923, -3.8647, -8.034, 7.7244, -3.8647, -4.7388, 7.7244, -6.5357, -8.034, -1.3923, -3.8647, -4.7388, 7.7244, -6.5357, -4.7388, -2.7124, -6.5357, -4.7388, -2.7124, -6.5357, -4.7388, 7.7244, -6.5357, -0.9806, 7.7244, -8.5873, -4.7388, -2.7124, -6.5357, -0.9806, 7.7244, -8.5873, -0.9806, -2.2617, -8.5873, -0.9806, -2.2617, -8.5873, -0.9806, 7.7244, -8.5873, 3.078, 7.7244, -9.8366, -0.9806, -2.2617, -8.5873, 3.078, 7.7244, -9.8366, 3.078, -1.3923, -9.8366, 3.078, -1.3923, -9.8366, 3.078, 7.7244, -9.8366, 7.4609, 7.7244, -10.258, 3.078, -1.3923, -9.8366, 7.4609, 7.7244, -10.258, 7.4609, -1.3923, -10.258, 7.4609, -1.3923, -10.258, 7.4609, 7.7244, -10.258, 11.6687, 7.7244, -9.8342, 7.4609, -1.3923, -10.258, 11.6687, 7.7244, -9.8342, 11.6687, -1.3923, -9.8342, 11.6687, -1.3923, -9.8342, 11.6687, 7.7244, -9.8342, 15.9042, 7.7244, -8.4866, 11.6687, -1.3923, -9.8342, 15.9042, 7.7244, -8.4866, 15.9042, -1.3923, -8.4866, 15.9042, -1.3923, -8.4866, 15.9042, 7.7244, -8.4866, 19.6803, 7.7244, -6.5368, 15.9042, -1.3923, -8.4866, 19.6803, 7.7244, -6.5368, 19.6803, -1.3923, -6.5368, 19.6803, -1.3923, -6.5368, 19.6803, 7.7244, -6.5368, 22.9495, 7.7244, -3.829, 19.6803, -1.3923, -6.5368, 22.9495, 7.7244, -3.829, 22.9495, -1.3923, -3.829, 22.9495, -1.3923, -3.829, 22.9495, 7.7244, -3.829, 25.7208, 7.7244, -0.4618, 22.9495, -1.3923, -3.829, 25.7208, 7.7244, -0.4618, 25.7207, -1.3923, -0.4618, 25.7207, -1.3923, -0.4618, 25.7208, 7.7244, -0.4618, 27.7178, 7.7244, 3.3401, 25.7207, -1.3923, -0.4618, 27.7178, 7.7244, 3.3401, 27.7178, -1.3923, 3.3401, 27.7178, -1.3923, 3.3401, 27.7178, 7.7244, 3.3401, 28.9655, 7.7244, 7.3823, 27.7178, -1.3923, 3.3401, 28.9655, 7.7244, 7.3823, 28.9655, -1.3923, 7.3823, 28.9379, -1.3923, 15.9431, 28.9379, 7.7244, 15.9431, 27.7153, 7.7244, 20.2713, 28.9379, -1.3923, 15.9431, 27.7153, 7.7244, 20.2713, 27.7153, -1.3923, 20.2713, 27.7153, -1.3923, 20.2713, 27.7153, 7.7244, 20.2713, 25.5887, 7.7244, 24.1355, 27.7153, -1.3923, 20.2713, 25.5887, 7.7244, 24.1355, 25.5887, -1.3923, 24.1355, 25.5887, -1.3923, 24.1355, 25.5887, 7.7244, 24.1355, 23.0552, 7.7244, 27.2603, 25.5887, -1.3923, 24.1355, 23.0552, 7.7244, 27.2603, 23.0552, -1.3923, 27.2603, 23.0552, -1.3923, 27.2603, 23.0552, 7.7244, 27.2603, 18.7068, 7.7014, 26.4664, 23.0552, -1.3923, 27.2603, 18.7068, 7.7014, 26.4664, 18.7096, -1.9203, 26.809, 18.7096, -1.9203, 26.809, 18.7068, 7.7014, 26.4664, 15.96, 7.4601, 24.7014, 18.7096, -1.9203, 26.809, 15.96, 7.4601, 24.7014, 15.064, -1.7563, 24.808) @@ -101,12 +101,12 @@ script = ExtResource("1_5jip8") Dialogue = ExtResource("2_7xfp0") [node name="Model" type="Node3D" parent="."] -transform = Transform3D(1.9, 0, 0, 0, 1.9, 0, 0, 0, 1.9, 0, 3.88968, 0) +transform = Transform3D(1.9, 0, 0, 0, 1.9, 0, 0, 0, 1.9, 0, 4.495, 0) [node name="02_ALTAR_FLOOR_ZER0_VER_1" parent="Model" instance=ExtResource("2_xpi6o")] [node name="Collision" type="Node3D" parent="."] -transform = Transform3D(1.9, 0, 0, 0, 1.9, 0, 0, 0, 1.9, 0, 3.88968, 0) +transform = Transform3D(1.9, 0, 0, 0, 1.9, 0, 0, 0, 1.9, 0, 4.495, 0) visible = false [node name="StaticBody3D" type="StaticBody3D" parent="Collision"] @@ -161,7 +161,7 @@ unique_name_in_owner = true transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 39.3951, -2.89376, -1.035) [node name="Room" type="Node3D" parent="."] -transform = Transform3D(1.9, 0, 0, 0, 1.9, 0, 0, 0, 1.9, 0, 3.88968, 0) +transform = Transform3D(1.9, 0, 0, 0, 1.9, 0, 0, 0, 1.9, 0, 4.495, 0) [node name="Room" type="Area3D" parent="Room"] unique_name_in_owner = true 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 diff --git a/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/19. Floor Exit A.tscn b/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/19. Floor Exit A.tscn index 834b9f29d..9d96ea3a6 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/19. Floor Exit A.tscn +++ b/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/19. Floor Exit A.tscn @@ -1398,7 +1398,8 @@ omni_range = 19.166 omni_attenuation = 1.106 [node name="E symbol!" type="MeshInstance3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.216361, 10.8155) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.550282, 10.8155) +visible = false layers = 2 cast_shadow = 0 mesh = SubResource("PlaneMesh_l1s1j") diff --git a/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set B/38. Floor Exit B.tscn b/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set B/38. Floor Exit B.tscn index 16ab810de..647a83547 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set B/38. Floor Exit B.tscn +++ b/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set B/38. Floor Exit B.tscn @@ -675,6 +675,7 @@ autoplay = "Flame Flicker" [node name="E symbol!" type="MeshInstance3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.469518, 10.8155) +visible = false layers = 2 mesh = SubResource("PlaneMesh_vsgtq") diff --git a/Zennysoft.Game.Ma/src/minimap/Minimap.tscn b/Zennysoft.Game.Ma/src/minimap/Minimap.tscn index 651ca43af..935f9f23e 100644 --- a/Zennysoft.Game.Ma/src/minimap/Minimap.tscn +++ b/Zennysoft.Game.Ma/src/minimap/Minimap.tscn @@ -64,13 +64,13 @@ grow_horizontal = 2 grow_vertical = 2 [node name="SubViewportContainer" type="SubViewportContainer" parent="CenterContainer"] -custom_minimum_size = Vector2(400, 400) +custom_minimum_size = Vector2(450, 400) layout_mode = 2 [node name="SubViewport" type="SubViewport" parent="CenterContainer/SubViewportContainer"] transparent_bg = true handle_input_locally = false -size = Vector2i(350, 350) +size = Vector2i(400, 350) render_target_update_mode = 4 [node name="MinimapCamera" type="Camera3D" parent="CenterContainer/SubViewportContainer/SubViewport"] diff --git a/Zennysoft.Game.Ma/src/ui/in_game_ui/InGameUI.cs b/Zennysoft.Game.Ma/src/ui/in_game_ui/InGameUI.cs index e5975e8f2..6e8e9d31a 100644 --- a/Zennysoft.Game.Ma/src/ui/in_game_ui/InGameUI.cs +++ b/Zennysoft.Game.Ma/src/ui/in_game_ui/InGameUI.cs @@ -38,29 +38,29 @@ public partial class InGameUI : Control, IInGameUI public void Setup() { - InGameUILogic = new InGameUILogic(); - InGameUILogic.Set(_gameRepo); + InGameUILogic = new InGameUILogic(); + InGameUILogic.Set(_gameRepo); } public void OnResolved() { - InGameUILogicBinding = InGameUILogic.Bind(); + InGameUILogicBinding = InGameUILogic.Bind(); - InGameUILogicBinding - .Handle((in InGameUILogic.Output.AnnounceMessageOnMainScreen output) => { InventoryMessageUI.DisplayMessage(output.Message); }) - .Handle((in InGameUILogic.Output.AnnounceMessageInInventory output) => { }) - .Handle((in InGameUILogic.Output.RemoveItemFromInventory output) => { }) - .Handle((in InGameUILogic.Output.ShowInventory _) => { InventoryMenu.Show(); InventoryMenu.SetProcessInput(true); }) - .Handle((in InGameUILogic.Output.HideInventory _) => { CloseInventory(); }); + InGameUILogicBinding + .Handle((in InGameUILogic.Output.AnnounceMessageOnMainScreen output) => { InventoryMessageUI.DisplayMessage(output.Message); }) + .Handle((in InGameUILogic.Output.AnnounceMessageInInventory output) => { }) + .Handle((in InGameUILogic.Output.RemoveItemFromInventory output) => { }) + .Handle((in InGameUILogic.Output.ShowInventory _) => { InventoryMenu.Show(); InventoryMenu.SetProcessInput(true); }) + .Handle((in InGameUILogic.Output.HideInventory _) => { CloseInventory(); }); - DebugInfo.Visible = DebugMenu.DebugOverlayVisible; + DebugInfo.Visible = DebugMenu.DebugOverlayVisible; - InGameUILogic.Start(); + InGameUILogic.Start(); } public void CloseInventory() { - InventoryMenu.Hide(); - InventoryMenu.SetProcessInput(false); + InventoryMenu.Hide(); + InventoryMenu.SetProcessInput(false); } } diff --git a/Zennysoft.Game.Ma/src/ui/in_game_ui/InGameUI.tscn b/Zennysoft.Game.Ma/src/ui/in_game_ui/InGameUI.tscn index 636f42365..15d1bd22d 100644 --- a/Zennysoft.Game.Ma/src/ui/in_game_ui/InGameUI.tscn +++ b/Zennysoft.Game.Ma/src/ui/in_game_ui/InGameUI.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=12 format=3 uid="uid://b1muxus5qdbeu"] +[gd_scene load_steps=12 format=3 uid="uid://b8tclvmc7j7dl"] [ext_resource type="Script" uid="uid://dlq2mkhl4pe7a" path="res://src/ui/in_game_ui/InGameUI.cs" id="1_sc13i"] [ext_resource type="PackedScene" uid="uid://bwbofurcvf3yh" path="res://src/minimap/Minimap.tscn" id="2_6sfje"] @@ -7,7 +7,7 @@ [ext_resource type="PackedScene" uid="uid://bea2waybmgd6u" path="res://src/ui/teleport_prompt/UseTeleportPrompt.tscn" id="5_h1hgq"] [ext_resource type="PackedScene" uid="uid://x0f1ol50nnp3" path="res://src/ui/in_game_ui/InventoryMessageUI.tscn" id="6_y26qy"] [ext_resource type="PackedScene" uid="uid://8f3dk16nj0dn" path="res://src/menu/DebugMenu.tscn" id="7_llomk"] -[ext_resource type="Texture2D" uid="uid://bj4p4qxb1mj3q" path="res://src/ui/player_ui/Assets/panel rough draft.png" id="7_ur8ag"] +[ext_resource type="Texture2D" uid="uid://dnt8myee0ju3v" path="res://src/ui/UI Front with Transparency.png" id="9_f46co"] [ext_resource type="PackedScene" uid="uid://cbxw70qa7gifp" path="res://src/ui/inventory_menu/InventoryMenu.tscn" id="9_ur8ag"] [ext_resource type="PackedScene" uid="uid://dwa7o6hkkwjg1" path="res://src/ui/inventory_menu/ItemRescueMenu.tscn" id="10_higkc"] @@ -120,7 +120,7 @@ offset_bottom = 620.0 [node name="Sidebar Texture" type="TextureRect" parent="Sidebar Container"] layout_mode = 2 -texture = ExtResource("7_ur8ag") +texture = ExtResource("9_f46co") [node name="PlayerInfoContainer" type="MarginContainer" parent="Sidebar Container"] layout_mode = 2