Almost shippable

addons/SimpleDungeons/sample_dungeons/custom_random_room_function_example/corridor.tscn

@@ -27,31 +27,31 @@ script = ExtResource("1_qqrlr")
 transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -5.68248e-07, 0, 0)
 material_override = SubResource("StandardMaterial3D_oj2cm")
 use_collision = true
-size = Vector3(10, 10, 10)
+size = Vector3(4, 4, 4)
 
 [node name="CSGBox3D2" type="CSGBox3D" parent="CSGBox3D"]
 operation = 2
-size = Vector3(9.5, 9.5, 9.5)
+size = Vector3(3.8, 3.8, 3.8)
 
 [node name="DOOR?_F_CUT" type="CSGBox3D" parent="CSGBox3D"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -2.75, -5.25)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.05713e-07, -0.0762184, -1.75306)
 operation = 2
-size = Vector3(2, 4, 1)
+size = Vector3(3.5, 3.65234, 0.5)
 
 [node name="DOOR?_R_CUT" type="CSGBox3D" parent="CSGBox3D"]
-transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 5, -2.75, 0)
+transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 1.75067, -0.0769043, -2.17967e-08)
 operation = 2
-size = Vector3(2, 4, 1)
+size = Vector3(3.5, 3.65381, 0.5)
 
 [node name="DOOR?_L_CUT" type="CSGBox3D" parent="CSGBox3D"]
-transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -5, -2.75, 0)
+transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -1.50397, -0.0749512, -0.0690359)
 operation = 2
-size = Vector3(2, 4, 1)
+size = Vector3(3.5, 3.6499, 1)
 
 [node name="DOOR?_B_CUT" type="CSGBox3D" parent="CSGBox3D"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -2.75, 5)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.05912e-07, -0.0749512, 1.50077)
 operation = 2
-size = Vector3(2, 4, 1)
+size = Vector3(3.5, 3.6499, 1)
 
 [node name="RemoveUnusedDoors" type="Node" parent="."]
 script = SubResource("GDScript_ldqn2")

project.godot

@@ -28,8 +28,8 @@ general/balloon_path="res://src/ui/dialogue/Balloon.tscn"
 
 [display]
 
-window/size/viewport_width=1920
+window/size/viewport_width=1280
-window/size/viewport_height=1080
+window/size/viewport_height=960
 
 [dotnet]
 
@@ -209,4 +209,11 @@ common/physics_ticks_per_second=144
 
 [rendering]
 
+textures/canvas_textures/default_texture_filter=0
+textures/lossless_compression/force_png=true
+shading/overrides/force_vertex_shading=true
+shading/overrides/force_lambert_over_burley=true
+textures/default_filters/anisotropic_filtering_level=0
 environment/screen_space_reflection/roughness_quality=0
+2d/snap/snap_2d_transforms_to_pixel=true
+2d/snap/snap_2d_vertices_to_pixel=true

src/app/App.gdshader

@@ -0,0 +1,140 @@
+shader_type canvas_item;
+
+// Handles the resolution changes, color depth, and dithering
+group_uniforms resolution_and_colors;
+uniform bool change_color_depth = false;
+uniform int target_color_depth : hint_range(1, 8) = 5;
+uniform bool dithering = false;
+uniform bool scale_resolution = false;
+uniform int target_resolution_scale = 3;
+
+// Handles the LUTish recoloring
+group_uniforms gradient_recoloring;
+uniform bool enable_recolor = false;
+uniform sampler2D to_gradient: hint_default_black;
+
+int dithering_pattern(ivec2 fragcoord) {
+	const int pattern[] = {
+		-4, +0, -3, +1, 
+		+2, -2, +3, -1, 
+		-3, +1, -4, +0, 
+		+3, -1, +2, -2
+	};
+	
+	int x = fragcoord.x % 4;
+	int y = fragcoord.y % 4;
+	
+	return pattern[y * 4 + x];
+}
+
+vec3 rgb2hsv(vec3 rgb) { //Converts RGB values to HSV
+	float r = rgb.r;
+	float g = rgb.g;
+	float b = rgb.b;
+
+	float cmax = max(r,max(g,b));
+	float cmin = min(r,min(g,b));
+	float delta = cmax - cmin;
+
+	float h = 0.f; //hue
+
+	if (delta > 0.f){
+		if (cmax == r){
+			h = (g-b)/delta;
+			h = mod(h,6.f);
+		} else if (cmax == g){
+			h = ((b - r) / delta) + 2.f;
+		} else {
+			h = ((r-g)/delta) + 4.f;
+		}
+		h = h * 60.f;
+	}
+
+	float s = 0.f; //saturation
+	if (cmax > 0.f){
+		s = delta / cmax;
+	}
+
+	return vec3(h,s,cmax); // Keep original alpha value 
+
+}
+
+vec3 hsv2rgb(vec3 hsv) { //Converts HSV values to RGB
+	float h = hsv.r;
+	float s = hsv.g;
+	float v = hsv.b;
+	float c = v * s;
+	//X = C × (1 - |(H / 60°) mod 2 - 1|)
+	float x = h / 60.f;
+	x = mod(x,2.f);
+	x = abs(x - 1.f);
+	x = c * (1.f - x);
+
+	float m = v - c;
+
+	vec3 rgb = vec3(0.f,0.f,0.f);
+
+	if (h < 60.f) {
+		rgb = vec3(c,x,0.f);
+	} else if (h < 120.f){
+		rgb = vec3(x,c,0.f);
+	} else if (h < 180.f){
+		rgb = vec3(0.f,c,x);
+	} else if (h < 240.f){
+		rgb = vec3(0.f,x,c);
+	} else if (h < 300.f){
+		rgb = vec3(x,0.f,c);
+	} else if (h < 360.f){
+		rgb = vec3(c,0.f,x);
+	}
+	rgb[0] = rgb[0] + m;
+	rgb[1] = rgb[1] + m;
+	rgb[2] = rgb[2] + m;
+
+	return rgb; 
+}
+
+void fragment() {
+	ivec2 uv;
+	vec3 color;
+	
+	if(scale_resolution){
+		uv = ivec2(FRAGCOORD.xy / float(target_resolution_scale));
+		color = texelFetch(TEXTURE, uv * target_resolution_scale, 0).rgb;
+	} else {
+		uv = ivec2(FRAGCOORD.xy);
+		color = texelFetch(TEXTURE, uv, 0).rgb;
+	}
+	
+	if(enable_recolor){
+		vec3 hsv = rgb2hsv(color);
+		float color_pos = (hsv.x / 360.0);
+		vec3 new_color = texture(to_gradient, vec2((color_pos), 0.5)).rgb;
+		vec3 new_hsv = rgb2hsv(new_color);
+		hsv.x = new_hsv.x;
+		vec3 final_rgb = hsv2rgb(hsv);
+
+		color.rgb = final_rgb;
+	}
+
+	
+	// Convert from [0.0, 1.0] range to [0, 255] range
+	ivec3 c = ivec3(round(color * 255.0));
+	
+	// Apply the dithering pattern
+	if (dithering) {
+		c += ivec3(dithering_pattern(uv));
+	}
+	
+	vec3 final_color;
+	if(change_color_depth){
+		// Truncate from 8 bits to color_depth bits
+		c >>= (8 - target_color_depth);
+		final_color = vec3(c) / float(1 << target_color_depth);
+	} else {
+		final_color = vec3(c) / float(1 << 8);
+	}
+	
+	// Convert back to [0.0, 1.0] range
+	COLOR.rgb = final_color;
+}

