Big refactor in place: Organize nodes in line with dependency injection expectations, use state machine flow more

2024-09-11 15:33:36 -07:00
parent 6a4eb81529
commit 4d47a7586e
63 changed files with 1123 additions and 469 deletions
--- a/src/map/Map.cs
+++ b/src/map/Map.cs
@@ -0,0 +1,56 @@
+using Chickensoft.AutoInject;
+using Chickensoft.GodotNodeInterfaces;
+using Chickensoft.Introspection;
+using DialogueManagerRuntime;
+using Godot;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace GameJamDungeon;
+
+public interface IMap : INode3D
+{
+  public List<IDungeonFloor> Floors { get; }
+
+  public Vector3 GetPlayerSpawnPoint();
+}
+
+
+[Meta(typeof(IAutoNode))]
+public partial class Map : Node3D, IMap
+{
+  public override void _Notification(int what) => this.Notify(what);
+
+  [Node] public Area3D Teleport { get; set; } = default!;
+
+  [Node] public IDungeonFloor Overworld { get; set; } = default!;
+
+  [Node] public IDungeonFloor Floor1 { get; set; } = default!;
+
+  [Node] public IDungeonFloor Floor2 { get; set; } = default!;
+
+  [Node] public IDungeonFloor Floor3 { get; set; } = default!;
+
+  public List<IDungeonFloor> Floors { get; set; } = default!;
+
+  private IDungeonFloor _currentFloor;
+
+  public void Setup()
+  {
+    Floors = [Overworld, Floor1, Floor2, Floor3];
+    _currentFloor = Floors.ElementAt(0);
+    Teleport.BodyEntered += OnTeleportEntered;
+  }
+
+  public Vector3 GetPlayerSpawnPoint()
+  {
+    return _currentFloor.GetPlayerSpawnPoint();
+  }
+
+  private void OnTeleportEntered(Node3D body)
+  {
+    DialogueManager.GetCurrentScene = (() => this);
+    var dialogueResource = GD.Load<Resource>("res://src/ui/dialogue/FloorExit.dialogue");
+    DialogueController.ShowDialogue(dialogueResource, "floor_exit");
+  }
+}
--- a/src/map/Map.tscn
+++ b/src/map/Map.tscn
@@ -0,0 +1,33 @@
+[gd_scene load_steps=6 format=3 uid="uid://by67pn7fdsg1m"]
+
+[ext_resource type="PackedScene" uid="uid://dvnc26rebk6o0" path="res://src/map/overworld/Overworld.tscn" id="1_ope1x"]
+[ext_resource type="PackedScene" uid="uid://bc1sp6xwe0j65" path="res://src/map/dungeon/floors/Floor1.tscn" id="2_merfv"]
+[ext_resource type="PackedScene" uid="uid://b3r0r22kc67bl" path="res://src/map/dungeon/floors/Floor2.tscn" id="3_kqqo3"]
+[ext_resource type="PackedScene" uid="uid://b40sstnic41dw" path="res://src/map/dungeon/floors/Floor3.tscn" id="4_1shir"]
+[ext_resource type="PackedScene" uid="uid://bjqgl5u05ia04" path="res://src/map/dungeon/Teleport.tscn" id="5_jiohg"]
+
+[node name="Map" type="Node3D"]
+
+[node name="OmniLight3D" type="OmniLight3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 24.5244, 0)
+layers = 3
+omni_range = 163.618
+omni_attenuation = -0.183
+
+[node name="Overworld" parent="." instance=ExtResource("1_ope1x")]
+unique_name_in_owner = true
+
+[node name="Floor1" parent="." instance=ExtResource("2_merfv")]
+unique_name_in_owner = true
+
+[node name="Floor2" parent="." instance=ExtResource("3_kqqo3")]
+unique_name_in_owner = true
+
+[node name="Floor3" parent="." instance=ExtResource("4_1shir")]
+unique_name_in_owner = true
+
+[node name="Teleport" parent="." instance=ExtResource("5_jiohg")]
+unique_name_in_owner = true
+process_mode = 3
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 900, 900, 900)
+disable_mode = 2
--- a/src/map/dungeon/Room.tscn
+++ b/src/map/dungeon/Room.tscn
@@ -27,8 +27,6 @@ unique_name_in_owner = true

 [node name="ItemDatabase" parent="." instance=ExtResource("2_ibf0a")]
 unique_name_in_owner = true
