Skip to content

Commit a8186d5

Browse files
committed
feat: configuracao de tamanho de mapa foi adicionado ao script de game e escaner foi alterado para emitir um sinal diretamente ao script game
1 parent bba2b13 commit a8186d5

File tree

7 files changed

+40
-13
lines changed

7 files changed

+40
-13
lines changed
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[gd_resource type="Resource" load_steps=2 format=3 uid="uid://cslplb3s5se2m"]
2+
3+
[ext_resource type="Script" path="res://Modules/Map/Scripts/MapSettingsResource.cs" id="1_bcgwb"]
4+
5+
[resource]
6+
script = ExtResource("1_bcgwb")
7+
Width = 100
8+
Height = 100

Modules/Game/Scenes/Game.tscn

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
[gd_scene load_steps=6 format=4 uid="uid://craosk8pj4wxt"]
1+
[gd_scene load_steps=9 format=4 uid="uid://craosk8pj4wxt"]
22

3+
[ext_resource type="Script" uid="uid://doeo50prutum0" path="res://Modules/Game/Scripts/Game.cs" id="1_ff0uo"]
34
[ext_resource type="TileSet" uid="uid://cjve6lin88aty" path="res://Modules/TileMaps/Resources/groundTileSet.tres" id="1_g4ia1"]
45
[ext_resource type="PackedScene" uid="uid://bgowra4ubjdnq" path="res://Modules/Player/Scenes/player.tscn" id="2_31c6s"]
6+
[ext_resource type="Resource" uid="uid://cslplb3s5se2m" path="res://Modules/Game/Resources/mapSettings.tres" id="2_ifo23"]
57
[ext_resource type="Texture2D" uid="uid://1u23a2nnfr5n" path="res://Modules/TileMaps/Textures/spawn.png" id="2_n2da8"]
8+
[ext_resource type="Script" uid="uid://di6j7dxqlb03e" path="res://Modules/Map/Scripts/MapScanner.cs" id="4_ifo23"]
69