src/app/App.tscn

@@ -13,7 +13,6 @@ anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
-stretch = true
 
 [node name="GameWindow" type="SubViewport" parent="SubViewportContainer"]
 unique_name_in_owner = true
@@ -21,7 +20,7 @@ transparent_bg = true
 handle_input_locally = false
 audio_listener_enable_2d = true
 audio_listener_enable_3d = true
-size = Vector2i(1920, 1080)
+size = Vector2i(1280, 960)
 render_target_update_mode = 4
 
 [node name="Menu" parent="." instance=ExtResource("2_kvwo1")]

src/enemy/Enemy.cs

@@ -147,7 +147,7 @@ public partial class Enemy : CharacterBody3D, IEnemy, IProvide<IEnemyLogic>
       {
         LoadShader("res://src/vfx/shaders/PixelMelt.gdshader");
         var tweener = GetTree().CreateTween();
-        tweener.TweenMethod(Callable.From((float x) => SetShaderValue(x)), 0.0f, 1.0f, 0.5f);
+        tweener.TweenMethod(Callable.From((float x) => SetShaderValue(x)), 0.0f, 1.0f, 0.8f);
         tweener.TweenCallback(Callable.From(QueueFree));
       });
 
@@ -230,6 +230,7 @@ public partial class Enemy : CharacterBody3D, IEnemy, IProvide<IEnemyLogic>
     var overlappingBodies = LineOfSight.GetOverlappingBodies();
     foreach (var overlap in overlappingBodies)
     {
+      if (Raycast.GlobalPosition != GameRepo.PlayerGlobalPosition.Value)
         Raycast.LookAt(GameRepo.PlayerGlobalPosition.Value, Vector3.Up);
       Raycast.ForceRaycastUpdate();
       if (Raycast.IsColliding())

src/enemy/enemy_types/michael/Michael.gdshader

@@ -0,0 +1,14 @@
+shader_type canvas_item;
+
+void vertex() {
+	// Called for every vertex the material is visible on.
+}
+
+void fragment() {
+	// Called for every pixel the material is visible on.
+}
+
+//void light() {
+	// Called for every pixel for every light affecting the CanvasItem.
+	// Uncomment to replace the default light processing function with this one.
+//}

src/enemy/enemy_types/michael/Michael.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=103 format=3 uid="uid://b0gwivt7cw7nd"]
+[gd_scene load_steps=104 format=3 uid="uid://b0gwivt7cw7nd"]
 
 [ext_resource type="Script" path="res://src/enemy/Enemy.cs" id="1_a6wro"]
 [ext_resource type="Script" path="res://src/enemy/EnemyStatResource.cs" id="2_x4pjh"]