-ItemScene = Array[PackedScene]([])
-DropRate = PackedFloat32Array()

 [node name="EnemyDatabase" parent="." instance=ExtResource("3_ha7vd")]
 unique_name_in_owner = true
--- a/src/map/dungeon/Teleport.tscn
+++ b/src/map/dungeon/Teleport.tscn
--- a/src/map/dungeon/floors/DungeonFloor.cs
+++ b/src/map/dungeon/floors/DungeonFloor.cs
@@ -6,6 +6,8 @@ using Godot;
 public interface IDungeonFloor : INode3D
 {
  void InitializeDungeon();
+
+  public Vector3 GetPlayerSpawnPoint();
 }

 [Meta(typeof(IAutoNode))]
@@ -19,4 +21,9 @@ public partial class DungeonFloor : Node3D, IDungeonFloor
  {
    DungeonGenerator.Call("generate");
  }
+
+  public Vector3 GetPlayerSpawnPoint()
+  {
+    return Vector3.Zero;
+  }
 }
--- a/src/map/dungeon/floors/Overworld.cs
+++ b/src/map/dungeon/floors/Overworld.cs
@@ -1,6 +1,5 @@
 using Chickensoft.AutoInject;
 using Chickensoft.Introspection;
-using DialogueManagerRuntime;
 using GameJamDungeon;
 using Godot;

@@ -18,4 +17,9 @@ public partial class Overworld : Node3D, IDungeonFloor
  {
    GameRepo.SetPlayerGlobalPosition(PlayerSpawnPoint.GlobalPosition);
  }
+
+  public Vector3 GetPlayerSpawnPoint()
+  {
+    return PlayerSpawnPoint.GlobalPosition;
+  }
 }
--- a/src/map/dungeon/rooms/Antechamber.tscn
+++ b/src/map/dungeon/rooms/Antechamber.tscn
@@ -1099,295 +1099,295 @@ size = Vector2(35, 30)
 [node name="Antechamber" type="Node3D"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.73082, 0, -1.86841)
 script = ExtResource("1_tdydv")
-size_in_voxels = Vector3i(5, 2, 4)
-voxel_scale = Vector3(12.955, 13.01, 12.945)

-[node name="NavigationRegion3D" type="NavigationRegion3D" parent="."]
+[node name="Room" type="Node3D" parent="."]
+unique_name_in_owner = true
+script = ExtResource("16_osbes")
+
+[node name="NavigationRegion3D" type="NavigationRegion3D" parent="Room"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.04836, 3.10489, 12.6166)
 navigation_mesh = SubResource("NavigationMesh_2x5qh")

-[node name="ANTECHAMBER" type="Node3D" parent="NavigationRegion3D"]
+[node name="ANTECHAMBER" type="Node3D" parent="Room/NavigationRegion3D"]
 transform = Transform3D(0.93, 0, 0, 0, 0.93, 0, 0, 0, 0.93, -122.383, -16.3014, -66.1084)

-[node name="StaticBody3D7" type="StaticBody3D" parent="NavigationRegion3D/ANTECHAMBER"]
+[node name="StaticBody3D7" type="StaticBody3D" parent="Room/NavigationRegion3D/ANTECHAMBER"]
 transform = Transform3D(0, 0, -0.515006, 0, 0.54653, 0, 0.593558, 0, 0, 116.446, 7.82144, 86.6174)

-[node name="Cube_016" type="MeshInstance3D" parent="NavigationRegion3D/ANTECHAMBER/StaticBody3D7"]
+[node name="Cube_016" type="MeshInstance3D" parent="Room/NavigationRegion3D/ANTECHAMBER/StaticBody3D7"]
 transform = Transform3D(0, 0, 0.835538, 0, 0.713892, 0, -0.794927, 0, 0, -0.594563, 5.69153, -0.0170364)
 mesh = SubResource("ArrayMesh_t87ci")
 skeleton = NodePath("")

