Merge branch 'main' of https://git.zenny.quest/zenayi/GameJamDungeon

Zennysoft.Game.Ma/src/map/dungeon/code/Altar.cs

@@ -23,15 +23,15 @@ public partial class Altar : Node3D, IDungeonFloor
 
   public override void _Ready()
   {
-    Show();
+	Show();
-    Exit.AreaEntered += Exit_AreaEntered;
+	Exit.AreaEntered += Exit_AreaEntered;
-    FloorIsLoaded = true;
+	FloorIsLoaded = true;
   }
 
   private void Exit_AreaEntered(Area3D area)
   {
-    if (area.GetOwner() is IPlayer)
+	if (area.GetOwner() is IPlayer)
-      ExitReached();
+	  ExitReached();
   }
 
   public void ExitReached() => Game.FloorExitReached();

Zennysoft.Game.Ma/src/map/dungeon/code/ExitRoom.cs

@@ -18,15 +18,15 @@ public partial class ExitRoom : DungeonRoom
 
   public override void _Ready()
   {
-    _exit.AreaEntered += Exit_AreaEntered;
+	_exit.AreaEntered += Exit_AreaEntered;
   }
 
   public void ExitReached()
-    => Game.FloorExitReached();
+	=> Game.FloorExitReached();
 
   private void Exit_AreaEntered(Area3D area)
   {
-    if (area.GetOwner() is IPlayer)
+	if (area.GetOwner() is IPlayer)
-      ExitReached();
+	  ExitReached();
   }
 }

Zennysoft.Game.Ma/src/map/dungeon/code/Overworld.cs

@@ -24,22 +24,22 @@ public partial class Overworld : Node3D, IDungeonFloor
 
   public void InitializeDungeon()
   {
-    Show();
+	Show();
-    Exit.AreaEntered += Exit_AreaEntered;
+	Exit.AreaEntered += Exit_AreaEntered;
-    RescuedItems.SpawnRescuedItems();
+	RescuedItems.SpawnRescuedItems();
-    FloorIsLoaded = true;
+	FloorIsLoaded = true;
   }
 
   private void Exit_AreaEntered(Area3D area)
   {
-    if (area.GetOwner() is IPlayer)
+	if (area.GetOwner() is IPlayer)
-      ExitReached();
+	  ExitReached();
   }
 
   public void ExitReached() => Game.FloorExitReached();
 
   public Transform3D GetPlayerSpawnPoint()
   {
-    return PlayerSpawnPoint.GlobalTransform;
+	return PlayerSpawnPoint.GlobalTransform;
   }
 }

Zennysoft.Game.Ma/src/map/dungeon/floors/SetAFloors/test_floor.tscn

@@ -16,11 +16,13 @@
 background_mode = 1
 background_energy_multiplier = 0.0
 ambient_light_source = 2
+ambient_light_energy = 0.0
+tonemap_exposure = 1.47
 ssao_radius = 1.88
 glow_enabled = true
-glow_intensity = 2.0
+glow_intensity = 2.15
-glow_strength = 0.7
+glow_strength = 0.82
-glow_bloom = 0.91
+glow_bloom = 1.0
 glow_blend_mode = 1
 fog_enabled = true
 fog_light_color = Color(0, 0, 0, 1)

Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/00. Altar.tscn

@@ -836,7 +836,7 @@ debug_color = Color(0.937255, 0, 0.623529, 1)
 
 [node name="PlayerSpawnPoint" type="Marker3D" parent="Spawn Points"]
 unique_name_in_owner = true
-transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 37.3951, -2.89376, -1.035)
+transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 39.3951, -2.89376, -1.035)
 
 [node name="ExitSpawnPoint" type="Marker3D" parent="Spawn Points"]
 unique_name_in_owner = true
