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/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/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/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 df973c310..49e652a45 100644 --- a/Zennysoft.Game.Ma/src/ui/in_game_ui/InGameUI.tscn +++ b/Zennysoft.Game.Ma/src/ui/in_game_ui/InGameUI.tscn @@ -2,12 +2,12 @@ [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"] -[ext_resource type="PackedScene" uid="uid://t22s2y1t8ktc" path="res://src/debug/DebugInfo.tscn" id="2_f0tui"] +[ext_resource type="PackedScene" uid="uid://t22s2y1t8ktc" path="res://src/debug_info/DebugInfo.tscn" id="2_f0tui"] [ext_resource type="PackedScene" uid="uid://dxl8il8f13c2x" path="res://src/ui/player_ui/PlayerInfoUI.tscn" id="4_46s5l"] [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="Texture2D" uid="uid://dnt8myee0ju3v" path="res://src/ui/UI Front with Transparency.png" id="7_higkc"] [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="PackedScene" uid="uid://c3e6hbctay1us" path="res://src/ui/inventory_menu/InventoryMenu2.tscn" id="9_ur8ag"] [ext_resource type="PackedScene" uid="uid://dwa7o6hkkwjg1" path="res://src/ui/inventory_menu/ItemRescueMenu.tscn" id="10_higkc"] @@ -79,6 +79,7 @@ layout_mode = 2 [node name="Panel" type="ColorRect" parent="HBoxContainer"] custom_minimum_size = Vector2(480, 0) layout_mode = 2 +color = Color(0, 0, 0, 1) [node name="MinimapZone" type="Panel" parent="HBoxContainer/Panel"] layout_mode = 2 @@ -100,15 +101,8 @@ offset_top = 354.0 offset_right = 423.0 offset_bottom = 620.0 -[node name="HSeparator2" type="HSeparator" parent="HBoxContainer/Panel/MinimapZone"] -layout_mode = 2 -offset_left = 78.0 -offset_top = 716.0 -offset_right = 370.0 -offset_bottom = 722.0 -theme_override_styles/separator = SubResource("StyleBoxLine_ur8ag") - [node name="TextureRect" type="TextureRect" parent="HBoxContainer/Panel"] +texture_filter = 2 layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 @@ -116,7 +110,7 @@ anchor_bottom = 1.0 offset_bottom = 1072.0 grow_horizontal = 2 grow_vertical = 2 -texture = ExtResource("7_ur8ag") +texture = ExtResource("7_higkc") stretch_mode = 4 [node name="PlayerInfoUI" parent="HBoxContainer/Panel" instance=ExtResource("4_46s5l")]