-[node name="CollisionShape3D" type="CollisionShape3D" parent="NavigationRegion3D/ANTECHAMBER/StaticBody3D7"]
+[node name="CollisionShape3D" type="CollisionShape3D" parent="Room/NavigationRegion3D/ANTECHAMBER/StaticBody3D7"]
 transform = Transform3D(0, 0, 0.835538, 0, 0.713892, 0, -0.794927, 0, 0, -0.594563, 5.69153, -0.0170364)
 shape = SubResource("ConcavePolygonShape3D_bjpni")

-[node name="StaticBody3D" type="StaticBody3D" parent="NavigationRegion3D/ANTECHAMBER"]
+[node name="StaticBody3D" type="StaticBody3D" parent="Room/NavigationRegion3D/ANTECHAMBER"]

-[node name="Cube_001" type="MeshInstance3D" parent="NavigationRegion3D/ANTECHAMBER/StaticBody3D"]
+[node name="Cube_001" type="MeshInstance3D" parent="Room/NavigationRegion3D/ANTECHAMBER/StaticBody3D"]
 transform = Transform3D(0, 0, 13.9165, 0, 13.9165, 0, -13.9165, 0, 0, 134.9, 14.2365, 22.742)
 mesh = SubResource("ArrayMesh_caq81")
 skeleton = NodePath("")

-[node name="CollisionShape3D" type="CollisionShape3D" parent="NavigationRegion3D/ANTECHAMBER/StaticBody3D"]
+[node name="CollisionShape3D" type="CollisionShape3D" parent="Room/NavigationRegion3D/ANTECHAMBER/StaticBody3D"]
 transform = Transform3D(0, 0, 13.9165, 0, 13.9165, 0, -13.9165, 0, 0, 134.9, 14.2365, 22.742)
 shape = SubResource("ConcavePolygonShape3D_038td")

-[node name="StaticBody3D2" type="StaticBody3D" parent="NavigationRegion3D/ANTECHAMBER"]
+[node name="StaticBody3D2" type="StaticBody3D" parent="Room/NavigationRegion3D/ANTECHAMBER"]

-[node name="Plane_005" type="MeshInstance3D" parent="NavigationRegion3D/ANTECHAMBER/StaticBody3D2"]
+[node name="Plane_005" type="MeshInstance3D" parent="Room/NavigationRegion3D/ANTECHAMBER/StaticBody3D2"]
 transform = Transform3D(3.843e-06, 0, -7.17802, 0, 1, 0, 2.22327, 0, 1.24075e-05, 148.895, 0.320863, 27.5919)
 mesh = SubResource("ArrayMesh_4awqv")
 skeleton = NodePath("")

-[node name="CollisionShape3D" type="CollisionShape3D" parent="NavigationRegion3D/ANTECHAMBER/StaticBody3D2"]
+[node name="CollisionShape3D" type="CollisionShape3D" parent="Room/NavigationRegion3D/ANTECHAMBER/StaticBody3D2"]
 transform = Transform3D(3.843e-06, 0, -7.17802, 0, 1, 0, 2.22327, 0, 1.24075e-05, 148.895, 0.320863, 27.5919)
 shape = SubResource("ConcavePolygonShape3D_740qy")

-[node name="StaticBody3D3" type="StaticBody3D" parent="NavigationRegion3D/ANTECHAMBER"]
+[node name="StaticBody3D3" type="StaticBody3D" parent="Room/NavigationRegion3D/ANTECHAMBER"]

-[node name="Plane_004" type="MeshInstance3D" parent="NavigationRegion3D/ANTECHAMBER/StaticBody3D3"]
+[node name="Plane_004" type="MeshInstance3D" parent="Room/NavigationRegion3D/ANTECHAMBER/StaticBody3D3"]
 transform = Transform3D(-1.85524e-06, 0, 7.17802, 0, 1, 0, -2.22327, 0, -5.98981e-06, 120.895, 0.320863, 87.5919)
 mesh = SubResource("ArrayMesh_vu1fd")
 skeleton = NodePath("")

