Almost shippable

src/map/Map.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=6 format=3 uid="uid://by67pn7fdsg1m"]
+[gd_scene load_steps=9 format=3 uid="uid://by67pn7fdsg1m"]
 
 [ext_resource type="Script" path="res://src/map/Map.cs" id="1_bw70o"]
 [ext_resource type="PackedScene" uid="uid://dvnc26rebk6o0" path="res://src/map/overworld/Overworld.tscn" id="1_ope1x"]
@@ -6,14 +6,31 @@
 [ext_resource type="PackedScene" uid="uid://g28xmp6cn16h" path="res://src/map/dungeon/floors/Floor11.tscn" id="3_niasb"]
 [ext_resource type="PackedScene" uid="uid://bjqgl5u05ia04" path="res://src/map/dungeon/Teleport.tscn" id="5_jiohg"]
 
+[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_phn4t"]
+sky_horizon_color = Color(0.64625, 0.65575, 0.67075, 1)
+sky_energy_multiplier = 0.3
+ground_horizon_color = Color(0.64625, 0.65575, 0.67075, 1)
+
+[sub_resource type="Sky" id="Sky_v6mio"]
+sky_material = SubResource("ProceduralSkyMaterial_phn4t")
+
+[sub_resource type="Environment" id="Environment_hjjsv"]
+background_energy_multiplier = 0.0
+sky = SubResource("Sky_v6mio")
+ambient_light_source = 1
+reflected_light_source = 1
+fog_mode = 1
+fog_density = 1.0
+volumetric_fog_enabled = true
+volumetric_fog_density = 0.0315
+volumetric_fog_length = 9.49
+adjustment_enabled = true
+
 [node name="Map" type="Node3D"]
 script = ExtResource("1_bw70o")
 
-[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="WorldEnvironment" type="WorldEnvironment" parent="."]
+environment = SubResource("Environment_hjjsv")
 
 [node name="Overworld" parent="." instance=ExtResource("1_ope1x")]
 unique_name_in_owner = true

src/map/dungeon/corridor/Corridor.tscn

@@ -2,10 +2,11 @@
 
 [ext_resource type="Script" path="res://addons/SimpleDungeons/DungeonRoom3D.gd" id="1_y0rqi"]
 [ext_resource type="Script" path="res://src/map/dungeon/corridor/remove_unused_doors.gd" id="3_8i1ij"]
-[ext_resource type="Texture2D" uid="uid://b8dow4tvs1ktr" path="res://src/map/dungeon/models/antechamber_1/ANTECHAMBER_TYPE1_VER2_brick3.png" id="3_j31st"]
+[ext_resource type="Texture2D" uid="uid://vtnruibl68fq" path="res://src/map/dungeon/models/antechamber_1/ANTECHAMBER_TYPE1_VER2_FLOOR1.jpg" id="3_opvgc"]
 
-[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_q3ft5"]
-albedo_texture = ExtResource("3_j31st")
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_p2p1w"]
+albedo_texture = ExtResource("3_opvgc")
+uv1_scale = Vector3(1.52, 1.52, 1.52)
 uv1_triplanar = true
 
 [sub_resource type="PlaneMesh" id="PlaneMesh_xt554"]
@@ -20,7 +21,7 @@ script = ExtResource("3_8i1ij")
 
 [node name="CSGBox3D" type="CSGBox3D" parent="."]
 transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -5.68248e-07, 0, 0)
-material_override = SubResource("StandardMaterial3D_q3ft5")
+material_override = SubResource("StandardMaterial3D_p2p1w")
 use_collision = true
 size = Vector3(4, 4, 4)
 
@@ -51,19 +52,3 @@ size = Vector3(3.75879, 3.79468, 0.105042)
 [node name="MeshInstance3D" type="MeshInstance3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1.90563, 0)
 mesh = SubResource("PlaneMesh_xt554")
-
-[node name="NavigationLink3D" type="NavigationLink3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.024736, -1.52475, 1.33622)
-end_position = Vector3(0, 0, 1)
-
-[node name="NavigationLink3D2" type="NavigationLink3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.024736, -1.52475, -1.97697)
-end_position = Vector3(0, 0, 1)
-
-[node name="NavigationLink3D3" type="NavigationLink3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.563159, -1.52475, 0.571144)
-end_position = Vector3(1, 0, 0)
-
-[node name="NavigationLink3D4" type="NavigationLink3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.385, -1.52475, 0.167886)
-end_position = Vector3(1, 0, 0)

src/map/dungeon/floors/Floor01.tscn

@@ -1,10 +1,12 @@
-[gd_scene load_steps=7 format=3 uid="uid://bc1sp6xwe0j65"]
+[gd_scene load_steps=9 format=3 uid="uid://bc1sp6xwe0j65"]
 
-[ext_resource type="Script" path="res://src/map/dungeon/floors/DungeonFloor.cs" id="1_0ecnn"]
+[ext_resource type="Script" path="res://src/map/dungeon/code/DungeonFloor.cs" id="1_0ecnn"]
 [ext_resource type="Script" path="res://addons/SimpleDungeons/DungeonGenerator3D.gd" id="2_cxmwa"]
 [ext_resource type="PackedScene" uid="uid://dpec2lbt83dhe" path="res://src/map/dungeon/scenes/Antechamber.tscn" id="3_tsw3y"]
 [ext_resource type="PackedScene" uid="uid://b82dx66mgs2d7" path="res://src/map/dungeon/scenes/BasinRoom.tscn" id="4_b2rkl"]
 [ext_resource type="PackedScene" uid="uid://bn4gslp2gk8ds" path="res://src/map/dungeon/corridor/Corridor.tscn" id="4_gni6i"]
+[ext_resource type="PackedScene" uid="uid://b7111krf365x0" path="res://src/map/dungeon/scenes/InnerBalcony.tscn" id="5_v15cv"]
+[ext_resource type="PackedScene" uid="uid://c1qicmrcg6q6x" path="res://src/map/dungeon/scenes/ColumnRoom.tscn" id="6_gy758"]
 
 [sub_resource type="NavigationMesh" id="NavigationMesh_gqi8w"]
 border_size = 1.0
@@ -21,9 +23,8 @@ navigation_mesh = SubResource("NavigationMesh_gqi8w")
 [node name="DungeonGenerator" type="Node3D" parent="NavigationRegion3D"]
 unique_name_in_owner = true
 script = ExtResource("2_cxmwa")
-room_scenes = Array[PackedScene]([ExtResource("3_tsw3y"), ExtResource("4_b2rkl")])
+room_scenes = Array[PackedScene]([ExtResource("3_tsw3y"), ExtResource("4_b2rkl"), ExtResource("5_v15cv"), ExtResource("6_gy758")])
 corridor_room_scene = ExtResource("4_gni6i")
-dungeon_size = Vector3i(20, 1, 20)
+dungeon_size = Vector3i(50, 1, 50)
 voxel_scale = Vector3(4, 4, 4)
 generate_on_ready = false
-place_even_if_fail = true

src/map/dungeon/floors/Floor02.tscn

@@ -1,10 +1,10 @@
 [gd_scene load_steps=6 format=3 uid="uid://b3r0r22kc67bl"]
 
 [ext_resource type="Script" path="res://addons/SimpleDungeons/DungeonGenerator3D.gd" id="1_afeds"]
-[ext_resource type="PackedScene" uid="uid://dhpwwqow1ahrc" path="res://src/map/dungeon/rooms/Room1.tscn" id="2_dss74"]
-[ext_resource type="PackedScene" uid="uid://bbwgmqy3evhh2" path="res://src/map/dungeon/rooms/Room2.tscn" id="3_5748f"]
+[ext_resource type="PackedScene" path="res://src/map/dungeon/rooms/Room1.tscn" id="2_dss74"]
+[ext_resource type="PackedScene" path="res://src/map/dungeon/rooms/Room2.tscn" id="3_5748f"]
 [ext_resource type="PackedScene" uid="uid://bn4gslp2gk8ds" path="res://src/map/dungeon/corridor/Corridor.tscn" id="4_mebix"]
-[ext_resource type="Script" path="res://src/map/dungeon/floors/DungeonFloor.cs" id="5_ld0kt"]
+[ext_resource type="Script" path="res://src/map/dungeon/code/DungeonFloor.cs" id="5_ld0kt"]
 
 [node name="Floor2" type="Node3D"]
 script = ExtResource("5_ld0kt")

src/map/dungeon/floors/Floor03.tscn

@@ -1,10 +1,10 @@
 [gd_scene load_steps=6 format=3 uid="uid://b40sstnic41dw"]
 
 [ext_resource type="Script" path="res://addons/SimpleDungeons/DungeonGenerator3D.gd" id="1_ou8lo"]
-[ext_resource type="PackedScene" uid="uid://dhpwwqow1ahrc" path="res://src/map/dungeon/rooms/Room1.tscn" id="2_8mwqw"]
-[ext_resource type="PackedScene" uid="uid://bbwgmqy3evhh2" path="res://src/map/dungeon/rooms/Room2.tscn" id="3_ap5wj"]
+[ext_resource type="PackedScene" path="res://src/map/dungeon/rooms/Room1.tscn" id="2_8mwqw"]
+[ext_resource type="PackedScene" path="res://src/map/dungeon/rooms/Room2.tscn" id="3_ap5wj"]
 [ext_resource type="PackedScene" uid="uid://bn4gslp2gk8ds" path="res://src/map/dungeon/corridor/Corridor.tscn" id="4_1741m"]
-[ext_resource type="Script" path="res://src/map/dungeon/floors/DungeonFloor.cs" id="5_mo2td"]
+[ext_resource type="Script" path="res://src/map/dungeon/code/DungeonFloor.cs" id="5_mo2td"]
 
 [node name="Floor3" type="Node3D"]
 script = ExtResource("5_mo2td")

src/map/dungeon/floors/Floor11.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://g28xmp6cn16h"]
 
-[ext_resource type="Script" path="res://src/map/dungeon/floors/BossFloor.cs" id="1_gsbuk"]
+[ext_resource type="Script" path="res://src/map/dungeon/code/BossFloor.cs" id="1_gsbuk"]
 
 [node name="Floor11" type="Node3D"]
 script = ExtResource("1_gsbuk")

src/map/dungeon/models/COLUMN_ROOM_VER3_5r4b2vhc34xa1.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dm62mh0tqe0ut"
+path="res://.godot/imported/COLUMN_ROOM_VER3_5r4b2vhc34xa1.png-bbe317b7429c7856903475394d526e1a.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://src/map/dungeon/models/COLUMN_ROOM_VER3_5r4b2vhc34xa1.png"
+dest_files=["res://.godot/imported/COLUMN_ROOM_VER3_5r4b2vhc34xa1.png-bbe317b7429c7856903475394d526e1a.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=0

src/map/dungeon/models/column_room/COLUMN_ROOM_VER3.1.glb.import

@@ -3,13 +3,13 @@
 importer="scene"
 importer_version=1
 type="PackedScene"
-uid="uid://b83t00c0ghtyt"
-path="res://.godot/imported/COLUMN_ROOM_VER2.glb-1c0b5671f19205bd291cf0fee4fbffaa.scn"
+uid="uid://bg2mjgtcscekq"
+path="res://.godot/imported/COLUMN_ROOM_VER3.1.glb-70cf05ad34cdc0aadfa3d769580297cb.scn"
 
 [deps]
 
-source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER2.glb"
-dest_files=["res://.godot/imported/COLUMN_ROOM_VER2.glb-1c0b5671f19205bd291cf0fee4fbffaa.scn"]
+source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3.1.glb"
+dest_files=["res://.godot/imported/COLUMN_ROOM_VER3.1.glb-70cf05ad34cdc0aadfa3d769580297cb.scn"]
 
 [params]
 

src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_5r4b2vhc34xa1.png.import

@@ -2,10 +2,11 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://dgeewonpytiyb"
-path="res://.godot/imported/COLUMN_ROOM_VER2_5r4b2vhc34xa1.png-de0495e0d9dcc29665041eb8321a6bfb.ctex"
+uid="uid://bont0nuph50qn"
+path.s3tc="res://.godot/imported/COLUMN_ROOM_VER3_5r4b2vhc34xa1.png-4fb48ff42269c2d4a9a1f6f8c0c391d6.s3tc.ctex"
 metadata={
-"vram_texture": false
+"imported_formats": ["s3tc_bptc"],
+"vram_texture": true
 }
 generator_parameters={
 "md5": "d11b0b140d6454a828e2e034674315ab"
@@ -13,12 +14,12 @@ generator_parameters={
 
 [deps]
 
-source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER2_5r4b2vhc34xa1.png"
-dest_files=["res://.godot/imported/COLUMN_ROOM_VER2_5r4b2vhc34xa1.png-de0495e0d9dcc29665041eb8321a6bfb.ctex"]
+source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_5r4b2vhc34xa1.png"
+dest_files=["res://.godot/imported/COLUMN_ROOM_VER3_5r4b2vhc34xa1.png-4fb48ff42269c2d4a9a1f6f8c0c391d6.s3tc.ctex"]
 
 [params]
 
-compress/mode=0
+compress/mode=2
 compress/high_quality=false
 compress/lossy_quality=0.7
 compress/hdr_compression=1

src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_CEILING_1.jpg.import

@@ -2,8 +2,8 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://bxi36tkatoou8"
-path="res://.godot/imported/COLUMN_ROOM_VER2_CEILING_1.jpg-f869fc91b0845c898877f82481b048b3.ctex"
+uid="uid://dfidrnk2qw3pf"
+path="res://.godot/imported/COLUMN_ROOM_VER3_CEILING_1.jpg-78cabbf835982065b08ecc903146af5f.ctex"
 metadata={
 "vram_texture": false
 }
@@ -13,8 +13,8 @@ generator_parameters={
 
 [deps]
 
-source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER2_CEILING_1.jpg"
-dest_files=["res://.godot/imported/COLUMN_ROOM_VER2_CEILING_1.jpg-f869fc91b0845c898877f82481b048b3.ctex"]
+source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_CEILING_1.jpg"
+dest_files=["res://.godot/imported/COLUMN_ROOM_VER3_CEILING_1.jpg-78cabbf835982065b08ecc903146af5f.ctex"]
 
 [params]
 

src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_CEILING_1_14.jpg.import

@@ -2,8 +2,8 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://w5i6iq6b11th"
-path="res://.godot/imported/COLUMN_ROOM_VER2_CEILING_1_14.jpg-9458a4f0884d37d619ae174474f4b00f.ctex"
+uid="uid://cs17e234nre54"
+path="res://.godot/imported/COLUMN_ROOM_VER3_CEILING_1_14.jpg-428973ef0b22984762d49f3b55505738.ctex"
 metadata={
 "vram_texture": false
 }
@@ -13,8 +13,8 @@ generator_parameters={
 
 [deps]
 
-source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER2_CEILING_1_14.jpg"
-dest_files=["res://.godot/imported/COLUMN_ROOM_VER2_CEILING_1_14.jpg-9458a4f0884d37d619ae174474f4b00f.ctex"]
+source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_CEILING_1_14.jpg"
+dest_files=["res://.godot/imported/COLUMN_ROOM_VER3_CEILING_1_14.jpg-428973ef0b22984762d49f3b55505738.ctex"]
 
 [params]
 

src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_COLUMN-DARKER.png.import

@@ -2,8 +2,8 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://e2tiknycypah"
-path="res://.godot/imported/COLUMN_ROOM_VER2_COLUMN-DARKER.png-63e49c58114191352bb71ce70e30e6ae.ctex"
+uid="uid://b2h2devo04do7"
+path="res://.godot/imported/COLUMN_ROOM_VER3_COLUMN-DARKER.png-bc76cadbb5217d7109b186d99bc11542.ctex"
 metadata={
 "vram_texture": false
 }
@@ -13,8 +13,8 @@ generator_parameters={
 
 [deps]
 
-source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER2_COLUMN-DARKER.png"
-dest_files=["res://.godot/imported/COLUMN_ROOM_VER2_COLUMN-DARKER.png-63e49c58114191352bb71ce70e30e6ae.ctex"]
+source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_COLUMN-DARKER.png"
+dest_files=["res://.godot/imported/COLUMN_ROOM_VER3_COLUMN-DARKER.png-bc76cadbb5217d7109b186d99bc11542.ctex"]
 
 [params]
 

src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_COLUMN.jpg.import

@@ -2,8 +2,8 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://bd827dwv4i13f"
-path="res://.godot/imported/COLUMN_ROOM_VER2_COLUMN.jpg-97f62b50678693e30acd3e3181f45a30.ctex"
+uid="uid://1knt4qif78c1"
+path="res://.godot/imported/COLUMN_ROOM_VER3_COLUMN.jpg-83075148dcf9883fe0323675a630206b.ctex"
 metadata={
 "vram_texture": false
 }
@@ -13,8 +13,8 @@ generator_parameters={
 
 [deps]
 
-source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER2_COLUMN.jpg"
-dest_files=["res://.godot/imported/COLUMN_ROOM_VER2_COLUMN.jpg-97f62b50678693e30acd3e3181f45a30.ctex"]
+source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_COLUMN.jpg"
+dest_files=["res://.godot/imported/COLUMN_ROOM_VER3_COLUMN.jpg-83075148dcf9883fe0323675a630206b.ctex"]
 
 [params]
 

src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_COLUMN_13.jpg.import

@@ -2,8 +2,8 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://cilpqtrtuldgi"
-path="res://.godot/imported/COLUMN_ROOM_VER2_COLUMN_13.jpg-0ef4b343c747a58c11bcc3df937c0e08.ctex"
+uid="uid://c5c3i2b10oslb"
+path="res://.godot/imported/COLUMN_ROOM_VER3_COLUMN_13.jpg-69e054738f2f316ea4175f5e6ef590da.ctex"
 metadata={
 "vram_texture": false
 }
@@ -13,8 +13,8 @@ generator_parameters={
 
 [deps]
 
-source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER2_COLUMN_13.jpg"
-dest_files=["res://.godot/imported/COLUMN_ROOM_VER2_COLUMN_13.jpg-0ef4b343c747a58c11bcc3df937c0e08.ctex"]
+source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_COLUMN_13.jpg"
+dest_files=["res://.godot/imported/COLUMN_ROOM_VER3_COLUMN_13.jpg-69e054738f2f316ea4175f5e6ef590da.ctex"]
 
 [params]
 

src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_FLOOR1.jpg.import

@@ -2,8 +2,8 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://dvklxcat8o6sv"
-path="res://.godot/imported/COLUMN_ROOM_VER2_FLOOR1.jpg-0da2c0786d418a960d56bb24a7afa90d.ctex"
+uid="uid://cvveolj70y2ve"
+path="res://.godot/imported/COLUMN_ROOM_VER3_FLOOR1.jpg-1a87ff500c8232b0661d051ff8003610.ctex"
 metadata={
 "vram_texture": false
 }
@@ -13,8 +13,8 @@ generator_parameters={
 
 [deps]
 
-source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER2_FLOOR1.jpg"
-dest_files=["res://.godot/imported/COLUMN_ROOM_VER2_FLOOR1.jpg-0da2c0786d418a960d56bb24a7afa90d.ctex"]
+source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_FLOOR1.jpg"
+dest_files=["res://.godot/imported/COLUMN_ROOM_VER3_FLOOR1.jpg-1a87ff500c8232b0661d051ff8003610.ctex"]
 
 [params]
 

src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_STONE_PANEL_1png.png.import

@@ -2,8 +2,8 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://k50xob3fs4bf"
-path="res://.godot/imported/COLUMN_ROOM_VER2_STONE_PANEL_1png.png-10f9129e2f9600eb7f86b90a38196b20.ctex"
+uid="uid://djxkkju4ge6ed"
+path="res://.godot/imported/COLUMN_ROOM_VER3_STONE_PANEL_1png.png-1d04ad9585e9ca96c291e8f4b9972f69.ctex"
 metadata={
 "vram_texture": false
 }
@@ -13,8 +13,8 @@ generator_parameters={
 
 [deps]
 
-source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER2_STONE_PANEL_1png.png"
-dest_files=["res://.godot/imported/COLUMN_ROOM_VER2_STONE_PANEL_1png.png-10f9129e2f9600eb7f86b90a38196b20.ctex"]
+source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_STONE_PANEL_1png.png"
+dest_files=["res://.godot/imported/COLUMN_ROOM_VER3_STONE_PANEL_1png.png-1d04ad9585e9ca96c291e8f4b9972f69.ctex"]
 
 [params]
 

src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_STONE_PANEL_2png.png.import

@@ -2,8 +2,8 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://8cc70lkujpkp"
-path="res://.godot/imported/COLUMN_ROOM_VER2_STONE_PANEL_2png.png-1685b03b7d9cbcb76630fba1542056c2.ctex"
+uid="uid://l4argvs2epjs"
+path="res://.godot/imported/COLUMN_ROOM_VER3_STONE_PANEL_2png.png-105ea1d2aeebe58dcd71c386fbd75424.ctex"
 metadata={
 "vram_texture": false
 }
@@ -13,8 +13,8 @@ generator_parameters={
 
 [deps]
 
-source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER2_STONE_PANEL_2png.png"
-dest_files=["res://.godot/imported/COLUMN_ROOM_VER2_STONE_PANEL_2png.png-1685b03b7d9cbcb76630fba1542056c2.ctex"]
+source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_STONE_PANEL_2png.png"
+dest_files=["res://.godot/imported/COLUMN_ROOM_VER3_STONE_PANEL_2png.png-105ea1d2aeebe58dcd71c386fbd75424.ctex"]
 
 [params]
 

src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_TILE4.png.import

@@ -2,8 +2,8 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://dd5m5btvsjuye"
-path="res://.godot/imported/COLUMN_ROOM_VER2_TILE4.png-2746fb3d117c498a586ce5b276d55051.ctex"
+uid="uid://dk703o186bnxa"
+path="res://.godot/imported/COLUMN_ROOM_VER3_TILE4.png-5c2cb404c5c949788b084a9752e70e9e.ctex"
 metadata={
 "vram_texture": false
 }
@@ -13,8 +13,8 @@ generator_parameters={
 
 [deps]
 
-source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER2_TILE4.png"
-dest_files=["res://.godot/imported/COLUMN_ROOM_VER2_TILE4.png-2746fb3d117c498a586ce5b276d55051.ctex"]
+source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_TILE4.png"
+dest_files=["res://.godot/imported/COLUMN_ROOM_VER3_TILE4.png-5c2cb404c5c949788b084a9752e70e9e.ctex"]
 
 [params]
 

src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_WALL TILE 1.jpg.import

@@ -2,8 +2,8 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://dkvpjmy3x26q0"
-path="res://.godot/imported/COLUMN_ROOM_VER2_WALL TILE 1.jpg-9d120d992dd32137dea675611a8df87b.ctex"
+uid="uid://cg2mvnq7f8uhj"
+path="res://.godot/imported/COLUMN_ROOM_VER3_WALL TILE 1.jpg-05c17d00d2ec88c46146a18b56c7006c.ctex"
 metadata={
 "vram_texture": false
 }
@@ -13,8 +13,8 @@ generator_parameters={
 
 [deps]
 
-source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER2_WALL TILE 1.jpg"
-dest_files=["res://.godot/imported/COLUMN_ROOM_VER2_WALL TILE 1.jpg-9d120d992dd32137dea675611a8df87b.ctex"]
+source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_WALL TILE 1.jpg"
+dest_files=["res://.godot/imported/COLUMN_ROOM_VER3_WALL TILE 1.jpg-05c17d00d2ec88c46146a18b56c7006c.ctex"]
 
 [params]
 

src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_WALL TILE 1_5.jpg.import

@@ -2,8 +2,8 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://ceejqxbdtf8rr"
-path="res://.godot/imported/COLUMN_ROOM_VER2_WALL TILE 1_5.jpg-dc439846e4c5670220166b7091ca77c8.ctex"
+uid="uid://b1jx5dagwdjiq"
+path="res://.godot/imported/COLUMN_ROOM_VER3_WALL TILE 1_5.jpg-09416bf04ba5376fe080c348c37f025b.ctex"
 metadata={
 "vram_texture": false
 }
@@ -13,8 +13,8 @@ generator_parameters={
 
 [deps]
 
-source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER2_WALL TILE 1_5.jpg"
-dest_files=["res://.godot/imported/COLUMN_ROOM_VER2_WALL TILE 1_5.jpg-dc439846e4c5670220166b7091ca77c8.ctex"]
+source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_WALL TILE 1_5.jpg"
+dest_files=["res://.godot/imported/COLUMN_ROOM_VER3_WALL TILE 1_5.jpg-09416bf04ba5376fe080c348c37f025b.ctex"]
 
 [params]
 

src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_brick3.png.import

@@ -2,8 +2,8 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://c2apnirkmpt8y"
-path="res://.godot/imported/COLUMN_ROOM_VER2_brick3.png-272d9a54bb0e90b6996e95e9abd96cd3.ctex"
+uid="uid://ca36l3t6htau7"
+path="res://.godot/imported/COLUMN_ROOM_VER3_brick3.png-eaa442f51242de76aee7895962930681.ctex"
 metadata={
 "vram_texture": false
 }
@@ -13,8 +13,8 @@ generator_parameters={
 
 [deps]
 
-source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER2_brick3.png"
-dest_files=["res://.godot/imported/COLUMN_ROOM_VER2_brick3.png-272d9a54bb0e90b6996e95e9abd96cd3.ctex"]
+source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_brick3.png"
+dest_files=["res://.godot/imported/COLUMN_ROOM_VER3_brick3.png-eaa442f51242de76aee7895962930681.ctex"]
 
 [params]
 

src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_effed-TILES-2.png.import

@@ -2,8 +2,8 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://bajtstyhowdi7"
-path="res://.godot/imported/COLUMN_ROOM_VER2_effed-TILES-2.png-16c53b085c5375ca20518ae729da5756.ctex"
+uid="uid://dafrf8sqqrhlr"
+path="res://.godot/imported/COLUMN_ROOM_VER3_effed-TILES-2.png-3c0bd1fb892db97f1d775bc2aa032e56.ctex"
 metadata={
 "vram_texture": false
 }
@@ -13,8 +13,8 @@ generator_parameters={
 
 [deps]
 
-source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER2_effed-TILES-2.png"
-dest_files=["res://.godot/imported/COLUMN_ROOM_VER2_effed-TILES-2.png-16c53b085c5375ca20518ae729da5756.ctex"]
+source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_effed-TILES-2.png"
+dest_files=["res://.godot/imported/COLUMN_ROOM_VER3_effed-TILES-2.png-3c0bd1fb892db97f1d775bc2aa032e56.ctex"]
 
 [params]
 

src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_hand-tiile.png.import

@@ -2,8 +2,8 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://bg4ha1vxcf1uv"
-path="res://.godot/imported/COLUMN_ROOM_VER2_hand-tiile.png-e928d5a2e995aaf08d2ad66a324c1895.ctex"
+uid="uid://ne8b5ixuw7wy"
+path="res://.godot/imported/COLUMN_ROOM_VER3_hand-tiile.png-2b65238c448e068043263d88200d4967.ctex"
 metadata={
 "vram_texture": false
 }
@@ -13,8 +13,8 @@ generator_parameters={
 
 [deps]
 
-source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER2_hand-tiile.png"
-dest_files=["res://.godot/imported/COLUMN_ROOM_VER2_hand-tiile.png-e928d5a2e995aaf08d2ad66a324c1895.ctex"]
+source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_hand-tiile.png"
+dest_files=["res://.godot/imported/COLUMN_ROOM_VER3_hand-tiile.png-2b65238c448e068043263d88200d4967.ctex"]
 
 [params]
 

src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_mother.png.import

@@ -2,8 +2,8 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://1dj5f40styj6"
-path="res://.godot/imported/COLUMN_ROOM_VER2_mother.png-db6dfb2d45aec5d8850b5f364063bc8a.ctex"
+uid="uid://jrsx4xa5qm15"
+path="res://.godot/imported/COLUMN_ROOM_VER3_mother.png-0256698903ec16cb885c3a21f79c55c4.ctex"
 metadata={
 "vram_texture": false
 }
@@ -13,8 +13,8 @@ generator_parameters={
 
 [deps]
 
-source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER2_mother.png"
-dest_files=["res://.godot/imported/COLUMN_ROOM_VER2_mother.png-db6dfb2d45aec5d8850b5f364063bc8a.ctex"]
+source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_mother.png"
+dest_files=["res://.godot/imported/COLUMN_ROOM_VER3_mother.png-0256698903ec16cb885c3a21f79c55c4.ctex"]
 
 [params]
 

src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_others_0020_color_1k.jpg.import

@@ -2,8 +2,8 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://boj82wijinlmi"
-path="res://.godot/imported/COLUMN_ROOM_VER2_others_0020_color_1k.jpg-08a709c9afe49ef3a01ec4856bb15445.ctex"
+uid="uid://bn5lx2dal2x23"
+path="res://.godot/imported/COLUMN_ROOM_VER3_others_0020_color_1k.jpg-5b505d8c2df761cb7e4e2c1c714faed8.ctex"
 metadata={
 "vram_texture": false
 }
@@ -13,8 +13,8 @@ generator_parameters={
 
 [deps]
 
-source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER2_others_0020_color_1k.jpg"
-dest_files=["res://.godot/imported/COLUMN_ROOM_VER2_others_0020_color_1k.jpg-08a709c9afe49ef3a01ec4856bb15445.ctex"]
+source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_others_0020_color_1k.jpg"
+dest_files=["res://.godot/imported/COLUMN_ROOM_VER3_others_0020_color_1k.jpg-5b505d8c2df761cb7e4e2c1c714faed8.ctex"]
 
 [params]
 

src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_swirled_column.png.import

@@ -2,8 +2,8 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://dqmdxhxrydysb"
-path="res://.godot/imported/COLUMN_ROOM_VER2_swirled_column.png-23337ee6e0421b4d2611567e86a06516.ctex"
+uid="uid://p4fcwsony27k"
+path="res://.godot/imported/COLUMN_ROOM_VER3_swirled_column.png-c575cb6e1ee3be99d603eaf1a2a0a933.ctex"
 metadata={
 "vram_texture": false
 }
@@ -13,8 +13,8 @@ generator_parameters={
 
 [deps]
 
-source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER2_swirled_column.png"
-dest_files=["res://.godot/imported/COLUMN_ROOM_VER2_swirled_column.png-23337ee6e0421b4d2611567e86a06516.ctex"]
+source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_swirled_column.png"
+dest_files=["res://.godot/imported/COLUMN_ROOM_VER3_swirled_column.png-c575cb6e1ee3be99d603eaf1a2a0a933.ctex"]
 
 [params]
 

src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_tile2.png.import

@@ -2,8 +2,8 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://prv7jvrlblen"
-path="res://.godot/imported/COLUMN_ROOM_VER2_tile2.png-d015475c67a5d15aa8d925483dc45f50.ctex"
+uid="uid://djaud0lauykv1"
+path="res://.godot/imported/COLUMN_ROOM_VER3_tile2.png-405acc0e29078877b681733b9d97d32b.ctex"
 metadata={
 "vram_texture": false
 }
@@ -13,8 +13,8 @@ generator_parameters={
 
 [deps]
 
-source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER2_tile2.png"
-dest_files=["res://.godot/imported/COLUMN_ROOM_VER2_tile2.png-d015475c67a5d15aa8d925483dc45f50.ctex"]
+source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_tile2.png"
+dest_files=["res://.godot/imported/COLUMN_ROOM_VER3_tile2.png-405acc0e29078877b681733b9d97d32b.ctex"]
 
 [params]
 

src/map/dungeon/scenes/Antechamber.tscn

@@ -782,3 +782,8 @@ script = ExtResource("21_m6pqv")
 [node name="MeshInstance3D" type="MeshInstance3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -2.01147, 0)
 mesh = SubResource("PlaneMesh_s0txx")
+
+[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
+transform = Transform3D(-0.866023, -0.433016, 0.250001, 0, 0.499998, 0.866027, -0.500003, 0.749999, -0.43301, 0, 0, 0)
+light_energy = 0.0
+shadow_enabled = true

src/map/dungeon/scenes/Antechamber_2.tscn

@@ -1751,3 +1751,8 @@ material_override = SubResource("StandardMaterial3D_2xt56")
 operation = 2
 size = Vector3(4, 4, 2)
 material = SubResource("StandardMaterial3D_a7x8v")
+
+[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
+transform = Transform3D(-0.866023, -0.433016, 0.250001, 0, 0.499998, 0.866027, -0.500003, 0.749999, -0.43301, 0, 0, 0)
+light_energy = 0.0
+shadow_enabled = true

src/map/dungeon/scenes/BasinRoom.tscn

@@ -804,7 +804,7 @@ size = Vector3(4, 4, 0.5)
 material = SubResource("StandardMaterial3D_bnx07")
 
 [node name="DOOR" type="CSGBox3D" parent="Room/CSGBox2"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.872507, 0, 0.0686455)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0374769, -3.91155e-08, 0.0686455)
 material_override = SubResource("StandardMaterial3D_m3gqj")
 operation = 2
 size = Vector3(4, 4, 2)

src/map/overworld/Overworld.tscn

@@ -1,10 +1,8 @@
-[gd_scene load_steps=9 format=3 uid="uid://dvnc26rebk6o0"]
+[gd_scene load_steps=7 format=3 uid="uid://dvnc26rebk6o0"]
 
-[ext_resource type="Script" path="res://src/map/dungeon/floors/Overworld.cs" id="1_5hmt3"]
+[ext_resource type="Script" path="res://src/map/dungeon/code/Overworld.cs" id="1_5hmt3"]
 [ext_resource type="PackedScene" uid="uid://dvj5lwymr02xn" path="res://src/map/overworld/OverworldMap.tscn" id="2_qwsky"]
 [ext_resource type="PackedScene" uid="uid://d4l4qutp8x40c" path="res://src/npc/rat/NPC.tscn" id="3_4sm8u"]
-[ext_resource type="PackedScene" uid="uid://b0gwivt7cw7nd" path="res://src/enemy/enemy_types/michael/Michael.tscn" id="4_c6gnn"]
-[ext_resource type="PackedScene" uid="uid://bksq62muhk3h5" path="res://src/enemy/enemy_types/sproingy/Sproingy.tscn" id="5_jnkr5"]
 
 [sub_resource type="NavigationMesh" id="NavigationMesh_xplxw"]
 vertices = PackedVector3Array(-26.8631, 1.06755, -24.5, -26.8631, 1.06755, 24.5, 22.1369, 1.06755, 24.5, 22.1369, 1.06755, -24.5)
@@ -21,13 +19,25 @@ size = Vector2(50, 50)
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.63488, -5.13176)
 script = ExtResource("1_5hmt3")
 
+[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
+transform = Transform3D(-0.866023, -0.433016, 0.250001, 0, 0.499998, 0.866027, -0.500003, 0.749999, -0.43301, 0, 0, 0)
+light_energy = 0.597
+light_indirect_energy = 1.647
+light_volumetric_fog_energy = 0.2
+shadow_enabled = true
+shadow_opacity = 0.75
+shadow_blur = 4.224
+directional_shadow_fade_start = 0.63
+
+[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
+
 [node name="PlayerSpawnPoint" type="Marker3D" parent="."]
 unique_name_in_owner = true
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.03633, 0.654655, 6.89279)
 
 [node name="ExitSpawnPoint" type="Marker3D" parent="."]
 unique_name_in_owner = true
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.49531, 1.49242, 0)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.60081, 1.49242, -45.1221)
 
 [node name="OverworldMap" parent="." instance=ExtResource("2_qwsky")]
 
@@ -40,10 +50,4 @@ visible = false
 mesh = SubResource("PlaneMesh_6o1o7")
 
 [node name="NPC" parent="." instance=ExtResource("3_4sm8u")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -14.1364, 2.01954, -3.50556)
-
-[node name="Michael" parent="." instance=ExtResource("4_c6gnn")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.8808, 1.77093, -2.19797)
-
-[node name="Sproingy" parent="." instance=ExtResource("5_jnkr5")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.71772, -11.9207)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -25.0589, 2.01954, -0.291408)

src/map/overworld/OverworldMap.tscn

@@ -76,9 +76,9 @@ shader_parameter/scale2 = Vector2(1, 1)
 shader_parameter/wave_strength = 0.25
 shader_parameter/wave_scale = 0.5
 shader_parameter/pixelation_level = 256
-shader_parameter/FoamSize = 0.2
+shader_parameter/FoamSize = 0.01
 shader_parameter/WaterOpacity = 0.5
-shader_parameter/FoamGlowIntensity = 0.5
+shader_parameter/FoamGlowIntensity = -0.08
 
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_mj3e2"]
 transparency = 1