Merge pull request #8 from Coding-in-community/feat/adicionar-escanea…

…mento-de-mapa

feat: adicionado classes iniciais de jogo que utilizara a classe mapsc…

GlobalUsings.cs

@@ -1,2 +1,2 @@
 global using Godot;
-global using DungeonRoyale.Shared.Scripts;
+global using DungeonRoyale.Shared.Scripts.Extensions;

Modules/Game/Resources/mapSettings.tres

@@ -0,0 +1,8 @@
+[gd_resource type="Resource" load_steps=2 format=3 uid="uid://cslplb3s5se2m"]
+
+[ext_resource type="Script" uid="uid://c2q15i1u3gl3y" path="res://Modules/Map/Scripts/MapSettingsResource.cs" id="1_bcgwb"]
+
+[resource]
+script = ExtResource("1_bcgwb")
+Width = 1500
+Height = 1500

Modules/Game/Scripts/Game.cs

@@ -0,0 +1,41 @@
+using DungeonRoyale.Modules.GameManagers.Scripts;
+using DungeonRoyale.Modules.Map.Scripts;
+
+namespace DungeonRoyale.Modules.Game.Scripts;
+
+public partial class Game : Node2D
+{
+    private static TilesManager _tilesManager => TilesManager.Instance!;
+
+    [Export] public MapSettingsResource MapSettings { get; private set; } = new MapSettingsResource();
+
+    private bool MapIsLoading { get; set; } = true;
+
+    public override void _Ready()
+    {
+        _tilesManager.SetUpTiles(MapSettings.Width, MapSettings.Height);
+
+        if (FindChild(nameof(MapScanner), true) is not MapScanner mapScanner)
+        {
+            GD.PrintErr("MapScanner node not found.");
+            return;
+        }
+
+        mapScanner.MapScanned += OnMapScanned;
+        mapScanner.Scan(MapSettings.Width, MapSettings.Height);
+    }
+
+    public void OnMapScanned()
+    {
+        MapIsLoading = false;
+
+        // Do something with the scanned map
+    }
+
+    public void OnMapGenerated()
+    {
+        MapIsLoading = false;
+
+        // Do something with the generated map
+    }
+}

Modules/Game/Scripts/Game.cs.uid

@@ -0,0 +1 @@
+uid://doeo50prutum0

Modules/GameManagers/Scripts/TileMapManager.cs

@@ -0,0 +1,36 @@
+namespace DungeonRoyale.Modules.GameManagers.Scripts;
+
+public partial class TileMapManager : Node2D
+{
+    public static TileMapManager? Instance { get; private set; }
+
+    public TileMapLayer GroundTileMap { get; private set; } = null!;
+    public TileMapLayer SpawnTileMap { get; private set; } = null!;
+
+    public override void _Ready()
+    {
+        if (Instance is null)
+        {
+            Instance = this;
+        }
+        else
+        {
+            GD.PrintErr("There is already an instance of TileMapManager in the scene.");
+        }
+
+        if (GetTree().CurrentScene.FindChild(nameof(GroundTileMap), true) is not TileMapLayer groundTileMap)
+        {
+            GD.PrintErr("GroundTileMap node not found.");
+            return;
+        }
+
+        if (GetTree().CurrentScene.FindChild(nameof(SpawnTileMap), true) is not TileMapLayer spawnTileMap)
+        {
+            GD.PrintErr("SpawnTileMap node not found.");
+            return;
+        }
+
+        GroundTileMap = groundTileMap;
+        SpawnTileMap = spawnTileMap;
+    }
+}

Modules/GameManagers/Scripts/TileMapManager.cs.uid

@@ -0,0 +1 @@
+uid://bt46ejg3cyafl

Modules/GameManagers/Scripts/TilesManager.cs

@@ -38,6 +38,12 @@ public void SetUpTiles(int width, int height)
         _height = height;
 
         Tiles = new DRTileData[_width, _height];