-[node name="CollisionShape3D" type="CollisionShape3D" parent="NavigationRegion3D/ANTECHAMBER/StaticBody3D3"]
+[node name="CollisionShape3D" type="CollisionShape3D" parent="Room/NavigationRegion3D/ANTECHAMBER/StaticBody3D3"]
 transform = Transform3D(-1.85524e-06, 0, 7.17802, 0, 1, 0, -2.22327, 0, -5.98981e-06, 120.895, 0.320863, 87.5919)
 shape = SubResource("ConcavePolygonShape3D_1ngn2")

-[node name="StaticBody3D4" type="StaticBody3D" parent="NavigationRegion3D/ANTECHAMBER"]
+[node name="StaticBody3D4" type="StaticBody3D" parent="Room/NavigationRegion3D/ANTECHAMBER"]

-[node name="Cylinder_005" type="MeshInstance3D" parent="NavigationRegion3D/ANTECHAMBER/StaticBody3D4"]
+[node name="Cylinder_005" type="MeshInstance3D" parent="Room/NavigationRegion3D/ANTECHAMBER/StaticBody3D4"]
 transform = Transform3D(4.07023, 0, 0, 0, 0, -4.07023, 0, 4.07023, 0, 163.045, 13.4492, 78.5838)
 mesh = SubResource("ArrayMesh_rleii")
 skeleton = NodePath("")

-[node name="CollisionShape3D" type="CollisionShape3D" parent="NavigationRegion3D/ANTECHAMBER/StaticBody3D4"]
+[node name="CollisionShape3D" type="CollisionShape3D" parent="Room/NavigationRegion3D/ANTECHAMBER/StaticBody3D4"]
 transform = Transform3D(4.07023, 0, 0, 0, 0, -4.07023, 0, 4.07023, 0, 163.045, 13.4492, 78.5838)
 shape = SubResource("ConcavePolygonShape3D_1ty8l")

-[node name="StaticBody3D5" type="StaticBody3D" parent="NavigationRegion3D/ANTECHAMBER"]
+[node name="StaticBody3D5" type="StaticBody3D" parent="Room/NavigationRegion3D/ANTECHAMBER"]

-[node name="Cylinder_010" type="MeshInstance3D" parent="NavigationRegion3D/ANTECHAMBER/StaticBody3D5"]
+[node name="Cylinder_010" type="MeshInstance3D" parent="Room/NavigationRegion3D/ANTECHAMBER/StaticBody3D5"]
 transform = Transform3D(0, 0, 0.553656, 0, 2.80124, 0, -0.423736, 0, 0, 153.394, 7.82472, 28.6819)
 mesh = SubResource("ArrayMesh_w861l")
 skeleton = NodePath("")

-[node name="CollisionShape3D" type="CollisionShape3D" parent="NavigationRegion3D/ANTECHAMBER/StaticBody3D5"]
+[node name="CollisionShape3D" type="CollisionShape3D" parent="Room/NavigationRegion3D/ANTECHAMBER/StaticBody3D5"]
 transform = Transform3D(0, 0, 0.553656, 0, 2.80124, 0, -0.423736, 0, 0, 153.394, 7.82472, 28.6819)
 shape = SubResource("ConcavePolygonShape3D_dlkak")

-[node name="StaticBody3D6" type="StaticBody3D" parent="NavigationRegion3D/ANTECHAMBER"]
+[node name="StaticBody3D6" type="StaticBody3D" parent="Room/NavigationRegion3D/ANTECHAMBER"]

-[node name="Cylinder_009" type="MeshInstance3D" parent="NavigationRegion3D/ANTECHAMBER/StaticBody3D6"]
+[node name="Cylinder_009" type="MeshInstance3D" parent="Room/NavigationRegion3D/ANTECHAMBER/StaticBody3D6"]
 transform = Transform3D(0, 0, -0.553656, 0, 2.80124, 0, 0.423736, 0, 0, 116.447, 7.82472, 86.7122)
 mesh = SubResource("ArrayMesh_w861l")
 skeleton = NodePath("")

-[node name="StaticBody3D8" type="StaticBody3D" parent="NavigationRegion3D/ANTECHAMBER"]
+[node name="StaticBody3D8" type="StaticBody3D" parent="Room/NavigationRegion3D/ANTECHAMBER"]

