diff --git a/art/nature/baum märz 2025/sonnenblumeseamless.png b/art/nature/baum märz 2025/sonnenblumeseamless.png index 2f7fea6..b224d95 100644 Binary files a/art/nature/baum märz 2025/sonnenblumeseamless.png and b/art/nature/baum märz 2025/sonnenblumeseamless.png differ diff --git a/scenes/Babushka_scene_farm_outside_2d.tscn b/scenes/Babushka_scene_farm_outside_2d.tscn index bfeb3e0..0e39640 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=79 format=3 uid="uid://gigb28qk8t12"] +[gd_scene load_steps=84 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"] @@ -26,6 +26,7 @@ [ext_resource type="Texture2D" uid="uid://btea6eyucsyxj" path="res://art/farm/farming/farmobjekte/zaun/tilable fence middle part.png" id="20_if5vh"] [ext_resource type="Texture2D" uid="uid://3ed3dgq3irn2" path="res://art/farm/farming/farmobjekte/zaun/tilable fence end part2.png" id="21_if5vh"] [ext_resource type="Texture2D" uid="uid://dg7rlugnq0t45" path="res://art/farm/farming/farmobjekte/brünnen.png" id="21_ualyd"] +[ext_resource type="Texture2D" uid="uid://bcw6oeovkmiup" path="res://art/nature/baum märz 2025/sonnenblumeseamless.png" id="23_d77e7"] [ext_resource type="PackedScene" uid="uid://dfvgp1my5rydh" path="res://prefabs/characters/Yeli.tscn" id="24_wtdui"] [ext_resource type="Script" uid="uid://dhxtdhfqx3bte" path="res://scripts/CSharp/Common/Farming/FieldService2D.cs" id="25_0qu0h"] [ext_resource type="PackedScene" uid="uid://dpbbroif2tnil" path="res://prefabs/interactions/generic_item_on_ground_2d.tscn" id="25_hukxv"] @@ -41,8 +42,10 @@ [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"] [ext_resource type="Shader" uid="uid://braevmqauoek7" path="res://shader/swaying_plant.gdshader" id="37_taxvr"] +[ext_resource type="Texture2D" uid="uid://bq2wojyy4ptva" path="res://art/nature/baum märz 2025/sonnenblume7.png" id="38_2rjny"] [ext_resource type="AudioStream" uid="uid://fsiypqhql67w" path="res://audio/sfx/Farming/SFX_GettingWater_01.wav" id="39_di1ed"] [ext_resource type="AudioStream" uid="uid://foyw26hq1qp5" path="res://audio/sfx/Farming/SFX_GettingWater_02.wav" id="40_ceriq"] +[ext_resource type="Texture2D" uid="uid://hlgoftb0fv34" path="res://art/farm/tilable grounds/böden/brüchiger beton boden.png" id="40_d77e7"] [ext_resource type="Script" uid="uid://cfnrd5k1k0gxw" path="res://scripts/CSharp/Common/AudioPlayer.cs" id="40_w3jkj"] [ext_resource type="Script" uid="uid://clxb3n668oud3" path="res://scripts/CSharp/Common/Audio/AudioDebugger.cs" id="42_1nkjm"] [ext_resource type="AudioStream" uid="uid://vcftvrpi6c7k" path="res://audio/sfx/Farming/SFX_Harke_03_Solo.wav" id="42_wtw65"] @@ -100,10 +103,14 @@ noise = SubResource("FastNoiseLite_wgikv") [sub_resource type="ShaderMaterial" id="ShaderMaterial_0sfl7"] resource_local_to_scene = true shader = ExtResource("13_kt1wx") -shader_parameter/tiling_scale = Vector2(25, 1) +shader_parameter/tiling_scale = Vector2(15, 1) [sub_resource type="RectangleShape2D" id="RectangleShape2D_2vojv"] -size = Vector2(722.933, 456) +size = Vector2(725.109, 456) + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_p4qqi"] +shader = ExtResource("13_kt1wx") +shader_parameter/tiling_scale = Vector2(3, 1) [sub_resource type="RectangleShape2D" id="RectangleShape2D_vbdb2"] size = Vector2(727.467, 216) @@ -147,14 +154,26 @@ radius = 300.0 shader = ExtResource("37_taxvr") shader_parameter/speed = 1.0 shader_parameter/minStrength = 0.05 -shader_parameter/maxStrength = 0.154 +shader_parameter/maxStrength = 0.187 shader_parameter/strengthScale = 100.0 shader_parameter/interval = 3.5 shader_parameter/detail = 2.095 shader_parameter/distortion = 1.0 -shader_parameter/heightOffset = 0.0 +shader_parameter/heightOffset = 0.51 shader_parameter/offset = 1.0 +[sub_resource type="ShaderMaterial" id="ShaderMaterial_618my"] +shader = ExtResource("37_taxvr") +shader_parameter/speed = 1.0 +shader_parameter/minStrength = 0.05 +shader_parameter/maxStrength = 0.157 +shader_parameter/strengthScale = 100.0 +shader_parameter/interval = 3.5 +shader_parameter/detail = 2.305 +shader_parameter/distortion = 1.0 +shader_parameter/heightOffset = 0.0 +shader_parameter/offset = 0.0 + [sub_resource type="RectangleShape2D" id="RectangleShape2D_2nee2"] size = Vector2(5905, 1176) @@ -753,6 +772,13 @@ texture = ExtResource("13_d53cn") region_enabled = true region_rect = Rect2(1834, -5, 733, 1360) +[node name="sunflower field" type="ParallaxLayer" parent="ParallaxBackground"] +motion_mirroring = Vector2(3779, 0) + +[node name="Sonnenblumeseamless" type="Sprite2D" parent="ParallaxBackground/sunflower field"] +position = Vector2(1892, 1863) +texture = ExtResource("23_d77e7") + [node name="ground layer" type="ParallaxLayer" parent="ParallaxBackground"] position = Vector2(80, 208) motion_mirroring = Vector2(8192, 0) @@ -766,18 +792,48 @@ texture = SubResource("NoiseTexture2D_e5alv") [node name="Fence" type="Node2D" parent="."] -[node name="Fence" type="Sprite2D" parent="Fence"] +[node name="Back Fence left" type="Sprite2D" parent="Fence"] texture_repeat = 2 material = SubResource("ShaderMaterial_0sfl7") -position = Vector2(5032, 1680) -scale = Vector2(30, 1) +position = Vector2(-1261.5, 1680) +scale = Vector2(12.7339, 1) +texture = ExtResource("20_if5vh") + +[node name="StaticBody2D" type="StaticBody2D" parent="Fence/Back Fence left"] +collision_layer = 2 +collision_mask = 4 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Fence/Back Fence left/StaticBody2D"] +position = Vector2(1.75458, 76) +shape = SubResource("RectangleShape2D_2vojv") + +[node name="Back Fence middle" type="Sprite2D" parent="Fence"] +texture_repeat = 2 +material = SubResource("ShaderMaterial_0sfl7") +position = Vector2(8646.75, 1680) +scale = Vector2(12.6385, 1) +texture = ExtResource("20_if5vh") + +[node name="StaticBody2D" type="StaticBody2D" parent="Fence/Back Fence middle"] +collision_layer = 2 +collision_mask = 4 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Fence/Back Fence middle/StaticBody2D"] +position = Vector2(1.75458, 76) +shape = SubResource("RectangleShape2D_2vojv") + +[node name="Back fence right" type="Sprite2D" parent="Fence"] +texture_repeat = 2 +material = SubResource("ShaderMaterial_p4qqi") +position = Vector2(14920.2, 1691) +scale = Vector2(2.91427, 1) texture = ExtResource("20_if5vh") -[node name="StaticBody2D" type="StaticBody2D" parent="Fence/Fence"] +[node name="StaticBody2D" type="StaticBody2D" parent="Fence/Back fence right"] collision_layer = 2 collision_mask = 4 -[node name="CollisionShape2D" type="CollisionShape2D" parent="Fence/Fence/StaticBody2D"] +[node name="CollisionShape2D" type="CollisionShape2D" parent="Fence/Back fence right/StaticBody2D"] position = Vector2(0.666672, 76) shape = SubResource("RectangleShape2D_2vojv") @@ -806,6 +862,15 @@ scale = Vector2(3.25, 1) skew = 1.309 texture = ExtResource("21_if5vh") +[node name="EndLeft2" type="Sprite2D" parent="Fence"] +texture_repeat = 2 +material = SubResource("ShaderMaterial_ualyd") +position = Vector2(-4161, 2486) +rotation = 1.5708 +scale = Vector2(2.37, 1) +skew = 1.309 +texture = ExtResource("21_if5vh") + [node name="EndRight" type="Sprite2D" parent="Fence"] texture_repeat = 2 material = SubResource("ShaderMaterial_ualyd") @@ -827,6 +892,17 @@ collision_mask = 2 position = Vector2(-218, -4.00146) shape = SubResource("RectangleShape2D_0qu0h") +[node name="EndLeftCollider2" type="StaticBody2D" parent="Fence"] +position = Vector2(-4161, 3433) +rotation = 1.5708 +scale = Vector2(4.70255, 0.560022) +collision_layer = 2 +collision_mask = 2 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Fence/EndLeftCollider2"] +position = Vector2(-218, -4.00146) +shape = SubResource("RectangleShape2D_0qu0h") + [node name="EndRightCollider" type="StaticBody2D" parent="Fence"] position = Vector2(15952, 4592) rotation = 1.5708 @@ -952,7 +1028,11 @@ polygon = PackedVector2Array(247.227, 43.5123, 44.7822, 43.5123, -87.2178, 45.12 position = Vector2(5839, 2349) scale = Vector2(2.425, 2.425) -[node name="bush" type="Sprite2D" parent="YSorted/Farm visuals/Static"] +[node name="greenery" type="Node2D" parent="YSorted/Farm visuals/Static"] + +[node name="left side" type="Node2D" parent="YSorted/Farm visuals/Static/greenery"] + +[node name="bush" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] material = SubResource("ShaderMaterial_bcdgk") position = Vector2(4313, 2633) scale = Vector2(2, 2) @@ -961,7 +1041,52 @@ offset = Vector2(0, -237) region_enabled = true region_rect = Rect2(130, 0, 201, 278) -[node name="bush2" type="Sprite2D" parent="YSorted/Farm visuals/Static"] +[node name="bush5" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(4310, 3636) +scale = Vector2(-2, 2) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -237) +region_enabled = true +region_rect = Rect2(130, 0, 201, 278) + +[node name="bush6" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(2612, 4022) +scale = Vector2(2, 2) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -237) +region_enabled = true +region_rect = Rect2(130, 0, 201, 278) + +[node name="bush7" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(2761, 2280) +scale = Vector2(2, 2) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -237) +region_enabled = true +region_rect = Rect2(1368, 673, 186, 136) + +[node name="bush8" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(3006, 2280) +scale = Vector2(2, 2) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -237) +region_enabled = true +region_rect = Rect2(1368, 673, 186, 136) + +[node name="bush9" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(3117, 2280) +scale = Vector2(-1.86739, 2.34145) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -237) +region_enabled = true +region_rect = Rect2(1368, 673, 186, 136) + +[node name="bush2" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] material = SubResource("ShaderMaterial_bcdgk") position = Vector2(4590, 2971) scale = Vector2(2, 2) @@ -970,7 +1095,7 @@ offset = Vector2(0, -196) region_enabled = true region_rect = Rect2(1699, 76, 280, 230) -[node name="bush4" type="Sprite2D" parent="YSorted/Farm visuals/Static"] +[node name="bush4" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] material = SubResource("ShaderMaterial_bcdgk") position = Vector2(7300, 2912) scale = Vector2(2, 2) @@ -979,7 +1104,173 @@ offset = Vector2(0, -172) region_enabled = true region_rect = Rect2(0, 604, 248, 228) -[node name="bush3" type="Sprite2D" parent="YSorted/Farm visuals/Static"] +[node name="bush10" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(7757, 2032) +scale = Vector2(2, 2) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -172) +region_enabled = true +region_rect = Rect2(1837, 651, 139, 180) + +[node name="bush11" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(8891, 2100) +scale = Vector2(2, 2) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -172) +region_enabled = true +region_rect = Rect2(1464, 419, 144, 115) + +[node name="bush12" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(9170, 2052) +scale = Vector2(2, 2) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -172) +region_enabled = true +region_rect = Rect2(1699, 76, 280, 230) + +[node name="bush13" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(8145, 4141) +scale = Vector2(-2.82886, 2.51195) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -172) +region_enabled = true +region_rect = Rect2(1699, 76, 280, 230) + +[node name="bush14" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(8925, 4194) +scale = Vector2(-5.54387, 3.80466) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -172) +region_enabled = true +region_rect = Rect2(130, 0, 201, 278) + +[node name="bush15" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(7757, 4194) +scale = Vector2(3.21806, 3.18583) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -172) +region_enabled = true +region_rect = Rect2(130, 0, 201, 278) + +[node name="bush16" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(3803, 2142) +scale = Vector2(-2.40318, 3.59175) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -172) +region_enabled = true +region_rect = Rect2(130, 0, 201, 278) + +[node name="bush17" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(9556, 2071) +scale = Vector2(-2.40318, 3.59175) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -172) +region_enabled = true +region_rect = Rect2(130, 0, 201, 278) + +[node name="bush18" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(9887, 2216) +scale = Vector2(-1.87764, 2.59175) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -172) +region_enabled = true +region_rect = Rect2(1368, 673, 186, 136) + +[node name="bush19" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(10074, 2216) +scale = Vector2(1.53273, 1.82378) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -172) +region_enabled = true +region_rect = Rect2(1368, 673, 186, 136) + +[node name="bush20" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(10217, 2026) +scale = Vector2(-1.93815, 1.5875) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -172) +region_enabled = true +region_rect = Rect2(1837, 651, 139, 180) + +[node name="bush21" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(10721, 2026) +scale = Vector2(-1.93815, 1.5875) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -172) +region_enabled = true +region_rect = Rect2(1837, 651, 139, 180) + +[node name="bush22" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(13292, 2026) +scale = Vector2(-1.93815, 1.5875) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -172) +region_enabled = true +region_rect = Rect2(1837, 651, 139, 180) + +[node name="bush25" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(12369, 2026) +scale = Vector2(-1.93815, 1.5875) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -172) +region_enabled = true +region_rect = Rect2(1368, 673, 186, 136) + +[node name="bush26" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(13458, 2026) +scale = Vector2(1.41694, 1.75208) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -172) +region_enabled = true +region_rect = Rect2(1368, 673, 186, 136) + +[node name="bush27" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(13687, 1938) +scale = Vector2(1.40272, 1.38546) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -172) +region_enabled = true +region_rect = Rect2(0, 604, 248, 228) + +[node name="bush23" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +z_index = 1 +y_sort_enabled = true +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(15022, 3301) +scale = Vector2(-1.93815, 1.5875) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -172) +region_enabled = true +region_rect = Rect2(1837, 651, 139, 180) + +[node name="bush24" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +z_index = 2 +y_sort_enabled = true +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(15973, 3380) +scale = Vector2(-1.93815, 1.5875) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -172) +region_enabled = true +region_rect = Rect2(1464, 419, 144, 115) + +[node name="bush3" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] material = SubResource("ShaderMaterial_bcdgk") position = Vector2(7053, 2891) scale = Vector2(2, 2) @@ -988,6 +1279,289 @@ offset = Vector2(0, -50) region_enabled = true region_rect = Rect2(1464, 419, 144, 115) +[node name="Sonnenblume8" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +z_index = 1 +y_sort_enabled = true +material = SubResource("ShaderMaterial_618my") +position = Vector2(7197, 2834) +scale = Vector2(0.373695, 0.388829) +texture = ExtResource("38_2rjny") +offset = Vector2(0, -800) +region_enabled = true +region_rect = Rect2(0, 0, 1440, 1576) + +[node name="Sonnenblume7" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +z_index = 1 +y_sort_enabled = true +material = SubResource("ShaderMaterial_618my") +position = Vector2(6909, 2932) +scale = Vector2(0.373695, 0.388829) +texture = ExtResource("38_2rjny") +offset = Vector2(0, -800) +region_enabled = true +region_rect = Rect2(1659, 479, 809, 1097) + +[node name="right side" type="Node2D" parent="YSorted/Farm visuals/Static/greenery"] +position = Vector2(13188, 30) + +[node name="bush" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/right side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(4697, 2112) +scale = Vector2(2, 2) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -237) +region_enabled = true +region_rect = Rect2(130, 0, 201, 278) + +[node name="bush5" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/right side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(3008, 3136) +scale = Vector2(-2, 2) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -237) +region_enabled = true +region_rect = Rect2(130, 0, 201, 278) + +[node name="bush6" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/right side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(5757, 4296) +scale = Vector2(2, 2) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -237) +region_enabled = true +region_rect = Rect2(130, 0, 201, 278) + +[node name="bush7" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/right side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(5051, 2217) +scale = Vector2(2, 2) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -237) +region_enabled = true +region_rect = Rect2(1368, 673, 186, 136) + +[node name="bush8" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/right side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(4008, 2250) +scale = Vector2(2, 2) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -237) +region_enabled = true +region_rect = Rect2(1368, 673, 186, 136) + +[node name="bush9" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/right side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(5325, 2263) +scale = Vector2(-1.86739, 2.34145) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -237) +region_enabled = true +region_rect = Rect2(1368, 673, 186, 136) + +[node name="bush2" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/right side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(1909, 3074) +scale = Vector2(2, 2) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -196) +region_enabled = true +region_rect = Rect2(1699, 76, 280, 230) + +[node name="bush4" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/right side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(7361, 2026) +scale = Vector2(2, 2) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -172) +region_enabled = true +region_rect = Rect2(0, 604, 248, 228) + +[node name="bush10" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/right side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(7757, 2032) +scale = Vector2(2, 2) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -172) +region_enabled = true +region_rect = Rect2(1837, 651, 139, 180) + +[node name="bush11" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/right side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(8981, 2112) +scale = Vector2(2, 2) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -172) +region_enabled = true +region_rect = Rect2(1464, 419, 144, 115) + +[node name="bush12" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/right side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(9208, 2026) +scale = Vector2(2, 2) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -172) +region_enabled = true +region_rect = Rect2(1699, 76, 280, 230) + +[node name="bush13" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/right side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(8145, 4141) +scale = Vector2(-2.82886, 2.51195) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -172) +region_enabled = true +region_rect = Rect2(1699, 76, 280, 230) + +[node name="bush14" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/right side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(8925, 4194) +scale = Vector2(-5.54387, 3.80466) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -172) +region_enabled = true +region_rect = Rect2(130, 0, 201, 278) + +[node name="bush15" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/right side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(7763, 4164) +scale = Vector2(3.21806, 3.18583) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -172) +region_enabled = true +region_rect = Rect2(130, 0, 201, 278) + +[node name="bush16" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/right side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(3803, 2142) +scale = Vector2(-2.40318, 3.59175) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -172) +region_enabled = true +region_rect = Rect2(130, 0, 201, 278) + +[node name="bush17" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/right side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(9556, 2071) +scale = Vector2(-2.40318, 3.59175) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -172) +region_enabled = true +region_rect = Rect2(130, 0, 201, 278) + +[node name="bush18" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/right side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(9887, 2216) +scale = Vector2(-1.87764, 2.59175) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -172) +region_enabled = true +region_rect = Rect2(1368, 673, 186, 136) + +[node name="bush19" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/right side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(10074, 2216) +scale = Vector2(1.53273, 1.82378) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -172) +region_enabled = true +region_rect = Rect2(1368, 673, 186, 136) + +[node name="bush20" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/right side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(10217, 2026) +scale = Vector2(-1.93815, 1.5875) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -172) +region_enabled = true +region_rect = Rect2(1837, 651, 139, 180) + +[node name="bush21" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/right side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(10721, 2026) +scale = Vector2(-1.93815, 1.5875) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -172) +region_enabled = true +region_rect = Rect2(1837, 651, 139, 180) + +[node name="bush22" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/right side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(10802, 2596) +scale = Vector2(-1.93815, 1.5875) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -172) +region_enabled = true +region_rect = Rect2(1837, 651, 139, 180) + +[node name="bush25" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/right side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(10802, 2779) +scale = Vector2(-1.93815, 1.5875) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -172) +region_enabled = true +region_rect = Rect2(1368, 673, 186, 136) + +[node name="bush26" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/right side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(10963, 3651) +scale = Vector2(1.41694, 1.75208) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -172) +region_enabled = true +region_rect = Rect2(1368, 673, 186, 136) + +[node name="bush27" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/right side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(10831, 3016) +scale = Vector2(1.40272, 1.38546) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -172) +region_enabled = true +region_rect = Rect2(0, 604, 248, 228) + +[node name="bush23" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/right side"] +z_index = 1 +y_sort_enabled = true +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(10963, 3820) +scale = Vector2(-1.93815, 1.5875) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -172) +region_enabled = true +region_rect = Rect2(1837, 651, 139, 180) + +[node name="bush24" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/right side"] +z_index = 2 +y_sort_enabled = true +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(10831, 2250) +scale = Vector2(-1.93815, 1.5875) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -172) +region_enabled = true +region_rect = Rect2(1464, 419, 144, 115) + +[node name="bush3" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/right side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(6758, 1838) +scale = Vector2(2, 2) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -50) +region_enabled = true +region_rect = Rect2(1464, 419, 144, 115) + +[node name="Sonnenblume8" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/right side"] +z_index = 1 +y_sort_enabled = true +material = SubResource("ShaderMaterial_618my") +position = Vector2(5146, 1935) +scale = Vector2(0.373695, 0.388829) +texture = ExtResource("38_2rjny") +offset = Vector2(0, -800) +region_enabled = true +region_rect = Rect2(0, 0, 1440, 1576) + [node name="FieldParent" type="Node2D" parent="YSorted/Farm visuals"] position = Vector2(53, 20) scale = Vector2(1, 0.993819) @@ -1007,6 +1581,34 @@ shape = SubResource("RectangleShape2D_2nee2") position = Vector2(11993, 2960) shape = SubResource("RectangleShape2D_p6n74") +[node name="Blocker" type="Node2D" parent="YSorted"] + +[node name="Fence Door" type="Sprite2D" parent="YSorted/Blocker"] +position = Vector2(13518.4, 1672.12) +scale = Vector2(0.923469, 0.965054) +texture = ExtResource("40_d77e7") + +[node name="StaticBody2D" type="StaticBody2D" parent="YSorted/Blocker/Fence Door"] +collision_layer = 2 +collision_mask = 4 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="YSorted/Blocker/Fence Door/StaticBody2D"] +position = Vector2(1.75458, 76) +shape = SubResource("RectangleShape2D_2vojv") + +[node name="Fence Door2" type="Sprite2D" parent="YSorted/Blocker"] +position = Vector2(3701, 1691) +scale = Vector2(0.923469, 0.965054) +texture = ExtResource("40_d77e7") + +[node name="StaticBody2D" type="StaticBody2D" parent="YSorted/Blocker/Fence Door2"] +collision_layer = 2 +collision_mask = 4 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="YSorted/Blocker/Fence Door2/StaticBody2D"] +position = Vector2(1.75458, 76) +shape = SubResource("RectangleShape2D_2vojv") + [node name="CanvasLayer" parent="." instance=ExtResource("32_2nee2")] follow_viewport_enabled = false diff --git a/scripts/CSharp/Common/Farming/FarmingControls2D.cs b/scripts/CSharp/Common/Farming/FarmingControls2D.cs index 2ee80fa..c9e259c 100644 --- a/scripts/CSharp/Common/Farming/FarmingControls2D.cs +++ b/scripts/CSharp/Common/Farming/FarmingControls2D.cs @@ -79,7 +79,6 @@ public partial class FarmingControls2D : Node2D { if (!inputEvent.IsPressed()) { - GD.Print("Input Event is not pressed." ); return; } @@ -88,23 +87,18 @@ public partial class FarmingControls2D : Node2D if (inputEvent is InputEventMouseButton inputEventMouseButton) { - GD.Print("Input Event is InputEventMouseButton." ); if (!inputEventMouseButton.Pressed) { - GD.Print("Input Event Mouse Button is not pressed." ); return; } } else { - GD.Print("Other Input Event registered." ); return; } - - GD.Print("Current tool id: " + _toolId ); + if (_toolId == 0) { - GD.Print("Trying to create field." ); Vector2I adjustedPosition = GetAdjustedMousePosition(); MakeField(adjustedPosition); }