diff --git a/Zennysoft.Game.Ma/src/map/Map.cs b/Zennysoft.Game.Ma/src/map/Map.cs index 1e448779..6ae4054f 100644 --- a/Zennysoft.Game.Ma/src/map/Map.cs +++ b/Zennysoft.Game.Ma/src/map/Map.cs @@ -44,6 +44,8 @@ public partial class Map : Node3D, IMap public AutoProp CurrentFloorNumber { get; private set; } = new AutoProp(0); + private readonly string _floorFilePath = @"res://src/map/dungeon/floors/"; + public void OnResolved() { GameChunk.AddChunk(MapChunk); @@ -56,18 +58,13 @@ public partial class Map : Node3D, IMap public void InitializeMapData() { FloorScenes = ImmutableDictionary.Empty - .Add(Floor.Overworld, $"res://src/map/overworld/Overworld.tscn") - .Add(Floor.Altar, $"res://src/map/dungeon/floors/Floor00.tscn") - .Add(Floor.BossFloorA, $"res://src/map/dungeon/floors/Special Floors/15. Boss Floor A.tscn") - .Add(Floor.BossFloorB, $"res://src/map/dungeon/floors/Special Floors/34. Boss Floor B.tscn") - .Add(Floor.GoddessOfGuidanceFloor, $"res://src/map/dungeon/floors/Special Floors/35. Goddess of Guidance's Room.tscn") - .Add(Floor.VoidRoom, $"res://src/map/dungeon/floors/Set B/30. Void Room.tscn") - .Add(Floor.FinalFloor, $"res://src/map/dungeon/floors/Special Floors/36. Final Floor.tscn") - .Add(Floor.Floor01, $"res://src/map/dungeon/floors/Floor01.tscn") - .Add(Floor.Floor02, $"res://src/map/dungeon/floors/Floor02.tscn") - .Add(Floor.Floor03, $"res://src/map/dungeon/floors/Floor03.tscn") - .Add(Floor.Floor04, $"res://src/map/dungeon/floors/Floor04.tscn") - .Add(Floor.Floor05, $"res://src/map/dungeon/floors/Floor05.tscn"); + .Add(Floor.Overworld, _floorFilePath + "Special Floors/Overworld.tscn") + .Add(Floor.Altar, _floorFilePath + "Special Floors/Altar.tscn") + .Add(Floor.BossFloorA, _floorFilePath + "Special Floors/15. Boss Floor A.tscn") + .Add(Floor.BossFloorB, _floorFilePath + "Special Floors/34. Boss Floor B.tscn") + .Add(Floor.GoddessOfGuidanceFloor, _floorFilePath + "Special Floors/35. Goddess of Guidance's Room.tscn") + .Add(Floor.VoidRoom, _floorFilePath + "Set B/30. Void Room.tscn") + .Add(Floor.FinalFloor, _floorFilePath + "Special Floors/36. Final Floor.tscn"); CurrentFloorNumber.OnNext(0); } @@ -91,17 +88,29 @@ public partial class Map : Node3D, IMap { AnimationPlayer.CallDeferred(AnimationPlayer.MethodName.Play, "fade_out"); ClearCurrentMap(); + var newFloor = await LoadNewFloor(sceneName); + AddChild(newFloor); + InitializeFloor(newFloor); + AnimationPlayer.CallDeferred(AnimationPlayer.MethodName.Play, ("fade_in")); + } + + private void InitializeFloor(Node newFloor) + { + CurrentFloor = (IDungeonFloor)newFloor; + SetupDungeonFloor(); + CurrentFloor.FloorIsLoaded = true; + CurrentFloorNumber.OnNext(CurrentFloorNumber.Value + 1); + } + + private async Task LoadNewFloor(string sceneName) + { var sceneLoader = new SceneLoader(); AddChild(sceneLoader); sceneLoader.LoadSceneRequest(sceneName); await ToSignal(sceneLoader, SceneLoader.SignalName.SceneLoaded); - AddChild(sceneLoader.LoadedScene); - CurrentFloor = (IDungeonFloor)sceneLoader.LoadedScene; - SetupDungeonFloor(); - CurrentFloor.FloorIsLoaded = true; - CurrentFloorNumber.OnNext(CurrentFloorNumber.Value + 1); + var result = sceneLoader.LoadedScene; sceneLoader.QueueFree(); - AnimationPlayer.CallDeferred(AnimationPlayer.MethodName.Play, ("fade_in")); + return result; } private void ClearCurrentMap() @@ -119,7 +128,7 @@ public partial class Map : Node3D, IMap private string[] GetMapFiles() { - var folderLocation = "res://src/map/dungeon/floors/" + "Floor" + CurrentFloorNumber.Value.ToString("D2"); + var folderLocation = _floorFilePath + "Floor" + CurrentFloorNumber.Value.ToString("D2"); return DirAccess.GetFilesAt(folderLocation); } } diff --git a/Zennysoft.Game.Ma/src/map/dungeon/NavigationMesh.tres b/Zennysoft.Game.Ma/src/map/dungeon/NavigationMesh.tres deleted file mode 100644 index 17d067de..00000000 --- a/Zennysoft.Game.Ma/src/map/dungeon/NavigationMesh.tres +++ /dev/null @@ -1,10 +0,0 @@ -[gd_resource type="NavigationMesh" format=3 uid="uid://d3n1gyxfjcm5u"] - -[resource] -vertices = PackedVector3Array(-16.5, -3.5, -6.5, -16.75, -3.5, -7.25, -17.5, -3.5, -7.5, -18.5, -3.5, -6, -52.5, -3.5, -10.5, -52.75, -3.5, -11.25, -53.5, -3.5, -11.5, -54.5, -3.5, -10, 23.5, -3.5, 41.5, 23.25, -3.5, 40.75, 22.5, -3.5, 40.5, 21.5, -3.5, 42, -12.5, -3.5, -46.5, -12.75, -3.5, -47.25, -13.5, -3.5, -47.5, -14.5, -3.5, -46, -20.5, -3.5, -50.5, -20.75, -3.5, -51.25, -21.5, -3.5, -51.5, -22.5, -3.5, -50, -42.5, -3.5, -47.5, -43.25, -3.5, -47.25, -43.5, -3.5, -46.5, -40.5, -3.5, -46, -40.5, -3.5, -47, -41.5, -3.5, -47.5, -46.5, -3.5, -43.5, -47.25, -3.5, -43.25, -47.5, -3.5, -42.5, -45.5, -3.5, -42, 23.5, -3.5, -10.5, 23.25, -3.5, -11.25, 22.5, -3.5, -11.5, 21.5, -3.5, -10, -41.25, -3.5, -42.25, -41.25, -3.5, -43, -42.5, -3.5, -43, -42.75, -3.5, -39.25, -31.5, -3.5, -10, -31.25, -3.5, -9, -30.5, -3.5, -8.75, -29.5, -3.5, -8.75, -28.75, -3.5, -10, -19.5, -3.5, -10, -19.25, -3.5, -9, -18.5, -3.5, -8.75, -17.5, -3.5, -10.5, -11.5, -3.5, -6, -11.25, -3.5, -5, -10.5, -3.5, -4.75, -9.5, -3.5, -6.5, 20.5, -3.5, 30, 20.75, -3.5, 31, 21.5, -3.5, 31.25, 22.5, -3.5, 29.5, 40.5, -3.5, 42, 40.75, -3.5, 43, 41.5, -3.5, 43.25, 42.5, -3.5, 41.5, -23.5, -3.5, -58, -23.25, -3.5, -57, -22.5, -3.5, -56.75, -21.5, -3.5, -58.5, -15.5, -3.5, -50, -15.25, -3.5, -49, -14.5, -3.5, -48.75, -13.5, -3.5, -50.5, 43.25, -3.5, 46, 43.25, -3.5, 45, 42.5, -3.5, 44.5, -33, -3.5, 6.25, -32.25, -3.5, 5, -33.25, -3.5, 4.5, 41.5, -3.5, 46, -12.75, -3.5, 13, -27.5, -3.5, 9, -32.75, -3.5, 9, -61.5, -3.5, 60.5, 24.5, -3.5, 26.5, 25.5, -3.5, 27.25, 44.5, -3.5, 38.5, 60.25, -3.5, 39.5, 41.5, -3.5, -7.5, -54.5, -3.5, -42.5, -53.5, -3.5, -40.75, -52.75, -3.5, -42, 0.5, -3.5, -43, 18.75, -3.5, -24.75, 19.5, -3.5, -26.5, 19.25, -3.5, -29.25, 3.25, -3.5, -43, 1, -3.5, -43.75, 60.5, -3.5, 53, 60.5, -3.5, 54.5, 61.5, -3.5, 54.75, 61.75, -3.5, 52.75, -53.5, -3.5, -20.75, -53.5, -3.5, -23.5, 21.5, -3.5, -24.75, 22.5, -3.5, -26.5, -13.25, -3.5, 3.25, -12.25, -3.5, 1, -13.25, -3.5, 0.5, -20.75, -3.5, -3, 3, -3.5, -45.75, 0.5, -3.5, -46, 61.75, -3.5, 50, 63.5, -3.5, 60.5, 63.5, -3.5, -60.5, -51.75, -3.5, -23, -50.5, -3.5, -20.75, -10.5, -3.5, 0.5, -50.5, -3.5, -23.5, -10.5, -3.5, 3.25, -29.5, -3.5, 6, -30.5, -3.5, 4.5, 24.5, -3.5, -46.5, 24.5, -3.5, -46, 61.5, -3.5, 57.75, 60.5, -3.5, 58, 60.5, -3.5, 60.5, -9.5, -3.5, 8.5, -40.5, -3.5, -42, -40.75, -3.5, -37.5, -8.75, -3.5, 9, -10.5, -3.5, 10, -7.5, -3.5, 10, 42.75, -3.5, 49.75, 42.75, -3.5, 49, 39.25, -3.5, 49, 43.25, -3.5, 50, 43.25, -3.5, 60.5, -56.75, -3.5, -7, -40.25, -3.5, -35.25, -50.5, -3.5, -39, 25.5, -3.5, -28.75, 40.5, -3.5, -13.5, 41.5, -3.5, -12.75, 24.5, -3.5, -49.5, 24.75, -3.5, -43.25, -45.5, -3.5, -44.75, -46.5, -3.5, -46.5, -44.75, -3.5, -46, 19.25, -3.5, -7, 18.75, -3.5, -7.5, -6.5, -3.5, -8.75, -6.5, -3.5, 8.5, 19.25, -3.5, 45, 18.75, -3.5, 44.5, 3.25, -3.5, 33, 18.75, -3.5, 33, -21.25, -3.5, -3.5, -21.25, -3.5, -7, -26.5, -3.5, -7, -17.25, -3.5, -43.5, -17.25, -3.5, -47, -23.25, -3.5, -47, -16.75, -3.5, -43, -23.5, -3.5, -35.25, -14.5, -3.5, -12.75, -14.5, -3.5, -9.5, -7.5, -3.5, -9.5, -56.5, -3.5, -45.5, -49.25, -3.5, -45.5, -49.25, -3.5, -48.75, 24.5, -3.5, -29.5, -13.25, -3.5, -3, -15.5, -3.5, -13.5, -48.5, -3.5, -49.5, -45.25, -3.5, -60.5, -61.5, -3.5, -60.5, -41.5, -3.5, -56.75, -42.5, -3.5, -58.5, 7.5, -3.5, 26.5, -7.25, -3.5, 12.75, 2.75, -3.5, 27.25, 5.25, -3.5, 27, -40.75, -3.5, -58, -18.5, -3.5, -60.5, -18.5, -3.5, -53.5, -11.5, -3.5, -53.5, 60.5, -3.5, 49.75, -10.5, -3.5, -52.75, -45.25, -3.5, -49.5, 38.75, -3.5, 48.5, -26.5, -3.5, 8.5, -13.25, -3.5, 12.5, -57.25, -3.5, -7.5, 38.75, -3.5, 45, 25.5, -3.5, 38.5, 36.5, -3.5, -10, 38.5, -3.5, -10.5, 36.5, -3.5, -7, 37, -3.5, -7.75, 38.5, -3.5, -7.5, -33.25, -3.5, -7, -50.5, -3.5, -13.5, 45.5, -3.5, 39.5, 25.5, -3.5, -13.5, 7.5, -3.5, 29.5, 5.5, -3.5, 30, 2.75, -3.5, 32.5, 7, -3.5, 27.75, -57.25, -3.5, -44.75, -10.5, -3.5, -49.5, -26.25, -1.75, -54.25, -25.25, -1.75, -54.5, -25.25, -1.75, -55, -38.5, -1.75, -55, -37.75, -1.75, -54.5, -37.75, -1.75, -37.5, -39, -1.75, -37.25, -39, -1.75, -36.75, -24.75, -1.75, -36.75, -24.75, -1.75, -37.25, -26.25, -1.75, -37.5, -38.25, -1.75, -45.25, -38.25, -1.75, -42.25, -37.75, -1.75, -40, -33.25, -1.75, -44.5, -38.25, -1.75, -47.25, -39.5, -1.75, -47, -39.5, -1.75, -45.75, -37.75, -1.75, -51.75, -33.5, -1.75, -47.25, -30.75, -1.75, -47.5, -26.25, -1.75, -51.75, -39, -1.75, -42, -39, -1.75, -40.25, -26.25, -1.75, -40, -30.5, -1.75, -44.75, -38.5, -1.75, -51.5, -24.75, -1.75, -40.25, -25.25, -1.75, -51.5, 56.75, 6.75, 40.5, 56.75, 6.75, 43.25, 59.25, 6.75, 43.25, 59.25, 6.75, 40.5, 44.75, 6.75, 40.75, 44.75, 6.75, 43.25, 47.25, 6.75, 43.25, 47.25, 6.75, 40.75, 45.5, -1.5, 45.25, 44.25, -1.5, 45.25, 44.75, -1.5, 46.75, 45.75, -1.5, 47, 55.75, -1.5, 44, 55.75, -1.5, 41, 48.25, -1.5, 41, 48.25, -1.5, 44, 58.75, -1.5, 54.75, 59.5, -1.5, 54.5, 59.5, -1.5, 53, 58.75, -1.5, 52.75, 55.75, -1.5, 56, 45.75, -1.5, 44.25, 58.75, -1.5, 55.75, 48.25, -1.5, 59.25, 55.75, -1.5, 59.25, 48, -1.5, 55.75, 59, -1.5, 44.25, 45.75, -1.5, 49.75, 44.75, -1.5, 50, 44.75, -1.5, 55.75, 57, -1.5, 41, 57, -1.5, 43, 59, -1.5, 43, 59, -1.5, 41, 44.75, 6.75, 56.75, 44.75, 6.75, 59.25, 47.25, 6.75, 59.25, 47.25, 6.75, 56.75, 56.75, 6.75, 56.75, 56.75, 6.75, 59.25, 59.25, 6.75, 59.25, 59.25, 6.75, 56.75, 45, -1.5, 57, 45, -1.5, 59, 47, -1.5, 59, 47, -1.5, 57) -polygons = [PackedInt32Array(1, 0, 2), PackedInt32Array(2, 0, 3), PackedInt32Array(5, 4, 6), PackedInt32Array(6, 4, 7), PackedInt32Array(9, 8, 10), PackedInt32Array(10, 8, 11), PackedInt32Array(13, 12, 14), PackedInt32Array(14, 12, 15), PackedInt32Array(17, 16, 18), PackedInt32Array(18, 16, 19), PackedInt32Array(21, 20, 22), PackedInt32Array(22, 20, 25), PackedInt32Array(22, 25, 24), PackedInt32Array(22, 24, 23), PackedInt32Array(27, 26, 28), PackedInt32Array(28, 26, 29), PackedInt32Array(31, 30, 32), PackedInt32Array(32, 30, 33), PackedInt32Array(35, 34, 36), PackedInt32Array(36, 34, 37), PackedInt32Array(39, 38, 40), PackedInt32Array(40, 38, 41), PackedInt32Array(41, 38, 42), PackedInt32Array(44, 43, 45), PackedInt32Array(45, 43, 46), PackedInt32Array(48, 47, 49), PackedInt32Array(49, 47, 50), PackedInt32Array(52, 51, 53), PackedInt32Array(53, 51, 54), PackedInt32Array(56, 55, 57), PackedInt32Array(57, 55, 58), PackedInt32Array(60, 59, 61), PackedInt32Array(61, 59, 62), PackedInt32Array(64, 63, 65), PackedInt32Array(65, 63, 66), PackedInt32Array(69, 68, 67), PackedInt32Array(72, 71, 70), PackedInt32Array(67, 73, 69), PackedInt32Array(69, 73, 57), PackedInt32Array(75, 74, 76), PackedInt32Array(76, 74, 77), PackedInt32Array(79, 78, 80), PackedInt32Array(80, 78, 81), PackedInt32Array(81, 78, 82), PackedInt32Array(85, 84, 83), PackedInt32Array(91, 90, 86), PackedInt32Array(86, 90, 89), PackedInt32Array(86, 89, 88), PackedInt32Array(86, 88, 87), PackedInt32Array(58, 69, 57), PackedInt32Array(93, 92, 94), PackedInt32Array(94, 92, 95), PackedInt32Array(42, 38, 46), PackedInt32Array(7, 97, 96), PackedInt32Array(87, 88, 98), PackedInt32Array(98, 88, 99), PackedInt32Array(3, 45, 2), PackedInt32Array(2, 45, 46), PackedInt32Array(101, 100, 102), PackedInt32Array(102, 100, 103), PackedInt32Array(105, 104, 91), PackedInt32Array(91, 104, 90), PackedInt32Array(106, 81, 107), PackedInt32Array(107, 81, 108), PackedInt32Array(50, 47, 0), PackedInt32Array(0, 47, 3), PackedInt32Array(97, 109, 96), PackedInt32Array(96, 109, 110), PackedInt32Array(111, 49, 50), PackedInt32Array(112, 110, 109), PackedInt32Array(111, 113, 101), PackedInt32Array(101, 113, 100), PackedInt32Array(84, 97, 83), PackedInt32Array(83, 97, 7), PackedInt32Array(71, 115, 70), PackedInt32Array(70, 115, 114), PackedInt32Array(117, 105, 116), PackedInt32Array(116, 105, 12), PackedInt32Array(119, 118, 120), PackedInt32Array(120, 118, 107), PackedInt32Array(66, 63, 16), PackedInt32Array(16, 63, 19), PackedInt32Array(113, 111, 121), PackedInt32Array(121, 111, 50), PackedInt32Array(34, 122, 37), PackedInt32Array(37, 122, 123), PackedInt32Array(121, 124, 125), PackedInt32Array(125, 124, 126), PackedInt32Array(129, 128, 127), PackedInt32Array(127, 130, 129), PackedInt32Array(129, 130, 131), PackedInt32Array(70, 76, 72), PackedInt32Array(72, 76, 132), PackedInt32Array(132, 76, 77), PackedInt32Array(123, 133, 37), PackedInt32Array(37, 133, 134), PackedInt32Array(134, 133, 112), PackedInt32Array(94, 95, 118), PackedInt32Array(118, 95, 107), PackedInt32Array(83, 28, 85), PackedInt32Array(85, 28, 29), PackedInt32Array(139, 138, 135), PackedInt32Array(135, 138, 136), PackedInt32Array(136, 138, 137), PackedInt32Array(137, 138, 108), PackedInt32Array(19, 61, 18), PackedInt32Array(18, 61, 62), PackedInt32Array(29, 26, 140), PackedInt32Array(142, 140, 141), PackedInt32Array(141, 140, 26), PackedInt32Array(7, 4, 38), PackedInt32Array(38, 4, 46), PackedInt32Array(141, 22, 142), PackedInt32Array(142, 22, 23), PackedInt32Array(144, 143, 145), PackedInt32Array(145, 143, 146), PackedInt32Array(148, 147, 149), PackedInt32Array(149, 147, 77), PackedInt32Array(149, 150, 148), PackedInt32Array(153, 152, 151), PackedInt32Array(156, 155, 154), PackedInt32Array(153, 151, 103), PackedInt32Array(154, 157, 156), PackedInt32Array(156, 157, 158), PackedInt32Array(161, 160, 159), PackedInt32Array(164, 163, 162), PackedInt32Array(135, 165, 139), PackedInt32Array(103, 166, 102), PackedInt32Array(159, 167, 161), PackedInt32Array(161, 167, 158), PackedInt32Array(164, 162, 168), PackedInt32Array(168, 162, 169), PackedInt32Array(169, 162, 170), PackedInt32Array(25, 20, 171), PackedInt32Array(171, 20, 172), PackedInt32Array(176, 175, 173), PackedInt32Array(173, 175, 174), PackedInt32Array(177, 171, 172), PackedInt32Array(15, 65, 14), PackedInt32Array(14, 65, 66), PackedInt32Array(180, 179, 178), PackedInt32Array(117, 104, 105), PackedInt32Array(106, 181, 81), PackedInt32Array(107, 95, 106), PackedInt32Array(165, 89, 139), PackedInt32Array(139, 89, 90), PackedInt32Array(180, 178, 182), PackedInt32Array(182, 178, 138), PackedInt32Array(138, 178, 108), PackedInt32Array(169, 183, 168), PackedInt32Array(126, 124, 146), PackedInt32Array(129, 131, 184), PackedInt32Array(184, 131, 147), PackedInt32Array(147, 131, 77), PackedInt32Array(103, 100, 153), PackedInt32Array(153, 100, 185), PackedInt32Array(185, 100, 186), PackedInt32Array(40, 41, 115), PackedInt32Array(115, 41, 114), PackedInt32Array(77, 187, 132), PackedInt32Array(147, 188, 184), PackedInt32Array(42, 46, 43), PackedInt32Array(33, 98, 32), PackedInt32Array(32, 98, 99), PackedInt32Array(82, 137, 81), PackedInt32Array(81, 137, 108), PackedInt32Array(80, 189, 79), PackedInt32Array(191, 190, 30), PackedInt32Array(30, 190, 33), PackedInt32Array(126, 146, 174), PackedInt32Array(174, 146, 143), PackedInt32Array(174, 143, 192), PackedInt32Array(193, 190, 194), PackedInt32Array(194, 190, 191), PackedInt32Array(113, 121, 125), PackedInt32Array(192, 193, 194), PackedInt32Array(194, 82, 192), PackedInt32Array(192, 82, 78), PackedInt32Array(192, 78, 173), PackedInt32Array(192, 173, 174), PackedInt32Array(132, 195, 72), PackedInt32Array(139, 117, 116), PackedInt32Array(186, 74, 185), PackedInt32Array(185, 74, 75), PackedInt32Array(145, 161, 144), PackedInt32Array(144, 161, 87), PackedInt32Array(87, 161, 86), PackedInt32Array(86, 161, 158), PackedInt32Array(110, 133, 196), PackedInt32Array(196, 133, 158), PackedInt32Array(196, 158, 167), PackedInt32Array(197, 80, 81), PackedInt32Array(11, 8, 55), PackedInt32Array(55, 8, 58), PackedInt32Array(158, 157, 86), PackedInt32Array(136, 198, 135), PackedInt32Array(11, 53, 10), PackedInt32Array(10, 53, 54), PackedInt32Array(139, 116, 138), PackedInt32Array(7, 96, 6), PackedInt32Array(200, 199, 51), PackedInt32Array(51, 199, 54), PackedInt32Array(201, 149, 77), PackedInt32Array(199, 200, 202), PackedInt32Array(202, 200, 176), PackedInt32Array(15, 12, 105), PackedInt32Array(173, 202, 176), PackedInt32Array(174, 175, 74), PackedInt32Array(74, 175, 201), PackedInt32Array(74, 201, 77), PackedInt32Array(203, 187, 170), PackedInt32Array(170, 187, 77), PackedInt32Array(138, 204, 182), PackedInt32Array(170, 162, 203), PackedInt32Array(110, 112, 133), PackedInt32Array(177, 172, 59), PackedInt32Array(59, 172, 62), PackedInt32Array(206, 205, 207), PackedInt32Array(207, 205, 209), PackedInt32Array(207, 209, 208), PackedInt32Array(211, 210, 212), PackedInt32Array(212, 210, 215), PackedInt32Array(212, 215, 214), PackedInt32Array(212, 214, 213), PackedInt32Array(217, 216, 218), PackedInt32Array(218, 216, 219), PackedInt32Array(221, 220, 222), PackedInt32Array(222, 220, 216), PackedInt32Array(226, 225, 205), PackedInt32Array(205, 225, 224), PackedInt32Array(205, 224, 223), PackedInt32Array(205, 223, 209), PackedInt32Array(227, 217, 228), PackedInt32Array(228, 217, 218), PackedInt32Array(218, 219, 210), PackedInt32Array(210, 219, 230), PackedInt32Array(210, 230, 229), PackedInt32Array(210, 229, 215), PackedInt32Array(220, 231, 223), PackedInt32Array(216, 220, 219), PackedInt32Array(219, 220, 224), PackedInt32Array(224, 220, 223), PackedInt32Array(226, 233, 225), PackedInt32Array(225, 233, 230), PackedInt32Array(230, 233, 229), PackedInt32Array(229, 233, 232), PackedInt32Array(237, 236, 234), PackedInt32Array(234, 236, 235), PackedInt32Array(241, 240, 238), PackedInt32Array(238, 240, 239), PackedInt32Array(245, 244, 242), PackedInt32Array(242, 244, 243), PackedInt32Array(249, 248, 246), PackedInt32Array(246, 248, 247), PackedInt32Array(251, 250, 252), PackedInt32Array(252, 250, 253), PackedInt32Array(253, 250, 254), PackedInt32Array(242, 255, 245), PackedInt32Array(245, 255, 249), PackedInt32Array(250, 256, 254), PackedInt32Array(258, 257, 254), PackedInt32Array(254, 257, 259), PackedInt32Array(246, 260, 253), PackedInt32Array(262, 261, 263), PackedInt32Array(263, 261, 259), PackedInt32Array(261, 245, 249), PackedInt32Array(254, 259, 253), PackedInt32Array(253, 259, 261), PackedInt32Array(253, 261, 249), PackedInt32Array(253, 249, 246), PackedInt32Array(267, 266, 264), PackedInt32Array(264, 266, 265), PackedInt32Array(271, 270, 268), PackedInt32Array(268, 270, 269), PackedInt32Array(275, 274, 272), PackedInt32Array(272, 274, 273), PackedInt32Array(279, 278, 276), PackedInt32Array(276, 278, 277)] -sample_partition_type = 2 -geometry_parsed_geometry_type = 1 -geometry_collision_mask = 2147483648 -agent_height = 2.0 -region_min_size = 8.0 diff --git a/Zennysoft.Game.Ma/src/map/dungeon/code/Floor0.cs b/Zennysoft.Game.Ma/src/map/dungeon/code/Altar.cs similarity index 83% rename from Zennysoft.Game.Ma/src/map/dungeon/code/Floor0.cs rename to Zennysoft.Game.Ma/src/map/dungeon/code/Altar.cs index e8b30d2c..025581d8 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/code/Floor0.cs +++ b/Zennysoft.Game.Ma/src/map/dungeon/code/Altar.cs @@ -7,7 +7,7 @@ using Zennysoft.Ma.Adapter; namespace Zennysoft.Game.Ma; [Meta(typeof(IAutoNode))] -public partial class Floor0 : Node3D, IDungeonFloor +public partial class Altar : Node3D, IDungeonFloor { public override void _Notification(int what) => this.Notify(what); @@ -23,15 +23,15 @@ public partial class Floor0 : Node3D, IDungeonFloor public override void _Ready() { - Show(); - Exit.AreaEntered += Exit_AreaEntered; - FloorIsLoaded = true; + Show(); + Exit.AreaEntered += Exit_AreaEntered; + FloorIsLoaded = true; } private void Exit_AreaEntered(Area3D area) { - if (area.GetOwner() is IPlayer) - ExitReached(); + if (area.GetOwner() is IPlayer) + ExitReached(); } public void ExitReached() => Game.FloorExitReached(); diff --git a/Zennysoft.Game.Ma/src/map/dungeon/code/Floor0.cs.uid b/Zennysoft.Game.Ma/src/map/dungeon/code/Altar.cs.uid similarity index 100% rename from Zennysoft.Game.Ma/src/map/dungeon/code/Floor0.cs.uid rename to Zennysoft.Game.Ma/src/map/dungeon/code/Altar.cs.uid diff --git a/Zennysoft.Game.Ma/src/map/dungeon/code/BossFloor.cs b/Zennysoft.Game.Ma/src/map/dungeon/code/BossFloor.cs deleted file mode 100644 index cb546202..00000000 --- a/Zennysoft.Game.Ma/src/map/dungeon/code/BossFloor.cs +++ /dev/null @@ -1,25 +0,0 @@ -using Chickensoft.AutoInject; -using Chickensoft.Introspection; -using Godot; -using System.Collections.Immutable; - -namespace Zennysoft.Game.Ma; - -[Meta(typeof(IAutoNode))] -public partial class BossFloor : Node3D, IDungeonFloor -{ - public override void _Notification(int what) => this.Notify(what); - - [Node] private IBossRoom BossFloorRoom { get; set; } = default!; - - public ImmutableList Rooms => []; - - public void InitializeDungeon() - { - FloorIsLoaded = true; - } - - public bool FloorIsLoaded { get; set; } - - public Transform3D GetPlayerSpawnPoint() => BossFloorRoom.PlayerSpawn.GlobalTransform; -} diff --git a/Zennysoft.Game.Ma/src/map/dungeon/code/BossFloor.cs.uid b/Zennysoft.Game.Ma/src/map/dungeon/code/BossFloor.cs.uid deleted file mode 100644 index dbb5c159..00000000 --- a/Zennysoft.Game.Ma/src/map/dungeon/code/BossFloor.cs.uid +++ /dev/null @@ -1 +0,0 @@ -uid://b74nta2e20elm diff --git a/Zennysoft.Game.Ma/src/map/dungeon/code/corridor.gd b/Zennysoft.Game.Ma/src/map/dungeon/code/corridor.gd deleted file mode 100644 index 245467f7..00000000 --- a/Zennysoft.Game.Ma/src/map/dungeon/code/corridor.gd +++ /dev/null @@ -1,17 +0,0 @@ -@tool -extends DungeonRoom3D - -# Called when the node enters the scene tree for the first time. -func _ready(): - super._ready() - dungeon_done_generating.connect(remove_unused_doors_and_walls) - -func remove_unused_doors_and_walls(): - if get_door_by_node($"Doors/DOOR?").get_room_leads_to() != null: - $"Doors/DOOR?".queue_free() - if get_door_by_node($"Doors/DOOR?2").get_room_leads_to() != null: - $"Doors/DOOR?2".queue_free() - if get_door_by_node($"Doors/DOOR?3").get_room_leads_to() != null: - $"Doors/DOOR?3".queue_free() - if get_door_by_node($"Doors/DOOR?4").get_room_leads_to() != null: - $"Doors/DOOR?4".queue_free() diff --git a/Zennysoft.Game.Ma/src/map/dungeon/code/corridor.gd.uid b/Zennysoft.Game.Ma/src/map/dungeon/code/corridor.gd.uid deleted file mode 100644 index d8eb77cb..00000000 --- a/Zennysoft.Game.Ma/src/map/dungeon/code/corridor.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://fk3jis6rsipv diff --git a/Zennysoft.Game.Ma/src/map/dungeon/debug_floors/DebugFloor03.tscn b/Zennysoft.Game.Ma/src/map/dungeon/debug_floors/DebugFloor03.tscn deleted file mode 100644 index 10aebf8b..00000000 --- a/Zennysoft.Game.Ma/src/map/dungeon/debug_floors/DebugFloor03.tscn +++ /dev/null @@ -1,284 +0,0 @@ -[gd_scene load_steps=16 format=3 uid="uid://bi8jggqen30w6"] - -[ext_resource type="Script" uid="uid://dwt6302nsf4vq" path="res://src/map/dungeon/code/DungeonFloor.cs" id="1_5qwu0"] -[ext_resource type="PackedScene" uid="uid://02v033xrh6xi" path="res://src/map/dungeon/rooms/Set B/38. Floor Exit B.tscn" id="3_5qwu0"] -[ext_resource type="PackedScene" uid="uid://dooy8nc5pgaxm" path="res://src/map/dungeon/rooms/Set B/37. Corridor 2.tscn" id="4_w3178"] -[ext_resource type="PackedScene" uid="uid://dadl2rua1ovhq" path="res://src/map/dungeon/rooms/Set B/20. Antechamber 3.tscn" id="5_mqac6"] -[ext_resource type="PackedScene" uid="uid://dra1mqcqhw7g0" path="res://src/map/dungeon/rooms/Set B/21. Gallery Room.tscn" id="6_0v4w1"] -[ext_resource type="PackedScene" uid="uid://cq82tqhlshn1k" path="res://src/map/dungeon/rooms/Set B/22. Pit Room B.tscn" id="7_5qwu0"] -[ext_resource type="PackedScene" uid="uid://utaqo4hl68yw" path="res://src/map/dungeon/rooms/Set B/23. Antechamber 4.tscn" id="8_w3178"] -[ext_resource type="PackedScene" uid="uid://bhqmpgpegcuu5" path="res://src/map/dungeon/rooms/Set B/24. Balcony Room 2.tscn" id="9_k2pbf"] -[ext_resource type="PackedScene" uid="uid://dbfkpodwvxmfe" path="res://src/map/dungeon/rooms/Set B/25. Pedestal Room.tscn" id="10_4abo2"] -[ext_resource type="PackedScene" uid="uid://d2k2v4bcybx3k" path="res://src/map/dungeon/rooms/Set B/26. Item Transfer Room B.tscn" id="11_h4n5t"] -[ext_resource type="PackedScene" uid="uid://dbvr8ewajja6a" path="res://src/enemy/EnemyDatabase.tscn" id="14_b8w6w"] -[ext_resource type="PackedScene" uid="uid://bs56ccgosmu47" path="res://src/enemy/enemy_types/01. sproingy/Sproingy.tscn" id="15_optp8"] -[ext_resource type="PackedScene" uid="uid://b0gwivt7cw7nd" path="res://src/enemy/enemy_types/02. michael/Michael.tscn" id="16_h86t4"] - -[sub_resource type="NavigationMesh" id="NavigationMesh_xw4dv"] -sample_partition_type = 2 -geometry_parsed_geometry_type = 1 -geometry_collision_mask = 2147483648 -cell_height = 1.0 -agent_height = 2.0 -agent_max_climb = 1.0 -region_min_size = 8.0 - -[sub_resource type="BoxShape3D" id="BoxShape3D_xw4dv"] -size = Vector3(191.648, 1, 155.671) - -[node name="Floor01" type="Node3D"] -script = ExtResource("1_5qwu0") - -[node name="NavigationRegion3D" type="NavigationRegion3D" parent="."] -unique_name_in_owner = true -navigation_mesh = SubResource("NavigationMesh_xw4dv") - -[node name="Antechamber 3" parent="NavigationRegion3D" instance=ExtResource("5_mqac6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 0, -16) - -[node name="Gallery Room" parent="NavigationRegion3D" instance=ExtResource("6_0v4w1")] -transform = Transform3D(1.19249e-08, 0, -1, 0, 1, 0, 1, 0, 1.19249e-08, -68, 0, -8) - -[node name="Pit Room B" parent="NavigationRegion3D" instance=ExtResource("7_5qwu0")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -42, 0, -54) - -[node name="Antechamber 4" parent="NavigationRegion3D" instance=ExtResource("8_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -42, 0, -8) - -[node name="Balcony Room 2" parent="NavigationRegion3D" instance=ExtResource("9_k2pbf")] -transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 4, 0, -50) - -[node name="Pedestal Room" parent="NavigationRegion3D" instance=ExtResource("10_4abo2")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -70, 0, 16) - -[node name="Item Transfer Room B" parent="NavigationRegion3D" instance=ExtResource("11_h4n5t")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 0, 12) - -[node name="Floor Exit B_0" parent="NavigationRegion3D" instance=ExtResource("3_5qwu0")] -transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -70, 0, -34) - -[node name="Corridor_1" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6, 0, -6) - -[node name="Corridor_2" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10, 0, -6) - -[node name="Corridor_3" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -14, 0, -6) - -[node name="Corridor_4" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -18, 0, -6) - -[node name="Corridor_5" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -22, 0, -6) - -[node name="Corridor_6" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -26, 0, -6) - -[node name="Corridor_7" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -30, 0, -6) - -[node name="Corridor_8" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -54, 0, -6) - -[node name="Corridor_9" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -58, 0, -6) - -[node name="Corridor_10" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -58, 0, -10) - -[node name="Corridor_11" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -58, 0, -14) - -[node name="Corridor_12" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -58, 0, -18) - -[node name="Corridor_13" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -58, 0, -22) - -[node name="Corridor_14" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -58, 0, -26) - -[node name="Corridor_15" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -58, 0, -30) - -[node name="Corridor_16" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -58, 0, -34) - -[node name="Corridor_17" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -54, 0, -34) - -[node name="Corridor_18" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -50, 0, -34) - -[node name="Corridor_19" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -46, 0, -34) - -[node name="Corridor_20" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -42, 0, -34) - -[node name="Corridor_21" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -42, 0, -30) - -[node name="Corridor_22" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -42, 0, -26) - -[node name="Corridor_23" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -42, 0, -22) - -[node name="Corridor_24" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -42, 0, -18) - -[node name="Corridor_25" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -22, 0, -54) - -[node name="Corridor_26" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -18, 0, -54) - -[node name="Corridor_27" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -14, 0, -54) - -[node name="Corridor_28" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -14, 0, -50) - -[node name="Corridor_29" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -18, 0, -50) - -[node name="Corridor_30" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -22, 0, -50) - -[node name="Corridor_31" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -22, 0, -46) - -[node name="Corridor_32" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -22, 0, -42) - -[node name="Corridor_33" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -22, 0, -38) - -[node name="Corridor_34" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -22, 0, -34) - -[node name="Corridor_35" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -26, 0, -34) - -[node name="Corridor_36" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -30, 0, -34) - -[node name="Corridor_37" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -34, 0, -34) - -[node name="Corridor_38" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -38, 0, -34) - -[node name="Corridor_39" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -58, 0, -2) - -[node name="Corridor_40" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -58, 0, 2) - -[node name="Corridor_41" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -62, 0, 2) - -[node name="Corridor_42" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -66, 0, 2) - -[node name="Corridor_43" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -70, 0, 2) - -[node name="Corridor_44" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -70, 0, 6) - -[node name="Corridor_45" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -66, 0, 6) - -[node name="Corridor_46" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -62, 0, 6) - -[node name="Corridor_47" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -58, 0, 6) - -[node name="Corridor_48" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -54, 0, 6) - -[node name="Corridor_49" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -50, 0, 6) - -[node name="Corridor_50" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -46, 0, 6) - -[node name="Corridor_51" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -42, 0, 6) - -[node name="Corridor_52" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -38, 0, 6) - -[node name="Corridor_53" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -34, 0, 6) - -[node name="Corridor_54" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -30, 0, 6) - -[node name="Corridor_55" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -26, 0, 6) - -[node name="Corridor_56" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -22, 0, 6) - -[node name="Corridor_57" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -18, 0, 6) - -[node name="Corridor_58" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -14, 0, 6) - -[node name="Corridor_59" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10, 0, 6) - -[node name="Corridor_60" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10, 0, 2) - -[node name="Corridor_61" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6, 0, 2) - -[node name="Corridor_62" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 0, 2) - -[node name="Corridor_63" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -14, 0, 2) - -[node name="Corridor_64" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -18, 0, 2) - -[node name="Corridor_65" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -22, 0, 2) - -[node name="Corridor_66" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -26, 0, 2) - -[node name="Corridor_67" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -30, 0, 2) - -[node name="Corridor_68" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -30, 0, -2) - -[node name="Corridor_69" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -62, 0, -54) - -[node name="Corridor_70" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -66, 0, -54) - -[node name="Corridor_71" parent="NavigationRegion3D" instance=ExtResource("4_w3178")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -70, 0, -54) - -[node name="StaticBody3D" type="StaticBody3D" parent="NavigationRegion3D"] -collision_layer = 2147483648 -collision_mask = 2147483648 - -[node name="CollisionShape3D" type="CollisionShape3D" parent="NavigationRegion3D/StaticBody3D"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -12.7119, 1, 0) -shape = SubResource("BoxShape3D_xw4dv") -disabled = true - -[node name="EnemyDatabase" parent="." instance=ExtResource("14_b8w6w")] -unique_name_in_owner = true -EnemyList = Array[PackedScene]([ExtResource("15_optp8"), ExtResource("16_h86t4")]) diff --git a/Zennysoft.Game.Ma/src/map/dungeon/debug_floors/DebugFloor04.tscn b/Zennysoft.Game.Ma/src/map/dungeon/debug_floors/DebugFloor04.tscn deleted file mode 100644 index 2343d2bf..00000000 --- a/Zennysoft.Game.Ma/src/map/dungeon/debug_floors/DebugFloor04.tscn +++ /dev/null @@ -1,229 +0,0 @@ -[gd_scene load_steps=16 format=3 uid="uid://bpqm38kxonb35"] - -[ext_resource type="Script" uid="uid://dwt6302nsf4vq" path="res://src/map/dungeon/code/DungeonFloor.cs" id="1_hwssm"] -[ext_resource type="PackedScene" uid="uid://02v033xrh6xi" path="res://src/map/dungeon/rooms/Set B/38. Floor Exit B.tscn" id="3_5wjmx"] -[ext_resource type="PackedScene" uid="uid://dooy8nc5pgaxm" path="res://src/map/dungeon/rooms/Set B/37. Corridor 2.tscn" id="4_5dvb6"] -[ext_resource type="PackedScene" uid="uid://cypdcaqeylnwl" path="res://src/map/dungeon/rooms/Set B/27. Water Room B.tscn" id="5_gt56l"] -[ext_resource type="PackedScene" uid="uid://b8tiuu3l181ke" path="res://src/map/dungeon/rooms/Set B/28. Long Room B.tscn" id="6_rkuht"] -[ext_resource type="PackedScene" uid="uid://5cstpejxygy6" path="res://src/map/dungeon/rooms/Set B/29. Column Circle Room.tscn" id="7_hwssm"] -[ext_resource type="PackedScene" uid="uid://b1oayub1dt5ag" path="res://src/map/dungeon/rooms/Set B/31. Dismantled Saint's Room.tscn" id="8_f10ye"] -[ext_resource type="PackedScene" uid="uid://cuau7xgx3rkxu" path="res://src/map/dungeon/rooms/Set B/32. Proscenium's Room.tscn" id="9_5wjmx"] -[ext_resource type="PackedScene" uid="uid://b6akxaacr8jd2" path="res://src/map/dungeon/rooms/Set B/33. Puer's Room.tscn" id="10_5dvb6"] -[ext_resource type="PackedScene" uid="uid://dqppy7sj8pial" path="res://src/map/dungeon/rooms/Set B/39. Gesthemii's Room 2.tscn" id="11_2me6y"] -[ext_resource type="PackedScene" uid="uid://dbvr8ewajja6a" path="res://src/enemy/EnemyDatabase.tscn" id="14_5jv0q"] -[ext_resource type="PackedScene" uid="uid://bs56ccgosmu47" path="res://src/enemy/enemy_types/01. sproingy/Sproingy.tscn" id="15_raccu"] -[ext_resource type="PackedScene" uid="uid://b0gwivt7cw7nd" path="res://src/enemy/enemy_types/02. michael/Michael.tscn" id="16_5jgmg"] - -[sub_resource type="NavigationMesh" id="NavigationMesh_xw4dv"] -sample_partition_type = 2 -geometry_parsed_geometry_type = 1 -geometry_collision_mask = 2147483648 -cell_height = 1.0 -agent_height = 2.0 -agent_max_climb = 1.0 -region_min_size = 8.0 - -[sub_resource type="BoxShape3D" id="BoxShape3D_xw4dv"] -size = Vector3(191.648, 1, 155.671) - -[node name="Floor01" type="Node3D"] -script = ExtResource("1_hwssm") - -[node name="NavigationRegion3D" type="NavigationRegion3D" parent="."] -unique_name_in_owner = true -navigation_mesh = SubResource("NavigationMesh_xw4dv") - -[node name="Water Room B" parent="NavigationRegion3D" instance=ExtResource("5_gt56l")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -14, 0, 0) - -[node name="Long Room B" parent="NavigationRegion3D" instance=ExtResource("6_rkuht")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 42) - -[node name="Column Circle Room" parent="NavigationRegion3D" instance=ExtResource("7_hwssm")] -transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 14, 0, 10) - -[node name="Dismantled Saint\'s Room" parent="NavigationRegion3D" instance=ExtResource("8_f10ye")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -62, 0, 42) - -[node name="Proscenium\'s Room" parent="NavigationRegion3D" instance=ExtResource("9_5wjmx")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 54, 0, 10) - -[node name="Puer\'s Room" parent="NavigationRegion3D" instance=ExtResource("10_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -62, 0, -14) - -[node name="GesthemiisRoom" parent="NavigationRegion3D" instance=ExtResource("11_2me6y")] -transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -58, 0, -58) - -[node name="RoomsContainer" type="Node3D" parent="NavigationRegion3D"] - -[node name="Floor Exit B_0" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("3_5wjmx")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10, 0, -26) - -[node name="Corridor_1" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -14, 0, 26) - -[node name="Corridor_2" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 0, 10) - -[node name="Corridor_3" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -30, 0, 14) - -[node name="Corridor_4" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -34, 0, 14) - -[node name="Corridor_5" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -38, 0, 14) - -[node name="Corridor_6" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -42, 0, 14) - -[node name="Corridor_7" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -42, 0, 18) - -[node name="Corridor_8" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -42, 0, 22) - -[node name="Corridor_9" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -42, 0, 26) - -[node name="Corridor_10" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -42, 0, 30) - -[node name="Corridor_11" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -42, 0, 34) - -[node name="Corridor_12" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -42, 0, 38) - -[node name="Corridor_13" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -42, 0, 42) - -[node name="Corridor_14" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -38, 0, 42) - -[node name="Corridor_15" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -34, 0, 42) - -[node name="Corridor_16" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -30, 0, 42) - -[node name="Corridor_17" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -26, 0, 42) - -[node name="Corridor_18" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 14, 0, 26) - -[node name="Corridor_19" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 14, 0, 22) - -[node name="Corridor_20" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 18, 0, 22) - -[node name="Corridor_21" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 22, 0, 22) - -[node name="Corridor_22" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 26, 0, 22) - -[node name="Corridor_23" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 26, 0, 18) - -[node name="Corridor_24" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 26, 0, 14) - -[node name="Corridor_25" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 26, 0, 10) - -[node name="Corridor_26" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 30, 0, 10) - -[node name="Corridor_27" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 34, 0, 10) - -[node name="Corridor_28" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -30, 0, -14) - -[node name="Corridor_29" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -34, 0, -14) - -[node name="Corridor_30" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -38, 0, -14) - -[node name="Corridor_31" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -42, 0, -14) - -[node name="Corridor_32" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -62, 0, -34) - -[node name="Corridor_33" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -62, 0, -38) - -[node name="Corridor_34" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -58, 0, -38) - -[node name="Corridor_35" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -54, 0, -38) - -[node name="Corridor_36" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -50, 0, -38) - -[node name="Corridor_37" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -46, 0, -38) - -[node name="Corridor_38" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -42, 0, -38) - -[node name="Corridor_39" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -38, 0, -38) - -[node name="Corridor_40" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -34, 0, -38) - -[node name="Corridor_41" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -30, 0, -38) - -[node name="Corridor_42" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -30, 0, -34) - -[node name="Corridor_43" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -30, 0, -30) - -[node name="Corridor_44" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -30, 0, -26) - -[node name="Corridor_45" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -30, 0, -22) - -[node name="Corridor_46" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -30, 0, -18) - -[node name="Corridor_47" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 0, 6) - -[node name="Corridor_48" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 0, 2) - -[node name="Corridor_49" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 0, -2) - -[node name="Corridor_50" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 0, -6) - -[node name="Corridor_51" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6, 0, -6) - -[node name="Corridor_52" parent="NavigationRegion3D/RoomsContainer" instance=ExtResource("4_5dvb6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10, 0, -6) - -[node name="StaticBody3D" type="StaticBody3D" parent="NavigationRegion3D"] -collision_layer = 2147483648 -collision_mask = 2147483648 - -[node name="CollisionShape3D" type="CollisionShape3D" parent="NavigationRegion3D/StaticBody3D"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -12.7119, 1, 0) -shape = SubResource("BoxShape3D_xw4dv") -disabled = true - -[node name="EnemyDatabase" parent="." instance=ExtResource("14_5jv0q")] -unique_name_in_owner = true -EnemyList = Array[PackedScene]([ExtResource("15_raccu"), ExtResource("16_5jgmg")]) 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 f3703c35..28ba5c1a 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 @@ -1,6 +1,6 @@ -[gd_scene load_steps=70 format=4 uid="uid://dl6h1djc27ddl"] +[gd_scene load_steps=58 format=4 uid="uid://dl6h1djc27ddl"] -[ext_resource type="Script" uid="uid://c1nhqlem1ew3m" path="res://src/map/dungeon/code/Floor0.cs" id="1_5jip8"] +[ext_resource type="Script" uid="uid://c1nhqlem1ew3m" path="res://src/map/dungeon/code/Altar.cs" id="1_5jip8"] [ext_resource type="Texture2D" uid="uid://b27ksiyfefb33" path="res://src/map/dungeon/models/Special Floors & Rooms/Altar/02_ALTAR_FLOOR_ZER0_VER_outside_desert.png" id="2_fsslh"] [ext_resource type="Texture2D" uid="uid://cmfhbi07s4v5x" path="res://src/map/dungeon/models/Special Floors & Rooms/Altar/02_ALTAR_FLOOR_ZER0_VER_BOULDER_DARK.png" id="3_ownfb"] [ext_resource type="Texture2D" uid="uid://cfo5c1twdrnea" path="res://src/map/dungeon/models/Special Floors & Rooms/Altar/02_ALTAR_FLOOR_ZER0_VER_concrete_0025_color_1k.jpg" id="4_5ln1c"] @@ -14,18 +14,6 @@ [ext_resource type="Texture2D" uid="uid://buj20s21gq0n7" path="res://src/map/dungeon/models/Special Floors & Rooms/Altar/02_ALTAR_FLOOR_ZER0_VER_HAND_CYCLE_MOTIF.png" id="12_yaq7o"] [ext_resource type="Texture2D" uid="uid://4k6vtn4oip5f" path="res://src/map/dungeon/models/Special Floors & Rooms/Altar/02_ALTAR_FLOOR_ZER0_VER_TILE4.png" id="13_4jatb"] [ext_resource type="Texture2D" uid="uid://bhttrt4aqu1d7" path="res://src/map/dungeon/models/Special Floors & Rooms/Altar/02_ALTAR_FLOOR_ZER0_VER_COLUMN.jpg" id="14_twr0i"] -[ext_resource type="PackedScene" uid="uid://db206brufi83s" path="res://src/items/weapons/Weapon.tscn" id="15_l2xnv"] -[ext_resource type="Resource" uid="uid://cfhwlpa0d7wb4" path="res://src/items/weapons/resources/MysteryRod.tres" id="16_cbrvl"] -[ext_resource type="PackedScene" uid="uid://b07srt3lckt4e" path="res://src/items/accessory/Accessory.tscn" id="17_0pvdq"] -[ext_resource type="Resource" uid="uid://ecmjxvihuahv" path="res://src/items/accessory/resources/MysteryAccessory.tres" id="18_gc6fh"] -[ext_resource type="PackedScene" uid="uid://dorr7v1tkeiy0" path="res://src/items/armor/Armor.tscn" id="19_3s7gu"] -[ext_resource type="Resource" uid="uid://05hilwkmrs7a" path="res://src/items/armor/resources/MysteryArmor.tres" id="20_mfiqx"] -[ext_resource type="PackedScene" uid="uid://c6w7dpk0hurj0" path="res://src/items/consumable/ConsumableItem.tscn" id="21_4jl0n"] -[ext_resource type="Resource" uid="uid://bjwbx3ymt8o7" path="res://src/items/consumable/resources/MysteryConsumable.tres" id="22_yif54"] -[ext_resource type="PackedScene" uid="uid://d0pl1n1jf77jm" path="res://src/items/effect/EffectItem.tscn" id="23_5fa0y"] -[ext_resource type="Resource" uid="uid://bptg6eybj5dxk" path="res://src/items/effect/resources/DevicRecall.tres" id="24_1e0wv"] -[ext_resource type="PackedScene" uid="uid://1fl6s352e2ej" path="res://src/items/throwable/ThrowableItem.tscn" id="25_3cbr7"] -[ext_resource type="Resource" uid="uid://bph8c6by4s047" path="res://src/items/throwable/resources/GeomanticDice.tres" id="26_oefjj"] [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://bmiitw4fcs68e" path="res://src/audio/AMB/amb_wind_loop_altar.wav" id="28_je2oh"] @@ -875,30 +863,6 @@ collision_mask = 256 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -13.1171, -2.1779, -0.0887146) shape = SubResource("BoxShape3D_db2o3") -[node name="Weapon" parent="." instance=ExtResource("15_l2xnv")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.00425, -2.90864, 0) -Stats = ExtResource("16_cbrvl") - -[node name="Accessory" parent="." instance=ExtResource("17_0pvdq")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.98595, -1.56419, 0) -Stats = ExtResource("18_gc6fh") - -[node name="Armor" parent="." instance=ExtResource("19_3s7gu")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.98595, -1.56419, 0) -Stats = ExtResource("20_mfiqx") - -[node name="ConsumableItem" parent="." instance=ExtResource("21_4jl0n")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.98595, -1.56419, 0) -Stats = ExtResource("22_yif54") - -[node name="EffectItem" parent="." instance=ExtResource("23_5fa0y")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.98595, -1.56419, 0) -Stats = ExtResource("24_1e0wv") - -[node name="ThrowableItem" parent="." instance=ExtResource("25_3cbr7")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.98595, -1.56419, 0) -Stats = ExtResource("26_oefjj") - [node name="WorldEnvironment" type="WorldEnvironment" parent="."] environment = SubResource("Environment_c86uk") camera_attributes = SubResource("CameraAttributesPractical_ojbcg") diff --git a/Zennysoft.Game.Ma/src/map/overworld/Overworld.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/Overworld.tscn similarity index 100% rename from Zennysoft.Game.Ma/src/map/overworld/Overworld.tscn rename to Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/Overworld.tscn diff --git a/Zennysoft.Game.Ma/src/ui/pause_menu/PauseDebugMenu.cs b/Zennysoft.Game.Ma/src/ui/pause_menu/PauseDebugMenu.cs index 447688fa..30bc30f8 100644 --- a/Zennysoft.Game.Ma/src/ui/pause_menu/PauseDebugMenu.cs +++ b/Zennysoft.Game.Ma/src/ui/pause_menu/PauseDebugMenu.cs @@ -24,26 +24,10 @@ public partial class PauseDebugMenu : Control, IDebugMenu [Node] public OptionButton SpawnEnemyDropDown { get; set; } = default!; private readonly string _floorFilePath = @"res://src/map/dungeon/floors/"; + private readonly string _enemyFilePath = @"res://src/enemy/enemy_types"; private ImmutableList _spawnableItems; - private ImmutableList _spawnableEnemies = - [ - @"res://src/enemy/enemy_types/01. sproingy/Sproingy.tscn", - @"res://src/enemy/enemy_types/02. michael/Michael.tscn", - @"res://src/enemy/enemy_types/03. filth_eater/FilthEater.tscn", - @"res://src/enemy/enemy_types/04. sara/Sara.tscn", - @"res://src/enemy/enemy_types/05. ballos/Ballos.tscn", - @"res://src/enemy/enemy_types/06. chariot/Chariot.tscn", - @"res://src/enemy/enemy_types/07. chinthe/Chinthe.tscn", - @"res://src/enemy/enemy_types/08a. Ambassador/Ambassador.tscn", - @"res://src/enemy/enemy_types/08b. Ambassador (red)/AmbassadorRed.tscn", - @"res://src/enemy/enemy_types/08c. Ambassador (steel)/AmbassadorSteel.tscn", - @"res://src/enemy/enemy_types/09. Agni/AgniDemon.tscn", - @"res://src/enemy/enemy_types/9b. Aqueos Demon/AqueosDemon.tscn", - @"res://src/enemy/enemy_types/11. Palan/Palan.tscn", - @"res://src/enemy/enemy_types/12. Shield of Heaven/ShieldModelView.tscn", - @"res://src/enemy/enemy_types/13. gold sproingy/GoldSproingy.tscn" - ]; + private ImmutableList _spawnableEnemies; private ItemDatabase _itemDatabase; @@ -52,6 +36,25 @@ public partial class PauseDebugMenu : Control, IDebugMenu _itemDatabase = new ItemDatabase(); _spawnableItems = _itemDatabase.Items; + _spawnableEnemies = + [ + _enemyFilePath + "/01. sproingy/Sproingy.tscn", + _enemyFilePath + "/02. michael/Michael.tscn", + _enemyFilePath + "/03. filth_eater/FilthEater.tscn", + _enemyFilePath + "/04. sara/Sara.tscn", + _enemyFilePath + "/05. ballos/Ballos.tscn", + _enemyFilePath + "/06. chariot/Chariot.tscn", + _enemyFilePath + "/07. chinthe/Chinthe.tscn", + _enemyFilePath + "/08a. Ambassador/Ambassador.tscn", + _enemyFilePath + "/08b. Ambassador (red)/AmbassadorRed.tscn", + _enemyFilePath + "/08c. Ambassador (steel)/AmbassadorSteel.tscn", + _enemyFilePath + "/09. Agni/AgniDemon.tscn", + _enemyFilePath + "/9b. Aqueos Demon/AqueosDemon.tscn", + _enemyFilePath + "/11. Palan/Palan.tscn", + _enemyFilePath + "/12. Shield of Heaven/ShieldModelView.tscn", + _enemyFilePath + "/13. gold sproingy/GoldSproingy.tscn" + ]; + foreach (var item in _spawnableItems) SpawnItemDropDown.AddItem(item.ItemName);