-[node name="Cube_017" type="MeshInstance3D" parent="NavigationRegion3D/ANTECHAMBER/StaticBody3D8"]
+[node name="Cube_017" type="MeshInstance3D" parent="Room/NavigationRegion3D/ANTECHAMBER/StaticBody3D8"]
 transform = Transform3D(0, 0, -0.515006, 0, 0.54653, 0, 0.593558, 0, 0, 116.446, 7.82144, 86.6174)
 mesh = SubResource("ArrayMesh_wn5ym")
 skeleton = NodePath("")

-[node name="CollisionShape3D" type="CollisionShape3D" parent="NavigationRegion3D/ANTECHAMBER/StaticBody3D8"]
+[node name="CollisionShape3D" type="CollisionShape3D" parent="Room/NavigationRegion3D/ANTECHAMBER/StaticBody3D8"]
 transform = Transform3D(0, 0, -0.515006, 0, 0.54653, 0, 0.593558, 0, 0, 116.446, 7.82144, 86.6174)
 shape = SubResource("ConcavePolygonShape3D_cnvi5")

-[node name="DOOR" type="Marker3D" parent="."]
+[node name="DOOR" type="Marker3D" parent="Room"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -13.1142, -8.45784, 32.0232)

-[node name="DOOR2" type="Marker3D" parent="."]
+[node name="DOOR2" type="Marker3D" parent="Room"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 7.92078, -8.62051, -27.067)

-[node name="Room" type="Node3D" parent="."]
-script = ExtResource("16_osbes")
-
-[node name="PlayerSpawn" type="Marker3D" parent="."]
+[node name="PlayerSpawn" type="Marker3D" parent="Room"]
 unique_name_in_owner = true
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -11.8813, 0)

-[node name="Minimap Texture" type="MeshInstance3D" parent="."]
+[node name="Minimap Texture" type="MeshInstance3D" parent="Room"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00325966, -7.7801, 0)
 visible = false
 layers = 2
 mesh = SubResource("PlaneMesh_bbi7v")
+skeleton = NodePath("../..")

-[node name="ItemSpawnPoints" type="Node3D" parent="."]
+[node name="ItemSpawnPoints" type="Node3D" parent="Room"]
 unique_name_in_owner = true

-[node name="ItemSpawn1" type="Marker3D" parent="ItemSpawnPoints"]
+[node name="ItemSpawn1" type="Marker3D" parent="Room/ItemSpawnPoints"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.83448, -11.8091, -2.92704)
 gizmo_extents = 1.0

-[node name="ItemSpawn2" type="Marker3D" parent="ItemSpawnPoints"]
+[node name="ItemSpawn2" type="Marker3D" parent="Room/ItemSpawnPoints"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.44186, -11.8091, -2.92704)
 gizmo_extents = 1.0

-[node name="ItemSpawn3" type="Marker3D" parent="ItemSpawnPoints"]
+[node name="ItemSpawn3" type="Marker3D" parent="Room/ItemSpawnPoints"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.09183, -11.8091, -2.92704)
 gizmo_extents = 1.0

-[node name="ItemSpawn4" type="Marker3D" parent="ItemSpawnPoints"]
+[node name="ItemSpawn4" type="Marker3D" parent="Room/ItemSpawnPoints"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.83448, -11.8091, -5.86665)
 gizmo_extents = 1.0

-[node name="ItemSpawn5" type="Marker3D" parent="ItemSpawnPoints"]
+[node name="ItemSpawn5" type="Marker3D" parent="Room/ItemSpawnPoints"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.21845, -11.8091, -5.59059)
 gizmo_extents = 1.0

-[node name="ItemSpawn6" type="Marker3D" parent="ItemSpawnPoints"]
+[node name="ItemSpawn6" type="Marker3D" parent="Room/ItemSpawnPoints"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.8145, -11.8091, -2.92704)
 gizmo_extents = 1.0

-[node name="ItemSpawn7" type="Marker3D" parent="ItemSpawnPoints"]
+[node name="ItemSpawn7" type="Marker3D" parent="Room/ItemSpawnPoints"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.8145, -11.8091, -2.92704)
 gizmo_extents = 1.0

