diff --git a/art/farm/tilable grounds/böden/nasse farming erde rund.png b/art/farm/tilable grounds/böden/nasse farming erde rund.png new file mode 100644 index 0000000..d44fc33 Binary files /dev/null and b/art/farm/tilable grounds/böden/nasse farming erde rund.png differ diff --git a/art/farm/tilable grounds/böden/nasse farming erde rund.png.import b/art/farm/tilable grounds/böden/nasse farming erde rund.png.import new file mode 100644 index 0000000..cd2b096 --- /dev/null +++ b/art/farm/tilable grounds/böden/nasse farming erde rund.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d3dq15edmgbwf" +path="res://.godot/imported/nasse farming erde rund.png-fbcae264f5ec8b8f0c408c39499733a8.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://art/farm/tilable grounds/böden/nasse farming erde rund.png" +dest_files=["res://.godot/imported/nasse farming erde rund.png-fbcae264f5ec8b8f0c408c39499733a8.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 diff --git a/art/farm/tilable grounds/böden/trockene farming erde rund.png b/art/farm/tilable grounds/böden/trockene farming erde rund.png new file mode 100644 index 0000000..1d8b2fe Binary files /dev/null and b/art/farm/tilable grounds/böden/trockene farming erde rund.png differ diff --git a/art/farm/tilable grounds/böden/trockene farming erde rund.png.import b/art/farm/tilable grounds/böden/trockene farming erde rund.png.import new file mode 100644 index 0000000..fc8d039 --- /dev/null +++ b/art/farm/tilable grounds/böden/trockene farming erde rund.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cpxjptdjw7bi6" +path="res://.godot/imported/trockene farming erde rund.png-892eaafdb75c5a99486dd5e1895c7b0a.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://art/farm/tilable grounds/böden/trockene farming erde rund.png" +dest_files=["res://.godot/imported/trockene farming erde rund.png-892eaafdb75c5a99486dd5e1895c7b0a.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 diff --git a/prefabs/characters/Yeli.tscn b/prefabs/characters/Yeli.tscn index 60ee0c5..3c2178a 100644 --- a/prefabs/characters/Yeli.tscn +++ b/prefabs/characters/Yeli.tscn @@ -187,6 +187,7 @@ y_sort_enabled = true script = ExtResource("1_at1n1") [node name="InteractionArea" parent="." instance=ExtResource("42_ahrat")] +position = Vector2(0, -450) scale = Vector2(2.805, 2.805) [node name="CollisionShape3D" parent="InteractionArea/Area2D" index="0"] @@ -209,7 +210,6 @@ _timelinesToPlay = PackedStringArray("yeli_intro_01") [node name="AnimatedSprite" type="AnimatedSprite2D" parent="TalkingControl"] y_sort_enabled = true -position = Vector2(0, 450) sprite_frames = SubResource("SpriteFrames_f6hss") animation = &"idle" frame_progress = 0.437711 diff --git a/prefabs/farm/base_field_2d.tscn b/prefabs/farm/base_field_2d.tscn index 4259655..0008eed 100644 --- a/prefabs/farm/base_field_2d.tscn +++ b/prefabs/farm/base_field_2d.tscn @@ -2,8 +2,8 @@ [ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interactions/interaction_area_2d.tscn" id="1_femni"] [ext_resource type="Script" uid="uid://bdffon388rkty" path="res://scripts/CSharp/Common/Farming/FieldBehaviour2D.cs" id="2_femni"] -[ext_resource type="Texture2D" uid="uid://c2pirgay3jfnn" path="res://art/farm/tilable grounds/böden/trockene farming erde.png" id="3_lsfck"] -[ext_resource type="Texture2D" uid="uid://ctvdxwgmfaj5c" path="res://art/farm/tilable grounds/böden/nasse farming erde.png" id="4_cus02"] +[ext_resource type="Texture2D" uid="uid://cpxjptdjw7bi6" path="res://art/farm/tilable grounds/böden/trockene farming erde rund.png" id="2_yi42k"] +[ext_resource type="Texture2D" uid="uid://d3dq15edmgbwf" path="res://art/farm/tilable grounds/böden/nasse farming erde rund.png" id="4_lsfck"] [ext_resource type="PackedScene" uid="uid://c3hwbwo423nbm" path="res://prefabs/farm/base_plant_2d.tscn" id="5_femni"] [sub_resource type="CircleShape2D" id="CircleShape2D_femni"] @@ -19,10 +19,10 @@ scale = Vector2(2.225, 2.225) [node name="FieldBehaviour" type="Sprite2D" parent="."] z_index = -1 -texture = ExtResource("3_lsfck") +texture = ExtResource("2_yi42k") script = ExtResource("2_femni") -Tilled = ExtResource("3_lsfck") -Watered = ExtResource("4_cus02") +Tilled = ExtResource("2_yi42k") +Watered = ExtResource("4_lsfck") [node name="BasePlant" parent="FieldBehaviour" node_paths=PackedStringArray("_field") instance=ExtResource("5_femni")] _field = NodePath("..") diff --git a/scenes/Babushka_scene_farm_outside_2d.tscn b/scenes/Babushka_scene_farm_outside_2d.tscn index 0633e01..65a53ae 100644 --- a/scenes/Babushka_scene_farm_outside_2d.tscn +++ b/scenes/Babushka_scene_farm_outside_2d.tscn @@ -39,8 +39,8 @@ [sub_resource type="ShaderMaterial" id="ShaderMaterial_wtdui"] shader = ExtResource("13_7p0hq") -shader_parameter/hue_shift = -0.229 -shader_parameter/saturation_mult = 0.542 +shader_parameter/hue_shift = 0.0 +shader_parameter/saturation_mult = 0.603 shader_parameter/value_mult = 1.0 shader_parameter/brightness_add = 0.0 shader_parameter/contrast_mult = 1.0 @@ -796,7 +796,8 @@ z_index = 1 y_sort_enabled = true [node name="Yeli" parent="YSorted" instance=ExtResource("24_wtdui")] -position = Vector2(6173, 2648) +z_index = 1 +position = Vector2(6173, 3310) [node name="Vesna" parent="YSorted" node_paths=PackedStringArray("_fieldParent") instance=ExtResource("1_7wfwe")] z_index = 1