built first 2d indoor scene + added kitchen

art/indoor/küchenraum.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://ejq7h5pgxl84"
+path="res://.godot/imported/küchenraum.png-bb22e43621d167e1c76157f0a17f669c.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://art/indoor/küchenraum.png"
+dest_files=["res://.godot/imported/küchenraum.png-bb22e43621d167e1c76157f0a17f669c.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/babushka_ui_inventory_slot.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://c2dbd0q02x2h"
-path="res://.godot/imported/babushka_ui_inventory_slot.png-cd1973aa1d3922af7e3271aeaf56cc88.ctex"
+path="res://.godot/imported/babushka_ui_inventory_slot.png-9d7d3ee5563e98c6963e4d5a2e761fcc.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://graphics/ui/babushka_ui_inventory_slot.png"
-dest_files=["res://.godot/imported/babushka_ui_inventory_slot.png-cd1973aa1d3922af7e3271aeaf56cc88.ctex"]
+source_file="res://art/ui/babushka_ui_inventory_slot.png"
+dest_files=["res://.godot/imported/babushka_ui_inventory_slot.png-9d7d3ee5563e98c6963e4d5a2e761fcc.ctex"]
 
 [params]
 

art/ui/babushka_ui_tmp_inventory_select.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://c7wqla0mbu3np"
-path="res://.godot/imported/babushka_ui_tmp_inventory_select.png-b544ba0ded36dd6bd66bd197fb76d424.ctex"
+path="res://.godot/imported/babushka_ui_tmp_inventory_select.png-4555eb73439162532df58b7148bf3ef2.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://graphics/ui/babushka_ui_tmp_inventory_select.png"
-dest_files=["res://.godot/imported/babushka_ui_tmp_inventory_select.png-b544ba0ded36dd6bd66bd197fb76d424.ctex"]
+source_file="res://art/ui/babushka_ui_tmp_inventory_select.png"
+dest_files=["res://.godot/imported/babushka_ui_tmp_inventory_select.png-4555eb73439162532df58b7148bf3ef2.ctex"]
 
 [params]
 

prefabs/UI/Inventory/Inventory.tscn

@@ -3,7 +3,7 @@
 [ext_resource type="Script" uid="uid://hg7jay2kt441" path="res://scripts/CSharp/Common/Inventory/InventoryUi.cs" id="1_6wusm"]
 [ext_resource type="Script" uid="uid://b2jhdxcrhtm2d" path="res://scripts/CSharp/Common/Inventory/InventoryTestScript.cs" id="3_exrk4"]
 [ext_resource type="Resource" uid="uid://datee0flk1e84" path="res://resources/items/pickaxe.tres" id="4_5fdxq"]
-[ext_resource type="Texture2D" uid="uid://c7wqla0mbu3np" path="res://graphics/ui/babushka_ui_tmp_inventory_select.png" id="4_tiss4"]
+[ext_resource type="Texture2D" uid="uid://c7wqla0mbu3np" path="res://art/ui/babushka_ui_tmp_inventory_select.png" id="4_tiss4"]
 
 [node name="Inventory" type="Control"]
 layout_mode = 3

prefabs/UI/Inventory/Slot.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=4 format=3 uid="uid://c0kmdjeqkqrwv"]
 
 [ext_resource type="Script" uid="uid://bh6wcyxh1f0cv" path="res://scripts/CSharp/Common/Inventory/SlotUi.cs" id="1_au0l0"]
-[ext_resource type="Texture2D" uid="uid://c2dbd0q02x2h" path="res://graphics/ui/babushka_ui_inventory_slot.png" id="2_7emux"]
+[ext_resource type="Texture2D" uid="uid://c2dbd0q02x2h" path="res://art/ui/babushka_ui_inventory_slot.png" id="2_7emux"]
 
 [sub_resource type="LabelSettings" id="LabelSettings_7emux"]
 font_size = 15

scenes/Babushka_scene_farm_vesna.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=16 format=3 uid="uid://br7yq757cawts"]
+[gd_scene load_steps=22 format=3 uid="uid://br7yq757cawts"]
 
 [ext_resource type="Material" uid="uid://p1mf3uc4k164" path="res://art/materials/Tilleable_ground.tres" id="1_6i8r8"]
 [ext_resource type="PackedScene" uid="uid://dbd1niu3tp8y5" path="res://prefabs/Player3D.tscn" id="1_b1ibi"]