-[node name="ItemSpawn8" type="Marker3D" parent="ItemSpawnPoints"]
+[node name="ItemSpawn8" type="Marker3D" parent="Room/ItemSpawnPoints"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.8145, -11.8091, -2.92704)
 gizmo_extents = 1.0

-[node name="ItemSpawn9" type="Marker3D" parent="ItemSpawnPoints"]
+[node name="ItemSpawn9" type="Marker3D" parent="Room/ItemSpawnPoints"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.8145, -11.8091, -2.92704)
 gizmo_extents = 1.0

-[node name="ItemSpawn10" type="Marker3D" parent="ItemSpawnPoints"]
+[node name="ItemSpawn10" type="Marker3D" parent="Room/ItemSpawnPoints"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.8145, -11.8091, -2.92704)
 gizmo_extents = 1.0

-[node name="ItemSpawn11" type="Marker3D" parent="ItemSpawnPoints"]
+[node name="ItemSpawn11" type="Marker3D" parent="Room/ItemSpawnPoints"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.8145, -11.8091, -2.92704)
 gizmo_extents = 1.0

-[node name="ItemSpawn12" type="Marker3D" parent="ItemSpawnPoints"]
+[node name="ItemSpawn12" type="Marker3D" parent="Room/ItemSpawnPoints"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.8145, -11.8091, -2.92704)
 gizmo_extents = 1.0

-[node name="ItemSpawn13" type="Marker3D" parent="ItemSpawnPoints"]
+[node name="ItemSpawn13" type="Marker3D" parent="Room/ItemSpawnPoints"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.8145, -11.8091, -2.92704)
 gizmo_extents = 1.0

-[node name="ItemSpawn14" type="Marker3D" parent="ItemSpawnPoints"]
+[node name="ItemSpawn14" type="Marker3D" parent="Room/ItemSpawnPoints"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.8145, -11.8091, -2.92704)
 gizmo_extents = 1.0

-[node name="ItemSpawn15" type="Marker3D" parent="ItemSpawnPoints"]
+[node name="ItemSpawn15" type="Marker3D" parent="Room/ItemSpawnPoints"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.8145, -11.8091, -2.92704)
 gizmo_extents = 1.0

-[node name="ItemSpawn16" type="Marker3D" parent="ItemSpawnPoints"]
+[node name="ItemSpawn16" type="Marker3D" parent="Room/ItemSpawnPoints"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.8145, -11.8091, -2.92704)
 gizmo_extents = 1.0

-[node name="ItemSpawn17" type="Marker3D" parent="ItemSpawnPoints"]
+[node name="ItemSpawn17" type="Marker3D" parent="Room/ItemSpawnPoints"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.8145, -11.8091, -2.92704)
 gizmo_extents = 1.0

-[node name="ItemSpawn18" type="Marker3D" parent="ItemSpawnPoints"]
+[node name="ItemSpawn18" type="Marker3D" parent="Room/ItemSpawnPoints"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.8145, -11.8091, -2.92704)
 gizmo_extents = 1.0

-[node name="ItemSpawn19" type="Marker3D" parent="ItemSpawnPoints"]
+[node name="ItemSpawn19" type="Marker3D" parent="Room/ItemSpawnPoints"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.8145, -11.8091, -2.92704)
 gizmo_extents = 1.0

-[node name="ItemSpawn20" type="Marker3D" parent="ItemSpawnPoints"]
+[node name="ItemSpawn20" type="Marker3D" parent="Room/ItemSpawnPoints"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.8145, -11.8091, -2.92704)
 gizmo_extents = 1.0

-[node name="ItemSpawn21" type="Marker3D" parent="ItemSpawnPoints"]
+[node name="ItemSpawn21" type="Marker3D" parent="Room/ItemSpawnPoints"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.8145, -11.8091, -2.92704)
 gizmo_extents = 1.0

-[node name="ItemSpawn22" type="Marker3D" parent="ItemSpawnPoints"]
+[node name="ItemSpawn22" type="Marker3D" parent="Room/ItemSpawnPoints"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.8145, -11.8091, -2.92704)
 gizmo_extents = 1.0

