From 4705fca1484904093995f807a0b642c3fbce1540 Mon Sep 17 00:00:00 2001 From: MaddoScientisto Date: Tue, 29 Apr 2025 22:06:06 +0200 Subject: [PATCH] Mapping --- Cirno.csproj | 2 +- .../Acid_Horizontal_Walkway.tres | 19 +++++ Resources/RogueliteMaps/Factory_Theme.tres | 5 +- .../Acid_Horizontal_Walkway.tscn | 77 +++++++++++++++++++ Scenes/Maps/RogueliteMaps/RgLarge.tscn | 3 +- Scripts/UI/Minimap.cs | 13 ++++ 6 files changed, 115 insertions(+), 4 deletions(-) create mode 100644 Resources/RogueliteMaps/Acid_Horizontal_Walkway.tres create mode 100644 Scenes/Maps/RogueliteMaps/Acid_Horizontal_Walkway.tscn diff --git a/Cirno.csproj b/Cirno.csproj index afde3cb6..ff0cdeff 100644 --- a/Cirno.csproj +++ b/Cirno.csproj @@ -1,4 +1,4 @@ - + net8.0 true diff --git a/Resources/RogueliteMaps/Acid_Horizontal_Walkway.tres b/Resources/RogueliteMaps/Acid_Horizontal_Walkway.tres new file mode 100644 index 00000000..82d170df --- /dev/null +++ b/Resources/RogueliteMaps/Acid_Horizontal_Walkway.tres @@ -0,0 +1,19 @@ +[gd_resource type="Resource" script_class="RogueliteRoomResource" load_steps=6 format=3 uid="uid://cqlh2k4fndgg1"] + +[ext_resource type="Resource" uid="uid://cocl3qontm3be" path="res://Resources/Enemies/Base_Fairy.tres" id="1_rl3q6"] +[ext_resource type="Resource" uid="uid://cqfyuurvqb8m6" path="res://Resources/Enemies/Base_Fairy_Special.tres" id="2_1jnpt"] +[ext_resource type="Resource" uid="uid://qbo6avc7x64b" path="res://Resources/Enemies/Fairy_Guard.tres" id="3_2rby3"] +[ext_resource type="Resource" uid="uid://cfdvg162u65sr" path="res://Resources/Enemies/Thermathron.tres" id="4_dq36y"] +[ext_resource type="Script" uid="uid://bl2ne8w12e3a" path="res://Scripts/Resources/Roguelite/RogueliteRoomResource.cs" id="5_c4t84"] + +[resource] +script = ExtResource("5_c4t84") +RoomName = &"uid://bfsxivhvht61o" +Type = 1 +ScenePath = &"uid://b1d8s1dyvlpea" +Size = Vector2i(1, 1) +StartShrouded = true +DoorGridPositions = Array[Vector2i]([Vector2i(0, -1), Vector2i(0, 1), Vector2i(1, 0), Vector2i(-1, 0)]) +SpawnableEnemies = Array[Object]([ExtResource("1_rl3q6"), ExtResource("2_1jnpt"), ExtResource("3_2rby3"), ExtResource("4_dq36y")]) +DoorDirections = 24 +metadata/_custom_type_script = "uid://bl2ne8w12e3a" diff --git a/Resources/RogueliteMaps/Factory_Theme.tres b/Resources/RogueliteMaps/Factory_Theme.tres index f7de1c6c..30bf14df 100644 --- a/Resources/RogueliteMaps/Factory_Theme.tres +++ b/Resources/RogueliteMaps/Factory_Theme.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="RogueliteMapTheme" load_steps=56 format=3 uid="uid://cw6868vuvuynh"] +[gd_resource type="Resource" script_class="RogueliteMapTheme" load_steps=57 format=3 uid="uid://cw6868vuvuynh"] [ext_resource type="Script" uid="uid://bwtif3if3ea0u" path="res://Scripts/Resources/RogueliteMapTheme.cs" id="1_2rtdw"] [ext_resource type="Resource" uid="uid://cltxhkrqp055v" path="res://Resources/Items/Money_Pickup.tres" id="1_ae3bb"] @@ -43,6 +43,7 @@ [ext_resource type="Resource" uid="uid://b8lpo4im87rx7" path="res://Resources/RogueliteMaps/Long_Factory.tres" id="38_f7mru"] [ext_resource type="Resource" uid="uid://fa7jvapga27y" path="res://Scenes/Maps/RogueliteMaps/LongSidePassage.tres" id="39_3kwn2"] [ext_resource type="PackedScene" uid="uid://dff3lrk4srymb" path="res://Scenes/Misc/Vertical_Solid_Wall.tscn" id="40_tsgja"] +[ext_resource type="Resource" uid="uid://cqlh2k4fndgg1" path="res://Resources/RogueliteMaps/Acid_Horizontal_Walkway.tres" id="40_w335g"] [ext_resource type="Resource" uid="uid://bdpbekqhuuq4l" path="res://Resources/Items/Shield_Extend_Pickup.tres" id="41_tsgja"] [ext_resource type="Resource" uid="uid://ciybnocjfpshh" path="res://Resources/Items/Heart_Extend_Pickup.tres" id="42_qo6vk"] [ext_resource type="PackedScene" uid="uid://c21m7w5ahpsd0" path="res://Scenes/Activable/Shroud.tscn" id="43_3kwn2"] @@ -95,5 +96,5 @@ ChestLootTable = SubResource("Resource_nnvxo") ShopLootTable = SubResource("Resource_11cll") EnemiesLootTable = SubResource("Resource_tsgja") WeaponsLootTable = SubResource("Resource_eegnh") -Rooms = Array[Object]([ExtResource("5_sludw"), ExtResource("6_b3pjl"), ExtResource("7_nil27"), ExtResource("8_pmfuo"), ExtResource("9_0lwa1"), ExtResource("14_rjphh"), ExtResource("15_2gg5d"), ExtResource("16_402ix"), ExtResource("17_52l5g"), ExtResource("18_gh41q"), ExtResource("19_bn1n6"), ExtResource("20_0on7r"), ExtResource("23_p3lfl"), ExtResource("24_tsgja"), ExtResource("36_ga54h"), ExtResource("37_cxv74"), ExtResource("38_f7mru"), ExtResource("39_3kwn2")]) +Rooms = Array[Object]([ExtResource("5_sludw"), ExtResource("6_b3pjl"), ExtResource("7_nil27"), ExtResource("8_pmfuo"), ExtResource("9_0lwa1"), ExtResource("14_rjphh"), ExtResource("15_2gg5d"), ExtResource("16_402ix"), ExtResource("17_52l5g"), ExtResource("18_gh41q"), ExtResource("19_bn1n6"), ExtResource("20_0on7r"), ExtResource("23_p3lfl"), ExtResource("24_tsgja"), ExtResource("36_ga54h"), ExtResource("37_cxv74"), ExtResource("38_f7mru"), ExtResource("39_3kwn2"), ExtResource("40_w335g")]) metadata/_custom_type_script = "uid://bwtif3if3ea0u" diff --git a/Scenes/Maps/RogueliteMaps/Acid_Horizontal_Walkway.tscn b/Scenes/Maps/RogueliteMaps/Acid_Horizontal_Walkway.tscn new file mode 100644 index 00000000..dbeebbae --- /dev/null +++ b/Scenes/Maps/RogueliteMaps/Acid_Horizontal_Walkway.tscn @@ -0,0 +1,77 @@ +[gd_scene load_steps=9 format=4 uid="uid://bfsxivhvht61o"] + +[ext_resource type="Script" uid="uid://b2j00riayxkit" path="res://Scripts/Controllers/RogueliteRoom.cs" id="1_nlk61"] +[ext_resource type="Resource" uid="uid://cqlh2k4fndgg1" path="res://Resources/RogueliteMaps/Acid_Horizontal_Walkway.tres" id="2_nlk61"] +[ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="3_eocdn"] +[ext_resource type="Script" uid="uid://krean0uywtms" path="res://Scripts/TilemapAvoidance.cs" id="4_o7l1n"] +[ext_resource type="Script" uid="uid://8umfjejbkcsm" path="res://Scripts/Actors/RogueliteEnemySpawner.cs" id="5_tj2sv"] +[ext_resource type="Resource" uid="uid://cocl3qontm3be" path="res://Resources/Enemies/Base_Fairy.tres" id="6_3s427"] + +[sub_resource type="NavigationPolygon" id="NavigationPolygon_rlq0q"] +vertices = PackedVector2Array(166, 58, 294, 58, 294, 134, 166, 134, 166, 150, 154, 150, 154, 134, 154, 58, 26, 134, 26, 58, 166, 10, 154, 10) +polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3), PackedInt32Array(3, 4, 5, 6), PackedInt32Array(0, 3, 6, 7), PackedInt32Array(6, 8, 9, 7), PackedInt32Array(10, 0, 7, 11)]) +outlines = Array[PackedVector2Array]([PackedVector2Array(17, 36, 14, 12, 47, 15, 49, 34)]) +parsed_collision_mask = 353 +source_geometry_mode = 1 + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_rlq0q"] +size = Vector2(272, 85) + +[node name="Map" type="Node2D" node_paths=PackedStringArray("RoomClearActivation")] +process_mode = 1 +script = ExtResource("1_nlk61") +RoomResource = ExtResource("2_nlk61") +RoomClearActivation = [] + +[node name="Tilemaps" type="Node2D" parent="." groups=["navigation_polygon_source_geometry_group"]] + +[node name="Liquids" type="TileMapLayer" parent="Tilemaps"] +tile_map_data = PackedByteArray("AAABAAMAAAAJAAcAAAABAAQAAAAEAAMAAAABAAUAAAAEAAMAAAABAAYAAAAEAAMAAAABAAcAAAAEAAMAAAABAAgAAAAEAAMAAAACAAMAAAAJAAcAAAACAAQAAAAEAAMAAAACAAUAAAAEAAMAAAACAAYAAAAEAAMAAAACAAcAAAAEAAMAAAACAAgAAAAEAAMAAAADAAMAAAAJAAcAAAADAAQAAAAEAAMAAAADAAUAAAAEAAMAAAADAAYAAAAEAAMAAAADAAcAAAAEAAMAAAADAAgAAAAEAAMAAAAEAAMAAAAJAAcAAAAEAAQAAAAEAAMAAAAEAAUAAAAEAAMAAAAEAAYAAAAEAAMAAAAEAAcAAAAEAAMAAAAEAAgAAAAEAAMAAAAFAAMAAAAJAAcAAAAFAAQAAAAEAAMAAAAFAAUAAAAEAAMAAAAFAAYAAAAEAAMAAAAFAAcAAAAEAAMAAAAFAAgAAAAEAAMAAAAGAAMAAAAJAAcAAAAGAAQAAAAEAAMAAAAGAAUAAAAEAAMAAAAGAAYAAAAEAAMAAAAGAAcAAAAEAAMAAAAGAAgAAAAEAAMAAAAHAAMAAAAJAAcAAAAHAAQAAAAEAAMAAAAHAAUAAAAEAAMAAAAHAAYAAAAEAAMAAAAHAAcAAAAEAAMAAAAHAAgAAAAEAAMAAAAIAAMAAAAJAAcAAAAIAAQAAAAEAAMAAAAIAAUAAAAEAAMAAAAIAAYAAAAEAAMAAAAIAAcAAAAEAAMAAAAIAAgAAAAEAAMAAAAJAAMAAAAJAAcAAAAJAAQAAAAEAAMAAAAJAAUAAAAEAAMAAAAJAAYAAAAEAAMAAAAJAAcAAAAEAAMAAAAJAAgAAAAEAAMAAAAKAAMAAAAJAAcAAAAKAAQAAAAEAAMAAAAKAAUAAAAEAAMAAAAKAAYAAAAEAAMAAAAKAAcAAAAEAAMAAAAKAAgAAAAEAAMAAAALAAMAAAAJAAcAAAALAAQAAAAEAAMAAAALAAUAAAAEAAMAAAALAAYAAAAEAAMAAAALAAcAAAAEAAMAAAALAAgAAAAEAAMAAAAMAAMAAAAJAAcAAAAMAAQAAAAEAAMAAAAMAAUAAAAEAAMAAAAMAAYAAAAEAAMAAAAMAAcAAAAEAAMAAAAMAAgAAAAEAAMAAAANAAMAAAAJAAcAAAANAAQAAAAEAAMAAAANAAUAAAAEAAMAAAANAAYAAAAEAAMAAAANAAcAAAAEAAMAAAANAAgAAAAEAAMAAAAOAAMAAAAJAAcAAAAOAAQAAAAEAAMAAAAOAAUAAAAEAAMAAAAOAAYAAAAEAAMAAAAOAAcAAAAEAAMAAAAOAAgAAAAEAAMAAAAPAAMAAAAJAAcAAAAPAAQAAAAEAAMAAAAPAAUAAAAEAAMAAAAPAAYAAAAEAAMAAAAPAAcAAAAEAAMAAAAPAAgAAAAEAAMAAAAQAAMAAAAJAAcAAAAQAAQAAAAEAAMAAAAQAAUAAAAEAAMAAAAQAAYAAAAEAAMAAAAQAAcAAAAEAAMAAAAQAAgAAAAEAAMAAAARAAMAAAAJAAcAAAARAAQAAAAEAAMAAAARAAUAAAAEAAMAAAARAAYAAAAEAAMAAAARAAcAAAAEAAMAAAARAAgAAAAEAAMAAAASAAMAAAAJAAcAAAASAAQAAAAEAAMAAAASAAUAAAAEAAMAAAASAAYAAAAEAAMAAAASAAcAAAAEAAMAAAASAAgAAAAEAAMAAAA=") +tile_set = ExtResource("3_eocdn") + +[node name="Floor" type="TileMapLayer" parent="Tilemaps" node_paths=PackedStringArray("_solidLayers") groups=["Solid"]] +tile_map_data = PackedByteArray("AAAAAAIAAAALAAYAAAAAAAMAAAALAAYAAAAAAAQAAAALAAYAAAAAAAUAAAALAAYAAAAAAAYAAAALAAYAAAAAAAcAAAALAAYAAAAAAAgAAAALAAYAAAAAAAkAAAALAAYAAAABAAIAAAALAAYAAAABAAUAAAALAA8AAAABAAYAAAALAA8AAAABAAkAAAALAAYAAAACAAIAAAALAAYAAAACAAUAAAAMAA8AAAACAAYAAAAMAA8AAAACAAkAAAALAAYAAAADAAIAAAALAAYAAAADAAUAAAAMAA8AAAADAAYAAAAMAA8AAAADAAkAAAALAAYAAAAEAAIAAAALAAYAAAAEAAUAAAAMAA8AAAAEAAYAAAAMAA8AAAAEAAkAAAALAAYAAAAFAAIAAAALAAYAAAAFAAUAAAAMAA8AAAAFAAYAAAAMAA8AAAAFAAkAAAALAAYAAAAGAAIAAAALAAYAAAAGAAUAAAAMAA8AAAAGAAYAAAAMAA8AAAAGAAkAAAALAAYAAAAHAAIAAAALAAYAAAAHAAUAAAAMAA8AAAAHAAYAAAAMAA8AAAAHAAkAAAALAAYAAAAIAAIAAAALAAYAAAAIAAUAAAAMAA8AAAAIAAYAAAAMAA8AAAAIAAkAAAALAAYAAAAJAAIAAAALAAYAAAAJAAUAAAAMAA8AAAAJAAYAAAAMAA8AAAAJAAkAAAALAAYAAAAKAAIAAAALAAYAAAAKAAUAAAAMAA8AAAAKAAYAAAAMAA8AAAAKAAkAAAALAAYAAAALAAIAAAALAAYAAAALAAUAAAAMAA8AAAALAAYAAAAMAA8AAAALAAkAAAALAAYAAAAMAAIAAAALAAYAAAAMAAUAAAAMAA8AAAAMAAYAAAAMAA8AAAAMAAkAAAALAAYAAAANAAIAAAALAAYAAAANAAUAAAAMAA8AAAANAAYAAAAMAA8AAAANAAkAAAALAAYAAAAOAAIAAAALAAYAAAAOAAUAAAAMAA8AAAAOAAYAAAAMAA8AAAAOAAkAAAALAAYAAAAPAAIAAAALAAYAAAAPAAUAAAAMAA8AAAAPAAYAAAAMAA8AAAAPAAkAAAALAAYAAAAQAAIAAAALAAYAAAAQAAUAAAAMAA8AAAAQAAYAAAAMAA8AAAAQAAkAAAALAAYAAAARAAIAAAALAAYAAAARAAUAAAAMAA8AAAARAAYAAAAMAA8AAAARAAkAAAALAAYAAAASAAIAAAALAAYAAAASAAUAAAANAA8AAAASAAYAAAANAA8AAAASAAkAAAALAAYAAAATAAIAAAALAAYAAAATAAMAAAALAAYAAAATAAQAAAALAAYAAAATAAUAAAALAAYAAAATAAYAAAALAAYAAAATAAcAAAALAAYAAAATAAgAAAALAAYAAAATAAkAAAALAAYAAAAAAAAAAAALAAYAAAAAAAEAAAALAAYAAAABAAEAAAALAAYAAAACAAEAAAALAAYAAAADAAEAAAALAAYAAAAEAAEAAAALAAYAAAAFAAEAAAALAAYAAAAGAAEAAAALAAYAAAAHAAEAAAALAAYAAAAIAAEAAAALAAYAAAAJAAEAAAALAAYAAAAKAAEAAAALAAYAAAALAAEAAAALAAYAAAAMAAEAAAALAAYAAAANAAEAAAALAAYAAAAOAAEAAAALAAYAAAAPAAEAAAALAAYAAAAQAAEAAAALAAYAAAARAAEAAAALAAYAAAASAAEAAAALAAYAAAATAAAAAAALAAYAAAATAAEAAAALAAYAAAASAAQAAAANAA4AAAARAAQAAAAMAA4AAAAQAAQAAAAMAA4AAAAPAAQAAAAMAA4AAAAOAAQAAAAMAA4AAAANAAQAAAAMAA4AAAAMAAQAAAAMAA4AAAALAAQAAAAMAA4AAAAKAAQAAAAMAA4AAAAJAAQAAAAMAA4AAAAIAAQAAAAMAA4AAAAHAAQAAAAMAA4AAAAGAAQAAAAMAA4AAAAFAAQAAAAMAA4AAAAEAAQAAAAMAA4AAAADAAQAAAAMAA4AAAACAAQAAAAMAA4AAAABAAQAAAALAA4AAAASAAcAAAANABAAAAARAAcAAAAMABAAAAAQAAcAAAAMABAAAAAPAAcAAAAMABAAAAAOAAcAAAAMABAAAAANAAcAAAAMABAAAAAMAAcAAAAMABAAAAALAAcAAAAMABAAAAAKAAcAAAAMABAAAAAJAAcAAAAMABAAAAAIAAcAAAAMABAAAAAHAAcAAAAMABAAAAAGAAcAAAAMABAAAAAFAAcAAAAMABAAAAAEAAcAAAAMABAAAAADAAcAAAAMABAAAAACAAcAAAAMABAAAAABAAcAAAALABAAAAA=") +tile_set = ExtResource("3_eocdn") +navigation_enabled = false +script = ExtResource("4_o7l1n") +_solidLayers = [NodePath("../Solid"), NodePath("../Props")] +metadata/_edit_lock_ = true + +[node name="Solid" type="TileMapLayer" parent="Tilemaps" groups=["Solid"]] +tile_map_data = PackedByteArray("AAATAAAAAAABAAsAAAAAAAAAAAAAAAsAAAATAAIAAAAEAAQAAAATAAEAAAAAAAQAAAAAAAIAAAAEAAQAAAAAAAEAAAAAAAQAAAAAAAkAAAAAAAwAAAAAAAgAAAAAAAQAAAAAAAcAAAAAAAQAAAAAAAYAAAAFAAQAAAATAAkAAAABAAwAAAASAAkAAAABAAQAAAARAAkAAAABAAQAAAAQAAkAAAABAAQAAAAPAAkAAAABAAQAAAAOAAkAAAABAAQAAAANAAkAAAABAAQAAAAMAAkAAAABAAQAAAALAAkAAAABAAQAAAAIAAkAAAABAAQAAAAHAAkAAAABAAQAAAAGAAkAAAABAAQAAAAFAAkAAAABAAQAAAAEAAkAAAABAAQAAAADAAkAAAABAAQAAAACAAkAAAABAAQAAAABAAkAAAABAAQAAAATAAgAAAAAAAQAAAATAAcAAAAAAAQAAAATAAYAAAAFAAQAAAATAAMAAAAKAAgAAAATAAQAAAAKAAkAAAALAAEAAAAKAAgAAAALAAIAAAAKAAkAAAAMAAEAAAAKAAAAAAAMAAIAAAAKAAEAAAANAAEAAAAKAAgAAAANAAIAAAAKAAkAAAAOAAEAAAAJAAIAAAAOAAIAAAAJAAMAAAAPAAEAAAAKAAIAAAAPAAIAAAAKAAMAAAAQAAEAAAAKAAgAAAAQAAIAAAAKAAkAAAARAAEAAAAKAAgAAAARAAIAAAAKAAkAAAASAAEAAAAKAAgAAAASAAIAAAAKAAkAAAABAAEAAAAKAAgAAAABAAIAAAAKAAkAAAACAAEAAAAKAAgAAAACAAIAAAAKAAkAAAADAAEAAAAKAAgAAAADAAIAAAAKAAkAAAAEAAEAAAAJAAIAAAAEAAIAAAAJAAMAAAAFAAEAAAAKAAIAAAAFAAIAAAAKAAMAAAAGAAEAAAAKAAgAAAAGAAIAAAAKAAkAAAAHAAEAAAAKAAAAAAAHAAIAAAAKAAEAAAAIAAEAAAAKAAgAAAAIAAIAAAAKAAkAAAAAAAMAAAAKAAgAAAAAAAQAAAAKAAkAAAAKAAkAAAABAAQAAAAJAAkAAAABAAQAAAAJAAEAAAAKAAgAAAAJAAIAAAAKAAkAAAAKAAEAAAAKAAgAAAAKAAIAAAAKAAkAAAASAAAAAAABAAQAAAARAAAAAAABAAQAAAAQAAAAAAABAAQAAAAPAAAAAAABAAQAAAAOAAAAAAABAAQAAAANAAAAAAABAAQAAAAMAAAAAAABAAQAAAALAAAAAAABAAQAAAAKAAAAAAABAAQAAAAJAAAAAAABAAQAAAAIAAAAAAABAAQAAAAHAAAAAAABAAQAAAAGAAAAAAABAAQAAAAFAAAAAAABAAQAAAAEAAAAAAABAAQAAAADAAAAAAABAAQAAAACAAAAAAABAAQAAAABAAAAAAABAAQAAAA=") +tile_set = ExtResource("3_eocdn") +navigation_enabled = false +metadata/_edit_lock_ = true + +[node name="Props" type="TileMapLayer" parent="Tilemaps" groups=["Solid"]] +tile_map_data = PackedByteArray("AAATAAMAAAAKAA4AAAATAAQAAAAKAA8AAAAAAAMAAAAKAA4AAAAAAAQAAAAKAA8AAAADAAIAAAAAAAIAAAAQAAIAAAAAAAIAAAAJAAIAAAAAAAIAAAAKAAIAAAAAAAIAAAASAAMAAAAHAAsAAAARAAMAAAAHAAsAAAAQAAMAAAAHAAsAAAAPAAMAAAAHAAsAAAAOAAMAAAAHAAsAAAANAAMAAAAHAAsAAAAMAAMAAAAHAAsAAAALAAMAAAAHAAsAAAAKAAMAAAAHAAsAAAAJAAMAAAAHAAsAAAAIAAMAAAAHAAsAAAAHAAMAAAAHAAsAAAAGAAMAAAAHAAsAAAAFAAMAAAAHAAsAAAAEAAMAAAAHAAsAAAADAAMAAAAHAAsAAAACAAMAAAAHAAsAAAABAAMAAAAHAAsAAAASAAcAAAAHAAsAAAARAAcAAAAHAAsAAAAQAAcAAAAHAAsAAAAPAAcAAAAHAAsAAAAOAAcAAAAHAAsAAAANAAcAAAAHAAsAAAAMAAcAAAAHAAsAAAALAAcAAAAHAAsAAAAKAAcAAAAHAAsAAAAJAAcAAAAHAAsAAAAIAAcAAAAHAAsAAAAHAAcAAAAHAAsAAAAGAAcAAAAHAAsAAAAFAAcAAAAHAAsAAAAEAAcAAAAHAAsAAAADAAcAAAAHAAsAAAACAAcAAAAHAAsAAAABAAcAAAAHAAsAAAAFAAQAAQAAAAAAAQAGAAQAAQAAAAAAAQARAAQAAQAAAAAAAQAQAAQAAQAAAAAAAQA=") +tile_set = ExtResource("3_eocdn") +navigation_enabled = false +metadata/_edit_lock_ = true + +[node name="Actors" type="Node2D" parent="Tilemaps"] +metadata/_edit_lock_ = true + +[node name="EnemySpawners" type="Node2D" parent="."] + +[node name="RogueliteEnemySpawner5" type="Marker2D" parent="EnemySpawners"] +position = Vector2(171, 86) +script = ExtResource("5_tj2sv") +Enemy = ExtResource("6_3s427") + +[node name="NavigationRegion2D" type="NavigationRegion2D" parent="."] +visible = false +navigation_polygon = SubResource("NavigationPolygon_rlq0q") + +[node name="PlayerEnterDetector" type="Area2D" parent="."] +visible = false +collision_layer = 0 +collision_mask = 2 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="PlayerEnterDetector"] +position = Vector2(162, 94.5) +shape = SubResource("RectangleShape2D_rlq0q") + +[node name="Features" type="Node2D" parent="."] + +[connection signal="area_entered" from="PlayerEnterDetector" to="." method="OnRoomEntered"] diff --git a/Scenes/Maps/RogueliteMaps/RgLarge.tscn b/Scenes/Maps/RogueliteMaps/RgLarge.tscn index b43ac6df..cce63fe0 100644 --- a/Scenes/Maps/RogueliteMaps/RgLarge.tscn +++ b/Scenes/Maps/RogueliteMaps/RgLarge.tscn @@ -15,10 +15,11 @@ source_geometry_mode = 1 [sub_resource type="RectangleShape2D" id="RectangleShape2D_5bd7y"] size = Vector2(909, 85) -[node name="Map" type="Node2D"] +[node name="Map" type="Node2D" node_paths=PackedStringArray("RoomClearActivation")] process_mode = 1 script = ExtResource("1_5bd7y") RoomResource = ExtResource("2_5bd7y") +RoomClearActivation = [] [node name="Tilemaps" type="Node2D" parent="." groups=["navigation_polygon_source_geometry_group"]] diff --git a/Scripts/UI/Minimap.cs b/Scripts/UI/Minimap.cs index fe5bd46d..894a1c2b 100644 --- a/Scripts/UI/Minimap.cs +++ b/Scripts/UI/Minimap.cs @@ -44,6 +44,11 @@ public partial class Minimap : CanvasLayer { RedrawMinimap(); } + + // public override void _Process(double delta) + // { + // //RedrawMinimap(); + // } // public void SetRoomGrid(Dictionary roomGrid) // { @@ -97,6 +102,14 @@ public partial class Minimap : CanvasLayer //DrawDebugGrid(); } + private void DrawPlayer(Vector2I minGrid, Vector2 baseOffset) + { + var playerPosition = GameManager.Instance.PlayerPosition; + + //var scaledPos = playerPosition + + } + private void DrawDebugGrid() { foreach (var room in SpawnedRooms)