maddo/cirnogodot
1
0
Fork 0
mirror of https://gitlab.com/MaddoScientisto/cirnogodot.git synced 2026-06-01 11:05:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Maps fixes

Browse source
This commit is contained in:
Marco 2025-05-02 11:52:06 +02:00
commit 7f69b8fa0f
15 changed files with 64 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
ExternalMaterial/HexGrid/HexGrid.pxc
View file

Binary file not shown.

BIN
ExternalMaterial/HexGrid/HexGrid.pxc1
View file

Binary file not shown.

BIN
ExternalMaterial/HexGrid/TriangleGrid.png (Stored with Git LFS) Normal file
View file

Binary file not shown.

34
ExternalMaterial/HexGrid/TriangleGrid.png.import Normal file
View file

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://urhyxcn0nosr"
path="res://.godot/imported/TriangleGrid.png-7bee5333d60883c601717884b49e0993.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://ExternalMaterial/HexGrid/TriangleGrid.png"
dest_files=["res://.godot/imported/TriangleGrid.png-7bee5333d60883c601717884b49e0993.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

4
Resources/RogueliteMaps/Acid_Horizontal_Walkway.tres
View file

@ -8,9 +8,9 @@
[resource]
script = ExtResource("5_c4t84")
RoomName = &"uid://bfsxivhvht61o"
RoomName = &"Acid horizontal walkway"
Type = 1
ScenePath = &"uid://b1d8s1dyvlpea"
ScenePath = &"uid://bfsxivhvht61o"
Size = Vector2i(1, 1)
StartShrouded = true
DoorGridPositions = Array[Vector2i]([Vector2i(0, -1), Vector2i(0, 1), Vector2i(1, 0), Vector2i(-1, 0)])

4
Resources/RogueliteMaps/Factory_Theme.tres
View file

@ -83,7 +83,7 @@ MinKeys = 0
MaxKeys = 2
MinSecrets = 1
MaxSecrets = 1
MinTreasures = 1
MinTreasures = 0
MaxTreasures = 1
MinShops = 1
MaxShops = 1
@ -99,7 +99,7 @@ MinKeys = 1
MaxKeys = 2
MinSecrets = 1
MaxSecrets = 1
MinTreasures = 1
MinTreasures = 0
MaxTreasures = 1
MinShops = 1
MaxShops = 1

1
Scenes/Maps/Roguelike.tscn
View file

@ -27,6 +27,7 @@ process_mode = 1
y_sort_enabled = true
script = ExtResource("4_jtlua")
MapThemes = Array[Object]([ExtResource("25_7gtqx")])
ManualSeed = "5708733892301100157"
[node name="CameraController" type="Camera2D" parent="."]
process_mode = 1

2
Scenes/Maps/RogueliteMaps/Beginner1.tscn
View file

@ -44,7 +44,7 @@ RoomClearActivation = []
metadata/test_scene = "res://Scenes/Maps/Roguelike.tscn"
[node name="Floor" type="TileMapLayer" parent="." node_paths=PackedStringArray("_solidLayers") groups=["Solid"]]
tile_map_data = PackedByteArray("AAAAAAIAAAAEAAAAAAAAAAMAAAAEAAAAAAAAAAQAAAAEAAAAAAAAAAUAAAAEAAAAAAAAAAYAAAAEAAAAAAAAAAcAAAAEAAAAAAAAAAgAAAAEAAAAAAAAAAkAAAAEAAAAAAABAAIAAAAEAAAAAAABAAMAAAAEAAAAAAABAAQAAAAEAAAAAAABAAUAAAAEAAAAAAABAAYAAAAEAAAAAAABAAcAAAAEAAAAAAABAAgAAAAEAAAAAAABAAkAAAAEAAAAAAACAAIAAAAEAAAAAAACAAMAAAAEAAAAAAACAAQAAAAFAAIAAAACAAUAAAAFAAIAAAACAAYAAAAFAAIAAAACAAcAAAAEAAAAAAACAAgAAAAFAAIAAAACAAkAAAAEAAAAAAADAAIAAAAEAAAAAAADAAMAAAAEAAAAAAADAAQAAAAFAAIAAAADAAUAAAAEAAAAAAADAAYAAAAFAAIAAAADAAcAAAAEAAAAAAADAAgAAAAFAAIAAAADAAkAAAAEAAAAAAAEAAIAAAAEAAAAAAAEAAMAAAAEAAAAAAAEAAQAAAAFAAIAAAAEAAUAAAAEAAAAAAAEAAYAAAAFAAIAAAAEAAcAAAAFAAIAAAAEAAgAAAAFAAIAAAAEAAkAAAAEAAAAAAAFAAIAAAAEAAAAAAAFAAMAAAAEAAAAAAAFAAQAAAAEAAAAAAAFAAUAAAAEAAAAAAAFAAYAAAAEAAAAAAAFAAcAAAAEAAAAAAAFAAgAAAAEAAAAAAAFAAkAAAAEAAAAAAAGAAIAAAAEAAAAAAAGAAMAAAAEAAAAAAAGAAQAAAAFAAIAAAAGAAUAAAAEAAAAAAAGAAYAAAAEAAAAAAAGAAcAAAAEAAAAAAAGAAgAAAAEAAAAAAAGAAkAAAAEAAAAAAAHAAIAAAAEAAAAAAAHAAMAAAAEAAAAAAAHAAQAAAAFAAIAAAAHAAUAAAAFAAIAAAAHAAYAAAAFAAIAAAAHAAcAAAAFAAIAAAAHAAgAAAAFAAIAAAAHAAkAAAAEAAAAAAAIAAIAAAAEAAAAAAAIAAMAAAAEAAAAAAAIAAQAAAAFAAIAAAAIAAUAAAAEAAAAAAAIAAYAAAAEAAAAAAAIAAcAAAAEAAAAAAAIAAgAAAAEAAAAAAAIAAkAAAAEAAAAAAAJAAIAAAAEAAAAAAAJAAMAAAAEAAAAAAAJAAQAAAAEAAAAAAAJAAUAAAAEAAAAAAAJAAYAAAAEAAAAAAAJAAcAAAAEAAAAAAAJAAgAAAAEAAAAAAAJAAkAAAAEAAAAAAAKAAIAAAAEAAAAAAAKAAMAAAAEAAAAAAAKAAQAAAAFAAIAAAAKAAUAAAAFAAIAAAAKAAYAAAAFAAIAAAAKAAcAAAAFAAIAAAAKAAgAAAAFAAIAAAAKAAkAAAAEAAAAAAALAAIAAAAEAAAAAAALAAUAAAAEAAAAAAALAAYAAAAFAAIAAAALAAcAAAAEAAAAAAALAAgAAAAEAAAAAAALAAkAAAAEAAAAAAAMAAIAAAAEAAAAAAAMAAUAAAAFAAIAAAAMAAYAAAAFAAIAAAAMAAcAAAAFAAIAAAAMAAgAAAAFAAIAAAAMAAkAAAAEAAAAAAANAAIAAAAEAAAAAAANAAMAAAAEAAAAAAANAAQAAAAEAAAAAAANAAUAAAAEAAAAAAANAAYAAAAEAAAAAAANAAcAAAAEAAAAAAANAAgAAAAEAAAAAAANAAkAAAAEAAAAAAAOAAIAAAAEAAAAAAAOAAMAAAAEAAAAAAAOAAQAAAAFAAIAAAAOAAUAAAAFAAIAAAAOAAYAAAAFAAIAAAAOAAcAAAAFAAIAAAAOAAgAAAAFAAIAAAAOAAkAAAAEAAAAAAAPAAIAAAAEAAAAAAAPAAMAAAAEAAAAAAAPAAQAAAAFAAIAAAAPAAUAAAAEAAAAAAAPAAYAAAAFAAIAAAAPAAcAAAAEAAAAAAAPAAgAAAAEAAAAAAAPAAkAAAAEAAAAAAAQAAIAAAAEAAAAAAAQAAMAAAAEAAAAAAAQAAQAAAAEAAAAAAAQAAUAAAAFAAIAAAAQAAYAAAAEAAAAAAAQAAcAAAAFAAIAAAAQAAgAAAAFAAIAAAAQAAkAAAAEAAAAAAARAAIAAAAEAAAAAAARAAMAAAAEAAAAAAARAAQAAAAEAAAAAAARAAUAAAAEAAAAAAARAAYAAAAEAAAAAAARAAcAAAAEAAAAAAARAAgAAAAEAAAAAAARAAkAAAAEAAAAAAASAAIAAAAEAAAAAAASAAMAAAAEAAAAAAASAAQAAAAFAAIAAAASAAUAAAAEAAAAAAASAAYAAAAEAAAAAAASAAcAAAAEAAAAAAASAAgAAAAEAAAAAAASAAkAAAAEAAAAAAATAAIAAAAEAAAAAAATAAMAAAAEAAAAAAATAAQAAAAEAAAAAAATAAUAAAAFAAIAAAATAAYAAAAEAAAAAAATAAcAAAAEAAAAAAATAAgAAAAEAAAAAAATAAkAAAAEAAAAAAAAAAAAAAAEAAAAAAAAAAEAAAAEAAAAAAABAAAAAAAEAAAAAAABAAEAAAAEAAAAAAACAAAAAAAEAAAAAAACAAEAAAAEAAAAAAADAAAAAAAEAAAAAAADAAEAAAAEAAAAAAAEAAAAAAAEAAAAAAAEAAEAAAAEAAAAAAAFAAAAAAAEAAAAAAAFAAEAAAAEAAAAAAAGAAAAAAAEAAAAAAAGAAEAAAAEAAAAAAAHAAAAAAAEAAAAAAAHAAEAAAAEAAAAAAAIAAAAAAAEAAAAAAAIAAEAAAAEAAAAAAAJAAAAAAAEAAAAAAAJAAEAAAAEAAAAAAAKAAAAAAAEAAAAAAAKAAEAAAAEAAAAAAALAAAAAAAEAAAAAAALAAEAAAAEAAAAAAALAAMAAAAEAAAAAAALAAQAAAAFAAIAAAAMAAAAAAAEAAAAAAAMAAEAAAAEAAAAAAAMAAMAAAAEAAAAAAAMAAQAAAAFAAIAAAANAAAAAAAEAAAAAAANAAEAAAAEAAAAAAAOAAAAAAAEAAAAAAAOAAEAAAAEAAAAAAAPAAAAAAAEAAAAAAAPAAEAAAAEAAAAAAAQAAAAAAAEAAAAAAAQAAEAAAAEAAAAAAARAAAAAAAEAAAAAAARAAEAAAAEAAAAAAASAAAAAAAEAAAAAAASAAEAAAAEAAAAAAATAAAAAAAEAAAAAAATAAEAAAAEAAAAAAA=")
tile_map_data = PackedByteArray("AAAAAAIAAAAEAAAAAAAAAAMAAAAEAAAAAAAAAAQAAAAEAAAAAAAAAAUAAAALAAcAAAAAAAYAAAAEAAAAAAAAAAcAAAAEAAAAAAAAAAgAAAAEAAAAAAAAAAkAAAAEAAAAAAABAAIAAAAEAAAAAAABAAMAAAALAAcAAAABAAQAAAALAAcAAAABAAUAAAALAAcAAAABAAYAAAALAAcAAAABAAcAAAALAAcAAAABAAgAAAALAAcAAAABAAkAAAAEAAAAAAACAAIAAAAEAAAAAAACAAMAAAAEAAAAAAACAAQAAAAFAAIAAAACAAUAAAAFAAIAAAACAAYAAAAFAAIAAAACAAcAAAALAAcAAAACAAgAAAAFAAIAAAACAAkAAAAEAAAAAAADAAIAAAAEAAAAAAADAAMAAAAQAAcAAAADAAQAAAAFAAIAAAADAAUAAAAQAAcAAAADAAYAAAAFAAIAAAADAAcAAAALAAcAAAADAAgAAAAFAAIAAAADAAkAAAAEAAAAAAAEAAIAAAAEAAAAAAAEAAMAAAAQAAcAAAAEAAQAAAAFAAIAAAAEAAUAAAAQAAcAAAAEAAYAAAAFAAIAAAAEAAcAAAAFAAIAAAAEAAgAAAAFAAIAAAAEAAkAAAAEAAAAAAAFAAIAAAAEAAAAAAAFAAMAAAAQAAcAAAAFAAQAAAAQAAcAAAAFAAUAAAAQAAcAAAAFAAYAAAAQAAcAAAAFAAcAAAAQAAcAAAAFAAgAAAAQAAcAAAAFAAkAAAAEAAAAAAAGAAIAAAAEAAAAAAAGAAMAAAAQAAcAAAAGAAQAAAAFAAIAAAAGAAUAAAAQAAcAAAAGAAYAAAAQAAcAAAAGAAcAAAAQAAcAAAAGAAgAAAAQAAcAAAAGAAkAAAAEAAAAAAAHAAIAAAAEAAAAAAAHAAMAAAAQAAcAAAAHAAQAAAAFAAIAAAAHAAUAAAAFAAIAAAAHAAYAAAAFAAIAAAAHAAcAAAAFAAIAAAAHAAgAAAAFAAIAAAAHAAkAAAAEAAAAAAAIAAIAAAAEAAAAAAAIAAMAAAAQAAcAAAAIAAQAAAAFAAIAAAAIAAUAAAAEAAAAAAAIAAYAAAAEAAAAAAAIAAcAAAAEAAAAAAAIAAgAAAAEAAAAAAAIAAkAAAAEAAAAAAAJAAIAAAAEAAAAAAAJAAMAAAAEAAAAAAAJAAQAAAAEAAAAAAAJAAUAAAAEAAAAAAAJAAYAAAAEAAAAAAAJAAcAAAAEAAAAAAAJAAgAAAAEAAAAAAAJAAkAAAAEAAAAAAAKAAIAAAAEAAAAAAAKAAMAAAAEAAAAAAAKAAQAAAAFAAIAAAAKAAUAAAAFAAIAAAAKAAYAAAAFAAIAAAAKAAcAAAAFAAIAAAAKAAgAAAAFAAIAAAAKAAkAAAAEAAAAAAALAAIAAAAEAAAAAAALAAUAAAAEAAAAAAALAAYAAAAFAAIAAAALAAcAAAAEAAAAAAALAAgAAAAEAAAAAAALAAkAAAAEAAAAAAAMAAIAAAAEAAAAAAAMAAUAAAAFAAIAAAAMAAYAAAAFAAIAAAAMAAcAAAAFAAIAAAAMAAgAAAAFAAIAAAAMAAkAAAAEAAAAAAANAAIAAAAEAAAAAAANAAMAAAAEAAAAAAANAAQAAAAEAAAAAAANAAUAAAAEAAAAAAANAAYAAAAEAAAAAAANAAcAAAAEAAAAAAANAAgAAAAEAAAAAAANAAkAAAAEAAAAAAAOAAIAAAAEAAAAAAAOAAMAAAAEAAAAAAAOAAQAAAAFAAIAAAAOAAUAAAAFAAIAAAAOAAYAAAAFAAIAAAAOAAcAAAAFAAIAAAAOAAgAAAAFAAIAAAAOAAkAAAAEAAAAAAAPAAIAAAAEAAAAAAAPAAMAAAAEAAAAAAAPAAQAAAAFAAIAAAAPAAUAAAAEAAAAAAAPAAYAAAAFAAIAAAAPAAcAAAAEAAAAAAAPAAgAAAAEAAAAAAAPAAkAAAAEAAAAAAAQAAIAAAAEAAAAAAAQAAMAAAAEAAAAAAAQAAQAAAAEAAAAAAAQAAUAAAAFAAIAAAAQAAYAAAAEAAAAAAAQAAcAAAAFAAIAAAAQAAgAAAAFAAIAAAAQAAkAAAAEAAAAAAARAAIAAAAEAAAAAAARAAMAAAAEAAAAAAARAAQAAAAEAAAAAAARAAUAAAAEAAAAAAARAAYAAAAEAAAAAAARAAcAAAAEAAAAAAARAAgAAAAEAAAAAAARAAkAAAAEAAAAAAASAAIAAAAEAAAAAAASAAMAAAAEAAAAAAASAAQAAAAFAAIAAAASAAUAAAAEAAAAAAASAAYAAAAEAAAAAAASAAcAAAAEAAAAAAASAAgAAAAEAAAAAAASAAkAAAAEAAAAAAATAAIAAAAEAAAAAAATAAMAAAAEAAAAAAATAAQAAAAEAAAAAAATAAUAAAAFAAIAAAATAAYAAAAEAAAAAAATAAcAAAAEAAAAAAATAAgAAAAEAAAAAAATAAkAAAAEAAAAAAAAAAAAAAAEAAAAAAAAAAEAAAAEAAAAAAABAAAAAAAEAAAAAAABAAEAAAAEAAAAAAACAAAAAAAEAAAAAAACAAEAAAAEAAAAAAADAAAAAAAEAAAAAAADAAEAAAAEAAAAAAAEAAAAAAAEAAAAAAAEAAEAAAAEAAAAAAAFAAAAAAAEAAAAAAAFAAEAAAAEAAAAAAAGAAAAAAAEAAAAAAAGAAEAAAAEAAAAAAAHAAAAAAAEAAAAAAAHAAEAAAAEAAAAAAAIAAAAAAAEAAAAAAAIAAEAAAAEAAAAAAAJAAAAAAAEAAAAAAAJAAEAAAAEAAAAAAAKAAAAAAAEAAAAAAAKAAEAAAAEAAAAAAALAAAAAAAEAAAAAAALAAEAAAAEAAAAAAALAAMAAAAEAAAAAAALAAQAAAAFAAIAAAAMAAAAAAAEAAAAAAAMAAEAAAAEAAAAAAAMAAMAAAAEAAAAAAAMAAQAAAAFAAIAAAANAAAAAAAEAAAAAAANAAEAAAAEAAAAAAAOAAAAAAAEAAAAAAAOAAEAAAAEAAAAAAAPAAAAAAAEAAAAAAAPAAEAAAAEAAAAAAAQAAAAAAAEAAAAAAAQAAEAAAAEAAAAAAARAAAAAAAEAAAAAAARAAEAAAAEAAAAAAASAAAAAAAEAAAAAAASAAEAAAAEAAAAAAATAAAAAAAEAAAAAAATAAEAAAAEAAAAAAA=")
tile_set = ExtResource("3_u3c1h")
navigation_enabled = false
script = ExtResource("4_pys6w")

2
Scenes/Maps/RogueliteMaps/Corridor_2x3.tscn
View file

File diff suppressed because one or more lines are too long

4
Scenes/Maps/RogueliteMaps/Factory_Large.tscn
View file

File diff suppressed because one or more lines are too long

2
Scenes/Maps/RogueliteMaps/corridor_1x2.tscn
View file

File diff suppressed because one or more lines are too long

7
Scripts/Controllers/RogueliteRoomManager.cs
View file

@ -139,9 +139,11 @@ public partial class RogueliteRoomManager : Node2D
AddRandomOffshootType(offshoots, CurrentFloorData.MinSecrets, CurrentFloorData.MaxSecrets, RoomType.Secret);
AddRandomOffshootType(offshoots, CurrentFloorData.MinTreasures, CurrentFloorData.MaxTreasures, RoomType.Treasure);
var shuffledOffshoots = offshoots.Shuffle().ToList();
// Always add guaranteed treasure first
var shuffledOffshoots = offshoots.Shuffle();
var offshootsQueue = new Queue<RoomType>();
offshootsQueue.Enqueue(RoomType.Treasure); // Always add a guaranteed treasure first
offshootsQueue.EnqueueRange(shuffledOffshoots);
int currentOffshoot = 0;
@ -353,7 +355,6 @@ public partial class RogueliteRoomManager : Node2D
var spawnedRoom = TrySpawnRoom(roomToSpawn, nextPos, direction);
if (spawnedRoom is null)
{
GD.PrintErr($"Could not spawn room {roomToSpawn} at {nextPos}");
roomsList.Enqueue(roomToSpawn);
tries++;
continue;

BIN
Tilesets/factory.aseprite (Stored with Git LFS)
View file

Binary file not shown.

BIN
Tilesets/factory.png (Stored with Git LFS)
View file

Binary file not shown.

10
Tilesets/factory_tileset.tres
View file

@ -1,4 +1,4 @@
[gd_resource type="TileSet" load_steps=63 format=3 uid="uid://6k28roiljylj"]
[gd_resource type="TileSet" load_steps=64 format=3 uid="uid://6k28roiljylj"]
[ext_resource type="Texture2D" uid="uid://bty7p61v46chx" path="res://Resources/Textures/Tilemap_Canvas.tres" id="1_u4jco"]
[ext_resource type="PackedScene" uid="uid://bj28qiai2x2ar" path="res://Scenes/Props/Barrel.tscn" id="2_cxg4b"]
@ -102,6 +102,12 @@ polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3)])
outlines = Array[PackedVector2Array]([PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)])
agent_radius = 0.0
[sub_resource type="NavigationPolygon" id="NavigationPolygon_tnjhd"]
vertices = PackedVector2Array(8, 8, -8, 8, -8, -8, 8, -8)
polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3)])
outlines = Array[PackedVector2Array]([PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)])
agent_radius = 0.0
[sub_resource type="NavigationPolygon" id="NavigationPolygon_ipvrl"]
vertices = PackedVector2Array(8, 8, -8, 8, -8, -8, 8, -8)
polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3)])
@ -1238,6 +1244,8 @@ texture = ExtResource("1_u4jco")
15:6/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
15:7/0 = 0
15:7/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_hfdld")
16:7/0 = 0
16:7/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_tnjhd")
[sub_resource type="TileSetScenesCollectionSource" id="TileSetScenesCollectionSource_qg3vu"]
resource_name = "Props"