710
[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_rvjqr"]
811
texture = ExtResource("2_n2da8")
@@ -14,6 +17,8 @@ custom_data_layer_0/type = 0
1417
sources/0 = SubResource("TileSetAtlasSource_rvjqr")
1518

1619
[node name="Game" type="Node2D"]
20+
script = ExtResource("1_ff0uo")
21+
MapSettings = ExtResource("2_ifo23")
1722

1823
[node name="GUI" type="Control" parent="."]
1924
layout_mode = 3
@@ -39,5 +44,10 @@ tile_set = ExtResource("1_g4ia1")
3944
tile_map_data = PackedByteArray("AAB2AEUAAAAAAAAAAAB1AEUAAAAAAAAAAAB0AEUAAAAAAAAAAAB0AEQAAAAAAAAAAAB0AEMAAAAAAAAAAAB1AEMAAAAAAAAAAAB2AEMAAAAAAAAAAAB2AEQAAAAAAAAAAAB1AEQAAAAAAAAAAABzAEQAAAAAAAAAAAByAEQAAAAAAAAAAABxAEQAAAAAAAAAAABwAEQAAAAAAAAAAABwAEUAAAAAAAAAAABvAEUAAAAAAAAAAABvAEQAAAAAAAAAAABvAEMAAAAAAAAAAABwAEMAAAAAAAAAAABXACgAAAAAAAAAAABWACgAAAAAAAAAAABWACcAAAAAAAAAAABVACcAAAAAAAAAAABXACcAAAAAAAAAAABVACgAAAAAAAAAAABWACkAAAAAAAAAAABWACoAAAAAAAAAAABWACsAAAAAAAAAAABWACwAAAAAAAAAAABWAC0AAAAAAAAAAABXAC0AAAAAAAAAAABVAC0AAAAAAAAAAABVAC4AAAAAAAAAAABWAC4AAAAAAAAAAABXAC4AAAAAAAAAAABuAEQAAAAAAAAAAABuAEMAAAAAAAAAAABuAEUAAAAAAAAAAAA9AEMAAAAAAAAAAAA9AEQAAAAAAAAAAAA9AEUAAAAAAAAAAAA8AEUAAAAAAAAAAAA8AEQAAAAAAAAAAAA8AEMAAAAAAAAAAAA7AEMAAAAAAAAAAAA7AEQAAAAAAAAAAAA7AEUAAAAAAAAAAAA6AEQAAAAAAAAAAAA5AEQAAAAAAAAAAAA4AEQAAAAAAAAAAAA3AEQAAAAAAAAAAAA2AEUAAAAAAAAAAAA3AEUAAAAAAAAAAAA1AEUAAAAAAAAAAAA1AEQAAAAAAAAAAAA1AEMAAAAAAAAAAAA2AEMAAAAAAAAAAAA3AEMAAAAAAAAAAAA2AEQAAAAAAAAAAABVAGEAAAAAAAAAAABWAGEAAAAAAAAAAABWAGIAAAAAAAAAAABWAGMAAAAAAAAAAABVAGMAAAAAAAAAAABVAGIAAAAAAAAAAABUAGIAAAAAAAAAAABUAGMAAAAAAAAAAABUAGEAAAAAAAAAAABVAGAAAAAAAAAAAABVAF8AAAAAAAAAAABVAF4AAAAAAAAAAABVAF0AAAAAAAAAAABVAFwAAAAAAAAAAABWAFwAAAAAAAAAAABWAFsAAAAAAAAAAABVAFsAAAAAAAAAAABUAFsAAAAAAAAAAABUAFwAAAAAAAAAAABUAF0AAAAAAAAAAABWAF0AAAAAAAAAAABXAC8AAAAAAAAAAABWAC8AAAAAAAAAAABVAC8AAAAAAAAAAABXACkAAAAAAAAAAABVACkAAAAAAAAAAAA=")
4045
tile_set = SubResource("TileSet_ff0uo")
4146

47+
[node name="MapScanner" type="Node2D" parent="TileMaps"]
48+
script = ExtResource("4_ifo23")
49+
4250
[node name="Player" parent="." instance=ExtResource("2_31c6s")]
4351
position = Vector2(1387, 1078)
52+
53+
[connection signal="MapScanned" from="TileMaps/MapScanner" to="." method="OnMapScanned"]

Modules/Game/Scripts/Game.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
using DungeonRoyale.Modules.GameManagers.Scripts;
2+
using DungeonRoyale.Modules.Map.Scripts;
23

34
namespace DungeonRoyale.Modules.Game.Scripts;
45

56
public partial class Game : Node2D
67
{
78
private static TilesManager _tilesManager => TilesManager.Instance!;
89

9-
[Export] public int MapWidth { get; private set; }
10-
[Export] public int MapHeight { get; private set; }
10+
[Export] public MapSettingsResource MapSettings { get; private set; } = new MapSettingsResource();
1111

1212
private bool MapIsLoading { get; set; } = true;
1313

1414
public override void _Ready()
1515
{
16-
_tilesManager.SetUpTiles(MapWidth, MapHeight);
16+
_tilesManager.SetUpTiles(MapSettings.Width, MapSettings.Height);
1717
}
1818

1919
public void OnMapScanned()

Modules/Map/MapScanner.cs

Lines changed: 0 additions & 9 deletions
This file was deleted.

Modules/Map/Scripts/MapScanner.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
namespace DungeonRoyale.Modules.Map.Scripts;
2+
3+
public partial class MapScanner : Node2D
4+
{
5+
[Signal] public delegate void MapScannedEventHandler();
6+
7+
public override void _Ready()
8+
{
9+
EmitSignal(SignalName.MapScanned);
10+
}
11+
}
File renamed without changes.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
namespace DungeonRoyale.Modules.Map.Scripts;
2+
3+
public partial class MapSettingsResource : Resource
4+
{
5+
[Export] public int Width { get; private set; } = 100;
6+
[Export] public int Height { get; private set; } = 100;
7+
}

0 commit comments

Comments
 (0)