-[node name="ItemSpawn23" type="Marker3D" parent="ItemSpawnPoints"]
+[node name="ItemSpawn23" type="Marker3D" parent="Room/ItemSpawnPoints"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.8145, -11.8091, -2.92704)
 gizmo_extents = 1.0

-[node name="ItemSpawn24" type="Marker3D" parent="ItemSpawnPoints"]
+[node name="ItemSpawn24" type="Marker3D" parent="Room/ItemSpawnPoints"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.8145, -11.8091, -2.92704)
 gizmo_extents = 1.0

-[node name="ItemSpawn25" type="Marker3D" parent="ItemSpawnPoints"]
+[node name="ItemSpawn25" type="Marker3D" parent="Room/ItemSpawnPoints"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.8145, -11.8091, -2.92704)
 gizmo_extents = 1.0

-[node name="ItemSpawn26" type="Marker3D" parent="ItemSpawnPoints"]
+[node name="ItemSpawn26" type="Marker3D" parent="Room/ItemSpawnPoints"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.8145, -11.8091, -2.92704)
 gizmo_extents = 1.0

-[node name="ItemSpawn27" type="Marker3D" parent="ItemSpawnPoints"]
+[node name="ItemSpawn27" type="Marker3D" parent="Room/ItemSpawnPoints"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.8145, -11.8091, -2.92704)
 gizmo_extents = 1.0

-[node name="ItemSpawn28" type="Marker3D" parent="ItemSpawnPoints"]
+[node name="ItemSpawn28" type="Marker3D" parent="Room/ItemSpawnPoints"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.8145, -11.8091, -2.92704)
 gizmo_extents = 1.0

-[node name="ItemSpawn29" type="Marker3D" parent="ItemSpawnPoints"]
+[node name="ItemSpawn29" type="Marker3D" parent="Room/ItemSpawnPoints"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.8145, -11.8091, -2.92704)
 gizmo_extents = 1.0

-[node name="ItemSpawn30" type="Marker3D" parent="ItemSpawnPoints"]
+[node name="ItemSpawn30" type="Marker3D" parent="Room/ItemSpawnPoints"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.8145, -11.8091, -2.92704)
 gizmo_extents = 1.0

-[node name="ItemSpawn31" type="Marker3D" parent="ItemSpawnPoints"]
+[node name="ItemSpawn31" type="Marker3D" parent="Room/ItemSpawnPoints"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.8145, -11.8091, -2.92704)
 gizmo_extents = 1.0

-[node name="ItemSpawn32" type="Marker3D" parent="ItemSpawnPoints"]
+[node name="ItemSpawn32" type="Marker3D" parent="Room/ItemSpawnPoints"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.8145, -11.8091, -2.92704)
 gizmo_extents = 1.0

-[node name="ItemSpawn33" type="Marker3D" parent="ItemSpawnPoints"]
+[node name="ItemSpawn33" type="Marker3D" parent="Room/ItemSpawnPoints"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.8145, -11.8091, -2.92704)
 gizmo_extents = 1.0

-[node name="ItemSpawn34" type="Marker3D" parent="ItemSpawnPoints"]
+[node name="ItemSpawn34" type="Marker3D" parent="Room/ItemSpawnPoints"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.8145, -11.8091, -2.92704)
 gizmo_extents = 1.0

-[node name="ItemSpawn35" type="Marker3D" parent="ItemSpawnPoints"]
+[node name="ItemSpawn35" type="Marker3D" parent="Room/ItemSpawnPoints"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.8145, -11.8091, -2.92704)
 gizmo_extents = 1.0

-[node name="ItemSpawn36" type="Marker3D" parent="ItemSpawnPoints"]
+[node name="ItemSpawn36" type="Marker3D" parent="Room/ItemSpawnPoints"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.8145, -11.8091, -2.92704)
 gizmo_extents = 1.0

-[node name="ItemSpawn37" type="Marker3D" parent="ItemSpawnPoints"]
+[node name="ItemSpawn37" type="Marker3D" parent="Room/ItemSpawnPoints"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.8145, -11.8091, -2.92704)
 gizmo_extents = 1.0