@@ -107,6 +107,8 @@ radius = 1.0
 [sub_resource type="ViewportTexture" id="ViewportTexture_57rcc"]
 viewport_path = NodePath("Sprite/SubViewport")
 
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_1fhn0"]
+
 [sub_resource type="SpriteFrames" id="SpriteFrames_artt5"]
 animations = [{
 "frames": [{
@@ -641,14 +643,17 @@ texture = SubResource("ViewportTexture_57rcc")
 [node name="SubViewport" type="SubViewport" parent="Sprite"]
 disable_3d = true
 transparent_bg = true
-size = Vector2i(95, 95)
+size = Vector2i(200, 200)
 
 [node name="AnimatedSprite" type="AnimatedSprite2D" parent="Sprite/SubViewport"]
 unique_name_in_owner = true
 texture_filter = 1
+texture_repeat = 1
+material = SubResource("ShaderMaterial_1fhn0")
 position = Vector2(45, 45)
 sprite_frames = SubResource("SpriteFrames_artt5")
 animation = &"idle_back_walk"
+offset = Vector2(45, 45)
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
 unique_name_in_owner = true

src/enemy/state/states/EnemyLogic.State.FollowPlayer.cs

@@ -21,8 +21,9 @@ namespace GameJamDungeon
 
           enemy.Velocity = (targetPosition - enemy.GlobalTransform.Origin).Normalized() * 2f;
           var lookAtDir = enemy.GlobalTransform.Origin - enemy.Velocity;
-          if (enemy.Velocity != Vector3.Zero)
+          var lookAtPosition = new Vector3(lookAtDir.X, enemy.GlobalPosition.Y, lookAtDir.Z);
-            enemy.LookAt(new Vector3(lookAtDir.X, enemy.GlobalPosition.Y, lookAtDir.Z));
+          if (!enemy.Velocity.IsEqualApprox(Vector3.Zero) && !enemy.GlobalPosition.IsEqualApprox(lookAtPosition))
+            enemy.LookAt(lookAtPosition);
 
           Output(new Output.MovementComputed());
           return ToSelf();

src/enemy/state/states/EnemyLogic.State.Idle.cs

@@ -24,7 +24,8 @@ public partial class EnemyLogic
         enemy.Velocity = velocity;
         var lookAtDir = enemy.GlobalTransform.Origin - enemy.Velocity;
 
-        if (enemy.Velocity != Vector3.Zero)
+        var lookAtPosition = new Vector3(lookAtDir.X, enemy.GlobalPosition.Y, lookAtDir.Z);
+        if (!enemy.Velocity.IsEqualApprox(Vector3.Zero) && !enemy.GlobalPosition.IsEqualApprox(lookAtPosition))
           enemy.LookAt(new Vector3(lookAtDir.X, enemy.GlobalPosition.Y, lookAtDir.Z));
 
         Output(new Output.MovementComputed());

src/game/Game.cs

@@ -93,7 +93,7 @@ public partial class Game : Node3D, IGame
         Map.SpawnNextFloor();
       })
       .Handle((in GameLogic.Output.HidePauseMenu _) => { PauseMenu.Hide(); })
-      .Handle((in GameLogic.Output.ExitPauseMenu _) => { PauseMenu.FadeOut(); Input.MouseMode = Input.MouseModeEnum.Captured; PauseMenu.SetProcessUnhandledInput(false); })
+      .Handle((in GameLogic.Output.ExitPauseMenu _) => { PauseMenu.FadeOut(); Input.MouseMode = Input.MouseModeEnum.Visible; PauseMenu.SetProcessUnhandledInput(false); })
       .Handle((in GameLogic.Output.ShowFloorClearMenu _) => { FloorClearMenu.Show(); FloorClearMenu.FadeIn(); })
       .Handle((in GameLogic.Output.ExitFloorClearMenu _) => { FloorClearMenu.FadeOut(); })
       .Handle((in GameLogic.Output.OpenInventory _) => { InGameUI.ShowInventoryScreen(); InGameUI.InventoryMenu.SetProcessInput(true); })

src/game/Game.tscn

@@ -1,6 +1,7 @@
-[gd_scene load_steps=12 format=3 uid="uid://33ek675mfb5n"]
+[gd_scene load_steps=13 format=3 uid="uid://33ek675mfb5n"]
 
 [ext_resource type="Script" path="res://src/game/Game.cs" id="1_ytcii"]
+[ext_resource type="Shader" path="res://src/app/App.gdshader" id="2_6ifxs"]
 [ext_resource type="PackedScene" uid="uid://by67pn7fdsg1m" path="res://src/map/Map.tscn" id="3_d8awv"]
 [ext_resource type="PackedScene" uid="uid://cfecvvav8kkp6" path="res://src/player/Player.tscn" id="3_kk6ly"]
 [ext_resource type="PackedScene" uid="uid://b1muxus5qdbeu" path="res://src/ui/in_game_ui/InGameUI.tscn" id="5_lxtnp"]
@@ -11,22 +12,44 @@
 [ext_resource type="PackedScene" uid="uid://dbtfgrtgpr4qg" path="res://src/ui/death_menu/DeathMenu.tscn" id="11_wypid"]
 [ext_resource type="PackedScene" uid="uid://blbqgw3wosc1w" path="res://src/ui/pause_menu/PauseMenu.tscn" id="12_yev8k"]
 
-[sub_resource type="Environment" id="Environment_3jyth"]
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_e75a2"]
+shader = ExtResource("2_6ifxs")
+shader_parameter/change_color_depth = true
+shader_parameter/target_color_depth = 7
+shader_parameter/dithering = false
+shader_parameter/scale_resolution = true
+shader_parameter/target_resolution_scale = 4
+shader_parameter/enable_recolor = false
 
 [node name="Game" type="Node3D"]
 process_mode = 3
 script = ExtResource("1_ytcii")
 
-[node name="PauseContainer" type="Node3D" parent="."]
+[node name="SubViewportContainer" type="SubViewportContainer" parent="."]
+material = SubResource("ShaderMaterial_e75a2")
+custom_minimum_size = Vector2(1280, 960)
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+
+[node name="SubViewport" type="SubViewport" parent="SubViewportContainer"]
+transparent_bg = true
+handle_input_locally = false
+size = Vector2i(1280, 960)
+render_target_update_mode = 4
+
+[node name="PauseContainer" type="Node3D" parent="SubViewportContainer/SubViewport"]
 unique_name_in_owner = true
 process_mode = 1
 
-[node name="Player" parent="PauseContainer" instance=ExtResource("3_kk6ly")]
+[node name="Player" parent="SubViewportContainer/SubViewport/PauseContainer" instance=ExtResource("3_kk6ly")]
 unique_name_in_owner = true
 process_mode = 1
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -2.74459, 1.22144)
 
-[node name="Map" parent="PauseContainer" instance=ExtResource("3_d8awv")]
+[node name="Map" parent="SubViewportContainer/SubViewport/PauseContainer" instance=ExtResource("3_d8awv")]
 unique_name_in_owner = true
 process_mode = 1
 
@@ -53,6 +76,3 @@ visible = false
 unique_name_in_owner = true
 visible = false
 script = ExtResource("11_5ng8c")
-
-[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
-environment = SubResource("Environment_3jyth")

src/inventory_menu/InventoryMenu.tscn

@@ -43,7 +43,7 @@ font_color = Color(0.737255, 0.705882, 0.690196, 1)
 
 [sub_resource type="LabelSettings" id="LabelSettings_biilt"]
 font = ExtResource("5_2qnnx")
-font_size = 46
+font_size = 40
 font_color = Color(0.737255, 0.705882, 0.690196, 1)
 
 [sub_resource type="LabelSettings" id="LabelSettings_dot3k"]
@@ -53,7 +53,7 @@ font_color = Color(0.737255, 0.705882, 0.690196, 1)
 
 [sub_resource type="LabelSettings" id="LabelSettings_th0sm"]
 font = ExtResource("4_rg5yb")
-font_size = 46
+font_size = 40
 font_color = Color(0.737255, 0.705882, 0.690196, 1)
 
 [sub_resource type="LabelSettings" id="LabelSettings_ankkq"]
@@ -63,7 +63,7 @@ font_color = Color(0.737255, 0.705882, 0.690196, 1)
 
 [sub_resource type="LabelSettings" id="LabelSettings_ouwww"]
 font = ExtResource("4_rg5yb")
-font_size = 46
+font_size = 40
 font_color = Color(0.737255, 0.705882, 0.690196, 1)
 
 [sub_resource type="LabelSettings" id="LabelSettings_mundu"]
@@ -185,13 +185,9 @@ texture = SubResource("PlaceholderTexture2D_3ynpe")
 expand_mode = 2
 
 [node name="InventoryInfo" type="MarginContainer" parent="."]
-layout_mode = 1
+layout_mode = 0
-anchors_preset = 15
+offset_right = 1359.0
-anchor_right = 1.0
+offset_bottom = 958.0
-anchor_bottom = 1.0
-offset_bottom = -3.0
-grow_horizontal = 2
-grow_vertical = 2
 theme_override_constants/margin_top = 100
 
 [node name="HBoxContainer" type="HBoxContainer" parent="InventoryInfo"]
@@ -205,7 +201,7 @@ theme_override_constants/separation = 20
 layout_mode = 2
 
 [node name="ReferenceRect2" type="ReferenceRect" parent="InventoryInfo/HBoxContainer/PlayerInfo/FloorBox"]
-custom_minimum_size = Vector2(176, 0)
+custom_minimum_size = Vector2(50, 0)
 layout_mode = 2
 
 [node name="FloorLabel" type="Label" parent="InventoryInfo/HBoxContainer/PlayerInfo/FloorBox"]
@@ -218,7 +214,7 @@ label_settings = SubResource("LabelSettings_q0afw")
 layout_mode = 2
 
 [node name="ReferenceRect2" type="ReferenceRect" parent="InventoryInfo/HBoxContainer/PlayerInfo/LevelBox"]
-custom_minimum_size = Vector2(176, 0)
+custom_minimum_size = Vector2(50, 0)
 layout_mode = 2
 
 [node name="CurrentLevelLabel" type="Label" parent="InventoryInfo/HBoxContainer/PlayerInfo/LevelBox"]
@@ -235,17 +231,17 @@ layout_mode = 2
 layout_mode = 2
 
 [node name="ReferenceRect2" type="ReferenceRect" parent="InventoryInfo/HBoxContainer/PlayerInfo/EXPBox"]
-custom_minimum_size = Vector2(247, 0)
+custom_minimum_size = Vector2(50, 0)
 layout_mode = 2
 
 [node name="EXPLabel" type="Label" parent="InventoryInfo/HBoxContainer/PlayerInfo/EXPBox"]
-custom_minimum_size = Vector2(100, 0)
+custom_minimum_size = Vector2(50, 0)
 layout_mode = 2
 text = "EXP"
 label_settings = SubResource("LabelSettings_xxgnh")
 
 [node name="ReferenceRect" type="ReferenceRect" parent="InventoryInfo/HBoxContainer/PlayerInfo/EXPBox"]
-custom_minimum_size = Vector2(100, 0)
+custom_minimum_size = Vector2(50, 0)
 layout_mode = 2
 
 [node name="EXPValue" type="Label" parent="InventoryInfo/HBoxContainer/PlayerInfo/EXPBox"]
@@ -258,7 +254,7 @@ label_settings = SubResource("LabelSettings_biilt")
 layout_mode = 2
 
 [node name="ReferenceRect2" type="ReferenceRect" parent="InventoryInfo/HBoxContainer/PlayerInfo/HPBox"]
-custom_minimum_size = Vector2(247, 0)
+custom_minimum_size = Vector2(50, 0)
 layout_mode = 2
 
 [node name="HPLabel" type="Label" parent="InventoryInfo/HBoxContainer/PlayerInfo/HPBox"]
@@ -268,7 +264,7 @@ text = "HP"
 label_settings = SubResource("LabelSettings_dot3k")
 
 [node name="ReferenceRect" type="ReferenceRect" parent="InventoryInfo/HBoxContainer/PlayerInfo/HPBox"]
-custom_minimum_size = Vector2(100, 0)
+custom_minimum_size = Vector2(50, 0)
 layout_mode = 2
 
 [node name="HPValue" type="Label" parent="InventoryInfo/HBoxContainer/PlayerInfo/HPBox"]
@@ -292,7 +288,7 @@ label_settings = ExtResource("6_tmdno")
 layout_mode = 2
 
 [node name="ReferenceRect2" type="ReferenceRect" parent="InventoryInfo/HBoxContainer/PlayerInfo/VTBox"]
-custom_minimum_size = Vector2(247, 0)
+custom_minimum_size = Vector2(50, 0)
 layout_mode = 2
 
 [node name="VTLabel" type="Label" parent="InventoryInfo/HBoxContainer/PlayerInfo/VTBox"]
@@ -302,7 +298,7 @@ text = "VT"
 label_settings = SubResource("LabelSettings_ankkq")
 
 [node name="ReferenceRect" type="ReferenceRect" parent="InventoryInfo/HBoxContainer/PlayerInfo/VTBox"]
-custom_minimum_size = Vector2(100, 0)
+custom_minimum_size = Vector2(50, 0)
 layout_mode = 2
 
 [node name="VTValue" type="Label" parent="InventoryInfo/HBoxContainer/PlayerInfo/VTBox"]
@@ -326,7 +322,7 @@ label_settings = ExtResource("6_tmdno")
 layout_mode = 2
 
 [node name="ReferenceRect2" type="ReferenceRect" parent="InventoryInfo/HBoxContainer/PlayerInfo/ATKBox"]
-custom_minimum_size = Vector2(247, 0)
+custom_minimum_size = Vector2(50, 0)
 layout_mode = 2
 
 [node name="ATKLabel" type="Label" parent="InventoryInfo/HBoxContainer/PlayerInfo/ATKBox"]
@@ -336,7 +332,7 @@ text = "ATK"
 label_settings = SubResource("LabelSettings_ankkq")
 
 [node name="ReferenceRect" type="ReferenceRect" parent="InventoryInfo/HBoxContainer/PlayerInfo/ATKBox"]
-custom_minimum_size = Vector2(100, 0)
+custom_minimum_size = Vector2(50, 0)
 layout_mode = 2
 
 [node name="ATKValue" type="Label" parent="InventoryInfo/HBoxContainer/PlayerInfo/ATKBox"]
@@ -360,7 +356,7 @@ label_settings = ExtResource("6_tmdno")
 layout_mode = 2
 
 [node name="ReferenceRect2" type="ReferenceRect" parent="InventoryInfo/HBoxContainer/PlayerInfo/DEFBox"]
-custom_minimum_size = Vector2(247, 0)
+custom_minimum_size = Vector2(50, 0)
 layout_mode = 2
 
 [node name="DEFLabel" type="Label" parent="InventoryInfo/HBoxContainer/PlayerInfo/DEFBox"]
@@ -371,7 +367,7 @@ text = "DEF
 label_settings = SubResource("LabelSettings_ankkq")
 
 [node name="ReferenceRect" type="ReferenceRect" parent="InventoryInfo/HBoxContainer/PlayerInfo/DEFBox"]
-custom_minimum_size = Vector2(100, 0)
+custom_minimum_size = Vector2(50, 0)
 layout_mode = 2
 
 [node name="DEFValue" type="Label" parent="InventoryInfo/HBoxContainer/PlayerInfo/DEFBox"]
@@ -399,7 +395,7 @@ layout_mode = 2
 layout_mode = 2
 
 [node name="ReferenceRect2" type="ReferenceRect" parent="InventoryInfo/HBoxContainer/PlayerInfo/HBoxContainer"]
-custom_minimum_size = Vector2(247, 0)
+custom_minimum_size = Vector2(50, 0)
 layout_mode = 2
 
 [node name="VBoxContainer" type="VBoxContainer" parent="InventoryInfo/HBoxContainer/PlayerInfo/HBoxContainer"]
@@ -407,7 +403,7 @@ layout_mode = 2
 
 [node name="ItemDescriptionTitle" type="Label" parent="InventoryInfo/HBoxContainer/PlayerInfo/HBoxContainer/VBoxContainer"]
 unique_name_in_owner = true
-custom_minimum_size = Vector2(800, 100)
+custom_minimum_size = Vector2(400, 50)
 layout_mode = 2
 size_flags_horizontal = 0
 label_settings = ExtResource("7_vyrxm")
@@ -416,7 +412,7 @@ autowrap_mode = 2
 [node name="UseItemPrompt" type="Label" parent="InventoryInfo/HBoxContainer/PlayerInfo/HBoxContainer/VBoxContainer"]
 unique_name_in_owner = true
 visible = false
-custom_minimum_size = Vector2(800, 100)
+custom_minimum_size = Vector2(400, 100)
 layout_mode = 2
 size_flags_horizontal = 0
 text = "Use Item?"
@@ -425,7 +421,7 @@ autowrap_mode = 2
 
 [node name="ItemEffectLabel" type="Label" parent="InventoryInfo/HBoxContainer/PlayerInfo/HBoxContainer/VBoxContainer"]
 unique_name_in_owner = true
-custom_minimum_size = Vector2(800, 100)
+custom_minimum_size = Vector2(400, 100)
 layout_mode = 2
 size_flags_horizontal = 0
 label_settings = SubResource("LabelSettings_mundu")
@@ -504,11 +500,12 @@ text = "Drop"
 alignment = 0
 
 [node name="ItemInfo" type="VBoxContainer" parent="InventoryInfo/HBoxContainer"]
+custom_minimum_size = Vector2(725, 0)
 layout_mode = 2
 theme_override_constants/separation = 20
 
 [node name="ItemTitleContainer" type="MarginContainer" parent="InventoryInfo/HBoxContainer/ItemInfo"]
-custom_minimum_size = Vector2(800, 125)
+custom_minimum_size = Vector2(300, 125)
 layout_mode = 2
 size_flags_horizontal = 4
 
@@ -533,7 +530,7 @@ vertical_alignment = 1
 [node name="ForwardArrow" type="Label" parent="InventoryInfo/HBoxContainer/ItemInfo/ItemTitleContainer"]
 unique_name_in_owner = true
 visible = false
-custom_minimum_size = Vector2(800, 0)
+custom_minimum_size = Vector2(300, 0)
 layout_mode = 2
 size_flags_horizontal = 3
 size_flags_vertical = 1

src/inventory_menu/ItemSlot.cs

@@ -25,7 +25,7 @@ public partial class ItemSlot : HBoxContainer, IItemSlot
   [Dependency]
   public IGameRepo GameRepo => this.DependOn<IGameRepo>();
 
-  [Node] public Label EquipBonus { get; set; } = default!;
+  //[Node] public Label EquipBonus { get; set; } = default!;
 
   [Node] public TextureRect ItemTexture { get; set; } = default!;
 
@@ -40,7 +40,7 @@ public partial class ItemSlot : HBoxContainer, IItemSlot
   public void OnReady()
   {
     ItemName.Text = Item.Info.Name;
-    EquipBonus.Text = "...";
+    //EquipBonus.Text = "...";
     ItemTexture.Texture = Item.Info.Texture;
     GameRepo.PlayerData.Inventory.EquippedWeapon.Sync += EquippedWeapon_Sync;
     GameRepo.PlayerData.Inventory.EquippedArmor.Sync += EquippedArmor_Sync;
@@ -51,12 +51,12 @@ public partial class ItemSlot : HBoxContainer, IItemSlot
   {
     if (Item is Weapon weapon && weapon == obj)
     {
-      EquipBonus.Text = $"{obj.WeaponStats.Damage:+0;-#;\\.\\.\\.}";
+      //EquipBonus.Text = $"{obj.WeaponStats.Damage:+0;-#;\\.\\.\\.}";
       SetEquippedSelectedItemStyle();
     }
     if (Item is Weapon unequippedItem && unequippedItem != obj)
     {
-      EquipBonus.Text = $"...";
+      //EquipBonus.Text = $"...";
       SetItemStyle();
     }
   }
@@ -65,12 +65,12 @@ public partial class ItemSlot : HBoxContainer, IItemSlot
   {
     if (Item is Armor armor && armor == obj)
     {
-      EquipBonus.Text = $"{obj.ArmorStats.Defense:+0;-#;\\.\\.\\.}";
+      //EquipBonus.Text = $"{obj.ArmorStats.Defense:+0;-#;\\.\\.\\.}";
       SetEquippedSelectedItemStyle();
     }
     if (Item is Armor unequippedItem && unequippedItem != obj)
     {
-      EquipBonus.Text = $"...";
+      //EquipBonus.Text = $"...";
       SetItemStyle();
     }
   }
@@ -86,31 +86,31 @@ public partial class ItemSlot : HBoxContainer, IItemSlot
   public void SetItemStyle()
   {
     ItemName.LabelSettings = ItemFont;
-    EquipBonus.LabelSettings = ItemFont;
+    //EquipBonus.LabelSettings = ItemFont;
   }
   public void SetSelectedItemStyle()
   {
     if (Item is IEquipable equipableItem && GameRepo.PlayerData.Inventory.IsEquipped(equipableItem))
     {
       ItemName.LabelSettings = SelectedEquippedItemFont;
-      EquipBonus.LabelSettings = EquippedItemFont;
+      //EquipBonus.LabelSettings = EquippedItemFont;
     }
     else
     {
       ItemName.LabelSettings = SelectedItemFont;
-      EquipBonus.LabelSettings = SelectedItemFont;
+      //EquipBonus.LabelSettings = SelectedItemFont;
     }
   }
   public void SetEquippedItemStyle()
   {
     ItemName.LabelSettings = EquippedItemFont;
-    EquipBonus.LabelSettings = EquippedItemFont;
+    //EquipBonus.LabelSettings = EquippedItemFont;
   }
 
   public void SetEquippedSelectedItemStyle()
   {
     ItemName.LabelSettings = SelectedEquippedItemFont;
-    EquipBonus.LabelSettings = EquippedItemFont;
+    //EquipBonus.LabelSettings = EquippedItemFont;
   }
 
   public IInventoryItem Item { get; set; } = default!;

src/inventory_menu/ItemSlot.tscn

@@ -1,6 +1,5 @@
-[gd_scene load_steps=7 format=3 uid="uid://c005nd0m2eim"]
+[gd_scene load_steps=6 format=3 uid="uid://c005nd0m2eim"]
 
-[ext_resource type="LabelSettings" uid="uid://ca1q6yu8blwxf" path="res://src/ui/label_settings/InventoryMainTextBold.tres" id="1_ybfv1"]
 [ext_resource type="Script" path="res://src/inventory_menu/ItemSlot.cs" id="1_yttxt"]
 [ext_resource type="Texture2D" uid="uid://0r1dws4ajhdx" path="res://src/items/accessory/textures/MASK 01.PNG" id="2_7kdbd"]
 [ext_resource type="Script" path="res://src/inventory_menu/ItemLabel.cs" id="3_xlgl0"]
@@ -17,15 +16,6 @@ offset_right = 1748.0
 offset_bottom = 85.0
 script = ExtResource("1_yttxt")
 
-[node name="EquipBonus" type="Label" parent="."]
-unique_name_in_owner = true
-custom_minimum_size = Vector2(0, 50)
-layout_mode = 2
-text = "..."
-label_settings = ExtResource("1_ybfv1")
-horizontal_alignment = 1
-vertical_alignment = 1
-
 [node name="ReferenceRect" type="ReferenceRect" parent="."]
 custom_minimum_size = Vector2(40, 0)
 layout_mode = 2

src/items/throwable/ThrowableItem.tscn

@@ -22,7 +22,7 @@ script = ExtResource("3_qpunu")
 
 [node name="Sprite" type="Sprite3D" parent="Hitbox"]
 unique_name_in_owner = true
-pixel_size = 0.001
+pixel_size = 0.0005
 billboard = 2
 texture_filter = 0
 render_priority = 100

src/items/weapons/Weapon.gdshader

@@ -0,0 +1,14 @@
+shader_type spatial;
+
+void vertex() {
+	// Called for every vertex the material is visible on.
+}
+
+void fragment() {
+	// Called for every pixel the material is visible on.
+}
+
+//void light() {
+	// Called for every pixel for every light affecting the material.
+	// Uncomment to replace the default light processing function with this one.
+//}

src/items/weapons/Weapon.tscn

@@ -1,13 +1,13 @@
-[gd_scene load_steps=3 format=3 uid="uid://db206brufi83s"]
+[gd_scene load_steps=4 format=3 uid="uid://db206brufi83s"]
 
 [ext_resource type="Script" path="res://src/items/weapons/Weapon.cs" id="1_7pkyf"]
+[ext_resource type="Texture2D" uid="uid://740syoj0w14p" path="res://src/items/weapons/textures/PALM OF HEAVEN.PNG" id="3_r8rh2"]
 
 [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_wll7p"]
 radius = 0.470016
 
 [node name="Weapon" type="Node3D"]
 script = ExtResource("1_7pkyf")
-WeaponStats = null
 
 [node name="Pickup" type="Area3D" parent="."]
 unique_name_in_owner = true
@@ -23,6 +23,7 @@ double_sided = false
 alpha_antialiasing_mode = 1
 texture_filter = 0
 render_priority = 100
+texture = ExtResource("3_r8rh2")
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="Pickup"]
 shape = SubResource("CapsuleShape3D_wll7p")

src/items/weapons/textures/PALM OF HEAVEN.PNG.import

@@ -3,25 +3,26 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://740syoj0w14p"
-path="res://.godot/imported/PALM OF HEAVEN.PNG-35554a412a9c4bc09647efa86e6b581e.ctex"
+path.s3tc="res://.godot/imported/PALM OF HEAVEN.PNG-35554a412a9c4bc09647efa86e6b581e.s3tc.ctex"
 metadata={
-"vram_texture": false
+"imported_formats": ["s3tc_bptc"],
+"vram_texture": true
 }
 
 [deps]
 
 source_file="res://src/items/weapons/textures/PALM OF HEAVEN.PNG"
-dest_files=["res://.godot/imported/PALM OF HEAVEN.PNG-35554a412a9c4bc09647efa86e6b581e.ctex"]
+dest_files=["res://.godot/imported/PALM OF HEAVEN.PNG-35554a412a9c4bc09647efa86e6b581e.s3tc.ctex"]
 
 [params]
 
-compress/mode=0
+compress/mode=2
 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/generate=true
 mipmaps/limit=-1
 roughness/mode=0
 roughness/src_normal=""
@@ -31,4 +32,4 @@ 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
+detect_3d/compress_to=0

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="."]
+[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 24.5244, 0)
+environment = SubResource("Environment_hjjsv")
-layers = 3
-omni_range = 163.618
-omni_attenuation = -0.183
 
 [node name="Overworld" parent="." instance=ExtResource("1_ope1x")]
 unique_name_in_owner = true

src/map/dungeon/corridor/Corridor.tscn

@@ -1,11 +1,13 @@
 [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/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"]
+[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_rok2u"]
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_p2p1w"]
-albedo_texture = ExtResource("3_3adgk")
+albedo_texture = ExtResource("3_opvgc")
+uv1_scale = Vector3(1.52, 1.52, 1.52)
+uv1_triplanar = true
 
 [sub_resource type="PlaneMesh" id="PlaneMesh_xt554"]
 size = Vector2(4, 4)
@@ -18,33 +20,34 @@ voxel_scale = Vector3(4, 4, 4)
 script = ExtResource("3_8i1ij")
 
 [node name="CSGBox3D" type="CSGBox3D" parent="."]
-material_override = SubResource("StandardMaterial3D_rok2u")
+transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -5.68248e-07, 0, 0)
+material_override = SubResource("StandardMaterial3D_p2p1w")
 use_collision = true
-size = Vector3(4.12, 4, 4)
+size = Vector3(4, 4, 4)
 
-[node name="CSGBox3D" type="CSGBox3D" parent="CSGBox3D"]
+[node name="CSGBox3D2" type="CSGBox3D" parent="CSGBox3D"]
 operation = 2
 size = Vector3(3.8, 3.8, 3.8)
 
-[node name="DOOR?" type="CSGBox3D" parent="CSGBox3D"]
+[node name="DOOR?_F_CUT" type="CSGBox3D" parent="CSGBox3D"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1.98957)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.000927324, -0.000897169, -1.94666)
 operation = 2
-size = Vector3(3.8, 3.8, 0.5)
+size = Vector3(3.93805, 3.80299, 0.112793)
 
-[node name="DOOR?2" type="CSGBox3D" parent="CSGBox3D"]
+[node name="DOOR?_R_CUT" type="CSGBox3D" parent="CSGBox3D"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -1.95178)
+transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 1.94941, -0.00280762, -0.0253296)
 operation = 2
-size = Vector3(3.8, 3.8, 0.5)
+size = Vector3(3.81653, 3.802, 0.102539)
 
-[node name="DOOR?3" type="CSGBox3D" parent="CSGBox3D"]
+[node name="DOOR?_L_CUT" type="CSGBox3D" parent="CSGBox3D"]
-transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -1.81713, 0, -0.0274558)
+transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -1.94806, -0.00247192, -0.00629178)
 operation = 2
