Improving farm outside scene performance

art/ui/UI/UI_bag_export_highlight_01.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://u0dku75l17re"
+path="res://.godot/imported/UI_bag_export_highlight_01.png-75e9e14d3080a5afb41b921dc593da52.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://art/ui/UI/UI_bag_export_highlight_01.png"
+dest_files=["res://.godot/imported/UI_bag_export_highlight_01.png-75e9e14d3080a5afb41b921dc593da52.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=1

art/ui/UI/UI_bag_export_highlight_02.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bag1xalfh731d"
+path="res://.godot/imported/UI_bag_export_highlight_02.png-3c40cc6d764913cde7bcc1bd97f1eb6d.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://art/ui/UI/UI_bag_export_highlight_02.png"
+dest_files=["res://.godot/imported/UI_bag_export_highlight_02.png-3c40cc6d764913cde7bcc1bd97f1eb6d.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=1

art/ui/UI/UI_bag_export_highlight_03.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cxptule8n38ph"
+path="res://.godot/imported/UI_bag_export_highlight_03.png-d901f8d53fc4b996a469e8098ea5900b.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://art/ui/UI/UI_bag_export_highlight_03.png"
+dest_files=["res://.godot/imported/UI_bag_export_highlight_03.png-d901f8d53fc4b996a469e8098ea5900b.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=1

prefabs/UI/Inventory/Inventory.tscn

@@ -1,11 +1,13 @@
-[gd_scene load_steps=7 format=3 uid="uid://cgjc4wurbgimy"]
+[gd_scene load_steps=9 format=3 uid="uid://cgjc4wurbgimy"]
 
 [ext_resource type="Script" uid="uid://hg7jay2kt441" path="res://scripts/CSharp/Common/Inventory/InventoryUi.cs" id="1_6wusm"]
 [ext_resource type="Texture2D" uid="uid://3ln8aleyxgp1" path="res://art/ui/UI/UI_bag_export_01.png" id="3_vvo7l"]
-[ext_resource type="Texture2D" uid="uid://dcidjcsqk12p1" path="res://art/ui/UI/UI_bag_export_02.png" id="4_df8i8"]
 [ext_resource type="Texture2D" uid="uid://c7wqla0mbu3np" path="res://art/ui/babushka_ui_tmp_inventory_select.png" id="4_tiss4"]
+[ext_resource type="Texture2D" uid="uid://u0dku75l17re" path="res://art/ui/UI/UI_bag_export_highlight_01.png" id="5_df8i8"]
 [ext_resource type="PackedScene" uid="uid://c0kmdjeqkqrwv" path="res://prefabs/UI/Inventory/Slot.tscn" id="5_u7kje"]
 [ext_resource type="Script" uid="uid://cvkw4qd2hxksi" path="res://scripts/GdScript/dialogic_toggle.gd" id="6_n5apg"]
+[ext_resource type="Texture2D" uid="uid://bag1xalfh731d" path="res://art/ui/UI/UI_bag_export_highlight_02.png" id="6_u7kje"]
+[ext_resource type="Texture2D" uid="uid://cxptule8n38ph" path="res://art/ui/UI/UI_bag_export_highlight_03.png" id="7_l3npx"]
 
 [node name="CanvasLayer" type="CanvasLayer"]
 layer = 90
@@ -90,8 +92,9 @@ layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
-offset_left = -305.0
-offset_right = 303.0
+offset_left = 350.0
+offset_right = 254.0
+offset_bottom = 30.0
 grow_horizontal = 2
 grow_vertical = 2
 mouse_filter = 2
@@ -103,6 +106,9 @@ layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
+offset_left = -350.0
+offset_right = -446.0
+offset_bottom = 30.0
 grow_horizontal = 2
 grow_vertical = 2
 mouse_filter = 2
@@ -115,11 +121,53 @@ layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
+offset_left = -142.429
+offset_top = 1.85717
+offset_right = -808.428
+offset_bottom = -774.143
 grow_horizontal = 2
 grow_vertical = 2
+scale = Vector2(1.7, 1.7)
 mouse_filter = 2
-texture = ExtResource("4_df8i8")
-expand_mode = 3
+texture = ExtResource("5_df8i8")
+expand_mode = 1
+stretch_mode = 3
+flip_h = true
+
+[node name="TextureRect4" type="TextureRect" parent="Inventory/SlotsContainer/SlotsMover/BackgroundContainer"]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_left = 303.286
+offset_top = 209.0
+offset_right = -362.714
+offset_bottom = -567.0
+grow_horizontal = 2
+grow_vertical = 2
+scale = Vector2(1.7, 1.7)
+mouse_filter = 2
+texture = ExtResource("6_u7kje")
+expand_mode = 1
+stretch_mode = 3
+flip_h = true
+
+[node name="TextureRect5" type="TextureRect" parent="Inventory/SlotsContainer/SlotsMover/BackgroundContainer"]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_left = 474.714
+offset_top = 754.714
+offset_right = -191.286
+offset_bottom = -21.2858
+grow_horizontal = 2
+grow_vertical = 2
+scale = Vector2(1.7, 1.7)
+mouse_filter = 2
+texture = ExtResource("7_l3npx")
+expand_mode = 1
+stretch_mode = 3
 flip_h = true
 
 [node name="Slots" type="Control" parent="Inventory/SlotsContainer/SlotsMover"]

scenes/Babushka_scene_farm_outside_2d.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=71 format=3 uid="uid://gigb28qk8t12"]
+[gd_scene load_steps=70 format=3 uid="uid://gigb28qk8t12"]
 
 [ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Player2D.tscn" id="1_7wfwe"]
 [ext_resource type="Texture2D" uid="uid://8sr11ex30n0m" path="res://art/mockups/Kenney_Backgrounds/Samples/uncolored_hills.png" id="2_7b2ri"]
@@ -36,7 +36,6 @@
 [ext_resource type="Resource" uid="uid://datee0flk1e84" path="res://resources/items/scythe.tres" id="29_wtdui"]
 [ext_resource type="PackedScene" uid="uid://cgjc4wurbgimy" path="res://prefabs/UI/Inventory/Inventory.tscn" id="32_2nee2"]
 [ext_resource type="Script" uid="uid://cssdu8viimwm6" path="res://scripts/CSharp/Common/SceneTransition.cs" id="34_e5b7x"]
-[ext_resource type="PackedScene" uid="uid://bm21nqepnwaik" path="res://scenes/IndoorTest2.tscn" id="35_taxvr"]
 [ext_resource type="Texture2D" uid="uid://65e44yde224q" path="res://art/farm/Babushka_house_01.png" id="36_e5b7x"]
 [ext_resource type="AudioStream" uid="uid://cfqg50am0swb7" path="res://audio/Music/Farming_90BPM_69Bars_Loop.wav" id="37_8ey8m"]
 [ext_resource type="AudioStream" uid="uid://dku1rq5cocisg" path="res://audio/Music/Farming_90BPM_69Bars.wav" id="37_di1ed"]
@@ -165,7 +164,6 @@ stream_1/stream = ExtResource("40_ceriq")
 
 [node name="BabushkaSceneFarmOutside2d" type="Node2D"]
 script = ExtResource("34_e5b7x")
-_sceneToLoad = ExtResource("35_taxvr")
 
 [node name="ParallaxBackground" type="ParallaxBackground" parent="."]
 
@@ -233,7 +231,7 @@ offset = Vector2(0, -100)
 [node name="background layer 3" type="ParallaxLayer" parent="ParallaxBackground"]
 position = Vector2(18, -713)
 motion_scale = Vector2(0.25, 0.25)
-motion_mirroring = Vector2(7200, 0)
+motion_mirroring = Vector2(5424, 0)
 
 [node name="Kenney assets" type="Node2D" parent="ParallaxBackground/background layer 3"]
 position = Vector2(0, -39)
@@ -330,7 +328,7 @@ texture = ExtResource("12_6b2nr")
 [node name="JelenaMockupBg01" type="Sprite2D" parent="ParallaxBackground/background layer 3"]
 visible = false
 position = Vector2(3552, 1296)
-scale = Vector2(1.7404, 1.77563)
+scale = Vector2(3, 3.062)
 texture = ExtResource("11_vbdb2")
 
 [node name="background layer 4" type="ParallaxLayer" parent="ParallaxBackground"]
@@ -586,7 +584,7 @@ position = Vector2(1791.5, 1448)
 texture = ExtResource("14_mrwmr")
 flip_h = true
 region_enabled = true
-region_rect = Rect2(149, 15, 464, 478)
+region_rect = Rect2(130, 0, 201, 278)
 
 [node name="bush3" type="Sprite2D" parent="ParallaxBackground/back back trees layer"]
 material = SubResource("ShaderMaterial_8ey8m")
@@ -594,7 +592,7 @@ position = Vector2(1255.5, 1392)
 texture = ExtResource("14_mrwmr")
 flip_h = true
 region_enabled = true
-region_rect = Rect2(-6, 996, 467, 429)
+region_rect = Rect2(0, 604, 248, 228)
 
 [node name="bush4" type="Sprite2D" parent="ParallaxBackground/back back trees layer"]
 material = SubResource("ShaderMaterial_8ey8m")
@@ -602,14 +600,14 @@ position = Vector2(5471.5, 1432)
 texture = ExtResource("14_mrwmr")
 flip_h = true
 region_enabled = true
-region_rect = Rect2(2319, 1079, 353, 327)
+region_rect = Rect2(1837, 651, 139, 180)
 
 [node name="bush5" type="Sprite2D" parent="ParallaxBackground/back back trees layer"]
 material = SubResource("ShaderMaterial_8ey8m")
 position = Vector2(5007.5, 1312)
 texture = ExtResource("14_mrwmr")
 region_enabled = true
-region_rect = Rect2(2489, 707, 269, 224)
+region_rect = Rect2(1368, 673, 186, 136)
 
 [node name="bush6" type="Sprite2D" parent="ParallaxBackground/back back trees layer"]
 material = SubResource("ShaderMaterial_8ey8m")
@@ -618,7 +616,7 @@ scale = Vector2(0.575, 0.575)
 texture = ExtResource("14_mrwmr")
 flip_h = true
 region_enabled = true
-region_rect = Rect2(605, 877, 597, 537)
+region_rect = Rect2(358, 523, 345, 289)
 
 [node name="back tree bois layer 5" type="ParallaxLayer" parent="ParallaxBackground"]
 visible = false
@@ -914,7 +912,7 @@ position = Vector2(-8213, 84)
 y_sort_enabled = true
 material = SubResource("ShaderMaterial_lhtpe")
 position = Vector2(5986, 1718.25)
-scale = Vector2(2.31152, 1.91439)
+scale = Vector2(4.5, 3.725)
 texture = ExtResource("36_e5b7x")
 
 [node name="StaticBody2D" type="StaticBody2D" parent="YSorted/Farm visuals/Static/House Mockup"]
@@ -923,7 +921,7 @@ collision_mask = 6
 
 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="YSorted/Farm visuals/Static/House Mockup/StaticBody2D"]
 position = Vector2(-252.56, 231.32)
-polygon = PackedVector2Array(215.94, 279.421, 21.5883, 273.793, -387.163, 276.242, -392.515, 81.5491, -511.819, 78.5182, -539.95, -559.844, -345.984, -769.407, -25.0155, -821.798, 314.426, -909.26, 459.131, -804.479, 723.525, -766.376, 984.841, -536.463, 894.401, -445.97, 896.71, -297.458, 899.404, 87.0292, 775.096, 87.0292, 770.093, 276.242)
+polygon = PackedVector2Array(247.227, 43.5123, 44.7822, 43.5123, -87.2178, 45.123, -104.329, -55.2797, -154.107, -73.5347, -160.107, -380.38, -175.44, -400.783, -63.44, -512.461, 97.8934, -541.991, 261.671, -599.172, 374.782, -526.421, 502.338, -526.421, 637.893, -396.488, 598.56, -360.783, 596.338, -58.2327, 528.782, -58.2327, 501.449, 45.9283)
 
 [node name="EnterHouseInteraction" parent="YSorted/Farm visuals/Static" instance=ExtResource("27_klb81")]
 position = Vector2(5839, 2142)
@@ -931,35 +929,39 @@ scale = Vector2(2.425, 2.425)
 
 [node name="bush" type="Sprite2D" parent="YSorted/Farm visuals/Static"]
 material = SubResource("ShaderMaterial_bcdgk")
-position = Vector2(4321, 2478)
+position = Vector2(4313, 2633)
+scale = Vector2(2, 2)
 texture = ExtResource("14_mrwmr")
 offset = Vector2(0, -237)
 region_enabled = true
-region_rect = Rect2(222, 0, 342, 474)
+region_rect = Rect2(130, 0, 201, 278)
 
 [node name="bush2" type="Sprite2D" parent="YSorted/Farm visuals/Static"]
 material = SubResource("ShaderMaterial_bcdgk")
-position = Vector2(4616, 2757)
+position = Vector2(4590, 2971)
+scale = Vector2(2, 2)
 texture = ExtResource("14_mrwmr")
 offset = Vector2(0, -196)
 region_enabled = true
-region_rect = Rect2(2897, 130, 477, 391)
+region_rect = Rect2(1699, 76, 280, 230)
 
 [node name="bush4" type="Sprite2D" parent="YSorted/Farm visuals/Static"]
 material = SubResource("ShaderMaterial_bcdgk")
-position = Vector2(7308, 2757)
+position = Vector2(7300, 2912)
+scale = Vector2(2, 2)
 texture = ExtResource("14_mrwmr")
 offset = Vector2(0, -172)
 region_enabled = true
-region_rect = Rect2(0, 1029, 422, 389)
+region_rect = Rect2(0, 604, 248, 228)
 
 [node name="bush3" type="Sprite2D" parent="YSorted/Farm visuals/Static"]
 material = SubResource("ShaderMaterial_bcdgk")
-position = Vector2(7061, 2736)
+position = Vector2(7053, 2891)
+scale = Vector2(2, 2)
 texture = ExtResource("14_mrwmr")
 offset = Vector2(0, -50)
 region_enabled = true
-region_rect = Rect2(2495, 714, 246, 197)
+region_rect = Rect2(1464, 419, 144, 115)
 
 [node name="FieldParent" type="Node2D" parent="YSorted/Farm visuals"]
 position = Vector2(53, 20)
@@ -1004,22 +1006,26 @@ stream = SubResource("AudioStreamPlaylist_ceriq")
 volume_db = -15.0
 autoplay = true
 max_distance = 1e+06
+playback_type = 1
 
 [node name="SFX" type="Node" parent="Audio"]
 
 [node name="Farming SFX" type="AudioStreamPlayer2D" parent="Audio/SFX"]
 stream = SubResource("AudioStreamRandomizer_ceriq")
 max_distance = 2e+07
+playback_type = 2
 script = ExtResource("40_w3jkj")
 
 [node name="Watering SFX" type="AudioStreamPlayer2D" parent="Audio/SFX"]
 stream = SubResource("AudioStreamRandomizer_ceriq")
 max_distance = 2e+07
+playback_type = 2
 script = ExtResource("40_w3jkj")
 
 [node name="FillWater SFX2" type="AudioStreamPlayer2D" parent="Audio/SFX"]
 stream = SubResource("AudioStreamRandomizer_ceriq")
 max_distance = 2e+07
+playback_type = 2
 script = ExtResource("40_w3jkj")
 
 [connection signal="FilledWateringCan" from="YSorted/Vesna" to="Audio/SFX/FillWater SFX2" method="PlayOneShot"]

scripts/CSharp/Common/CharacterControls/Player2D.cs

@@ -43,8 +43,34 @@ public partial class Player2D : CharacterBody2D
 		
 		if (!_canHandleInput)
 			return;
-		
-		if (Input.IsActionPressed("move_right"))
+
+		bool right = Input.IsActionPressed("move_right");
+		bool left = Input.IsActionPressed("move_left");
+		bool up = Input.IsActionPressed("move_up");
+		bool down = Input.IsActionPressed("move_down");
+		bool walkingAnimationPicked = false;
+
+		if (up)
+		{
+			Velocity = new Vector2(0, -_speed);
+			MoveAndSlide();
+			_sprite.Animation = "back walking" + _toolString;
+			anyActionPressed = true;
+			_lastDirection = Vector2.Up;
+			walkingAnimationPicked = true;
+		}
+
+		if (down && !walkingAnimationPicked)
+		{
+			Velocity = new Vector2(0, _speed);
+			MoveAndSlide();
+			_sprite.Animation = "front walking" + _toolString;
+			anyActionPressed = true;
+			_lastDirection = Vector2.Down;
+			walkingAnimationPicked = true;
+		}
+
+		if (right && !walkingAnimationPicked)
 		{
 			Velocity = new Vector2(_speed, 0);
 			MoveAndSlide();
@@ -52,9 +78,10 @@ public partial class Player2D : CharacterBody2D
 			_sprite.Animation = "side walking" + _toolString;
 			anyActionPressed = true;
 			_lastDirection = Vector2.Right;
+			walkingAnimationPicked = true;
 		}
 
-		if (Input.IsActionPressed("move_left"))
+		if (left && !walkingAnimationPicked)
 		{
 			Velocity = new Vector2(-_speed, 0);
 			MoveAndSlide();
@@ -62,26 +89,9 @@ public partial class Player2D : CharacterBody2D
 			_sprite.Animation = "side walking" + _toolString;
 			anyActionPressed = true;
 			_lastDirection = Vector2.Left;
+			walkingAnimationPicked = true;
 		}
-
-		if (Input.IsActionPressed("move_up"))
-		{
-			Velocity = new Vector2(0, -_speed);
-			MoveAndSlide();
-			_sprite.Animation = "back walking" + _toolString;
-			anyActionPressed = true;
-			_lastDirection = Vector2.Up;
-		}
-
-		if (Input.IsActionPressed("move_down"))
-		{
-			Velocity = new Vector2(0, _speed);
-			MoveAndSlide();
-			_sprite.Animation = "front walking" + _toolString;
-			anyActionPressed = true;
-			_lastDirection = Vector2.Down;
-		}
-
+		
 		if (Input.IsActionPressed("interact2"))
 		{
 			_sprite.Animation = "back interact";