@@ -12,6 +12,27 @@
 [ext_resource type="PackedScene" uid="uid://bqhnejufg5ei2" path="res://prefabs/farm/fence_part_01.tscn" id="10_84r6a"]
 [ext_resource type="PackedScene" uid="uid://cxceu5dgq3akw" path="res://prefabs/farm/fence_part_02.tscn" id="11_nmncb"]
 [ext_resource type="PackedScene" uid="uid://cm5oekefe6ct3" path="res://prefabs/farm/fence_part_03.tscn" id="12_ww4l5"]
+[ext_resource type="Texture2D" uid="uid://c7f3t65jskd6v" path="res://art/mockups/house_prototype.png" id="13_nmncb"]
+
+[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_nmncb"]
+sky_horizon_color = Color(0.662243, 0.671743, 0.686743, 1)
+ground_horizon_color = Color(0.662243, 0.671743, 0.686743, 1)
+
+[sub_resource type="Sky" id="Sky_ww4l5"]
+sky_material = SubResource("ProceduralSkyMaterial_nmncb")
+
+[sub_resource type="Environment" id="Environment_m0ieq"]
+background_mode = 2
+sky = SubResource("Sky_ww4l5")
+tonemap_mode = 2
+glow_enabled = true
+
+[sub_resource type="CameraAttributesPractical" id="CameraAttributesPractical_prdor"]
+dof_blur_far_distance = 563.99
+dof_blur_far_transition = 6118.24
+dof_blur_amount = 0.04
+
+[sub_resource type="Compositor" id="Compositor_nmncb"]
 
 [sub_resource type="PlaneMesh" id="PlaneMesh_8yprl"]
 
@@ -24,6 +45,11 @@ radius = 1.0
 
 [node name="SceneFarmVesna" type="Node3D"]
 
+[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
+environment = SubResource("Environment_m0ieq")
+camera_attributes = SubResource("CameraAttributesPractical_prdor")
+compositor = SubResource("Compositor_nmncb")
+
 [node name="Floor" type="MeshInstance3D" parent="."]
 transform = Transform3D(50, 0, 0, 0, 50, 0, 0, 0, 50, 0, 0, 0)
 mesh = SubResource("PlaneMesh_8yprl")
@@ -177,6 +203,12 @@ transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -45, 0
 [node name="fence_part_03" parent="Fence/fencegroup5" instance=ExtResource("12_ww4l5")]
 transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -45, 0, -3.5)
 
+[node name="House" type="Sprite3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.28486, 1.15105, 6.0303)
+pixel_size = 0.005
+billboard = 1
+texture = ExtResource("13_nmncb")
+
 [connection signal="Interacted" from="HoePickup" to="HoePickup/SpriteSwitcher Hoe" method="SwitchState"]
 [connection signal="Switch" from="HoePickup/SpriteSwitcher Hoe" to="Player3d" method="ActivateHoe"]
 [connection signal="Interacted" from="Watering Can Pickup" to="Watering Can Pickup/SpriteSwitcher Hoe" method="SwitchState"]

scenes/IndoorTest.tscn

@@ -0,0 +1,37 @@
+[gd_scene load_steps=3 format=3 uid="uid://chvc0e4441o2k"]
+
+[ext_resource type="Texture2D" uid="uid://ejq7h5pgxl84" path="res://art/indoor/küchenraum.png" id="2_ttdge"]
+[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/Player2D.tscn" id="3_oibke"]
+
+[node name="IndoorTest" type="Node2D"]
+
+[node name="background" type="Sprite2D" parent="."]
+texture = ExtResource("2_ttdge")
+region_enabled = true
+region_rect = Rect2(111, 292, 3323, 2160)
+
+[node name="StaticBody2D" type="StaticBody2D" parent="background"]
+
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="background/StaticBody2D"]
+position = Vector2(-1195, 1075)
+polygon = PackedVector2Array(-467, -7, -472, -1988, 1922, -1684, 2851, -1753, 2860, -260, 1679, -421, -26, -12, -430, -7)
+
+[node name="middleground" type="Sprite2D" parent="."]
+position = Vector2(-234, 864)
+texture = ExtResource("2_ttdge")
+region_enabled = true
+region_rect = Rect2(2093, 2947, 1905, 417)
+
+[node name="foreground" type="Sprite2D" parent="."]
+z_index = 2
+position = Vector2(1168, 3)
+texture = ExtResource("2_ttdge")
+region_enabled = true
+region_rect = Rect2(4707, 676, 2016, 2160)
+
+[node name="Player2d" parent="." instance=ExtResource("3_oibke")]
+position = Vector2(-3, 509)
+
+[node name="Camera2D" type="Camera2D" parent="."]
+offset = Vector2(100, 0)
+zoom = Vector2(0.325, 0.325)

scenes/testing/abandoned_street_2D.tscn

@@ -1,8 +1,7 @@
-[gd_scene load_steps=13 format=3 uid="uid://dx7gn5yiq1aki"]
+[gd_scene load_steps=12 format=3 uid="uid://dx7gn5yiq1aki"]
 
 [ext_resource type="PackedScene" uid="uid://dd3giw31imfk4" path="res://prefabs/player.tscn" id="1_aa8yc"]
 [ext_resource type="Texture2D" uid="uid://cg1cxmqbo1pa" path="res://art/mockups/trees/darktree1.png" id="2_k41x3"]
-[ext_resource type="Script" uid="uid://b4h7k5w0jsjri" path="res://scripts/CSharp/Common/CameraController.cs" id="2_tykdc"]
 [ext_resource type="Texture2D" uid="uid://fcm6etmmj65d" path="res://art/mockups/trees/darktree2.png" id="3_tykdc"]
 [ext_resource type="Texture2D" uid="uid://c8h24ouqcqlxv" path="res://art/mockups/trees/darktree3.png" id="4_4u5mu"]
 [ext_resource type="Texture2D" uid="uid://dcimm8umxko8" path="res://art/mockups/trees/darktree4.png" id="5_y2pux"]
@@ -22,7 +21,6 @@ position = Vector2(586, 343)
 
 [node name="Camera2D" type="Camera2D" parent="."]
 position = Vector2(578, 327)
-script = ExtResource("2_tykdc")
 
 [node name="background" type="Node2D" parent="."]
 

scenes/testing/abandoned_street_3d.tscn

@@ -1394,7 +1394,7 @@ shaded = true
 texture = ExtResource("29_kse13")
 
 [node name="Player3d" parent="." instance=ExtResource("27_mqdni")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.032, 0, -0.061)
+transform = Transform3D(0.17, 0, 0, 0, 0.17, 0, 0, 0, 0.17, 0.032, 0.07, -0.061)
 
 [node name="best_house" parent="." instance=ExtResource("31_lqlrn")]
 transform = Transform3D(-5.24537e-09, 0, 0.12, 0, 0.12, 0, -0.12, 0, -5.24537e-09, 0.418, 0, -0.187)

scripts/CSharp/Common/CharacterControls/Player2D.cs

@@ -5,16 +5,52 @@ namespace Babushka.scripts.CSharp.Common.CharacterControls;
 public partial class Player2D : Node2D
 {
 	[Export] private float _speed = 100f;
+	[Export] private AnimatedSprite2D _sprite;
+
+	private bool anyActionPressed;
 
 	public override void _Process(double delta)
 	{
-		if (Input.IsActionPressed("move_right")) 
+		anyActionPressed = false;
+		
+		if (Input.IsActionPressed("move_right"))
+		{
 			Position = new Vector2(Position.X + (_speed * (float)delta), Position.Y);
-		if (Input.IsActionPressed("move_left")) 
+			_sprite.FlipH = false;
+			_sprite.Animation = "side_walking";
+			anyActionPressed = true;
+		}
+
+		if (Input.IsActionPressed("move_left"))
+		{
 			Position = new Vector2(Position.X - (_speed * (float)delta), Position.Y);
-		if (Input.IsActionPressed("move_up")) 
+			_sprite.FlipH = true;
+			_sprite.Animation = "side_walking";
+			anyActionPressed = true;
+		}
+
+		if (Input.IsActionPressed("move_up"))
+		{
 			Position = new Vector2(Position.X, Position.Y - (_speed * (float)delta));
-		if (Input.IsActionPressed("move_down")) 
+			_sprite.Animation = "back walking";
+			anyActionPressed = true;
+		}
+
+		if (Input.IsActionPressed("move_down"))
+		{
 			Position = new Vector2(Position.X, Position.Y + (_speed * (float)delta));
+			_sprite.Animation = "front walking";
+			anyActionPressed = true;
+		}
+
+		if (anyActionPressed)
+		{
+			_sprite.Play();
+		}
+		else
+		{
+			_sprite.Animation = "front idle";
+		}
+		
 	}
 }