diff --git a/src/map/dungeon/DungeonGenerator.tscn b/src/map/dungeon/DungeonGenerator.tscn deleted file mode 100644 index b92366fd..00000000 --- a/src/map/dungeon/DungeonGenerator.tscn +++ /dev/null @@ -1,9 +0,0 @@ -[gd_scene load_steps=3 format=3 uid="uid://co5mli30wcq1t"] - -[ext_resource type="Script" path="res://addons/SimpleDungeons/DungeonGenerator3D.gd" id="1_l4et8"] -[ext_resource type="PackedScene" uid="uid://bn4gslp2gk8ds" path="res://src/map/dungeon/corridor/Corridor.tscn" id="3_ujbm3"] - -[node name="DungeonGenerator3D" type="Node3D"] -script = ExtResource("1_l4et8") -corridor_room_scene = ExtResource("3_ujbm3") -dungeon_size = Vector3i(10, 1, 10) diff --git a/src/map/dungeon/Room.tscn b/src/map/dungeon/Room.tscn deleted file mode 100644 index bc8d4e88..00000000 --- a/src/map/dungeon/Room.tscn +++ /dev/null @@ -1,32 +0,0 @@ -[gd_scene load_steps=5 format=3 uid="uid://di401q8a5t86m"] - -[ext_resource type="Script" path="res://addons/SimpleDungeons/DungeonRoom3D.gd" id="1_7rwye"] -[ext_resource type="PackedScene" uid="uid://twrj4wixcbu7" path="res://src/items/ItemDatabase.tscn" id="2_ibf0a"] -[ext_resource type="PackedScene" uid="uid://dbvr8ewajja6a" path="res://src/enemy/EnemyDatabase.tscn" id="3_ha7vd"] - -[sub_resource type="PlaneMesh" id="PlaneMesh_xhsyn"] -size = Vector2(10, 10) - -[node name="Room" type="Node3D"] -script = ExtResource("1_7rwye") - -[node name="PlayerSpawn" type="Marker3D" parent="."] -unique_name_in_owner = true -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -4.23461, 0) - -[node name="Minimap Texture" type="MeshInstance3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -4.9805, 0) -layers = 2 -mesh = SubResource("PlaneMesh_xhsyn") - -[node name="ItemSpawnPoints" type="Node3D" parent="."] -unique_name_in_owner = true - -[node name="EnemySpawnPoints" type="Node3D" parent="."] -unique_name_in_owner = true - -[node name="ItemDatabase" parent="." instance=ExtResource("2_ibf0a")] -unique_name_in_owner = true - -[node name="EnemyDatabase" parent="." instance=ExtResource("3_ha7vd")] -unique_name_in_owner = true diff --git a/src/map/dungeon/rooms/DungeonRoom.cs b/src/map/dungeon/code/DungeonRoom.cs similarity index 100% rename from src/map/dungeon/rooms/DungeonRoom.cs rename to src/map/dungeon/code/DungeonRoom.cs diff --git a/src/map/dungeon/rooms/DungeonRoomLogic.cs b/src/map/dungeon/code/DungeonRoomLogic.cs similarity index 100% rename from src/map/dungeon/rooms/DungeonRoomLogic.cs rename to src/map/dungeon/code/DungeonRoomLogic.cs diff --git a/src/map/dungeon/rooms/DungeonRoomLogic.g.puml b/src/map/dungeon/code/DungeonRoomLogic.g.puml similarity index 100% rename from src/map/dungeon/rooms/DungeonRoomLogic.g.puml rename to src/map/dungeon/code/DungeonRoomLogic.g.puml diff --git a/src/map/dungeon/rooms/state/DungeonRoomLogic.State.cs b/src/map/dungeon/code/state/DungeonRoomLogic.State.cs similarity index 100% rename from src/map/dungeon/rooms/state/DungeonRoomLogic.State.cs rename to src/map/dungeon/code/state/DungeonRoomLogic.State.cs diff --git a/src/map/dungeon/rooms/state/states/DungeonRoomLogic.State.Idle.cs b/src/map/dungeon/code/state/states/DungeonRoomLogic.State.Idle.cs similarity index 100% rename from src/map/dungeon/rooms/state/states/DungeonRoomLogic.State.Idle.cs rename to src/map/dungeon/code/state/states/DungeonRoomLogic.State.Idle.cs diff --git a/src/map/CORRIDOR test_FLOOR1.jpg b/src/map/dungeon/corridor/CORRIDOR test_FLOOR1.jpg similarity index 100% rename from src/map/CORRIDOR test_FLOOR1.jpg rename to src/map/dungeon/corridor/CORRIDOR test_FLOOR1.jpg diff --git a/src/map/CORRIDOR test_FLOOR1.jpg.import b/src/map/dungeon/corridor/CORRIDOR test_FLOOR1.jpg.import similarity index 70% rename from src/map/CORRIDOR test_FLOOR1.jpg.import rename to src/map/dungeon/corridor/CORRIDOR test_FLOOR1.jpg.import index 405b279d..a2200d67 100644 --- a/src/map/CORRIDOR test_FLOOR1.jpg.import +++ b/src/map/dungeon/corridor/CORRIDOR test_FLOOR1.jpg.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://0idh4qh35cp7" -path.s3tc="res://.godot/imported/CORRIDOR test_FLOOR1.jpg-9b2ee600f28a1ba05ba5b454a266da92.s3tc.ctex" +path.s3tc="res://.godot/imported/CORRIDOR test_FLOOR1.jpg-f451297e91c67dd575624e1dd435120f.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -14,8 +14,8 @@ generator_parameters={ [deps] -source_file="res://src/map/CORRIDOR test_FLOOR1.jpg" -dest_files=["res://.godot/imported/CORRIDOR test_FLOOR1.jpg-9b2ee600f28a1ba05ba5b454a266da92.s3tc.ctex"] +source_file="res://src/map/dungeon/corridor/CORRIDOR test_FLOOR1.jpg" +dest_files=["res://.godot/imported/CORRIDOR test_FLOOR1.jpg-f451297e91c67dd575624e1dd435120f.s3tc.ctex"] [params] diff --git a/src/map/dungeon/corridor/Corridor.tscn b/src/map/dungeon/corridor/Corridor.tscn index b1cf9cdf..4380c24a 100644 --- a/src/map/dungeon/corridor/Corridor.tscn +++ b/src/map/dungeon/corridor/Corridor.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=6 format=3 uid="uid://bn4gslp2gk8ds"] [ext_resource type="Script" path="res://addons/SimpleDungeons/DungeonRoom3D.gd" id="1_y0rqi"] -[ext_resource type="Texture2D" uid="uid://0idh4qh35cp7" path="res://src/map/CORRIDOR test_FLOOR1.jpg" id="3_3adgk"] +[ext_resource type="Texture2D" uid="uid://0idh4qh35cp7" path="res://src/map/dungeon/corridor/CORRIDOR test_FLOOR1.jpg" id="3_3adgk"] [ext_resource type="Script" path="res://src/map/dungeon/corridor/remove_unused_doors.gd" id="3_8i1ij"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_e86yo"] diff --git a/src/map/dungeon/rooms/Antechamber.tscn b/src/map/dungeon/scenes/Antechamber.tscn similarity index 99% rename from src/map/dungeon/rooms/Antechamber.tscn rename to src/map/dungeon/scenes/Antechamber.tscn index cb9deeca..d4877a7e 100644 --- a/src/map/dungeon/rooms/Antechamber.tscn +++ b/src/map/dungeon/scenes/Antechamber.tscn @@ -15,7 +15,7 @@ [ext_resource type="Texture2D" uid="uid://dmeji5w2ft1as" path="res://src/map/dungeon/models/antechamber/ANTECHAMBER_FLOOR1.jpg" id="13_musc4"] [ext_resource type="Texture2D" uid="uid://b0d11o60nnn6y" path="res://src/map/dungeon/models/antechamber/ANTECHAMBER_TILE4.png" id="14_7aovo"] [ext_resource type="Texture2D" uid="uid://xgc2aaxm1pus" path="res://src/map/dungeon/models/antechamber/ANTECHAMBER_TILE5.png" id="15_xykt8"] -[ext_resource type="Script" path="res://src/map/dungeon/rooms/DungeonRoom.cs" id="16_osbes"] +[ext_resource type="Script" path="res://src/map/dungeon/code/DungeonRoom.cs" id="16_osbes"] [ext_resource type="PackedScene" uid="uid://twrj4wixcbu7" path="res://src/items/ItemDatabase.tscn" id="17_50pl8"] [ext_resource type="PackedScene" uid="uid://dbvr8ewajja6a" path="res://src/enemy/EnemyDatabase.tscn" id="18_3twov"]