-[node name="ItemSpawn38" type="Marker3D" parent="ItemSpawnPoints"]
+[node name="ItemSpawn38" type="Marker3D" parent="Room/ItemSpawnPoints"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.8145, -11.8091, -2.92704)
 gizmo_extents = 1.0

-[node name="ItemSpawn39" type="Marker3D" parent="ItemSpawnPoints"]
+[node name="ItemSpawn39" type="Marker3D" parent="Room/ItemSpawnPoints"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.8145, -11.8091, -2.92704)
 gizmo_extents = 1.0

-[node name="ItemSpawn40" type="Marker3D" parent="ItemSpawnPoints"]
+[node name="ItemSpawn40" type="Marker3D" parent="Room/ItemSpawnPoints"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.8145, -11.8091, -2.92704)
 gizmo_extents = 1.0

-[node name="EnemySpawnPoints" type="Node3D" parent="."]
+[node name="EnemySpawnPoints" type="Node3D" parent="Room"]
 unique_name_in_owner = true

-[node name="EnemySpawn1" type="Marker3D" parent="EnemySpawnPoints"]
+[node name="EnemySpawn1" type="Marker3D" parent="Room/EnemySpawnPoints"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8.71409, -11.0741, 0)

-[node name="ItemDatabase" parent="." instance=ExtResource("17_50pl8")]
+[node name="ItemDatabase" parent="Room" instance=ExtResource("17_50pl8")]
 unique_name_in_owner = true

-[node name="EnemyDatabase" parent="." instance=ExtResource("18_3twov")]
+[node name="EnemyDatabase" parent="Room" instance=ExtResource("18_3twov")]
 unique_name_in_owner = true
 SpawnRate = PackedFloat32Array(1)

-[node name="ExitSpawnLocation" type="Marker3D" parent="." groups=["Exit"]]
+[node name="ExitSpawnLocation" type="Marker3D" parent="Room" groups=["Exit"]]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.06499, -11.8837, -9.52855)
--- a/src/map/dungeon/rooms/DungeonRoomLogic.g.puml
+++ b/src/map/dungeon/rooms/DungeonRoomLogic.g.puml
@@ -0,0 +1,6 @@
+@startuml DungeonRoomLogic
+state "DungeonRoomLogic State" as GameJamDungeon_DungeonRoomLogic_State {
+  state "Idle" as GameJamDungeon_DungeonRoomLogic_State_Idle
+}
+[*] --> GameJamDungeon_DungeonRoomLogic_State_Idle
+@enduml
--- a/src/map/overworld/Overworld.tscn
+++ b/src/map/overworld/Overworld.tscn
@@ -8,7 +8,7 @@
 [ext_resource type="Texture2D" uid="uid://b1crojyrqmhql" path="res://src/map/overworld/Textures/kenney_prototype-textures/stick.jpeg" id="7_6df1n"]
 [ext_resource type="ArrayMesh" uid="uid://df5fykeos37m1" path="res://src/map/overworld/Models/raft.obj" id="8_a4vos"]
 [ext_resource type="Material" uid="uid://6pu2bdointq4" path="res://src/map/overworld/Textures/premade.tres" id="9_th6qc"]
-[ext_resource type="Shader" path="res://src/map/water.gdshader" id="10_ntrgc"]
+[ext_resource type="Shader" path="res://src/map/overworld/water.gdshader" id="10_ntrgc"]
 [ext_resource type="Texture2D" uid="uid://bxodl26dnwrkc" path="res://src/map/overworld/Textures/SMALLER1/others_0020_color_1k.jpg" id="11_kf3by"]
 [ext_resource type="Texture2D" uid="uid://c4iqttgjb0kq3" path="res://src/map/overworld/Textures/kenney_prototype-textures/treetexture.png" id="12_i7q8i"]
 [ext_resource type="ArrayMesh" uid="uid://bb46flkajcbtd" path="res://src/map/overworld/Models/tree.obj" id="13_uvfqy"]
--- a/src/map/overworld/water.gdshader
+++ b/src/map/overworld/water.gdshader