diff --git a/Resources/RogueliteMaps/TestRGMapLarge.tres b/Resources/RogueliteMaps/TestRGMapLarge.tres new file mode 100644 index 00000000..b7596ffa --- /dev/null +++ b/Resources/RogueliteMaps/TestRGMapLarge.tres @@ -0,0 +1,17 @@ +[gd_resource type="Resource" script_class="RogueliteRoomResource" load_steps=6 format=3 uid="uid://cjtcksew0qy6d"] + +[ext_resource type="Resource" uid="uid://cocl3qontm3be" path="res://Resources/Enemies/Base_Fairy.tres" id="1_hqy32"] +[ext_resource type="Resource" uid="uid://cqfyuurvqb8m6" path="res://Resources/Enemies/Base_Fairy_Special.tres" id="2_gpwow"] +[ext_resource type="Resource" uid="uid://qbo6avc7x64b" path="res://Resources/Enemies/Fairy_Guard.tres" id="3_m1jol"] +[ext_resource type="Resource" uid="uid://cfdvg162u65sr" path="res://Resources/Enemies/Thermathron.tres" id="4_xpv8o"] +[ext_resource type="Script" uid="uid://bl2ne8w12e3a" path="res://Scripts/Resources/Roguelite/RogueliteRoomResource.cs" id="5_nda2n"] + +[resource] +script = ExtResource("5_nda2n") +RoomName = &"Test" +Type = 1 +ScenePath = &"uid://c36nvk7cw3emg" +Size = Vector2i(3, 1) +DoorGridPositions = Array[Vector2i]([Vector2i(0, -1), Vector2i(0, 1), Vector2i(1, 0), Vector2i(-1, 0)]) +SpawnableEnemies = Array[Object]([ExtResource("1_hqy32"), ExtResource("2_gpwow"), ExtResource("3_m1jol"), ExtResource("4_xpv8o")]) +metadata/_custom_type_script = "uid://bl2ne8w12e3a" diff --git a/Scenes/Maps/Roguelike.tscn b/Scenes/Maps/Roguelike.tscn index b18d3bad..6e3e93ca 100644 --- a/Scenes/Maps/Roguelike.tscn +++ b/Scenes/Maps/Roguelike.tscn @@ -4,7 +4,7 @@ [ext_resource type="PackedScene" uid="uid://c4pr2707hbeph" path="res://Scenes/Actors/fsm_player.tscn" id="2_3fyis"] [ext_resource type="Resource" uid="uid://6ek4lmtuij4t" path="res://Resources/Maps/Roguelite.tres" id="2_k5t51"] [ext_resource type="Script" uid="uid://bt2qjgnf1wc2r" path="res://Scripts/Controllers/RogueliteRoomManager.cs" id="4_jtlua"] -[ext_resource type="Resource" uid="uid://b5x83li01qrav" path="res://Resources/RogueliteMaps/TestRGMap.tres" id="5_gwtv6"] +[ext_resource type="Resource" uid="uid://cjtcksew0qy6d" path="res://Resources/RogueliteMaps/TestRGMapLarge.tres" id="5_pfafs"] [ext_resource type="Resource" uid="uid://ly8l7asedjpx" path="res://Resources/RogueliteMaps/TestRGMap2.tres" id="6_gwtv6"] [ext_resource type="Resource" uid="uid://dn3ai56rrxfnk" path="res://Resources/RogueliteMaps/Beginner1.tres" id="7_wbqvu"] [ext_resource type="Resource" uid="uid://cgac12krx7vbf" path="res://Resources/RogueliteMaps/Boss1.tres" id="8_3fyis"] @@ -29,7 +29,7 @@ SpawnMarkers = Dictionary[int, NodePath]({ [node name="Maps" type="Node2D" parent="." groups=["navigation_polygon_source_geometry_group"]] process_mode = 1 script = ExtResource("4_jtlua") -Rooms = Array[Object]([ExtResource("5_gwtv6"), ExtResource("6_gwtv6"), ExtResource("7_wbqvu"), ExtResource("8_3fyis"), ExtResource("9_go1yg")]) +Rooms = Array[Object]([ExtResource("5_pfafs"), ExtResource("6_gwtv6"), ExtResource("7_wbqvu"), ExtResource("8_3fyis"), ExtResource("9_go1yg"), ExtResource("5_pfafs")]) DungeonLength = 4 [node name="CameraController" type="Camera2D" parent="."] diff --git a/Scenes/Maps/RogueliteMaps/Rg1.tscn b/Scenes/Maps/RogueliteMaps/Rg1.tscn index 7375a344..2e529733 100644 --- a/Scenes/Maps/RogueliteMaps/Rg1.tscn +++ b/Scenes/Maps/RogueliteMaps/Rg1.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=9 format=4 uid="uid://da7hmajaaiohm"] [ext_resource type="Script" uid="uid://b2j00riayxkit" path="res://Scripts/Controllers/RogueliteRoom.cs" id="1_dm6kf"] -[ext_resource type="Resource" uid="uid://b5x83li01qrav" path="res://Resources/RogueliteMaps/TestRGMap.tres" id="2_5s4nm"] +[ext_resource type="Resource" uid="uid://cjtcksew0qy6d" path="res://Resources/RogueliteMaps/TestRGMapLarge.tres" id="2_rlq0q"] [ext_resource type="PackedScene" uid="uid://l84on3kv2s52" path="res://Scenes/Door_Horizontal.tscn" id="3_sid7o"] [ext_resource type="PackedScene" uid="uid://b0k2grrc8xp1l" path="res://Scenes/Props/BigTank.tscn" id="4_rlq0q"] [ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="5_q5p8k"] @@ -18,7 +18,7 @@ source_geometry_mode = 1 [node name="Map" type="Node2D"] process_mode = 1 script = ExtResource("1_dm6kf") -RoomResource = ExtResource("2_5s4nm") +RoomResource = ExtResource("2_rlq0q") DoorPrefab = ExtResource("3_sid7o") WallPrefab = ExtResource("4_rlq0q") diff --git a/Scenes/Maps/RogueliteMaps/RgLarge.tscn b/Scenes/Maps/RogueliteMaps/RgLarge.tscn new file mode 100644 index 00000000..a5ed56eb --- /dev/null +++ b/Scenes/Maps/RogueliteMaps/RgLarge.tscn @@ -0,0 +1,104 @@ +[gd_scene load_steps=9 format=4 uid="uid://c36nvk7cw3emg"] + +[ext_resource type="Script" uid="uid://b2j00riayxkit" path="res://Scripts/Controllers/RogueliteRoom.cs" id="1_5bd7y"] +[ext_resource type="Resource" uid="uid://cjtcksew0qy6d" path="res://Resources/RogueliteMaps/TestRGMapLarge.tres" id="2_5bd7y"] +[ext_resource type="PackedScene" uid="uid://l84on3kv2s52" path="res://Scenes/Door_Horizontal.tscn" id="3_4pnhf"] +[ext_resource type="PackedScene" uid="uid://b0k2grrc8xp1l" path="res://Scenes/Props/BigTank.tscn" id="4_1w61p"] +[ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="5_2mndj"] +[ext_resource type="Script" uid="uid://krean0uywtms" path="res://Scripts/TilemapAvoidance.cs" id="6_1dlui"] +[ext_resource type="Script" uid="uid://ddry5kjj3fr6c" path="res://Scripts/Controllers/DoorMarker.cs" id="7_d57gj"] + +[sub_resource type="NavigationPolygon" id="NavigationPolygon_rlq0q"] +vertices = PackedVector2Array(474, 58, 474, 10, 486, 10, 486, 58, 794, 58, 794, 10, 806, 10, 806, 58, 934, 58, 934, 134, 806, 134, 794, 134, 806, 150, 794, 150, 486, 134, 474, 134, 486, 150, 474, 150, 166, 58, 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(4, 5, 6, 7), PackedInt32Array(7, 8, 9, 10), PackedInt32Array(4, 7, 10, 11), PackedInt32Array(10, 12, 13, 11), PackedInt32Array(3, 4, 11, 14), PackedInt32Array(0, 3, 14, 15), PackedInt32Array(14, 16, 17, 15), PackedInt32Array(18, 0, 15, 19), PackedInt32Array(19, 20, 21, 22), PackedInt32Array(18, 19, 22, 23), PackedInt32Array(22, 24, 25, 23), PackedInt32Array(26, 18, 23, 27)]) +outlines = Array[PackedVector2Array]([PackedVector2Array(17, 36, 14, 12, 47, 15, 49, 34)]) +parsed_collision_mask = 353 +source_geometry_mode = 1 + +[node name="Map" type="Node2D"] +process_mode = 1 +script = ExtResource("1_5bd7y") +RoomResource = ExtResource("2_5bd7y") +DoorPrefab = ExtResource("3_4pnhf") +WallPrefab = ExtResource("4_1w61p") + +[node name="Tilemaps" type="Node2D" parent="." groups=["navigation_polygon_source_geometry_group"]] + +[node name="Floor" type="TileMapLayer" parent="Tilemaps" node_paths=PackedStringArray("_solidLayers") groups=["Solid"]] +tile_map_data = PackedByteArray("                                                                   	                                                                	                                                                	                                                                	                                                                	                                                                	                                                                	                                                                	                                                                	       	        	        	        	        	        	        	        	 	       
        
        
        
        
        
        
        
 	                                                	                                                	                                                                	                                                                	                                                                	                                                                	                                                                	                                                                	                                                                	                                                                                                                                                                  	         	        
         
                                                                                                                                                                                                                                                                           	                                                                                 	                                                                                 	                                                                                 	                                                                                 	                                                                                 	                                                                                 	                                                                                 	                                                                                 	                                                                                 	                                                                                 	                                                                                 	                                                                                           	       !         !        !        !        !        !        !        !        !        ! 	       "         "        "        "        "        "        "        "        "        " 	       #         #        #        #        #        #        #        #        #        # 	       $         $        $        $        $        $        $        $        $        $ 	       %         %        %        %        %        %        %        %        %        % 	       &         &        &        &        &        &        &        &        &        & 	       '         '        '        '        '        '        '        '        '        ' 	       (         (        (        (        (        (        (        (        (        ( 	       )         )        )        )        )        )        )        )        )        ) 	       *         *        *        *        *        *        *        *        *        * 	       +         +        +        +        +        +        +        +        +        + 	       ,         ,        ,        ,        ,        ,        ,        ,        ,        , 	       -         -        -        -        -        -        -        -        -        - 	       .         .        .        .        .        .        .        .        .        . 	       /         /        /        /        /        /        /        /        /        / 	       0         0        0        0        0        0        0        0        0        0 	       1         1        1        1        1        1        1        1        1        1 	       2         2        2        2        2        2        2        2        2        2 	       3         3        3        3        3        3        3        3        3        3 	       4         4        4        4        4        4        4        4        4        4 	       5         5        5        5        5        5        5        5        5        5 	       6         6        6        6        6        6        6        6        6        6 	       7         7        7        7        7        7        7        7        7        7 	       8         8        8        8        8        8        8        8        8        8 	       9         9        9        9        9        9        9        9        9        9 	       :         :        :        :        :        :        :        :        :        : 	       ;         ;        ;        ;        ;        ;        ;        ;        ;        ; 	       ") +tile_set = ExtResource("5_2mndj") +navigation_enabled = false +script = ExtResource("6_1dlui") +_solidLayers = [NodePath("../Solid"), NodePath("../Props")] +metadata/_edit_lock_ = true + +[node name="Solid" type="TileMapLayer" parent="Tilemaps" groups=["Solid"]] +tile_map_data = PackedByteArray("AAATAAAAAAABAAsAAAASAAAAAAABAAQAAAARAAAAAAABAAQAAAAQAAAAAAABAAQAAAAPAAAAAAABAAQAAAAOAAAAAAABAAQAAAANAAAAAAABAAQAAAAMAAAAAAABAAQAAAALAAAAAAACAAQAAAAIAAAAAAADAAQAAAAHAAAAAAABAAQAAAAGAAAAAAABAAQAAAAFAAAAAAABAAQAAAAEAAAAAAABAAQAAAADAAAAAAABAAQAAAACAAAAAAABAAQAAAABAAAAAAABAAQAAAAAAAAAAAAAAAsAAAATAAIAAAAEAAQAAAATAAEAAAAAAAQAAAAAAAIAAAAEAAQAAAAAAAEAAAAAAAQAAAAAAAkAAAAAAAwAAAAAAAgAAAAAAAQAAAAAAAcAAAAAAAQAAAAAAAYAAAAFAAQAAAATAAkAAAADAAQAAAASAAkAAAABAAQAAAARAAkAAAABAAQAAAAQAAkAAAABAAQAAAAPAAkAAAABAAQAAAAOAAkAAAABAAQAAAANAAkAAAABAAQAAAAMAAkAAAABAAQAAAALAAkAAAACAAQAAAAIAAkAAAADAAQAAAAHAAkAAAABAAQAAAAGAAkAAAABAAQAAAAFAAkAAAABAAQAAAAEAAkAAAABAAQAAAADAAkAAAABAAQAAAACAAkAAAABAAQAAAABAAkAAAABAAQAAAALAAEAAAAKAAgAAAALAAIAAAAKAAkAAAAMAAEAAAAKAAgAAAAMAAIAAAAKAAkAAAANAAEAAAAKAAgAAAANAAIAAAAKAAkAAAAOAAEAAAAKAAgAAAAOAAIAAAAKAAkAAAAPAAEAAAAKAAgAAAAPAAIAAAAKAAkAAAAQAAEAAAAKAAgAAAAQAAIAAAAKAAkAAAARAAEAAAAKAAgAAAARAAIAAAAKAAkAAAASAAEAAAAKAAgAAAASAAIAAAAKAAkAAAABAAEAAAAKAAgAAAABAAIAAAAKAAkAAAACAAEAAAAKAAgAAAACAAIAAAAKAAkAAAADAAEAAAAKAAgAAAADAAIAAAAKAAkAAAAEAAEAAAAKAAgAAAAEAAIAAAAKAAkAAAAFAAEAAAAKAAgAAAAFAAIAAAAKAAkAAAAGAAEAAAAKAAgAAAAGAAIAAAAKAAkAAAAHAAEAAAAKAAgAAAAHAAIAAAAKAAkAAAAIAAEAAAAKAAgAAAAIAAIAAAAKAAkAAAAAAAMAAAAKAAgAAAAAAAQAAAAKAAkAAAAUAAAAAAAAAAsAAAAUAAEAAAAAAAQAAAAUAAIAAAAEAAQAAAAUAAkAAAACAAQAAAAVAAAAAAABAAQAAAAVAAEAAAAKAAgAAAAVAAIAAAAKAAkAAAAVAAkAAAABAAQAAAAWAAAAAAABAAQAAAAWAAEAAAAKAAgAAAAWAAIAAAAKAAkAAAAWAAkAAAABAAQAAAAXAAAAAAABAAQAAAAXAAEAAAAKAAgAAAAXAAIAAAAKAAkAAAAXAAkAAAABAAQAAAAYAAAAAAABAAQAAAAYAAEAAAAKAAgAAAAYAAIAAAAKAAkAAAAYAAkAAAABAAQAAAAZAAAAAAABAAQAAAAZAAEAAAAKAAgAAAAZAAIAAAAKAAkAAAAZAAkAAAABAAQAAAAaAAAAAAABAAQAAAAaAAEAAAAKAAgAAAAaAAIAAAAKAAkAAAAaAAkAAAABAAQAAAAbAAAAAAABAAQAAAAbAAEAAAAKAAgAAAAbAAIAAAAKAAkAAAAbAAkAAAABAAQAAAAcAAAAAAADAAQAAAAcAAEAAAAKAAgAAAAcAAIAAAAKAAkAAAAcAAkAAAADAAQAAAAfAAAAAAACAAQAAAAfAAEAAAAKAAgAAAAfAAIAAAAKAAkAAAAfAAkAAAACAAQAAAAgAAAAAAABAAQAAAAgAAEAAAAKAAgAAAAgAAIAAAAKAAkAAAAgAAkAAAABAAQAAAAhAAAAAAABAAQAAAAhAAEAAAAKAAgAAAAhAAIAAAAKAAkAAAAhAAkAAAABAAQAAAAiAAAAAAABAAQAAAAiAAEAAAAKAAgAAAAiAAIAAAAKAAkAAAAiAAkAAAABAAQAAAAjAAAAAAABAAQAAAAjAAEAAAAKAAgAAAAjAAIAAAAKAAkAAAAjAAkAAAABAAQAAAAkAAAAAAABAAQAAAAkAAEAAAAKAAgAAAAkAAIAAAAKAAkAAAAkAAkAAAABAAQAAAAlAAAAAAABAAQAAAAlAAEAAAAKAAgAAAAlAAIAAAAKAAkAAAAlAAkAAAABAAQAAAAmAAAAAAABAAQAAAAmAAEAAAAKAAgAAAAmAAIAAAAKAAkAAAAmAAkAAAABAAQAAAAnAAAAAAABAAsAAAAnAAEAAAAAAAQAAAAnAAIAAAAEAAQAAAAnAAkAAAADAAQAAAAoAAAAAAAAAAsAAAAoAAEAAAAAAAQAAAAoAAIAAAAEAAQAAAAoAAkAAAACAAQAAAApAAAAAAABAAQAAAApAAEAAAAKAAgAAAApAAIAAAAKAAkAAAApAAkAAAABAAQAAAAqAAAAAAABAAQAAAAqAAEAAAAKAAgAAAAqAAIAAAAKAAkAAAAqAAkAAAABAAQAAAArAAAAAAABAAQAAAArAAEAAAAKAAgAAAArAAIAAAAKAAkAAAArAAkAAAABAAQAAAAsAAAAAAABAAQAAAAsAAEAAAAKAAgAAAAsAAIAAAAKAAkAAAAsAAkAAAABAAQAAAAtAAAAAAABAAQAAAAtAAEAAAAKAAgAAAAtAAIAAAAKAAkAAAAtAAkAAAABAAQAAAAuAAAAAAABAAQAAAAuAAEAAAAKAAgAAAAuAAIAAAAKAAkAAAAuAAkAAAABAAQAAAAvAAAAAAABAAQAAAAvAAEAAAAKAAgAAAAvAAIAAAAKAAkAAAAvAAkAAAABAAQAAAAwAAAAAAADAAQAAAAwAAEAAAAKAAgAAAAwAAIAAAAKAAkAAAAwAAkAAAADAAQAAAAzAAAAAAACAAQAAAAzAAEAAAAKAAgAAAAzAAIAAAAKAAkAAAAzAAkAAAACAAQAAAA0AAAAAAABAAQAAAA0AAEAAAAKAAgAAAA0AAIAAAAKAAkAAAA0AAkAAAABAAQAAAA1AAAAAAABAAQAAAA1AAEAAAAKAAgAAAA1AAIAAAAKAAkAAAA1AAkAAAABAAQAAAA2AAAAAAABAAQAAAA2AAEAAAAKAAgAAAA2AAIAAAAKAAkAAAA2AAkAAAABAAQAAAA3AAAAAAABAAQAAAA3AAEAAAAKAAgAAAA3AAIAAAAKAAkAAAA3AAkAAAABAAQAAAA4AAAAAAABAAQAAAA4AAEAAAAKAAgAAAA4AAIAAAAKAAkAAAA4AAkAAAABAAQAAAA5AAAAAAABAAQAAAA5AAEAAAAKAAgAAAA5AAIAAAAKAAkAAAA5AAkAAAABAAQAAAA6AAAAAAABAAQAAAA6AAEAAAAKAAgAAAA6AAIAAAAKAAkAAAA6AAkAAAABAAQAAAA7AAAAAAABAAsAAAA7AAEAAAAAAAQAAAA7AAIAAAAEAAQAAAA7AAMAAAAKAAgAAAA7AAQAAAAKAAkAAAA7AAYAAAAFAAQAAAA7AAcAAAAAAAQAAAA7AAgAAAAAAAQAAAA7AAkAAAABAAwAAAA=") +tile_set = ExtResource("5_2mndj") +navigation_enabled = false +metadata/_edit_lock_ = true + +[node name="Props" type="TileMapLayer" parent="Tilemaps" groups=["Solid"]] +tile_set = ExtResource("5_2mndj") +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="RogueliteEnemySpawner" type="Marker2D" parent="EnemySpawners"] +position = Vector2(57, 67) + +[node name="RogueliteEnemySpawner2" type="Marker2D" parent="EnemySpawners"] +position = Vector2(88, 126) + +[node name="RogueliteEnemySpawner3" type="Marker2D" parent="EnemySpawners"] +position = Vector2(266, 122) + +[node name="Doors" type="Node2D" parent="."] + +[node name="North" type="Marker2D" parent="Doors"] +position = Vector2(159, 23) +script = ExtResource("7_d57gj") + +[node name="North2" type="Marker2D" parent="Doors"] +position = Vector2(479.257, 20.6745) +script = ExtResource("7_d57gj") +WallIndex = 1 + +[node name="North3" type="Marker2D" parent="Doors"] +position = Vector2(794.686, 18.3888) +script = ExtResource("7_d57gj") +WallIndex = 2 + +[node name="South" type="Marker2D" parent="Doors"] +position = Vector2(159.196, 149.348) +script = ExtResource("7_d57gj") +Direction = 1 + +[node name="South2" type="Marker2D" parent="Doors"] +position = Vector2(479.86, 149.81) +script = ExtResource("7_d57gj") +Direction = 1 +WallIndex = 1 + +[node name="South3" type="Marker2D" parent="Doors"] +position = Vector2(798.847, 148.522) +script = ExtResource("7_d57gj") +Direction = 1 +WallIndex = 2 + +[node name="East" type="Marker2D" parent="Doors"] +position = Vector2(312, 87) +script = ExtResource("7_d57gj") +Direction = 2 + +[node name="West" type="Marker2D" parent="Doors"] +position = Vector2(8.1806, 87.7693) +script = ExtResource("7_d57gj") +Direction = 3 + +[node name="NavigationRegion2D" type="NavigationRegion2D" parent="."] +navigation_polygon = SubResource("NavigationPolygon_rlq0q") diff --git a/Scripts/Controllers/RogueliteRoomManager.cs b/Scripts/Controllers/RogueliteRoomManager.cs index c0affd13..96619ecb 100644 --- a/Scripts/Controllers/RogueliteRoomManager.cs +++ b/Scripts/Controllers/RogueliteRoomManager.cs @@ -2,6 +2,7 @@ using System.Linq; using Cirno.Scripts.Enums; using Cirno.Scripts.Resources.Roguelite; +using Cirno.Scripts.Utils; using Godot; using Godot.Collections; @@ -79,6 +80,8 @@ public partial class RogueliteRoomManager : Node2D var starterRoom = Rooms.Where(r => r.Type == RoomType.Starter).PickRandom(); SpawnRoom(starterRoom, origin); _mainPath.Add(origin); + + var randomRoomsList = RegularRooms.Shuffle(DungeonLength).ToList(); var currentPos = origin; Vector2I nextPos; @@ -87,13 +90,13 @@ public partial class RogueliteRoomManager : Node2D { nextPos = currentPos + new Vector2I(0, 1); - var roomToSpawn = Rooms.Where(x => x.Type == RoomType.Regular).PickRandom(); + //var roomToSpawn = Rooms.Where(x => x.Type == RoomType.Regular).PickRandom(); + var roomToSpawn = randomRoomsList[i]; if (!SpawnRoom(roomToSpawn, nextPos)) break; _mainPath.Add(nextPos); - if (roomToSpawn.Size.Y > 1) { nextPos += new Vector2I(0, roomToSpawn.Size.Y - 1); @@ -328,7 +331,7 @@ public partial class RogueliteRoomManager : Node2D // for reference //SpawnRoom(room, origin + (room.Size * new Vector2(i, j) * tileSize)); spawnedScene.Spawn(); - MarkRoom(SpawnOrigin, room.Size, spawnedScene); + MarkRoom(gridPos, room.Size, spawnedScene); return true; } diff --git a/Scripts/Utils/ShuffleExtensions.cs b/Scripts/Utils/ShuffleExtensions.cs new file mode 100644 index 00000000..64c1868d --- /dev/null +++ b/Scripts/Utils/ShuffleExtensions.cs @@ -0,0 +1,45 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using Godot; + +namespace Cirno.Scripts.Utils; + +public static class ShuffleExtensions +{ + //private static Random rng = new Random(); + + public static IEnumerable Shuffle(this IEnumerable source, int? desiredLength = null) + { + if (source == null) throw new ArgumentNullException(nameof(source)); + + var list = source.ToList(); + int originalCount = list.Count; + + if (originalCount == 0) yield break; + + // Repeat elements to meet the desired length + if (desiredLength.HasValue && desiredLength > originalCount) + { + int countToAdd = desiredLength.Value - originalCount; + for (int i = 0; i < countToAdd; i++) + { + list.Add(list[i % originalCount]); + } + } + + // Fisher-Yates shuffle + for (int i = list.Count - 1; i > 0; i--) + { + //int j = rng.Next(i + 1); + int j = GD.RandRange(0, i); + (list[i], list[j]) = (list[j], list[i]); + } + + // Return only up to desired length if specified + foreach (var item in list.Take(desiredLength ?? list.Count)) + { + yield return item; + } + } +} \ No newline at end of file