@@ -868,6 +868,7 @@ environment = SubResource("Environment_c86uk")
 camera_attributes = SubResource("CameraAttributesPractical_ojbcg")
 
 [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
+process_mode = 3
 stream = ExtResource("28_je2oh")
 volume_db = -8.0
 autoplay = true

Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/Overworld.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=591 format=4 uid="uid://dvnc26rebk6o0"]
+[gd_scene load_steps=592 format=4 uid="uid://dvnc26rebk6o0"]
 
 [ext_resource type="Script" uid="uid://cuhfkyh3d7noa" path="res://src/map/dungeon/code/Overworld.cs" id="1_5hmt3"]
 [ext_resource type="Texture2D" uid="uid://co6h8vyi11sl2" path="res://src/map/overworld/Models/Overworld_CLOUD_RINGS_INNER_63.png" id="2_g6b7b"]
@@ -16758,7 +16758,7 @@ sky = SubResource("Sky_nfcfh")
 ambient_light_sky_contribution = 0.0
 ambient_light_energy = 0.0
 reflected_light_source = 2
-tonemap_exposure = 0.5
+tonemap_exposure = 0.6
 sdfgi_enabled = true
 sdfgi_min_cell_size = 16.0
 sdfgi_y_scale = 0
@@ -16767,21 +16767,19 @@ glow_enabled = true
 glow_levels/2 = 0.41
 glow_levels/4 = 2.24
 glow_intensity = 2.6
-glow_strength = 0.21
+glow_strength = 0.25
 glow_bloom = 1.0
 glow_blend_mode = 0
 volumetric_fog_enabled = true
 volumetric_fog_density = 0.001
 adjustment_enabled = true
-adjustment_brightness = 1.2
+adjustment_brightness = 1.1
-adjustment_contrast = 1.05
+adjustment_contrast = 0.98
-adjustment_saturation = 0.9
 
 [sub_resource type="CameraAttributesPractical" id="CameraAttributesPractical_8nnl3"]
 dof_blur_far_enabled = true
-dof_blur_far_distance = 17.0
+dof_blur_far_distance = 15.22
-dof_blur_far_transition = -1.0
+dof_blur_amount = 0.06
-dof_blur_amount = 0.04
 
 [sub_resource type="Gradient" id="Gradient_q2pi3"]
 
@@ -17578,7 +17576,7 @@ shape = SubResource("BoxShape3D_b53dq")
 transform = Transform3D(27.9, 0, 0, 0, 27.9, 0, 0, 0, 27.9, -248.608, 139.71, 58.538)
 
 [node name="BLOCKER1" type="MeshInstance3D" parent="Utility Meshes"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.558139, -0.194005, -0.191518)
+transform = Transform3D(1.325, 0, 0, 0, 1.325, 0, 0, 0, 1.325, 0.466, -3.173, -0.192)
 mesh = SubResource("PlaneMesh_322om")
 skeleton = NodePath("../../Lighting And Environment/DirectionalLight3D")
 
@@ -17587,6 +17585,11 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.10342, -4.29303, -0.517254)
 mesh = SubResource("PlaneMesh_322om")
 skeleton = NodePath("../../Lighting And Environment/DirectionalLight3D")
 
+[node name="BLOCKER4" type="MeshInstance3D" parent="Utility Meshes"]
+transform = Transform3D(0.0665743, 0.864816, 0.497655, -0.99705, 0.0767538, 0, -0.038197, -0.496187, 0.867375, 1.24075, -3.95802, -2.2074)
+mesh = SubResource("PlaneMesh_322om")
+skeleton = NodePath("../../Lighting And Environment/DirectionalLight3D")
+
 [node name="BLOCKER3" type="MeshInstance3D" parent="Utility Meshes"]
 transform = Transform3D(0.43369, 0.901062, 0, -0.901062, 0.43369, 0, 0, 0, 1.46, 4.27664, -4.553, 1.395)
 mesh = SubResource("PlaneMesh_322om")
