Update to latest Godot, fix Sproingy animation issues

GameJamDungeon.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Godot.NET.Sdk/4.4.0-beta.1">
+<Project Sdk="Godot.NET.Sdk/4.4.0-beta.4">
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <EnableDynamicLoading>true</EnableDynamicLoading>

GameJamDungeon.csproj.old.5

@@ -0,0 +1,40 @@
+<Project Sdk="Godot.NET.Sdk/4.4.0-beta.1">
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <EnableDynamicLoading>true</EnableDynamicLoading>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Remove="src\enemy\enemy_types\NewFolder\**" />
+    <Compile Remove="src\map\dungeon\corridor\**" />
+    <EmbeddedResource Remove="src\enemy\enemy_types\NewFolder\**" />
+    <EmbeddedResource Remove="src\map\dungeon\corridor\**" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Chickensoft.AutoInject" Version="2.5.0" />
+    <PackageReference Include="Chickensoft.GodotNodeInterfaces" Version="2.4.0" />
+    <PackageReference Include="Chickensoft.Introspection.Generator" Version="2.2.0" />
+    <PackageReference Include="Chickensoft.LogicBlocks" Version="5.15.0" />
+    <PackageReference Include="Chickensoft.LogicBlocks.DiagramGenerator" Version="5.15.0" />
+    <PackageReference Include="Chickensoft.SaveFileBuilder" Version="1.1.0" />
+    <PackageReference Include="GodotSharp.SourceGenerators" Version="2.5.0" />
+    <PackageReference Include="SSH.NET" Version="2024.2.0" />
+    <PackageReference Include="System.IO.Abstractions" Version="21.2.1" />
+    <PackageReference Include="Zeroconf" Version="3.7.16" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="src\items\weapons\models\" />
+    <Folder Include="src\ui\dialogue\" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include=".editorconfig" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Update="Godot.SourceGenerators" Version="4.4.0-dev.2" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Update="GodotSharp" Version="4.4.0-dev.2" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Update="GodotSharpEditor" Version="4.4.0-dev.2" />
+  </ItemGroup>
+</Project>

src/enemy/Enemy.cs