-size = Vector3(3.8, 3.8, 0.5)
+size = Vector3(3.78564, 3.79486, 0.111816)
 
-[node name="DOOR?4" type="CSGBox3D" parent="CSGBox3D"]
+[node name="DOOR?_B_CUT" type="CSGBox3D" parent="CSGBox3D"]
-transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 2.06901, 0, -0.0274558)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00830109, -0.00256348, 1.94825)
 operation = 2
-size = Vector3(3.8, 3.8, 0.5)
+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)

src/map/dungeon/floors/Floor01.tscn

@@ -1,11 +1,17 @@
-[gd_scene load_steps=6 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
+agent_height = 3.0
+agent_radius = 0.1
 
 [node name="Floor1" type="Node3D"]
 script = ExtResource("1_0ecnn")
@@ -17,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")])
+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" 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/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" 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/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"
+uid="uid://bg2mjgtcscekq"
-path="res://.godot/imported/COLUMN_ROOM_VER2.glb-1c0b5671f19205bd291cf0fee4fbffaa.scn"
+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"
+source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3.1.glb"
-dest_files=["res://.godot/imported/COLUMN_ROOM_VER2.glb-1c0b5671f19205bd291cf0fee4fbffaa.scn"]
+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"
+uid="uid://bont0nuph50qn"
-path="res://.godot/imported/COLUMN_ROOM_VER2_5r4b2vhc34xa1.png-de0495e0d9dcc29665041eb8321a6bfb.ctex"
+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"
+source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_5r4b2vhc34xa1.png"
-dest_files=["res://.godot/imported/COLUMN_ROOM_VER2_5r4b2vhc34xa1.png-de0495e0d9dcc29665041eb8321a6bfb.ctex"]
+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"
+uid="uid://dfidrnk2qw3pf"
-path="res://.godot/imported/COLUMN_ROOM_VER2_CEILING_1.jpg-f869fc91b0845c898877f82481b048b3.ctex"
+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"
+source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_CEILING_1.jpg"
-dest_files=["res://.godot/imported/COLUMN_ROOM_VER2_CEILING_1.jpg-f869fc91b0845c898877f82481b048b3.ctex"]
+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"
+uid="uid://cs17e234nre54"
-path="res://.godot/imported/COLUMN_ROOM_VER2_CEILING_1_14.jpg-9458a4f0884d37d619ae174474f4b00f.ctex"
+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"
+source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_CEILING_1_14.jpg"
-dest_files=["res://.godot/imported/COLUMN_ROOM_VER2_CEILING_1_14.jpg-9458a4f0884d37d619ae174474f4b00f.ctex"]
+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"
+uid="uid://b2h2devo04do7"
-path="res://.godot/imported/COLUMN_ROOM_VER2_COLUMN-DARKER.png-63e49c58114191352bb71ce70e30e6ae.ctex"
+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"
+source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_COLUMN-DARKER.png"
-dest_files=["res://.godot/imported/COLUMN_ROOM_VER2_COLUMN-DARKER.png-63e49c58114191352bb71ce70e30e6ae.ctex"]
+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"
+uid="uid://1knt4qif78c1"
-path="res://.godot/imported/COLUMN_ROOM_VER2_COLUMN.jpg-97f62b50678693e30acd3e3181f45a30.ctex"
+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"
+source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_COLUMN.jpg"
-dest_files=["res://.godot/imported/COLUMN_ROOM_VER2_COLUMN.jpg-97f62b50678693e30acd3e3181f45a30.ctex"]
+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"
+uid="uid://c5c3i2b10oslb"
-path="res://.godot/imported/COLUMN_ROOM_VER2_COLUMN_13.jpg-0ef4b343c747a58c11bcc3df937c0e08.ctex"
+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"
+source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_COLUMN_13.jpg"
-dest_files=["res://.godot/imported/COLUMN_ROOM_VER2_COLUMN_13.jpg-0ef4b343c747a58c11bcc3df937c0e08.ctex"]
+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"
+uid="uid://cvveolj70y2ve"
-path="res://.godot/imported/COLUMN_ROOM_VER2_FLOOR1.jpg-0da2c0786d418a960d56bb24a7afa90d.ctex"
+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"
+source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_FLOOR1.jpg"
-dest_files=["res://.godot/imported/COLUMN_ROOM_VER2_FLOOR1.jpg-0da2c0786d418a960d56bb24a7afa90d.ctex"]
+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"
+uid="uid://djxkkju4ge6ed"
-path="res://.godot/imported/COLUMN_ROOM_VER2_STONE_PANEL_1png.png-10f9129e2f9600eb7f86b90a38196b20.ctex"
+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"
+source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_STONE_PANEL_1png.png"
-dest_files=["res://.godot/imported/COLUMN_ROOM_VER2_STONE_PANEL_1png.png-10f9129e2f9600eb7f86b90a38196b20.ctex"]
+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"
+uid="uid://l4argvs2epjs"
-path="res://.godot/imported/COLUMN_ROOM_VER2_STONE_PANEL_2png.png-1685b03b7d9cbcb76630fba1542056c2.ctex"
+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"
+source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_STONE_PANEL_2png.png"
-dest_files=["res://.godot/imported/COLUMN_ROOM_VER2_STONE_PANEL_2png.png-1685b03b7d9cbcb76630fba1542056c2.ctex"]
+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"
+uid="uid://dk703o186bnxa"
-path="res://.godot/imported/COLUMN_ROOM_VER2_TILE4.png-2746fb3d117c498a586ce5b276d55051.ctex"
+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"
+source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_TILE4.png"
-dest_files=["res://.godot/imported/COLUMN_ROOM_VER2_TILE4.png-2746fb3d117c498a586ce5b276d55051.ctex"]
+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"
+uid="uid://cg2mvnq7f8uhj"
-path="res://.godot/imported/COLUMN_ROOM_VER2_WALL TILE 1.jpg-9d120d992dd32137dea675611a8df87b.ctex"
+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"
+source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_WALL TILE 1.jpg"
-dest_files=["res://.godot/imported/COLUMN_ROOM_VER2_WALL TILE 1.jpg-9d120d992dd32137dea675611a8df87b.ctex"]
+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"
+uid="uid://b1jx5dagwdjiq"
-path="res://.godot/imported/COLUMN_ROOM_VER2_WALL TILE 1_5.jpg-dc439846e4c5670220166b7091ca77c8.ctex"
+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"
+source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_WALL TILE 1_5.jpg"
-dest_files=["res://.godot/imported/COLUMN_ROOM_VER2_WALL TILE 1_5.jpg-dc439846e4c5670220166b7091ca77c8.ctex"]
+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"
+uid="uid://ca36l3t6htau7"
-path="res://.godot/imported/COLUMN_ROOM_VER2_brick3.png-272d9a54bb0e90b6996e95e9abd96cd3.ctex"
+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"
+source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_brick3.png"
-dest_files=["res://.godot/imported/COLUMN_ROOM_VER2_brick3.png-272d9a54bb0e90b6996e95e9abd96cd3.ctex"]
+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"
+uid="uid://dafrf8sqqrhlr"
-path="res://.godot/imported/COLUMN_ROOM_VER2_effed-TILES-2.png-16c53b085c5375ca20518ae729da5756.ctex"
+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"
+source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_effed-TILES-2.png"
-dest_files=["res://.godot/imported/COLUMN_ROOM_VER2_effed-TILES-2.png-16c53b085c5375ca20518ae729da5756.ctex"]
+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"
+uid="uid://ne8b5ixuw7wy"
-path="res://.godot/imported/COLUMN_ROOM_VER2_hand-tiile.png-e928d5a2e995aaf08d2ad66a324c1895.ctex"
+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"
+source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_hand-tiile.png"
-dest_files=["res://.godot/imported/COLUMN_ROOM_VER2_hand-tiile.png-e928d5a2e995aaf08d2ad66a324c1895.ctex"]
+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"
+uid="uid://jrsx4xa5qm15"
-path="res://.godot/imported/COLUMN_ROOM_VER2_mother.png-db6dfb2d45aec5d8850b5f364063bc8a.ctex"
+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"
+source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_mother.png"
-dest_files=["res://.godot/imported/COLUMN_ROOM_VER2_mother.png-db6dfb2d45aec5d8850b5f364063bc8a.ctex"]
+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"
+uid="uid://bn5lx2dal2x23"
-path="res://.godot/imported/COLUMN_ROOM_VER2_others_0020_color_1k.jpg-08a709c9afe49ef3a01ec4856bb15445.ctex"
+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"
+source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_others_0020_color_1k.jpg"
-dest_files=["res://.godot/imported/COLUMN_ROOM_VER2_others_0020_color_1k.jpg-08a709c9afe49ef3a01ec4856bb15445.ctex"]
+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"
+uid="uid://p4fcwsony27k"
-path="res://.godot/imported/COLUMN_ROOM_VER2_swirled_column.png-23337ee6e0421b4d2611567e86a06516.ctex"
+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"
+source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_swirled_column.png"
-dest_files=["res://.godot/imported/COLUMN_ROOM_VER2_swirled_column.png-23337ee6e0421b4d2611567e86a06516.ctex"]
+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"
+uid="uid://djaud0lauykv1"
-path="res://.godot/imported/COLUMN_ROOM_VER2_tile2.png-d015475c67a5d15aa8d925483dc45f50.ctex"
+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"
+source_file="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_tile2.png"
-dest_files=["res://.godot/imported/COLUMN_ROOM_VER2_tile2.png-d015475c67a5d15aa8d925483dc45f50.ctex"]
+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/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)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -25.0589, 2.01954, -0.291408)
-
-[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)

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