@@ -17604,7 +17607,7 @@ skeleton = NodePath("../VFX/Overworld_ocean_plane/OCEAN")
 surface_material_override/0 = SubResource("ShaderMaterial_uuhpn")
 
 [node name="Top Water" type="MeshInstance3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -350.758, -6.31911, 113.556)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -350.758, -2.20991, 113.556)
 mesh = SubResource("PlaneMesh_xwneg")
 
 [node name="Actors" type="Node3D" parent="."]
@@ -17621,7 +17624,7 @@ transform = Transform3D(1.11, 0, 0, 0, 1.11, 0, 0, 0, 1.11, 0, 0.179583, 0)
 frame_progress = 0.120696
 
 [node name="Caretaker of Saints" parent="Actors" instance=ExtResource("80_8isf0")]
-transform = Transform3D(-1.5853, 0, -3.66481, 0, 3.993, 0, 3.66481, 0, -1.5853, -245.674, -2.862, 272.252)
+transform = Transform3D(-1.42252, 0, -3.28851, 0, 3.583, 0, 3.28851, 0, -1.42252, -245.674, -3.417, 272.252)
 
 [node name="AnimatedSprite3D" parent="Actors/Caretaker of Saints" index="0"]
 texture_filter = 0
@@ -17813,19 +17816,18 @@ spot_angle = 42.6012
 [node name="DirectionalLight3D" type="DirectionalLight3D" parent="Lighting And Environment"]
 transform = Transform3D(-0.631325, -0.773543, -0.055314, -0.378821, 0.245364, 0.892352, -0.676701, 0.584318, -0.447939, 350.758, 3.90238, -113.556)
 light_color = Color(0.983166, 0.96718, 0.943783, 1)
-light_energy = 2.671
+light_energy = 1.234
-light_volumetric_fog_energy = 3.299
+light_volumetric_fog_energy = 7.228
-light_specular = 0.329
+light_specular = 0.234
-light_bake_mode = 1
 shadow_enabled = true
-shadow_opacity = 0.98
+shadow_opacity = 0.99
-shadow_blur = 2.437
+shadow_blur = 1.419
 directional_shadow_max_distance = 739.4
 
 [node name="CSGCylinder3D" type="CSGCylinder3D" parent="Lighting And Environment"]
-transform = Transform3D(20.185, 0, 0, 0, 20.185, 0, 0, 0, 20.185, 118.599, 47.3837, -66.0835)
+transform = Transform3D(20.185, 0, 0, 0, 20.185, 0, 0, 0, 20.185, 118.599, 42.8541, -66.0835)
-radius = 0.832031
+radius = 1.10986
-height = 4.42154
+height = 3.94248
 cone = true
 material = SubResource("ShaderMaterial_l0fgw")
 
@@ -17851,12 +17853,12 @@ cone = true
 material = SubResource("ShaderMaterial_l0fgw")
 
 [node name="SpotLight3D3" type="SpotLight3D" parent="Lighting And Environment"]
-transform = Transform3D(1, 0, 0, 0, 0.00535818, 0.999986, 0, -0.999986, 0.00535818, 116.319, 40.0846, -62.5124)
+transform = Transform3D(1, 0, 0, 0, -0.107531, 0.994202, 0, -0.994202, -0.107531, 116.319, 40.0846, -62.5124)
 light_energy = 8.623
 shadow_enabled = true
 spot_range = 62.606
 spot_attenuation = 0.32
-spot_angle = 31.3
+spot_angle = 28.5323
 
 [node name="OmniLight3D" type="OmniLight3D" parent="Lighting And Environment"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 195.404, 9.06882, -59.5851)

Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/03. Antechamber A.tscn

@@ -954,7 +954,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.97031, 0)
 
 [node name="PlayerSpawn" type="Marker3D" parent="Spawn Points"]
 unique_name_in_owner = true
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.02156, -1.64971, 7.62062)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.022, -1.8, 7.621)
 
 [node name="ItemSpawnPoints" type="Node3D" parent="Spawn Points"]
 unique_name_in_owner = true

Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/11. Long Room.tscn

