diff --git a/prefabs/Player2D.tscn b/prefabs/Player2D.tscn index 1783175..fe4abc0 100644 --- a/prefabs/Player2D.tscn +++ b/prefabs/Player2D.tscn @@ -3507,7 +3507,7 @@ position = Vector2(0, 374) collision_layer = 4 collision_mask = 3 script = ExtResource("1_ssqtd") -_speed = 1500.0 +_speed = 500.0 _sprite = NodePath("visuals/Animated Sprites") [node name="CollisionShape2D" type="CollisionShape2D" parent="CharacterBody2D"] @@ -3557,18 +3557,18 @@ region_rect = Rect2(-1, 1128, 417, 299) position = Vector2(26, -469) zoom = Vector2(0.3, 0.3) -[node name="Inventory" parent="CharacterBody2D" instance=ExtResource("539_aew1f")] -visible = false -z_index = 100 -offset_top = 226.0 -offset_bottom = 226.0 -scale = Vector2(3, 3) - [node name="FarmingControls" type="Node2D" parent="." node_paths=PackedStringArray("_movingPlayer", "_camera")] script = ExtResource("291_31q85") _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/prefabs/farm/base_field_2d.tscn b/prefabs/farm/base_field_2d.tscn index 624106f..0e7b005 100644 --- a/prefabs/farm/base_field_2d.tscn +++ b/prefabs/farm/base_field_2d.tscn @@ -14,6 +14,7 @@ z_index = 1 scale = Vector2(2.225, 2.225) [node name="FieldBehaviour" type="Sprite2D" parent="."] +z_index = -1 texture = ExtResource("3_lsfck") script = ExtResource("2_femni") Tilled = ExtResource("3_lsfck") diff --git a/prefabs/farm/base_plant_2d.tscn b/prefabs/farm/base_plant_2d.tscn index f3c9d02..5454789 100644 --- a/prefabs/farm/base_plant_2d.tscn +++ b/prefabs/farm/base_plant_2d.tscn @@ -1,11 +1,24 @@ -[gd_scene load_steps=6 format=3 uid="uid://c3hwbwo423nbm"] +[gd_scene load_steps=8 format=3 uid="uid://c3hwbwo423nbm"] [ext_resource type="Script" uid="uid://cms357f23fmfy" path="res://scripts/CSharp/Common/Farming/PlantBehaviour2D.cs" id="1_tikj4"] +[ext_resource type="Shader" uid="uid://braevmqauoek7" path="res://prefabs/farm/swaying_plant.gdshader" id="2_goh03"] [ext_resource type="Texture2D" uid="uid://dtr4uga5uspg" path="res://art/farm/farming/farmobjekte/tomaten/tomaten baby.png" id="2_rmjrk"] [ext_resource type="Texture2D" uid="uid://b2gu6ur2xc7s4" path="res://art/farm/farming/farmobjekte/tomaten/tomaten blume.png" id="3_goh03"] [ext_resource type="Texture2D" uid="uid://cnwd3mb3jnuxm" path="res://art/farm/farming/farmobjekte/tomaten/teen adulte tomaten.png" id="4_u4cty"] [ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interaction_area_2d.tscn" id="5_tikj4"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_u4cty"] +shader = ExtResource("2_goh03") +shader_parameter/speed = 3.0 +shader_parameter/minStrength = 0.05 +shader_parameter/maxStrength = 0.36 +shader_parameter/strengthScale = 100.0 +shader_parameter/interval = 3.5 +shader_parameter/detail = 1.0 +shader_parameter/distortion = 0.0 +shader_parameter/heightOffset = 0.635 +shader_parameter/offset = 0.0 + [node name="BasePlant" type="Node2D" node_paths=PackedStringArray("_seeds", "_smallPlants", "_bigPlants", "_readyPlants")] script = ExtResource("1_tikj4") _seeds = [NodePath("Seeds/TomatoSeed"), NodePath("Seeds/TomatoSeed2"), NodePath("Seeds/TomatoSeed3")] @@ -18,6 +31,8 @@ position = Vector2(0, 0.5) [node name="TomatoSeed" type="Sprite2D" parent="Seeds"] visible = false +y_sort_enabled = true +material = SubResource("ShaderMaterial_u4cty") texture = ExtResource("2_rmjrk") flip_v = true region_enabled = true @@ -25,6 +40,8 @@ region_rect = Rect2(-2, 15, 85, 81) [node name="TomatoSeed2" type="Sprite2D" parent="Seeds"] visible = false +y_sort_enabled = true +material = SubResource("ShaderMaterial_u4cty") texture = ExtResource("2_rmjrk") flip_v = true region_enabled = true @@ -32,6 +49,8 @@ region_rect = Rect2(15, 177, 84, 108) [node name="TomatoSeed3" type="Sprite2D" parent="Seeds"] visible = false +y_sort_enabled = true +material = SubResource("ShaderMaterial_u4cty") texture = ExtResource("2_rmjrk") flip_v = true region_enabled = true @@ -42,24 +61,32 @@ position = Vector2(0, 0.5) [node name="01" type="Sprite2D" parent="SmallPlant"] visible = false +y_sort_enabled = true +material = SubResource("ShaderMaterial_u4cty") texture = ExtResource("2_rmjrk") region_enabled = true region_rect = Rect2(203, 1, 128, 164) [node name="02" type="Sprite2D" parent="SmallPlant"] visible = false +y_sort_enabled = true +material = SubResource("ShaderMaterial_u4cty") texture = ExtResource("2_rmjrk") region_enabled = true region_rect = Rect2(218, 204, 112, 130) [node name="03" type="Sprite2D" parent="SmallPlant"] visible = false +y_sort_enabled = true +material = SubResource("ShaderMaterial_u4cty") texture = ExtResource("2_rmjrk") region_enabled = true region_rect = Rect2(224, 399, 105, 105) [node name="04" type="Sprite2D" parent="SmallPlant"] visible = false +y_sort_enabled = true +material = SubResource("ShaderMaterial_u4cty") texture = ExtResource("2_rmjrk") region_enabled = true region_rect = Rect2(228, 600, 85, 92) @@ -69,24 +96,32 @@ position = Vector2(0, 2) [node name="01" type="Sprite2D" parent="BigPlant"] visible = false +y_sort_enabled = true +material = SubResource("ShaderMaterial_u4cty") texture = ExtResource("3_goh03") region_enabled = true region_rect = Rect2(-8, 1, 498, 682) [node name="02" type="Sprite2D" parent="BigPlant"] visible = false +y_sort_enabled = true +material = SubResource("ShaderMaterial_u4cty") texture = ExtResource("3_goh03") region_enabled = true region_rect = Rect2(575, 82, 516, 591) [node name="03" type="Sprite2D" parent="BigPlant"] visible = false +y_sort_enabled = true +material = SubResource("ShaderMaterial_u4cty") texture = ExtResource("3_goh03") region_enabled = true region_rect = Rect2(-25, 694, 521, 687) [node name="04" type="Sprite2D" parent="BigPlant"] visible = false +y_sort_enabled = true +material = SubResource("ShaderMaterial_u4cty") texture = ExtResource("3_goh03") region_enabled = true region_rect = Rect2(546, 697, 535, 687) @@ -96,24 +131,32 @@ position = Vector2(0, 2.3) [node name="01" type="Sprite2D" parent="ReadyPlant"] visible = false +y_sort_enabled = true +material = SubResource("ShaderMaterial_u4cty") texture = ExtResource("4_u4cty") region_enabled = true region_rect = Rect2(399, 3, 679, 808) [node name="02" type="Sprite2D" parent="ReadyPlant"] visible = false +y_sort_enabled = true +material = SubResource("ShaderMaterial_u4cty") texture = ExtResource("4_u4cty") region_enabled = true region_rect = Rect2(1077, 109, 633, 695) [node name="03" type="Sprite2D" parent="ReadyPlant"] visible = false +y_sort_enabled = true +material = SubResource("ShaderMaterial_u4cty") texture = ExtResource("4_u4cty") region_enabled = true region_rect = Rect2(415, 838, 639, 817) [node name="04" type="Sprite2D" parent="ReadyPlant"] visible = false +y_sort_enabled = true +material = SubResource("ShaderMaterial_u4cty") texture = ExtResource("4_u4cty") region_enabled = true region_rect = Rect2(1167, 863, 528, 785) diff --git a/scenes/Babushka_scene_farm_outside_2d.tscn b/scenes/Babushka_scene_farm_outside_2d.tscn index 6d76484..05e4fff 100644 --- a/scenes/Babushka_scene_farm_outside_2d.tscn +++ b/scenes/Babushka_scene_farm_outside_2d.tscn @@ -87,35 +87,35 @@ size = Vector2(374, 295.995) [sub_resource type="RectangleShape2D" id="RectangleShape2D_klb81"] size = Vector2(353, 296) -[sub_resource type="ShaderMaterial" id="ShaderMaterial_lhtpe"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_2vojv"] shader = ExtResource("13_7p0hq") shader_parameter/hue_shift = 0.0 shader_parameter/saturation_mult = 1.0 -shader_parameter/value_mult = 1.068 +shader_parameter/value_mult = 1.0 shader_parameter/brightness_add = 0.0 -shader_parameter/contrast_mult = 0.913 +shader_parameter/contrast_mult = 1.398 -[sub_resource type="RectangleShape2D" id="RectangleShape2D_2nee2"] -size = Vector2(14208, 1176) +[sub_resource type="RectangleShape2D" id="RectangleShape2D_0sfl7"] +size = Vector2(728, 368) -[sub_resource type="RectangleShape2D" id="RectangleShape2D_p6n74"] +[sub_resource type="CircleShape2D" id="CircleShape2D_p6n74"] resource_local_to_scene = true -size = Vector2(7048, 1192) +radius = 600.0 -[sub_resource type="ShaderMaterial" id="ShaderMaterial_2vojv"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_lhtpe"] shader = ExtResource("13_7p0hq") shader_parameter/hue_shift = 0.0 shader_parameter/saturation_mult = 1.0 -shader_parameter/value_mult = 1.0 +shader_parameter/value_mult = 1.068 shader_parameter/brightness_add = 0.0 -shader_parameter/contrast_mult = 1.398 +shader_parameter/contrast_mult = 0.913 -[sub_resource type="RectangleShape2D" id="RectangleShape2D_0sfl7"] -size = Vector2(728, 368) +[sub_resource type="RectangleShape2D" id="RectangleShape2D_2nee2"] +size = Vector2(14208, 1176) -[sub_resource type="CircleShape2D" id="CircleShape2D_p6n74"] +[sub_resource type="RectangleShape2D" id="RectangleShape2D_p6n74"] resource_local_to_scene = true -radius = 600.0 +size = Vector2(7048, 1192) [sub_resource type="CircleShape2D" id="CircleShape2D_kxdmn"] resource_local_to_scene = true @@ -664,45 +664,6 @@ collision_mask = 2 position = Vector2(-206.5, 12.001) shape = SubResource("RectangleShape2D_klb81") -[node name="Farm visuals" type="Node2D" parent="."] - -[node name="Static" type="Node2D" parent="Farm visuals"] - -[node name="House Mockup" type="Sprite2D" parent="Farm visuals/Static"] -visible = false -material = SubResource("ShaderMaterial_lhtpe") -position = Vector2(5280, 1600) -scale = Vector2(5, 5) -texture = ExtResource("2_lhtpe") - -[node name="StaticBody2D" type="StaticBody2D" parent="Farm visuals/Static/House Mockup"] -visible = false -collision_layer = 2 -collision_mask = 6 - -[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Farm visuals/Static/House Mockup/StaticBody2D"] -visible = false -position = Vector2(-257.6, 236.8) -polygon = PackedVector2Array(232, -4.80005, 0, 0, 0, -96, -262.4, -97.6, -265.6, -260.8, -310.4, -260.8, -235.2, -321.6, -124.8, -323.2, -57.6, -424, 84.8, -436.8, 118.4, -452.8, 136, -436.8, 726.4, -452.8, 817.6, -299.2, 785.6, -291.2, 785.6, -108.8, 241.6, -94.4) -disabled = true - -[node name="FieldParent" type="Node2D" parent="Farm visuals"] -position = Vector2(48, 0) -script = ExtResource("25_0qu0h") -metadata/_custom_type_script = "uid://dhxtdhfqx3bte" - -[node name="Area2D" type="Area2D" parent="Farm visuals/FieldParent"] -position = Vector2(-48, -16) -collision_mask = 5 - -[node name="CollisionShape2D" type="CollisionShape2D" parent="Farm visuals/FieldParent/Area2D"] -position = Vector2(1536, 2964) -shape = SubResource("RectangleShape2D_2nee2") - -[node name="CollisionShape2D2" type="CollisionShape2D" parent="Farm visuals/FieldParent/Area2D"] -position = Vector2(13772, 2960) -shape = SubResource("RectangleShape2D_p6n74") - [node name="YSorted" type="Node2D" parent="."] z_index = 1 y_sort_enabled = true @@ -710,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) -_fieldParent = NodePath("../../Farm visuals/FieldParent") +_fieldParent = NodePath("../Farm visuals/FieldParent") [node name="Brünnen" type="Sprite2D" parent="YSorted"] z_index = 1 @@ -734,6 +695,45 @@ _id = 1 position = Vector2(80, -368) shape = SubResource("CircleShape2D_p6n74") +[node name="Farm visuals" type="Node2D" parent="YSorted"] + +[node name="Static" type="Node2D" parent="YSorted/Farm visuals"] + +[node name="House Mockup" type="Sprite2D" parent="YSorted/Farm visuals/Static"] +visible = false +material = SubResource("ShaderMaterial_lhtpe") +position = Vector2(5280, 1600) +scale = Vector2(5, 5) +texture = ExtResource("2_lhtpe") + +[node name="StaticBody2D" type="StaticBody2D" parent="YSorted/Farm visuals/Static/House Mockup"] +visible = false +collision_layer = 2 +collision_mask = 6 + +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="YSorted/Farm visuals/Static/House Mockup/StaticBody2D"] +visible = false +position = Vector2(-257.6, 236.8) +polygon = PackedVector2Array(232, -4.80005, 0, 0, 0, -96, -262.4, -97.6, -265.6, -260.8, -310.4, -260.8, -235.2, -321.6, -124.8, -323.2, -57.6, -424, 84.8, -436.8, 118.4, -452.8, 136, -436.8, 726.4, -452.8, 817.6, -299.2, 785.6, -291.2, 785.6, -108.8, 241.6, -94.4) +disabled = true + +[node name="FieldParent" type="Node2D" parent="YSorted/Farm visuals"] +position = Vector2(48, 0) +script = ExtResource("25_0qu0h") +metadata/_custom_type_script = "uid://dhxtdhfqx3bte" + +[node name="Area2D" type="Area2D" parent="YSorted/Farm visuals/FieldParent"] +position = Vector2(-48, -16) +collision_mask = 5 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="YSorted/Farm visuals/FieldParent/Area2D"] +position = Vector2(1536, 2964) +shape = SubResource("RectangleShape2D_2nee2") + +[node name="CollisionShape2D2" type="CollisionShape2D" parent="YSorted/Farm visuals/FieldParent/Area2D"] +position = Vector2(13772, 2960) +shape = SubResource("RectangleShape2D_p6n74") + [node name="Hoe Pickup" parent="." node_paths=PackedStringArray("_sprites") instance=ExtResource("27_klb81")] position = Vector2(7728, 2000) rotation = 3.3074 @@ -779,11 +779,11 @@ region_rect = Rect2(-2, 1135, 421, 292) texture = ExtResource("29_p6n74") region_rect = Rect2(1, 1138, 418, 288) -[connection signal="mouse_entered" from="Farm visuals/FieldParent/Area2D" to="Farm visuals/FieldParent" method="MouseEnteredAllowedArea"] -[connection signal="mouse_exited" from="Farm visuals/FieldParent/Area2D" to="Farm visuals/FieldParent" method="MouseExitedAllowedArea"] [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"] +[connection signal="mouse_entered" from="YSorted/Farm visuals/FieldParent/Area2D" to="YSorted/Farm visuals/FieldParent" method="MouseEnteredAllowedArea"] +[connection signal="mouse_exited" from="YSorted/Farm visuals/FieldParent/Area2D" to="YSorted/Farm visuals/FieldParent" method="MouseExitedAllowedArea"] [connection signal="Interacted" from="Hoe Pickup" to="Hoe Pickup/ItemOnGround" method="TryPickUp"] [connection signal="InteractedTool" from="Hoe Pickup" to="YSorted/Player2d" method="ActivateTool"] [connection signal="InteractedTool" from="Watercan Pickup" to="YSorted/Player2d" method="ActivateTool"]