src/player/PS1Fog.gdshader

@@ -0,0 +1,17 @@
+shader_type canvas_item;
+
+uniform float inner_radius = 0.1;
+uniform float outer_radius = 1;
+uniform float vignette_strength = 1.0;
+uniform float dither_strength = 0.03;
+uniform vec4 vignette_color: source_color;
+
+
+void fragment() {
+	float dist = distance(UV, vec2(0.5));
+	
+	float vignette = smoothstep(inner_radius, outer_radius, dist) * vignette_strength;
+	float dither = fract(sin(dot(UV, vec2(12.9898, 78.233))) * 43758.5453123) * dither_strength;
+	
+	COLOR = vec4(vignette_color.rgb, vignette + dither);
+}

src/player/Player.tscn

@@ -9,8 +9,8 @@
 
 [sub_resource type="Resource" id="Resource_btp2w"]
 script = ExtResource("2_xq68d")
-RotationSpeed = 3.0
+RotationSpeed = 1.8
-MoveSpeed = 4.0
+MoveSpeed = 3.0
 Acceleration = 1.0
 CurrentHP = 100
 MaximumHP = 100
@@ -375,12 +375,13 @@ shape = SubResource("BoxShape3D_hs4wf")
 [node name="Camera3D" type="Camera3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00341564, 1.40507, 0.645068)
 cull_mask = 1048573
-fov = 55.0
+fov = 45.0
 near = 0.001
 
 [node name="OmniLight3D" type="OmniLight3D" parent="."]
-light_energy = 4.183
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.57563, 0.620484)
-omni_range = 83.659
+omni_range = 16.633
+omni_attenuation = 0.27
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
 unique_name_in_owner = true

src/ui/in_game_ui/InGameUI.tscn

@@ -9,7 +9,7 @@
 
 [node name="InGameUI" type="Control"]
 process_mode = 3
-custom_minimum_size = Vector2(1920, 1080)
+custom_minimum_size = Vector2(1280, 960)
 layout_mode = 3
 anchors_preset = 15
 anchor_right = 1.0
@@ -22,6 +22,7 @@ script = ExtResource("1_sc13i")
 
 [node name="PlayerInfoUI" parent="." instance=ExtResource("4_46s5l")]
 unique_name_in_owner = true
+custom_minimum_size = Vector2(1024, 768)
 layout_mode = 1
 
 [node name="MiniMap" parent="." instance=ExtResource("2_6sfje")]

src/ui/player_ui/PlayerInfoUI.tscn

@@ -21,6 +21,7 @@ anchor_bottom = 1.0
 offset_right = 426.0
 grow_vertical = 2
 theme_override_constants/margin_left = 32
+theme_override_constants/margin_top = 20
 
 [node name="PlayerInfo" type="VBoxContainer" parent="MarginContainer"]
 unique_name_in_owner = true