@@ -206,14 +206,16 @@ omni_attenuation = 1.781
 
 [node name="OmniLight3D3" type="OmniLight3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.86789, 6.1146, -0.382709)
-light_energy = 5.0
+light_energy = 6.665
 shadow_enabled = true
+shadow_blur = 10.0
 omni_range = 18.0
 omni_attenuation = 1.781
 
 [node name="OmniLight3D2" type="OmniLight3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.98437, 6.1146, -0.382709)
-light_energy = 5.0
+light_energy = 6.48
 shadow_enabled = true
+shadow_blur = 10.0
 omni_range = 18.0
 omni_attenuation = 1.781

Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/19. Floor Exit A.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=63 format=3 uid="uid://cihbmyo0ltq4m"]
+[gd_scene load_steps=66 format=3 uid="uid://cihbmyo0ltq4m"]
 
 [ext_resource type="PackedScene" uid="uid://c77acs4px36hq" path="res://src/map/dungeon/models/Area 1/Exit/A1-Exit.glb" id="2_54fgm"]
 [ext_resource type="Script" uid="uid://bd824eigybu51" path="res://src/map/dungeon/code/ExitRoom.cs" id="2_umdkt"]
@@ -374,6 +374,105 @@ animations = [{
 "speed": 16.0
 }]
 
+[sub_resource type="Animation" id="Animation_k6ywg"]
+resource_name = "Flame Flicker"
+length = 2.62501
+loop_mode = 1
+step = 0.0625
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath(".:frame")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0, 2.5625),
+"transitions": PackedFloat32Array(1, 1),
+"update": 0,
+"values": [0, 41]
+}
+tracks/1/type = "value"
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/path = NodePath("../AnimatedSprite3D2:frame")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/keys = {
+"times": PackedFloat32Array(0, 2.5625),
+"transitions": PackedFloat32Array(1, 1),
+"update": 0,
+"values": [0, 41]
+}
+tracks/2/type = "value"
+tracks/2/imported = false
+tracks/2/enabled = true
+tracks/2/path = NodePath("../OmniLight3D:light_energy")
+tracks/2/interp = 1
+tracks/2/loop_wrap = true
+tracks/2/keys = {
+"times": PackedFloat32Array(0, 0.125, 0.25, 0.375, 0.5, 0.625, 0.75, 0.875, 1, 1.125, 1.25, 1.375, 1.5, 1.625, 1.75, 1.875, 2, 2.125, 2.25, 2.375, 2.5),
+"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1),
+"update": 0,
+"values": [6.436, 6.0, 6.9, 5.6, 6.2, 5.5, 6.0, 6.436, 6.0, 6.9, 5.6, 6.2, 5.5, 6.0, 6.436, 6.0, 6.9, 5.6, 6.2, 5.5, 6.0]
+}
+tracks/3/type = "value"
+tracks/3/imported = false
+tracks/3/enabled = true
+tracks/3/path = NodePath("../OmniLight3D2:light_energy")
+tracks/3/interp = 1
+tracks/3/loop_wrap = true
+tracks/3/keys = {
+"times": PackedFloat32Array(0, 0.125, 0.25, 0.375, 0.5, 0.625, 0.75, 0.875, 1, 1.125, 1.25, 1.375, 1.5, 1.625, 1.75, 1.875, 2, 2.125, 2.25, 2.375, 2.5),
+"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1),
+"update": 0,
+"values": [6.436, 6.0, 6.9, 5.6, 6.2, 5.5, 6.0, 6.436, 6.0, 6.9, 5.6, 6.2, 5.5, 6.0, 6.436, 6.0, 6.9, 5.6, 6.2, 5.5, 6.0]
+}
+
+[sub_resource type="Animation" id="Animation_54fgm"]
+length = 0.001
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath(".:frame")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 1,
+"values": [0]
+}
+tracks/1/type = "value"
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/path = NodePath("../AnimatedSprite3D2:frame")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 1,
+"values": [0]
+}
+tracks/2/type = "value"
+tracks/2/imported = false
+tracks/2/enabled = true
+tracks/2/path = NodePath("../OmniLight3D:light_energy")
+tracks/2/interp = 1
+tracks/2/loop_wrap = true
+tracks/2/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 0,
+"values": [6.436]
+}
+
+[sub_resource type="AnimationLibrary" id="AnimationLibrary_ljhl3"]
+_data = {
+&"Flame Flicker": SubResource("Animation_k6ywg"),
+&"RESET": SubResource("Animation_54fgm")
+}
+
 [node name="Floor Exit A" type="Node3D"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.1224, 0, 19.9536)
 script = ExtResource("2_umdkt")
