diff --git a/art/mockups/3d/best_house_blender.blend.import b/art/mockups/3d/best_house_blender.blend.import index 7031f50..2f414a6 100644 --- a/art/mockups/3d/best_house_blender.blend.import +++ b/art/mockups/3d/best_house_blender.blend.import @@ -4,12 +4,11 @@ importer="scene" importer_version=1 type="PackedScene" uid="uid://b3kyrsoobmkhp" -path="res://.godot/imported/best_house_blender.blend-ac89c74aef2f275bdf4b4baadee17c0c.scn" +valid=false [deps] source_file="res://art/mockups/3d/best_house_blender.blend" -dest_files=["res://.godot/imported/best_house_blender.blend-ac89c74aef2f275bdf4b4baadee17c0c.scn"] [params] diff --git a/prefabs/Player2D.tscn b/prefabs/Player2D.tscn index fe4abc0..fb949d7 100644 --- a/prefabs/Player2D.tscn +++ b/prefabs/Player2D.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=822 format=3 uid="uid://c25udixd5m6l0"] +[gd_scene load_steps=821 format=3 uid="uid://c25udixd5m6l0"] [ext_resource type="Script" uid="uid://cjbclkxesh3hc" path="res://scripts/CSharp/Common/CharacterControls/Player2D.cs" id="1_ssqtd"] [ext_resource type="Script" uid="uid://b05uyj001ehwi" path="res://scripts/CSharp/Common/Farming/VesnaBehaviour2D.cs" id="1_yl84k"] @@ -698,7 +698,6 @@ [ext_resource type="Texture2D" uid="uid://cxcaqeilw6qyv" path="res://art/animation/Vesna2D/Vesna Anims Sequences/S02-Walk/0018.png" id="484_2au4g"] [ext_resource type="Texture2D" uid="uid://tywawvrx32tv" path="res://art/animation/Vesna2D/Vesna Anims Sequences/S02-Walk/0019.png" id="485_tsiv1"] [ext_resource type="Texture2D" uid="uid://e0act1bcstyj" path="res://art/animation/Vesna2D/Vesna Anims Sequences/S02-Walk/0020.png" id="486_i2imi"] -[ext_resource type="PackedScene" uid="uid://cgjc4wurbgimy" path="res://prefabs/UI/Inventory/Inventory.tscn" id="539_aew1f"] [ext_resource type="Texture2D" uid="uid://dihktwgykpaux" path="res://art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0001.png" id="545_mor3p"] [ext_resource type="Texture2D" uid="uid://gg5807j8g780" path="res://art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0002.png" id="546_gd1lw"] [ext_resource type="Texture2D" uid="uid://bldn11wgjaqle" path="res://art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0003.png" id="547_6lalt"] @@ -3563,12 +3562,5 @@ _fieldPrefab = ExtResource("294_28qer") _movingPlayer = NodePath("../CharacterBody2D") _camera = NodePath("../CharacterBody2D/Camera2D") -[node name="Inventory" parent="." instance=ExtResource("539_aew1f")] -visible = false -z_index = 100 -offset_top = 600.0 -offset_bottom = 600.0 -scale = Vector2(3, 3) - [connection signal="PickedUpTool" from="." to="CharacterBody2D" method="ActivateTool"] [connection signal="WateringField" from="FarmingControls" to="CharacterBody2D" method="PlayWateringAnimation"] diff --git a/project.godot b/project.godot index fe71c10..eea71f7 100644 --- a/project.godot +++ b/project.godot @@ -76,6 +76,10 @@ window/stretch/aspect="keep_height" project/assembly_name="Babushka" +[editor] + +movie_writer/movie_file="/home/kaddi/Documents/Repos/Godot/Babushka/clips/clip.avi" + [editor_plugins] enabled=PackedStringArray("res://addons/anthonyec.camera_preview/plugin.cfg", "res://addons/dialogic/plugin.cfg") diff --git a/scenes/Babushka_scene_farm_outside_2d.tscn b/scenes/Babushka_scene_farm_outside_2d.tscn index 05e4fff..33caa08 100644 --- a/scenes/Babushka_scene_farm_outside_2d.tscn +++ b/scenes/Babushka_scene_farm_outside_2d.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=54 format=3 uid="uid://gigb28qk8t12"] +[gd_scene load_steps=55 format=3 uid="uid://gigb28qk8t12"] [ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/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"] @@ -31,6 +31,7 @@ [ext_resource type="Texture2D" uid="uid://x8hr8287ff2n" path="res://art/farm/farming/farmobjekte/tools atlas.png" id="29_p6n74"] [ext_resource type="Script" uid="uid://bdsel2amlbnuq" path="res://scripts/CSharp/Common/Inventory/ItemOnGroundSpawnWith2D.cs" id="30_2nee2"] [ext_resource type="Resource" uid="uid://c5yg3lx756v4v" path="res://resources/items/hoe.tres" id="31_r0vdg"] +[ext_resource type="PackedScene" uid="uid://cgjc4wurbgimy" path="res://prefabs/UI/Inventory/Inventory.tscn" id="32_2nee2"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_xy0kg"] shader = ExtResource("13_7p0hq") @@ -670,7 +671,7 @@ y_sort_enabled = true [node name="Player2d" parent="YSorted" node_paths=PackedStringArray("_fieldParent") instance=ExtResource("1_7wfwe")] z_index = 1 -position = Vector2(1064, 2128) +position = Vector2(1071, 2125) _fieldParent = NodePath("../Farm visuals/FieldParent") [node name="Brünnen" type="Sprite2D" parent="YSorted"] @@ -696,6 +697,7 @@ position = Vector2(80, -368) shape = SubResource("CircleShape2D_p6n74") [node name="Farm visuals" type="Node2D" parent="YSorted"] +position = Vector2(-60, 122) [node name="Static" type="Node2D" parent="YSorted/Farm visuals"] @@ -779,6 +781,21 @@ region_rect = Rect2(-2, 1135, 421, 292) texture = ExtResource("29_p6n74") region_rect = Rect2(1, 1138, 418, 288) +[node name="CanvasLayer" parent="." instance=ExtResource("32_2nee2")] +visible = false + +[node name="Inventory" parent="CanvasLayer" index="0"] +anchors_preset = 7 +anchor_left = 0.5 +anchor_top = 1.0 +anchor_right = 0.5 +offset_left = -172.8 +offset_top = -194.4 +offset_right = 172.8 +grow_vertical = 0 +size_flags_horizontal = 4 +size_flags_vertical = 8 + [connection signal="PickedUpTool" from="YSorted/Player2d" to="Hoe Pickup" method="SetSpriteActiveState"] [connection signal="PickedUpTool" from="YSorted/Player2d" to="Watercan Pickup" method="SetSpriteActiveState"] [connection signal="InteractedTool" from="YSorted/Brünnen/InteractionArea" to="YSorted/Player2d" method="TryFillWateringCan"] @@ -788,7 +805,9 @@ region_rect = Rect2(1, 1138, 418, 288) [connection signal="InteractedTool" from="Hoe Pickup" to="YSorted/Player2d" method="ActivateTool"] [connection signal="InteractedTool" from="Watercan Pickup" to="YSorted/Player2d" method="ActivateTool"] +[editable path="YSorted/Player2d"] [editable path="YSorted/Brünnen/InteractionArea"] [editable path="Hoe Pickup"] [editable path="Watercan Pickup"] [editable path="Watercan Pickup/ActiveInactive"] +[editable path="CanvasLayer"]