@@ -174,7 +174,7 @@ public partial class Enemy : RigidBody3D, IEnemy, IProvide<IEnemyLogic>
 
   private void OnAttackTimeout()
   {
-    if (GlobalPosition.DistanceTo(Player.CurrentPosition) > 2.5f)
+    if (GlobalPosition.DistanceTo(Player.CurrentPosition) > 5f)
     {
       _enemyLogic.Input(new EnemyLogic.Input.Alerted());
       return;

src/enemy/enemy_types/1. sproingy/Sproingy.cs

@@ -24,11 +24,11 @@ public partial class Sproingy : Enemy, IHasPrimaryAttack
   {
     _enemyLogic.Input(new EnemyLogic.Input.PhysicsTick(delta));
 
-    if (_enemyLogic.Value is EnemyLogic.State.FollowPlayer && GlobalPosition.DistanceTo(Player.CurrentPosition) < 5f)
+    if (_enemyLogic.Value is EnemyLogic.State.FollowPlayer && GlobalPosition.DistanceTo(Player.CurrentPosition) < 3f)
       _enemyLogic.Input(new EnemyLogic.Input.StartAttacking());
     if (_enemyLogic.Value is EnemyLogic.State.FollowPlayer && GlobalPosition.DistanceTo(Player.CurrentPosition) > 45f)
       _enemyLogic.Input(new EnemyLogic.Input.LostPlayer());
-    if (_enemyLogic.Value is EnemyLogic.State.Attacking && GlobalPosition.DistanceTo(Player.CurrentPosition) > 5f)
+    if (_enemyLogic.Value is EnemyLogic.State.Attacking && GlobalPosition.DistanceTo(Player.CurrentPosition) > 3f)
       _enemyLogic.Input(new EnemyLogic.Input.Alerted());
   }
 

src/enemy/enemy_types/1. sproingy/SproingyModelView.tscn

@@ -377,7 +377,7 @@ tracks/1/path = NodePath("Sprite3D/SubViewportContainer/SubViewport/AnimatedSpri
 tracks/1/interp = 1
 tracks/1/loop_wrap = true
 tracks/1/keys = {
-"times": PackedFloat32Array(0, 0.0833333, 0.166667, 0.25, 0.333333, 0.416667, 0.5, 0.583333, 0.666667, 0.75, 0.833333, 0.916667, 1, 1.08333, 1.16667),
+"times": PackedFloat32Array(0, 0.0833333, 0.166667, 0.333333, 0.416667, 0.5, 0.583333, 0.666667, 0.75, 0.833333, 0.916667, 1, 1.08333, 1.16667, 1.25),
 "transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1),
 "update": 0,
 "values": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14]
@@ -592,6 +592,7 @@ switch_mode = 1
 switch_mode = 1
 
 [sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_jyt1n"]
+switch_mode = 1
 
 [sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_5un2v"]
 switch_mode = 1
@@ -600,6 +601,7 @@ switch_mode = 1
 switch_mode = 1
 
 [sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_6a5nw"]
+switch_mode = 1
 
 [sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_0jqty"]
 switch_mode = 1
@@ -623,6 +625,7 @@ switch_mode = 1
 switch_mode = 1
 
 [sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_25i3y"]
+switch_mode = 1
 
 [sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_5g722"]
 switch_mode = 1
@@ -651,10 +654,12 @@ switch_mode = 1
 switch_mode = 1
 
 [sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_mjxlk"]
+switch_mode = 1
 
 [sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_al2xs"]
 
 [sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_afa0q"]
+switch_mode = 2
 
 [sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_irq32"]
 
@@ -663,26 +668,27 @@ switch_mode = 1
 [sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_k7x0x"]
 
 [sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_noc6c"]
+switch_mode = 2
 
 [sub_resource type="AnimationNodeStateMachine" id="AnimationNodeStateMachine_d5bmw"]
 states/End/position = Vector2(1466, 104)
-states/Start/position = Vector2(92, 119)
+states/Start/position = Vector2(29, 290)
 states/idle_back/node = SubResource("AnimationNodeAnimation_53wuj")
 states/idle_back/position = Vector2(180.116, -34)
 states/idle_back_walk/node = SubResource("AnimationNodeAnimation_o0tmb")
-states/idle_back_walk/position = Vector2(676, -8.0526)
+states/idle_back_walk/position = Vector2(1024, 12.9474)
 states/idle_front/node = SubResource("AnimationNodeAnimation_d5bmw")
-states/idle_front/position = Vector2(403.116, 43.9474)
+states/idle_front/position = Vector2(676, 119)
 states/idle_front_walk/node = SubResource("AnimationNodeAnimation_a6s5c")
 states/idle_front_walk/position = Vector2(644, -100)
 states/idle_left/node = SubResource("AnimationNodeAnimation_fpvxl")
-states/idle_left/position = Vector2(367.116, 119)
+states/idle_left/position = Vector2(466.116, 119)
 states/idle_left_walk/node = SubResource("AnimationNodeAnimation_dvj10")
 states/idle_left_walk/position = Vector2(438, 242.947)
 states/primary_attack/node = SubResource("AnimationNodeAnimation_erbrx")
-states/primary_attack/position = Vector2(1024, 92.9474)
+states/primary_attack/position = Vector2(1521, 176.947)
 transitions = ["idle_front_walk", "idle_left_walk", SubResource("AnimationNodeStateMachineTransition_3xv6a"), "idle_left_walk", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_0h1op"), "idle_front_walk", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_361b7"), "idle_back_walk", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_wftla"), "idle_back_walk", "idle_left_walk", SubResource("AnimationNodeStateMachineTransition_gqqkl"), "idle_left_walk", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_5cj36"), "idle_front_walk", "primary_attack", SubResource("AnimationNodeStateMachineTransition_4t05h"), "primary_attack", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_8hgxu"), "primary_attack", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_fq2yw"), "primary_attack", "idle_left_walk", SubResource("AnimationNodeStateMachineTransition_yqm0k"), "idle_back_walk", "primary_attack", SubResource("AnimationNodeStateMachineTransition_bmy1k"), "idle_left_walk", "primary_attack", SubResource("AnimationNodeStateMachineTransition_mxl7w"), "Start", "idle_front", SubResource("AnimationNodeStateMachineTransition_qq0ru"), "idle_front", "idle_back", SubResource("AnimationNodeStateMachineTransition_c54uj"), "idle_back", "idle_left", SubResource("AnimationNodeStateMachineTransition_qmo72"), "idle_left", "idle_front", SubResource("AnimationNodeStateMachineTransition_jyt1n"), "idle_left", "idle_back", SubResource("AnimationNodeStateMachineTransition_5un2v"), "idle_back", "idle_front", SubResource("AnimationNodeStateMachineTransition_2x3nl"), "idle_front", "idle_left", SubResource("AnimationNodeStateMachineTransition_6a5nw"), "idle_back", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_0jqty"), "idle_front", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_yjcrh"), "idle_back", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_2ybyh"), "idle_left", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_n454k"), "idle_back_walk", "idle_left", SubResource("AnimationNodeStateMachineTransition_vrcjv"), "idle_back_walk", "idle_front", SubResource("AnimationNodeStateMachineTransition_h1yxw"), "idle_back_walk", "idle_back", SubResource("AnimationNodeStateMachineTransition_kg6hd"), "idle_back", "idle_left_walk", SubResource("AnimationNodeStateMachineTransition_25i3y"), "idle_left", "idle_left_walk", SubResource("AnimationNodeStateMachineTransition_5g722"), "idle_front", "idle_left_walk", SubResource("AnimationNodeStateMachineTransition_a6y4x"), "idle_left_walk", "idle_front", SubResource("AnimationNodeStateMachineTransition_7y7m4"), "idle_left_walk", "idle_left", SubResource("AnimationNodeStateMachineTransition_ldcvv"), "idle_left_walk", "idle_back", SubResource("AnimationNodeStateMachineTransition_aalmk"), "idle_front_walk", "idle_back", SubResource("AnimationNodeStateMachineTransition_2le5t"), "idle_front_walk", "idle_front", SubResource("AnimationNodeStateMachineTransition_4nmgu"), "idle_front_walk", "idle_left", SubResource("AnimationNodeStateMachineTransition_mw5r6"), "idle_front", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_jbtxi"), "idle_left", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_mjxlk"), "idle_back", "primary_attack", SubResource("AnimationNodeStateMachineTransition_al2xs"), "primary_attack", "idle_back", SubResource("AnimationNodeStateMachineTransition_afa0q"), "idle_front", "primary_attack", SubResource("AnimationNodeStateMachineTransition_irq32"), "primary_attack", "idle_front", SubResource("AnimationNodeStateMachineTransition_2khaq"), "idle_left", "primary_attack", SubResource("AnimationNodeStateMachineTransition_k7x0x"), "primary_attack", "idle_left", SubResource("AnimationNodeStateMachineTransition_noc6c")]
-graph_offset = Vector2(46.1163, -73.3694)
+graph_offset = Vector2(-124.884, 28.2972)
 
 [node name="EnemyModelView" type="Node3D"]
 script = ExtResource("1_0vbio")

src/enemy/enemy_types/2. michael/Michael.cs

@@ -22,11 +22,11 @@ public partial class Michael : Enemy, IHasPrimaryAttack
   {
     _enemyLogic.Input(new EnemyLogic.Input.PhysicsTick(delta));
 
-    if (_enemyLogic.Value is EnemyLogic.State.FollowPlayer && GlobalPosition.DistanceTo(Player.CurrentPosition) < 2.5f)
+    if (_enemyLogic.Value is EnemyLogic.State.FollowPlayer && GlobalPosition.DistanceTo(Player.CurrentPosition) < 3f)
       _enemyLogic.Input(new EnemyLogic.Input.StartAttacking());
     if (_enemyLogic.Value is EnemyLogic.State.FollowPlayer && GlobalPosition.DistanceTo(Player.CurrentPosition) > 45f)
       _enemyLogic.Input(new EnemyLogic.Input.LostPlayer());
-    if (_enemyLogic.Value is EnemyLogic.State.Attacking && GlobalPosition.DistanceTo(Player.CurrentPosition) > 2.5f)
+    if (_enemyLogic.Value is EnemyLogic.State.Attacking && GlobalPosition.DistanceTo(Player.CurrentPosition) > 3f)
       _enemyLogic.Input(new EnemyLogic.Input.Alerted());
   }
 

src/enemy/enemy_types/2. michael/MichaelModelView.tscn

@@ -725,7 +725,7 @@ script = ExtResource("1_iajg3")
 EnemyLoreInfo = ExtResource("2_fssmb")
 
 [node name="Sprite" type="Sprite3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.209741, 0)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.086869, 0)
 billboard = 2
 alpha_cut = 1
 texture_filter = 0

src/map/dungeon/models/Set A/06. Balcony Room A/INNER_BALCONY_ROOM_VER2_STONE_PANEL_1png.png.import

@@ -2,14 +2,11 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://ca83ef2cf1i8c"
+uid="uid://cl6gq1xxh7a1p"
 path="res://.godot/imported/INNER_BALCONY_ROOM_VER2_STONE_PANEL_1png.png-98aacb07c283e2d76bb61392be9f8b48.ctex"
 metadata={
 "vram_texture": false
 }
-generator_parameters={
-"md5": "227975486c1181a9276cf8c8194791a5"
-}
 
 [deps]
 
@@ -24,7 +21,7 @@ compress/lossy_quality=0.7
 compress/hdr_compression=1
 compress/normal_map=0
 compress/channel_pack=0
-mipmaps/generate=true
+mipmaps/generate=false
 mipmaps/limit=-1
 roughness/mode=0
 roughness/src_normal=""

src/map/dungeon/models/Set A/06. Balcony Room A/INNER_BALCONY_ROOM_VER2_mother.png.import

@@ -2,7 +2,7 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://b7tsum5uiwakt"
+uid="uid://cjiyibg7dwpk7"
 path="res://.godot/imported/INNER_BALCONY_ROOM_VER2_mother.png-bb2402cc08a73f655ce08d4426c147a7.ctex"
 metadata={
 "vram_texture": false

src/map/dungeon/models/Set A/07. Statue Room/ANTECHAMBER_TYPE2_VER3_hand-tiile.png.import

@@ -2,7 +2,7 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://bftg4wbwo22ec"
+uid="uid://diycnai6xchra"
 path="res://.godot/imported/ANTECHAMBER_TYPE2_VER3_hand-tiile.png-c6c4b4320c1a14a0f2bede0486701ea6.ctex"
 metadata={
 "vram_texture": false

src/map/dungeon/models/Set A/07. Statue Room/ANTECHAMBER_TYPE2_VER3_mother.png.import

@@ -2,14 +2,11 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://drhdnxjtr5nfu"
+uid="uid://psegg6m0wkkv"
 path="res://.godot/imported/ANTECHAMBER_TYPE2_VER3_mother.png-674fa1d32c04a956eb74fc74fc505ec6.ctex"
 metadata={
 "vram_texture": false
 }
-generator_parameters={
-"md5": "0557edb32f31fcbcdb10c4c6f0694eab"
-}
 
 [deps]
 
@@ -24,7 +21,7 @@ compress/lossy_quality=0.7
 compress/hdr_compression=1
 compress/normal_map=0
 compress/channel_pack=0
-mipmaps/generate=true
+mipmaps/generate=false
 mipmaps/limit=-1
 roughness/mode=0
 roughness/src_normal=""

src/map/dungeon/models/Set A/18. Corridor A/18_A1_CORRIDOR_A_lower_corridor_lower.png.import

@@ -2,14 +2,11 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://dnka6wb7edep0"
+uid="uid://bb4i5iu6c0jrt"
 path="res://.godot/imported/18_A1_CORRIDOR_A_lower_corridor_lower.png-647ee4ca7c52c6957283f558c5ec6c10.ctex"
 metadata={
 "vram_texture": false
 }
-generator_parameters={
-"md5": "11718783be351bc85b6cb01552e92311"
-}
 
 [deps]
 
@@ -24,7 +21,7 @@ compress/lossy_quality=0.7
 compress/hdr_compression=1
 compress/normal_map=0
 compress/channel_pack=0
-mipmaps/generate=true
+mipmaps/generate=false
 mipmaps/limit=-1
 roughness/mode=0
 roughness/src_normal=""

src/map/dungeon/models/Set B/23. Antechamber D/23_A2_ANTECHAMBER_TYPE_D_swirled_column _AREA222.png.import

@@ -2,14 +2,11 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://dcwgcwnp1i6mi"
+uid="uid://bjweptdtrd8oo"
 path="res://.godot/imported/23_A2_ANTECHAMBER_TYPE_D_swirled_column _AREA222.png-53a1160fc681b720d20da8ce83c0db1a.ctex"
 metadata={
 "vram_texture": false
 }
-generator_parameters={
-"md5": "eb893a496c2c6a9fff5bfa9e12d7e83f"
-}
 
 [deps]
 
@@ -24,7 +21,7 @@ compress/lossy_quality=0.7
 compress/hdr_compression=1
 compress/normal_map=0
 compress/channel_pack=0
-mipmaps/generate=true
+mipmaps/generate=false
 mipmaps/limit=-1
 roughness/mode=0
 roughness/src_normal=""

src/map/dungeon/models/Set B/25. Pedestal Room/25_A2_PEDESTAL_ROOM_AREA_2_MAIN_STON2E.png.import

@@ -2,14 +2,11 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://x6syr6fsdeap"
+uid="uid://8cq4tiia1ewt"
 path="res://.godot/imported/25_A2_PEDESTAL_ROOM_AREA_2_MAIN_STON2E.png-d71ff3376349bded92dc1de07acd0154.ctex"
 metadata={
 "vram_texture": false
 }
-generator_parameters={
-"md5": "139c50444b8c5bb604e01ab7f78d241c"
-}
 
 [deps]
 
@@ -24,7 +21,7 @@ compress/lossy_quality=0.7
 compress/hdr_compression=1
 compress/normal_map=0
 compress/channel_pack=0
-mipmaps/generate=true
+mipmaps/generate=false
 mipmaps/limit=-1
 roughness/mode=0
 roughness/src_normal=""

src/map/dungeon/models/Set B/26. Item Transfer Room B/26_A2_ITEM_TRANSFER_ROOM_B_area_2_tile_3.png.import

@@ -2,14 +2,11 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://d056fs5xvo86h"
+uid="uid://bq3n2uk4bwp8e"
 path="res://.godot/imported/26_A2_ITEM_TRANSFER_ROOM_B_area_2_tile_3.png-75db6bc4ce1d62a810edb92bd086d74c.ctex"
 metadata={
 "vram_texture": false
 }
-generator_parameters={
-"md5": "819a5d534963bc6ec1b5baf551805ca8"
-}
 
 [deps]
 
@@ -24,7 +21,7 @@ compress/lossy_quality=0.7
 compress/hdr_compression=1
 compress/normal_map=0
 compress/channel_pack=0
-mipmaps/generate=true
+mipmaps/generate=false
 mipmaps/limit=-1
 roughness/mode=0
 roughness/src_normal=""

src/map/dungeon/models/Set B/27. Water Room B/27_A2_WATER_ROOM_B_COLUMN_WHITE.png.import

@@ -2,14 +2,11 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://bu00jxokwmoyp"
+uid="uid://bkco21hp0xbob"
 path="res://.godot/imported/27_A2_WATER_ROOM_B_COLUMN_WHITE.png-8ca816408ff5afdfc6b7dc8c03259537.ctex"
 metadata={
 "vram_texture": false
 }
-generator_parameters={
-"md5": "0e8fa39a22324fd5345ebb4d3f1deeec"
-}
 
 [deps]
 
@@ -24,7 +21,7 @@ compress/lossy_quality=0.7
 compress/hdr_compression=1
 compress/normal_map=0
 compress/channel_pack=0
-mipmaps/generate=true
+mipmaps/generate=false
 mipmaps/limit=-1
 roughness/mode=0
 roughness/src_normal=""

src/map/dungeon/models/Set B/27. Water Room B/27_A2_WATER_ROOM_B_area_2_big_tile.png.import

@@ -2,14 +2,11 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://cu4igoj0p0ikk"
+uid="uid://cphyqhrudnton"
 path="res://.godot/imported/27_A2_WATER_ROOM_B_area_2_big_tile.png-320b1a1fbca1e1c608d588b64f080374.ctex"
 metadata={
 "vram_texture": false
 }
-generator_parameters={
-"md5": "0c25630c903927ac616a7b2238fa2766"
-}
 
 [deps]
 
@@ -24,7 +21,7 @@ compress/lossy_quality=0.7
 compress/hdr_compression=1
 compress/normal_map=0
 compress/channel_pack=0
-mipmaps/generate=true
+mipmaps/generate=false
 mipmaps/limit=-1
 roughness/mode=0
 roughness/src_normal=""

src/map/dungeon/models/Set B/29. Column Circle Room/29_A2_COLUMN_CIRCLE_ROOM_area_2_tile_3.png.import

@@ -2,14 +2,11 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://bfk41l5tsd80c"
+uid="uid://cdcufn741ylbi"
 path="res://.godot/imported/29_A2_COLUMN_CIRCLE_ROOM_area_2_tile_3.png-e6f705097a771e3bdfa0be3393aa06c3.ctex"
 metadata={
 "vram_texture": false
 }
-generator_parameters={
-"md5": "819a5d534963bc6ec1b5baf551805ca8"
-}
 
 [deps]
 
@@ -24,7 +21,7 @@ compress/lossy_quality=0.7
 compress/hdr_compression=1
 compress/normal_map=0
 compress/channel_pack=0
-mipmaps/generate=true
+mipmaps/generate=false
 mipmaps/limit=-1
 roughness/mode=0
 roughness/src_normal=""

src/map/dungeon/models/Set B/29. Column Circle Room/29_A2_COLUMN_CIRCLE_ROOM_area_2_tile_stained_2.png.import

@@ -2,14 +2,11 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://ds1x87881eftw"
+uid="uid://cx815j3kde7w0"
 path="res://.godot/imported/29_A2_COLUMN_CIRCLE_ROOM_area_2_tile_stained_2.png-ce0a83d896b10634498006aa500e31fd.ctex"
 metadata={
 "vram_texture": false
 }
-generator_parameters={
-"md5": "1e3bab1819b9a3e1f68269b8dd31f358"
-}
 
 [deps]
 
@@ -24,7 +21,7 @@ compress/lossy_quality=0.7
 compress/hdr_compression=1
 compress/normal_map=0
 compress/channel_pack=0
-mipmaps/generate=true
+mipmaps/generate=false
 mipmaps/limit=-1
 roughness/mode=0
 roughness/src_normal=""

src/map/dungeon/models/Set B/33. Puer's Room/33_A2_PUERS_ROOM_lime_hand_relief.png.import

@@ -2,14 +2,11 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://b32bm18lgbgic"
+uid="uid://bsfrcb2c8hufq"
 path="res://.godot/imported/33_A2_PUERS_ROOM_lime_hand_relief.png-6d035f7f05ec1b17a0d3788330e16971.ctex"
 metadata={
 "vram_texture": false
 }
-generator_parameters={
-"md5": "1493c571147fcafccb4754b97c33ad1f"
-}
 
 [deps]
 
@@ -24,7 +21,7 @@ compress/lossy_quality=0.7
 compress/hdr_compression=1
 compress/normal_map=0
 compress/channel_pack=0
-mipmaps/generate=true
+mipmaps/generate=false
 mipmaps/limit=-1
 roughness/mode=0
 roughness/src_normal=""

src/vfx/shaders/PixelPostProcessor.gdshader

@@ -4,7 +4,7 @@ render_mode cull_disabled, unshaded;
 uniform sampler2D depth_texture : source_color, hint_depth_texture;
 uniform sampler2D screen_texture : source_color, hint_screen_texture, repeat_disable, filter_nearest;
 
-uniform bool enable_fog = true; 
+uniform bool enable_fog = true;
 uniform vec3 fog_color : source_color;
 uniform vec3 noise_color : source_color;
 uniform float fog_distance : hint_range(1, 6000) = 100;
@@ -14,7 +14,7 @@ uniform float noise_time_fac : hint_range(0.1, 10) = 4;
 uniform bool enable_color_limitation = true;
 uniform int color_levels : hint_range(2, 256) = 32;
 uniform bool enable_dithering = true;
-uniform float dither_strength : hint_range(0.0, 1.0) = 0.3; 
+uniform float dither_strength : hint_range(0.0, 1.0) = 0.3;
 
 float hashOld12(vec2 p){
 	return fract(sin(dot(p, vec2(12.9898, 78.233))) * 43758.5453 + (sin((TIME)) / noise_time_fac)) ;
@@ -54,16 +54,16 @@ void fragment(){
 	vec2 screen_coords = SCREEN_UV * 2.0 - 1.0;
 	float depth = texture(depth_texture, SCREEN_UV).x;
 	vec3 ndc = vec3(screen_coords, depth);
-	
+
 	vec4 view = INV_PROJECTION_MATRIX * vec4(ndc, 1.0);
 	view.xyz /= view.w;
-	
+
 	float linear_depth = -view.z;
-	
+
 	float depth_mask_inv = clamp((linear_depth - (fog_distance - fog_fade_range)) / fog_fade_range, 0.0, 1.0);
-	
+
 	vec3 final_color = screen_color;
-	
+
 	if (enable_noise){
 		vec3 twocolornoise = color_mix(fog_color, noise_color, hashOld12(screen_coords));
 		final_color = color_mix(twocolornoise, final_color, depth_mask_inv);