@@ -477,30 +576,30 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 7.86203, 4.919, 0.443518)
 light_color = Color(0.414176, 0.813573, 0.948183, 1)
 light_energy = 6.436
 shadow_enabled = true
+shadow_blur = 10.0
 omni_range = 20.929
 omni_attenuation = 1.346
 
 [node name="OmniLight3D2" type="OmniLight3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.09453, 4.919, 0.443518)
 light_color = Color(0.414176, 0.813573, 0.948183, 1)
-light_energy = 6.436
+light_energy = 6.69992
 shadow_enabled = true
+shadow_blur = 10.0
 omni_range = 20.929
 omni_attenuation = 1.346
 
 [node name="AnimatedSprite3D" type="AnimatedSprite3D" parent="."]
-transform = Transform3D(0.885, 0, 0, 0, 0.445, 0, 0, 0, 0.445, -7.91461, 5.15882, 0.45137)
+transform = Transform3D(0.615, 0, 0, 0, 0.445, 0, 0, 0, 0.445, -7.91461, 5.15882, 0.45137)
 billboard = 2
 sprite_frames = SubResource("SpriteFrames_s0p2a")
 autoplay = "default"
-frame_progress = 0.691121
 
 [node name="AnimatedSprite3D2" type="AnimatedSprite3D" parent="."]
-transform = Transform3D(0.8, 0, 0, 0, 0.445, 0, 0, 0, 0.445, 8.15739, 5.15882, 0.45137)
+transform = Transform3D(0.615, 0, 0, 0, 0.445, 0, 0, 0, 0.445, 8.15739, 5.15882, 0.45137)
 billboard = 2
 sprite_frames = SubResource("SpriteFrames_s0p2a")
 autoplay = "default"
-frame_progress = 0.46563
 
 [node name="OmniLight3D3" type="OmniLight3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 13.623, -5.91127)
@@ -511,3 +610,10 @@ omni_range = 14.399
 [node name="FogVolume" type="FogVolume" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.482666, 20.6513, -16.0869)
 size = Vector3(30.7642, 10.3584, 24.915)
+
+[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
+root_node = NodePath("../AnimatedSprite3D")
+libraries = {
+&"": SubResource("AnimationLibrary_ljhl3")
+}
+autoplay = "Flame Flicker"

Zennysoft.Game.Ma/src/player/Player.tscn

@@ -412,11 +412,11 @@ transform = Transform3D(-0.015, 0, -2.26494e-09, 0, 0.015, 0, 2.26494e-09, 0, -0
 
 [node name="OmniLight3D" type="OmniLight3D" parent="Camera/Lights"]
 transform = Transform3D(0.999997, 0, 0.00260054, 0, 1, 0, -0.00260054, 0, 0.999997, 0.0645475, 1.59919, 2.57452)
-light_energy = 1.5
+light_energy = 1.692
 light_bake_mode = 1
 shadow_enabled = true
-omni_range = 12.0
+omni_range = 16.18
-omni_attenuation = 2.0
+omni_attenuation = 1.76
 
 [node name="Minimap" type="Node3D" parent="."]