+
+        for (int x = 0; x < _width; x++)
+        for (int y = 0; y < _height; y++)
+        {
+            Tiles[x, y] = new DRTileData(x, y);
+        }
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]

Modules/Map/Scripts/MapScanner.cs

@@ -0,0 +1,39 @@
+using DungeonRoyale.Modules.GameManagers.Scripts;
+
+namespace DungeonRoyale.Modules.Map.Scripts;
+
+public partial class MapScanner : Node2D 
+{
+    private TileMapManager _tileMapManager => TileMapManager.Instance!;
+    private TilesManager _tilesManager => TilesManager.Instance!;
+
+    [Signal] public delegate void MapScannedEventHandler();
+
+    public void Scan(int width, int height)
+    {
+        GD.Print("Scanning map...");
+        for (int x = 0; x < width; x++)
+        for (int y = 0; y < height; y++)
+        {
+            var groundTile = _tileMapManager.GroundTileMap.GetCellTileData(new Vector2I(x, y));
+
+            if (groundTile is null)
+                continue;
+
+            if (!_tilesManager.TryGetTileAt(x, y, out var tileData))
+                continue;
+
+            tileData.IsWalkable = groundTile.GetCustomData("IsWalkable").AsBool();
+
+            var spawnTile = _tileMapManager.SpawnTileMap.GetCellTileData(new Vector2I(x, y));
+
+            if (spawnTile is null)
+                continue;
+
+            tileData.IsSpawnPoint = true;
+        }
+
+        GD.Print("Map scanned.");
+        EmitSignal(SignalName.MapScanned);
+    }
+}

Modules/Map/Scripts/MapScanner.cs.uid

@@ -0,0 +1 @@
+uid://di6j7dxqlb03e

Modules/Map/Scripts/MapSettingsResource.cs

@@ -0,0 +1,7 @@
+namespace DungeonRoyale.Modules.Map.Scripts;
+
+public partial class MapSettingsResource : Resource
+{
+    [Export] public int Width { get; private set; } = 100;
+    [Export] public int Height { get; private set; } = 100;
+}

Modules/Map/Scripts/MapSettingsResource.cs.uid

@@ -0,0 +1 @@
+uid://c2q15i1u3gl3y

Modules/TileMaps/Resources/groundTileSet.tres

@@ -62,6 +62,7 @@ texture = ExtResource("1_e6sjf")
 2:2/0/terrains_peering_bit/top_side = 0
 2:2/0/terrains_peering_bit/top_right_corner = 0
 2:2/0/custom_data_0 = true
+2:2/0/custom_data_1 = true
 3:2/0 = 0
 3:2/0/terrain_set = 0
 3:2/0/terrain = 0
@@ -74,6 +75,7 @@ texture = ExtResource("1_e6sjf")
 3:2/0/terrains_peering_bit/top_side = 0
 3:2/0/terrains_peering_bit/top_right_corner = 0
 3:2/0/custom_data_0 = true
+3:2/0/custom_data_1 = true
 4:2/0 = 0
 4:2/0/terrain_set = 0
 4:2/0/terrain = 0
@@ -86,6 +88,7 @@ texture = ExtResource("1_e6sjf")
 4:2/0/terrains_peering_bit/top_side = 0
 4:2/0/terrains_peering_bit/top_right_corner = 0
 4:2/0/custom_data_0 = true
+4:2/0/custom_data_1 = true
 5:2/0 = 0
 5:2/0/terrain_set = 0
 5:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
@@ -117,6 +120,7 @@ texture = ExtResource("1_e6sjf")
 2:3/0/terrains_peering_bit/top_side = 0
 2:3/0/terrains_peering_bit/top_right_corner = 0
 2:3/0/custom_data_0 = true
+2:3/0/custom_data_1 = true
 3:3/0 = 0
 3:3/0/terrain_set = 0
 3:3/0/terrain = 0
@@ -129,6 +133,7 @@ texture = ExtResource("1_e6sjf")
 3:3/0/terrains_peering_bit/top_side = 0
 3:3/0/terrains_peering_bit/top_right_corner = 0
 3:3/0/custom_data_0 = true
+3:3/0/custom_data_1 = true
 4:3/0 = 0
 4:3/0/terrain_set = 0
 4:3/0/terrain = 0
@@ -141,6 +146,7 @@ texture = ExtResource("1_e6sjf")
 4:3/0/terrains_peering_bit/top_side = 0
 4:3/0/terrains_peering_bit/top_right_corner = 0
 4:3/0/custom_data_0 = true
+4:3/0/custom_data_1 = true
 5:3/0 = 0
 5:3/0/terrain_set = 0
 5:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
@@ -169,6 +175,7 @@ texture = ExtResource("1_e6sjf")
 2:4/0/terrains_peering_bit/top_side = 0
 2:4/0/terrains_peering_bit/top_right_corner = 0
 2:4/0/custom_data_0 = true
+2:4/0/custom_data_1 = true
 3:4/0 = 0
 3:4/0/terrain_set = 0
 3:4/0/terrain = 0
@@ -181,6 +188,7 @@ texture = ExtResource("1_e6sjf")
 3:4/0/terrains_peering_bit/top_side = 0
 3:4/0/terrains_peering_bit/top_right_corner = 0
 3:4/0/custom_data_0 = true
+3:4/0/custom_data_1 = true
 4:4/0 = 0
 4:4/0/terrain_set = 0
 4:4/0/terrain = 0
@@ -193,6 +201,7 @@ texture = ExtResource("1_e6sjf")
 4:4/0/terrains_peering_bit/top_side = 0
 4:4/0/terrains_peering_bit/top_right_corner = 0
 4:4/0/custom_data_0 = true
+4:4/0/custom_data_1 = true
 5:4/0 = 0
 5:4/0/terrain_set = 0
 5:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
@@ -282,4 +291,6 @@ terrain_set_0/terrain_0/name = "Ground"
 terrain_set_0/terrain_0/color = Color(0.5, 0.34375, 0.25, 1)
 custom_data_layer_0/name = "CanSpawnBox"
 custom_data_layer_0/type = 1
+custom_data_layer_1/name = "IsWalkable"
+custom_data_layer_1/type = 1
 sources/0 = SubResource("TileSetAtlasSource_a18vg")

Modules/Tiles/Scripts/DRTileData.cs

@@ -5,9 +5,9 @@ public partial class DRTileData
     public int X { get; private set; }
     public int Y { get; private set; }
 
-    public bool IsWalkable { get; private set; }
+    public bool IsWalkable { get; set; }
 
-    public bool IsSpawnPoint { get; private set; }
+    public bool IsSpawnPoint { get; set; }
 
     public DRTileData()
     {

Shared/Scripts/Extensions/NodeExtensions.cs

@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+
+namespace DungeonRoyale.Shared.Scripts.Extensions;
+
+public static class NodeExtensions
+{
+    public static List<T> GetRecursivelyNodesOfType<T>(this Node node, List<T>? nodesList = null) where T : Node
+	{
+		nodesList ??= [];
+
+		foreach (Node child in node.GetChildren())
+		{
+			if (child is T t)
+			{
+				nodesList.Add(t);
+			}
+
+			if (child.GetChildCount() > 0)
+			{
+				child.GetRecursivelyNodesOfType(nodesList);
+			}
+		}
+
+		return nodesList;
+	}
+}

project.godot

@@ -15,10 +15,6 @@ run/main_scene="res://Modules/Game/Scenes/Game.tscn"
 config/features=PackedStringArray("4.4", "C#", "GL Compatibility")
 config/icon="res://icon.svg"
 
-[autoload]
-
-TilesManager="*res://Modules/GameManagers/Scripts/TilesManager.cs"
-
 [dotnet]
 
 project/assembly_name="DungeonRoyale"