diff --git a/art/effects/suneffect.afdesign b/art/effects/suneffect.afdesign new file mode 100644 index 0000000..4301fed Binary files /dev/null and b/art/effects/suneffect.afdesign differ diff --git a/art/effects/suneffect.png b/art/effects/suneffect.png new file mode 100644 index 0000000..81e73a3 Binary files /dev/null and b/art/effects/suneffect.png differ diff --git a/art/effects/suneffect.png.import b/art/effects/suneffect.png.import new file mode 100644 index 0000000..e74f5f0 --- /dev/null +++ b/art/effects/suneffect.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cq66tjp1p0qek" +path="res://.godot/imported/suneffect.png-cf98cdad9da8a68f4212475a0741a24a.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://art/effects/suneffect.png" +dest_files=["res://.godot/imported/suneffect.png-cf98cdad9da8a68f4212475a0741a24a.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/mockups/3d/best_house_blender.blend.import b/art/mockups/3d/best_house_blender.blend.import index 2f414a6..7031f50 100644 --- a/art/mockups/3d/best_house_blender.blend.import +++ b/art/mockups/3d/best_house_blender.blend.import @@ -4,11 +4,12 @@ importer="scene" importer_version=1 type="PackedScene" uid="uid://b3kyrsoobmkhp" -valid=false +path="res://.godot/imported/best_house_blender.blend-ac89c74aef2f275bdf4b4baadee17c0c.scn" [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/farm/duck.tscn b/prefabs/farm/duck.tscn index c83462a..c348e74 100644 --- a/prefabs/farm/duck.tscn +++ b/prefabs/farm/duck.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=25 format=3 uid="uid://muuxxgvx33fp"] +[gd_scene load_steps=24 format=3 uid="uid://muuxxgvx33fp"] [ext_resource type="Script" uid="uid://7m1rt7agb6rm" path="res://scripts/CSharp/Common/Temp/MVPDuck.cs" id="1_54k4r"] [ext_resource type="Texture2D" uid="uid://hvchk6t0xe7j" path="res://art/animals/Ente.png" id="1_cgxhx"] @@ -16,7 +16,6 @@ [ext_resource type="Animation" uid="uid://b3dwd88uvfk1k" path="res://art/animals/duck_flapFlap.res" id="14_uo3dh"] [ext_resource type="AudioStream" uid="uid://bsr5m8u2sle5k" path="res://audio/sfx/Animals/SFX_Duck_Wings_07.wav" id="14_xhefb"] [ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interactions/interaction_area_2d.tscn" id="15_uo3dh"] -[ext_resource type="Material" uid="uid://blch5kdhkbj75" path="res://art/materials/simple_interactable_outline.tres" id="16_nxoeu"] [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_sot7i"] streams_count = 4 @@ -163,7 +162,6 @@ libraries = { [node name="InteractionArea" parent="." node_paths=PackedStringArray("_spriteToOutline") instance=ExtResource("15_uo3dh")] position = Vector2(18, -250) -_outlineMaterial = ExtResource("16_nxoeu") _spriteToOutline = NodePath("../Duck rendered") [node name="CollisionShape3D" parent="InteractionArea/Area2D" index="0"] diff --git a/project.godot b/project.godot index 8c08406..755066f 100644 --- a/project.godot +++ b/project.godot @@ -145,6 +145,8 @@ directories/tres_directory={ "farming_equipment_glossary": "res://dialog/farming_equipment_glossary.tres", "hoe": "res://resources/items/hoe.tres", "inventory_interactable_outline": "res://art/materials/inventory_interactable_outline.tres", +"noise": "res://scenes/noise.tres", +"othernoise": "res://scenes/othernoise.tres", "preview_character": "res://addons/dialogic/Modules/Character/preview_character.tres", "rake": "res://resources/items/rake.tres", "scythe": "res://resources/items/scythe.tres", diff --git a/scenes/Babushka_scene_farm_outside_2d.tscn b/scenes/Babushka_scene_farm_outside_2d.tscn index 64a27a3..9761a43 100644 --- a/scenes/Babushka_scene_farm_outside_2d.tscn +++ b/scenes/Babushka_scene_farm_outside_2d.tscn @@ -1,12 +1,15 @@ -[gd_scene load_steps=119 format=3 uid="uid://gigb28qk8t12"] +[gd_scene load_steps=128 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"] [ext_resource type="Script" uid="uid://bqomwxclsbhd3" path="res://scripts/CSharp/Common/Camera/CameraController.cs" id="3_p4qqi"] [ext_resource type="Texture2D" uid="uid://be1nofeo7an0" path="res://art/mockups/Kenney_Backgrounds/PNG/cloud2.png" id="3_r34wi"] +[ext_resource type="Texture2D" uid="uid://cq66tjp1p0qek" path="res://art/effects/suneffect.png" id="3_xcwle"] +[ext_resource type="Texture2D" uid="uid://gqnq3iofi13p" path="res://scenes/othernoise.tres" id="4_q1g8e"] [ext_resource type="Texture2D" uid="uid://o6vnf7n7qp8o" path="res://art/mockups/Kenney_Backgrounds/PNG/cloud6.png" id="4_xh22q"] [ext_resource type="Texture2D" uid="uid://cc0o84q5u437k" path="res://art/mockups/Kenney_Backgrounds/PNG/cloud7.png" id="5_k3wpj"] [ext_resource type="Texture2D" uid="uid://cqdb0iqhlk5st" path="res://art/mockups/Kenney_Backgrounds/PNG/cloud8.png" id="5_r0vdg"] +[ext_resource type="Script" uid="uid://j6xijojgoo3l" path="res://scenes/move.gd" id="5_vx3c5"] [ext_resource type="Texture2D" uid="uid://cydc6feouwxys" path="res://art/mockups/Kenney_Backgrounds/PNG/Flat/hills1.png" id="7_sbyqw"] [ext_resource type="Texture2D" uid="uid://vt1gtr2trvwt" path="res://art/mockups/Kenney_Backgrounds/PNG/Flat/hills2.png" id="8_kt1wx"] [ext_resource type="Texture2D" uid="uid://b6k4vrgj745k" path="res://art/mockups/Kenney_Backgrounds/PNG/Flat/tree03.png" id="9_ubx8m"] @@ -35,6 +38,7 @@ [ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interactions/interaction_area_2d.tscn" id="27_klb81"] [ext_resource type="Resource" uid="uid://dlcmqfjvgphqu" path="res://resources/items/rake.tres" id="28_6b2nr"] [ext_resource type="Resource" uid="uid://cndd64batns31" path="res://resources/items/wateringcan.tres" id="28_ipqaa"] +[ext_resource type="Texture2D" uid="uid://s6olqfj6ebqk" path="res://scenes/noise.tres" id="28_jiarp"] [ext_resource type="Resource" uid="uid://datee0flk1e84" path="res://resources/items/scythe.tres" id="29_wtdui"] [ext_resource type="PackedScene" uid="uid://cgjc4wurbgimy" path="res://prefabs/UI/Inventory/Inventory.tscn" id="32_2nee2"] [ext_resource type="Script" uid="uid://boehox1ydbcnx" path="res://scripts/CSharp/Common/Farming/WellBehaviour.cs" id="32_lbnqo"] @@ -78,6 +82,9 @@ [ext_resource type="Resource" uid="uid://byjqeukpibkvi" path="res://resources/quests/demo/7_talk_yeli_inside_1.tres" id="76_xcwle"] [ext_resource type="Script" uid="uid://dih1b0opgc3f7" path="res://scripts/GdScript/dialogic_start_specific.gd" id="77_l7ekk"] +[sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_q1g8e"] +blend_mode = 1 + [sub_resource type="ShaderMaterial" id="ShaderMaterial_wtdui"] shader = ExtResource("13_7p0hq") shader_parameter/hue_shift = 0.0 @@ -109,21 +116,6 @@ shader = ExtResource("13_kt1wx") shader_parameter/tiling_scale = Vector2(7.79, 5.2) shader_parameter/noise = SubResource("NoiseTexture2D_d53cn") -[sub_resource type="Gradient" id="Gradient_eryax"] -offsets = PackedFloat32Array(0, 0.743902, 1) -colors = PackedColorArray(0.22, 0.1078, 0.16764, 1, 0.443137, 0.4, 0.360784, 1, 0.6, 0.4853, 0.414, 1) - -[sub_resource type="FastNoiseLite" id="FastNoiseLite_wgikv"] -frequency = 0.0296 -fractal_octaves = 7 -fractal_gain = 0.795 -domain_warp_enabled = true - -[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_e5alv"] -seamless = true -color_ramp = SubResource("Gradient_eryax") -noise = SubResource("FastNoiseLite_wgikv") - [sub_resource type="ShaderMaterial" id="ShaderMaterial_0sfl7"] resource_local_to_scene = true shader = ExtResource("13_kt1wx") @@ -190,11 +182,11 @@ radius = 300.0 [sub_resource type="ShaderMaterial" id="ShaderMaterial_bcdgk"] shader = ExtResource("37_taxvr") shader_parameter/speed = 1.0 -shader_parameter/minStrength = 0.05 -shader_parameter/maxStrength = 0.187 -shader_parameter/strengthScale = 100.0 +shader_parameter/minStrength = 0.029 +shader_parameter/maxStrength = 0.153 +shader_parameter/strengthScale = 500.0 shader_parameter/interval = 3.5 -shader_parameter/detail = 2.095 +shader_parameter/detail = 2.86 shader_parameter/distortion = 1.0 shader_parameter/heightOffset = 0.51 shader_parameter/offset = 1.0 @@ -249,6 +241,50 @@ shader_parameter/contrast_mult = 1.0 [sub_resource type="RectangleShape2D" id="RectangleShape2D_ycj14"] size = Vector2(707.116, 604.111) +[sub_resource type="AtlasTexture" id="AtlasTexture_q1g8e"] +atlas = ExtResource("14_mrwmr") +region = Rect2(137.555, 590.703, 59.3171, 79.177) + +[sub_resource type="Curve" id="Curve_q1g8e"] +_limits = [-1.0, 1.0, 0.0, 1.0] +_data = [Vector2(0.12963, 1), 0.0, 0.0, 0, 0, Vector2(0.273148, -0.672247), 0.0, 0.0, 0, 0, Vector2(0.402778, 1), 0.0, 0.0, 0, 0, Vector2(0.486111, -0.0881057), 0.0, 0.0, 0, 0, Vector2(0.601852, 0.45022), 0.0, 0.0, 0, 0, Vector2(0.75463, -0.488987), 0.0, 0.0, 0, 0, Vector2(0.921296, 0.0149781), 0.0, 0.0, 0, 0, Vector2(0.969907, 1), 0.0, 0.0, 0, 0] +point_count = 8 + +[sub_resource type="Curve" id="Curve_vx3c5"] +_data = [Vector2(0.173611, 0.307048), 0.0, 0.0, 0, 0, Vector2(0.263889, 0.673568), 0.0, 0.0, 0, 0, Vector2(0.483796, 0.0493393), 0.0, 0.0, 0, 0, Vector2(0.726852, 0.461674), 0.0, 0.0, 0, 0, Vector2(0.891204, 0.100881), 0.0, 0.0, 0, 0] +point_count = 5 + +[sub_resource type="CurveXYZTexture" id="CurveXYZTexture_jiarp"] +curve_x = SubResource("Curve_q1g8e") +curve_y = SubResource("Curve_vx3c5") + +[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_vx3c5"] +particle_flag_disable_z = true +emission_shape_scale = Vector3(5000, 1, 1) +emission_shape = 3 +emission_box_extents = Vector3(1, 1, 1) +angle_min = -180.8 +angle_max = 134.8 +velocity_pivot = Vector3(27.11, -32.27, 0) +direction = Vector3(0.575, 1, 0) +initial_velocity_min = 165.98 +initial_velocity_max = 397.89 +angular_velocity_min = -27.57 +angular_velocity_max = 24.51 +directional_velocity_min = -38.83 +directional_velocity_max = 62.28 +directional_velocity_curve = SubResource("CurveXYZTexture_jiarp") +gravity = Vector3(0, 10, 0) +scale_min = 0.4 +turbulence_noise_strength = 13.35 +turbulence_noise_scale = 10.0 +turbulence_noise_speed = Vector3(0, 1, 0) +turbulence_noise_speed_random = 1.09 +turbulence_influence_min = 0.057 +turbulence_influence_max = 0.117 +turbulence_initial_displacement_min = -28.2 +turbulence_initial_displacement_max = -24.8 + [sub_resource type="AudioStreamPlaylist" id="AudioStreamPlaylist_ceriq"] loop = false stream_count = 1 @@ -282,6 +318,18 @@ blueprint = ExtResource("28_6b2nr") amount = 1 metadata/_custom_type_script = "uid://be54lnb6gg81f" +[sub_resource type="Environment" id="Environment_l7ekk"] +background_mode = 3 +tonemap_mode = 3 +tonemap_exposure = 0.74 +tonemap_white = 1.33 +glow_enabled = true +glow_normalized = true +glow_bloom = 0.2 +adjustment_saturation = 1.1 + +[sub_resource type="CameraAttributesPractical" id="CameraAttributesPractical_065st"] + [node name="BabushkaSceneFarmOutside2d" type="Node2D"] script = ExtResource("34_e5b7x") _sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_indoor_common_room.tscn") @@ -299,6 +347,121 @@ editor_draw_limits = true script = ExtResource("3_p4qqi") _followNode = NodePath("../YSorted/Vesna/CharacterBody2D") +[node name="effects" type="CanvasLayer" parent="."] +layer = 10 + +[node name="Suneffect" type="Sprite2D" parent="effects"] +modulate = Color(1, 1, 1, 0.494118) +material = SubResource("CanvasItemMaterial_q1g8e") +position = Vector2(1896, 246) +scale = Vector2(1.04297, 0.931312) +texture = ExtResource("3_xcwle") + +[node name="fogmove1" type="Node2D" parent="effects"] +script = ExtResource("5_vx3c5") +speed = Vector2(-150, 0) + +[node name="fognoise" type="Sprite2D" parent="effects/fogmove1"] +modulate = Color(1, 1, 1, 0.0470588) +position = Vector2(512, 512) +scale = Vector2(4, 4) +texture = ExtResource("4_q1g8e") + +[node name="fognoise2" type="Sprite2D" parent="effects/fogmove1"] +modulate = Color(1, 1, 1, 0.0470588) +position = Vector2(2560, 512) +scale = Vector2(4, 4) +texture = ExtResource("4_q1g8e") + +[node name="fognoise3" type="Sprite2D" parent="effects/fogmove1"] +modulate = Color(1, 1, 1, 0.0470588) +position = Vector2(4608, 513) +scale = Vector2(4, 4) +texture = ExtResource("4_q1g8e") + +[node name="fognoise4" type="Sprite2D" parent="effects/fogmove1"] +modulate = Color(1, 1, 1, 0.0470588) +position = Vector2(6656, 513) +scale = Vector2(4, 4) +texture = ExtResource("4_q1g8e") + +[node name="fognoise5" type="Sprite2D" parent="effects/fogmove1"] +modulate = Color(1, 1, 1, 0.0470588) +position = Vector2(8703, 513) +scale = Vector2(4, 4) +texture = ExtResource("4_q1g8e") + +[node name="fognoise6" type="Sprite2D" parent="effects/fogmove1"] +modulate = Color(1, 1, 1, 0.0470588) +position = Vector2(10751, 513) +scale = Vector2(4, 4) +texture = ExtResource("4_q1g8e") + +[node name="fognoise7" type="Sprite2D" parent="effects/fogmove1"] +modulate = Color(1, 1, 1, 0.0470588) +position = Vector2(12799, 514) +scale = Vector2(4, 4) +texture = ExtResource("4_q1g8e") + +[node name="fognoise8" type="Sprite2D" parent="effects/fogmove1"] +modulate = Color(1, 1, 1, 0.0470588) +position = Vector2(14847, 514) +scale = Vector2(4, 4) +texture = ExtResource("4_q1g8e") + +[node name="fogmove2" type="Node2D" parent="effects"] +position = Vector2(-5623, -9) +script = ExtResource("5_vx3c5") +speed = Vector2(150, 0) + +[node name="fognoise" type="Sprite2D" parent="effects/fogmove2"] +modulate = Color(1, 1, 1, 0.0470588) +position = Vector2(512, 512) +scale = Vector2(4, 4) +texture = ExtResource("4_q1g8e") + +[node name="fognoise2" type="Sprite2D" parent="effects/fogmove2"] +modulate = Color(1, 1, 1, 0.0470588) +position = Vector2(2560, 512) +scale = Vector2(4, 4) +texture = ExtResource("4_q1g8e") + +[node name="fognoise3" type="Sprite2D" parent="effects/fogmove2"] +modulate = Color(1, 1, 1, 0.0470588) +position = Vector2(4608, 513) +scale = Vector2(4, 4) +texture = ExtResource("4_q1g8e") + +[node name="fognoise4" type="Sprite2D" parent="effects/fogmove2"] +modulate = Color(1, 1, 1, 0.0470588) +position = Vector2(6656, 513) +scale = Vector2(4, 4) +texture = ExtResource("4_q1g8e") + +[node name="fognoise5" type="Sprite2D" parent="effects/fogmove2"] +modulate = Color(1, 1, 1, 0.0470588) +position = Vector2(-7680, 511) +scale = Vector2(4, 4) +texture = ExtResource("4_q1g8e") + +[node name="fognoise6" type="Sprite2D" parent="effects/fogmove2"] +modulate = Color(1, 1, 1, 0.0470588) +position = Vector2(-5632, 511) +scale = Vector2(4, 4) +texture = ExtResource("4_q1g8e") + +[node name="fognoise7" type="Sprite2D" parent="effects/fogmove2"] +modulate = Color(1, 1, 1, 0.0470588) +position = Vector2(-3584, 512) +scale = Vector2(4, 4) +texture = ExtResource("4_q1g8e") + +[node name="fognoise8" type="Sprite2D" parent="effects/fogmove2"] +modulate = Color(1, 1, 1, 0.0470588) +position = Vector2(-1536, 512) +scale = Vector2(4, 4) +texture = ExtResource("4_q1g8e") + [node name="ParallaxBackground" type="ParallaxBackground" parent="."] [node name="background color layer" type="ParallaxLayer" parent="ParallaxBackground"] @@ -911,7 +1074,7 @@ texture_repeat = 2 material = SubResource("ShaderMaterial_ubx8m") position = Vector2(3888, 2688) scale = Vector2(16, 5.48) -texture = SubResource("NoiseTexture2D_e5alv") +texture = ExtResource("28_jiarp") [node name="Fence" type="Node2D" parent="."] @@ -1053,6 +1216,9 @@ _fieldParent = NodePath("../Farm visuals/FieldParent") _hoe = ExtResource("28_6b2nr") _wateringCan = ExtResource("28_ipqaa") +[node name="WateringCanUI" parent="YSorted/Vesna/CharacterBody2D" index="2" node_paths=PackedStringArray("_stages")] +_stages = [] + [node name="FarmingControls" parent="YSorted/Vesna" index="1" node_paths=PackedStringArray("_camera")] _camera = NodePath("../../../Camera2D") @@ -1181,6 +1347,86 @@ offset = Vector2(0, -237) region_enabled = true region_rect = Rect2(130, 0, 201, 278) +[node name="bush36" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +modulate = Color(1, 0.86, 0.86, 1) +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(5096, 4043) +scale = Vector2(2, 2) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -237) +region_enabled = true +region_rect = Rect2(130, 0, 201, 278) + +[node name="bush37" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +modulate = Color(1, 0.86, 0.86, 1) +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(6628, 3153) +scale = Vector2(2, 2) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -237) +region_enabled = true +region_rect = Rect2(130, 0, 201, 278) + +[node name="bush38" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +modulate = Color(1, 0.86, 0.86, 1) +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(7887, 2440) +scale = Vector2(2, 2) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -237) +region_enabled = true +region_rect = Rect2(130, 0, 201, 278) + +[node name="bush39" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +modulate = Color(1, 0.86, 0.86, 1) +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(7669, 2011) +scale = Vector2(2, 2) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -237) +region_enabled = true +region_rect = Rect2(130, 0, 201, 278) + +[node name="bush40" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +modulate = Color(1, 0.86, 0.86, 1) +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(6587, 4129) +scale = Vector2(2, 2) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -237) +region_enabled = true +region_rect = Rect2(130, 0, 201, 278) + +[node name="bush41" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +modulate = Color(1, 0.86, 0.86, 1) +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(5379, 3993) +scale = Vector2(2, 2) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -237) +region_enabled = true +region_rect = Rect2(130, 0, 201, 278) + +[node name="bush42" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +modulate = Color(1, 0.86, 0.86, 1) +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(8149, 3983) +scale = Vector2(2, 2) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -237) +region_enabled = true +region_rect = Rect2(130, 0, 201, 278) + +[node name="bush28" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +modulate = Color(1, 0.86, 0.86, 1) +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(5011, 3043) +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/left side"] material = SubResource("ShaderMaterial_bcdgk") position = Vector2(4310, 3636) @@ -1190,6 +1436,60 @@ offset = Vector2(0, -237) region_enabled = true region_rect = Rect2(130, 0, 201, 278) +[node name="bush31" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(7661, 2671) +scale = Vector2(-2, 2) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -237) +region_enabled = true +region_rect = Rect2(130, 0, 201, 278) + +[node name="bush32" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(8055, 2130) +scale = Vector2(-2, 2) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -237) +region_enabled = true +region_rect = Rect2(130, 0, 201, 278) + +[node name="bush33" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(4780, 4081) +scale = Vector2(-2, 2) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -237) +region_enabled = true +region_rect = Rect2(130, 0, 201, 278) + +[node name="bush34" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(6039, 4091) +scale = Vector2(-2, 2) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -237) +region_enabled = true +region_rect = Rect2(130, 0, 201, 278) + +[node name="bush35" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(7070, 4051) +scale = Vector2(-2, 2) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -237) +region_enabled = true +region_rect = Rect2(130, 0, 201, 278) + +[node name="bush29" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(4324, 2959) +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"] modulate = Color(0.8428, 0.8771, 0.98, 1) material = SubResource("ShaderMaterial_bcdgk") @@ -1238,6 +1538,87 @@ offset = Vector2(0, -196) region_enabled = true region_rect = Rect2(1699, 76, 280, 230) +[node name="bush43" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(4388, 3886) +scale = Vector2(2, 2) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -196) +region_enabled = true +region_rect = Rect2(1699, 76, 280, 230) + +[node name="bush44" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(6496, 3219) +scale = Vector2(2, 2) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -196) +region_enabled = true +region_rect = Rect2(1699, 76, 280, 230) + +[node name="bush45" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(7684, 2794) +scale = Vector2(2, 2) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -196) +region_enabled = true +region_rect = Rect2(1699, 76, 280, 230) + +[node name="bush46" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(8048, 2597) +scale = Vector2(2, 2) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -196) +region_enabled = true +region_rect = Rect2(1699, 76, 280, 230) + +[node name="bush47" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(5410, 4214) +scale = Vector2(2, 2) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -196) +region_enabled = true +region_rect = Rect2(1699, 76, 280, 230) + +[node name="bush48" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(6658, 4169) +scale = Vector2(2, 2) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -196) +region_enabled = true +region_rect = Rect2(1699, 76, 280, 230) + +[node name="bush49" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(7654, 4174) +scale = Vector2(2, 2) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -196) +region_enabled = true +region_rect = Rect2(1699, 76, 280, 230) + +[node name="bush50" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(4980, 4245) +scale = Vector2(2, 2) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -196) +region_enabled = true +region_rect = Rect2(1699, 76, 280, 230) + +[node name="bush30" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(4215, 3200) +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/left side"] modulate = Color(0.8428, 0.8771, 0.98, 1) material = SubResource("ShaderMaterial_bcdgk") @@ -1793,7 +2174,31 @@ region_rect = Rect2(364, 32, 148, 153) [node name="grass21" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/grass"] z_index = -5 -position = Vector2(5510, 3499) +position = Vector2(5702, 3443) +scale = Vector2(7.28513, 6.16997) +texture = ExtResource("44_uxa2m") +region_enabled = true +region_rect = Rect2(364, 32, 148, 153) + +[node name="grass42" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/grass"] +z_index = -5 +position = Vector2(8219, 2892) +scale = Vector2(7.28513, 6.16997) +texture = ExtResource("44_uxa2m") +region_enabled = true +region_rect = Rect2(364, 32, 148, 153) + +[node name="grass43" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/grass"] +z_index = -5 +position = Vector2(8532, 1997) +scale = Vector2(7.28513, 6.16997) +texture = ExtResource("44_uxa2m") +region_enabled = true +region_rect = Rect2(364, 32, 148, 153) + +[node name="grass44" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/grass"] +z_index = -5 +position = Vector2(4579, 3114) scale = Vector2(7.28513, 6.16997) texture = ExtResource("44_uxa2m") region_enabled = true @@ -1808,6 +2213,51 @@ texture = ExtResource("44_uxa2m") region_enabled = true region_rect = Rect2(364, 32, 148, 153) +[node name="grass45" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/grass"] +modulate = Color(0.78, 0.78, 0.78, 1) +z_index = -5 +position = Vector2(5407, 3041) +scale = Vector2(7.28513, 4.43792) +texture = ExtResource("44_uxa2m") +region_enabled = true +region_rect = Rect2(364, 32, 148, 153) + +[node name="grass46" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/grass"] +modulate = Color(0.78, 0.78, 0.78, 1) +z_index = -5 +position = Vector2(7126, 3076) +scale = Vector2(7.28513, 4.43792) +texture = ExtResource("44_uxa2m") +region_enabled = true +region_rect = Rect2(364, 32, 148, 153) + +[node name="grass47" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/grass"] +modulate = Color(0.78, 0.78, 0.78, 1) +z_index = -5 +position = Vector2(6439, 3025) +scale = Vector2(7.28513, 4.43792) +texture = ExtResource("44_uxa2m") +region_enabled = true +region_rect = Rect2(364, 32, 148, 153) + +[node name="grass48" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/grass"] +modulate = Color(0.78, 0.78, 0.78, 1) +z_index = -5 +position = Vector2(8370, 3369) +scale = Vector2(7.28513, 4.43792) +texture = ExtResource("44_uxa2m") +region_enabled = true +region_rect = Rect2(364, 32, 148, 153) + +[node name="grass49" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/grass"] +modulate = Color(0.78, 0.78, 0.78, 1) +z_index = -5 +position = Vector2(8476, 2100) +scale = Vector2(7.28513, 4.43792) +texture = ExtResource("44_uxa2m") +region_enabled = true +region_rect = Rect2(364, 32, 148, 153) + [node name="grass23" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/grass"] modulate = Color(0.954868, 0.882599, 0.798501, 1) z_index = -5 @@ -2332,6 +2782,15 @@ offset_top = 0.228533 offset_right = -456.339 offset_bottom = 30.2285 +[node name="GPUParticles2D" type="GPUParticles2D" parent="."] +z_index = 40 +position = Vector2(-3463, -349) +amount = 100 +texture = SubResource("AtlasTexture_q1g8e") +lifetime = 25.0 +visibility_rect = Rect2(-6000, -100, 20000, 20000) +process_material = SubResource("ParticleProcessMaterial_vx3c5") + [node name="Audio" type="Node" parent="."] [node name="Background Music Ramp up" type="AudioStreamPlayer2D" parent="Audio"] @@ -2398,6 +2857,10 @@ _toNextQuest = ExtResource("76_xcwle") script = ExtResource("77_l7ekk") timeline = "quest2_tomatoes_end" +[node name="WorldEnvironment" type="WorldEnvironment" parent="."] +environment = SubResource("Environment_l7ekk") +camera_attributes = SubResource("CameraAttributesPractical_065st") + [connection signal="FilledWateringCan" from="YSorted/Vesna" to="Audio/SFX/FillWater SFX2" method="PlayOneShot"] [connection signal="WateringField" from="YSorted/Vesna/FarmingControls" to="Audio/SFX/Watering SFX" method="PlayOneShot"] [connection signal="InteractedTool" from="YSorted/BrĂ¼nnen/InteractionArea" to="YSorted/Vesna" method="TryFillWateringCan"] diff --git a/scenes/Babushka_scene_outside_beets.tscn b/scenes/Babushka_scene_outside_beets.tscn index c5acf97..1659d55 100644 --- a/scenes/Babushka_scene_outside_beets.tscn +++ b/scenes/Babushka_scene_outside_beets.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=91 format=3 uid="uid://b3ibx4resa1f3"] +[gd_scene load_steps=92 format=3 uid="uid://b3ibx4resa1f3"] [ext_resource type="Script" uid="uid://cssdu8viimwm6" path="res://scripts/CSharp/Common/SceneTransition.cs" id="1_6krrk"] [ext_resource type="Script" uid="uid://bqomwxclsbhd3" path="res://scripts/CSharp/Common/Camera/CameraController.cs" id="2_4ktoi"] @@ -137,11 +137,15 @@ size = Vector2(1041, 368) resource_local_to_scene = true radius = 371.058 -[sub_resource type="CircleShape2D" id="CircleShape2D_2nee2"] +[sub_resource type="CircleShape2D" id="CircleShape2D_dr6bm"] +resource_local_to_scene = true +radius = 300.0 + +[sub_resource type="CircleShape2D" id="CircleShape2D_34r5t"] resource_local_to_scene = true radius = 300.0 -[sub_resource type="CircleShape2D" id="CircleShape2D_ipqaa"] +[sub_resource type="CircleShape2D" id="CircleShape2D_hpgl7"] resource_local_to_scene = true radius = 300.0 @@ -173,27 +177,27 @@ shader_parameter/offset = 0.0 shader = ExtResource("24_anpd4") shader_parameter/tiling_scale = Vector2(1, 20) -[sub_resource type="CircleShape2D" id="CircleShape2D_hpgl7"] +[sub_resource type="CircleShape2D" id="CircleShape2D_qavgq"] resource_local_to_scene = true radius = 300.0 -[sub_resource type="CircleShape2D" id="CircleShape2D_qavgq"] +[sub_resource type="CircleShape2D" id="CircleShape2D_njxly"] resource_local_to_scene = true radius = 300.0 -[sub_resource type="CircleShape2D" id="CircleShape2D_dr6bm"] +[sub_resource type="CircleShape2D" id="CircleShape2D_54ty3"] resource_local_to_scene = true radius = 300.0 -[sub_resource type="CircleShape2D" id="CircleShape2D_njxly"] +[sub_resource type="CircleShape2D" id="CircleShape2D_gbxtf"] resource_local_to_scene = true radius = 300.0 -[sub_resource type="CircleShape2D" id="CircleShape2D_34r5t"] +[sub_resource type="CircleShape2D" id="CircleShape2D_6krrk"] resource_local_to_scene = true radius = 300.0 -[sub_resource type="CircleShape2D" id="CircleShape2D_54ty3"] +[sub_resource type="CircleShape2D" id="CircleShape2D_4ktoi"] resource_local_to_scene = true radius = 300.0 @@ -952,6 +956,9 @@ _wateringCan = ExtResource("29_6laxt") [node name="Animated Sprites" parent="YSorted/Vesna/CharacterBody2D/visuals" index="0"] position = Vector2(-33, 554) +[node name="WateringCanUI" parent="YSorted/Vesna/CharacterBody2D" index="2" node_paths=PackedStringArray("_stages")] +_stages = [] + [node name="FarmingControls" parent="YSorted/Vesna" index="1" node_paths=PackedStringArray("_camera")] _camera = NodePath("../../../Camera2D") @@ -987,8 +994,8 @@ position = Vector2(6095, 2087) [node name="SpawnWithItem" parent="YSorted/HoeGenericPickup" index="0"] _blueprint = ExtResource("33_v0fwx") -[node name="CollisionShape3D" parent="YSorted/HoeGenericPickup/InteractionArea2/Area2D" index="0"] -shape = SubResource("CircleShape2D_2nee2") +[node name="CollisionShape3D" parent="YSorted/HoeGenericPickup/PickupInteractionArea/Area2D" index="0"] +shape = SubResource("CircleShape2D_dr6bm") [node name="CanGenericPickup" parent="YSorted" instance=ExtResource("32_752hh")] visible = false @@ -997,11 +1004,8 @@ position = Vector2(8192, 3507) [node name="SpawnWithItem" parent="YSorted/CanGenericPickup" index="0"] _blueprint = ExtResource("29_6laxt") -[node name="InteractionArea2" parent="YSorted/CanGenericPickup" index="3"] -position = Vector2(0, -159) - -[node name="CollisionShape3D" parent="YSorted/CanGenericPickup/InteractionArea2/Area2D" index="0"] -shape = SubResource("CircleShape2D_ipqaa") +[node name="CollisionShape3D" parent="YSorted/CanGenericPickup/PickupInteractionArea/Area2D" index="0"] +shape = SubResource("CircleShape2D_34r5t") [node name="RakeGenericPickup" parent="YSorted" instance=ExtResource("32_752hh")] visible = false @@ -1010,8 +1014,8 @@ position = Vector2(8391, 2060) [node name="SpawnWithItem" parent="YSorted/RakeGenericPickup" index="0"] _blueprint = ExtResource("28_le48k") -[node name="CollisionShape3D" parent="YSorted/RakeGenericPickup/InteractionArea2/Area2D" index="0"] -shape = SubResource("CircleShape2D_ipqaa") +[node name="CollisionShape3D" parent="YSorted/RakeGenericPickup/PickupInteractionArea/Area2D" index="0"] +shape = SubResource("CircleShape2D_hpgl7") [node name="Farm visuals" type="Node2D" parent="YSorted"] position = Vector2(-60, 122) @@ -1751,10 +1755,11 @@ rotation = 1.5708 scale = Vector2(0.1, 8.7) texture = ExtResource("26_bwvai") -[node name="FieldParent" type="Node2D" parent="YSorted/Farm visuals"] +[node name="FieldParent" type="Node2D" parent="YSorted/Farm visuals" node_paths=PackedStringArray("fields")] position = Vector2(53, 20) scale = Vector2(1, 0.993819) script = ExtResource("46_xkmgh") +fields = {} metadata/_custom_type_script = "uid://dhxtdhfqx3bte" [node name="BaseField" parent="YSorted/Farm visuals" instance=ExtResource("43_dr6bm")] @@ -1769,8 +1774,8 @@ visible = true [node name="01" parent="YSorted/Farm visuals/BaseField/FieldBehaviour/BeetRoot/BigPlant" index="0"] visible = false -[node name="CollisionShape3D" parent="YSorted/Farm visuals/BaseField/FieldBehaviour/BeetRoot/ReadyPlantInventoryItem/InteractionArea2/Area2D" index="0"] -shape = SubResource("CircleShape2D_hpgl7") +[node name="CollisionShape3D" parent="YSorted/Farm visuals/BaseField/FieldBehaviour/BeetRoot/ReadyPlantInventoryItem/PickupInteractionArea/Area2D" index="0"] +shape = SubResource("CircleShape2D_qavgq") [node name="BaseField2" parent="YSorted/Farm visuals" instance=ExtResource("43_dr6bm")] position = Vector2(1230, 2590) @@ -1784,8 +1789,8 @@ visible = false [node name="03" parent="YSorted/Farm visuals/BaseField2/FieldBehaviour/BeetRoot/BigPlant" index="2"] visible = true -[node name="CollisionShape3D" parent="YSorted/Farm visuals/BaseField2/FieldBehaviour/BeetRoot/ReadyPlantInventoryItem/InteractionArea2/Area2D" index="0"] -shape = SubResource("CircleShape2D_qavgq") +[node name="CollisionShape3D" parent="YSorted/Farm visuals/BaseField2/FieldBehaviour/BeetRoot/ReadyPlantInventoryItem/PickupInteractionArea/Area2D" index="0"] +shape = SubResource("CircleShape2D_njxly") [node name="BaseField3" parent="YSorted/Farm visuals" instance=ExtResource("43_dr6bm")] position = Vector2(1994, 2603) @@ -1799,8 +1804,8 @@ visible = true [node name="01" parent="YSorted/Farm visuals/BaseField3/FieldBehaviour/BeetRoot/BigPlant" index="0"] visible = false -[node name="CollisionShape3D" parent="YSorted/Farm visuals/BaseField3/FieldBehaviour/BeetRoot/ReadyPlantInventoryItem/InteractionArea2/Area2D" index="0"] -shape = SubResource("CircleShape2D_dr6bm") +[node name="CollisionShape3D" parent="YSorted/Farm visuals/BaseField3/FieldBehaviour/BeetRoot/ReadyPlantInventoryItem/PickupInteractionArea/Area2D" index="0"] +shape = SubResource("CircleShape2D_54ty3") [node name="BaseField4" parent="YSorted/Farm visuals" instance=ExtResource("43_dr6bm")] position = Vector2(478, 3098) @@ -1814,8 +1819,8 @@ visible = true [node name="01" parent="YSorted/Farm visuals/BaseField4/FieldBehaviour/BeetRoot/BigPlant" index="0"] visible = false -[node name="CollisionShape3D" parent="YSorted/Farm visuals/BaseField4/FieldBehaviour/BeetRoot/ReadyPlantInventoryItem/InteractionArea2/Area2D" index="0"] -shape = SubResource("CircleShape2D_njxly") +[node name="CollisionShape3D" parent="YSorted/Farm visuals/BaseField4/FieldBehaviour/BeetRoot/ReadyPlantInventoryItem/PickupInteractionArea/Area2D" index="0"] +shape = SubResource("CircleShape2D_gbxtf") [node name="BaseField5" parent="YSorted/Farm visuals" instance=ExtResource("43_dr6bm")] position = Vector2(1279, 3123) @@ -1832,8 +1837,8 @@ visible = false [node name="02" parent="YSorted/Farm visuals/BaseField5/FieldBehaviour/BeetRoot/BigPlant" index="1"] visible = true -[node name="CollisionShape3D" parent="YSorted/Farm visuals/BaseField5/FieldBehaviour/BeetRoot/ReadyPlantInventoryItem/InteractionArea2/Area2D" index="0"] -shape = SubResource("CircleShape2D_34r5t") +[node name="CollisionShape3D" parent="YSorted/Farm visuals/BaseField5/FieldBehaviour/BeetRoot/ReadyPlantInventoryItem/PickupInteractionArea/Area2D" index="0"] +shape = SubResource("CircleShape2D_6krrk") [node name="BaseField6" parent="YSorted/Farm visuals" instance=ExtResource("43_dr6bm")] position = Vector2(2037, 3135) @@ -1847,8 +1852,8 @@ visible = true [node name="01" parent="YSorted/Farm visuals/BaseField6/FieldBehaviour/BeetRoot/BigPlant" index="0"] visible = false -[node name="CollisionShape3D" parent="YSorted/Farm visuals/BaseField6/FieldBehaviour/BeetRoot/ReadyPlantInventoryItem/InteractionArea2/Area2D" index="0"] -shape = SubResource("CircleShape2D_54ty3") +[node name="CollisionShape3D" parent="YSorted/Farm visuals/BaseField6/FieldBehaviour/BeetRoot/ReadyPlantInventoryItem/PickupInteractionArea/Area2D" index="0"] +shape = SubResource("CircleShape2D_4ktoi") [node name="Blocker" type="Node2D" parent="YSorted"] @@ -1958,33 +1963,33 @@ script = ExtResource("58_m3hs4") [editable path="YSorted/Vesna"] [editable path="YSorted/BrĂ¼nnen/InteractionArea"] [editable path="YSorted/HoeGenericPickup"] -[editable path="YSorted/HoeGenericPickup/InteractionArea2"] +[editable path="YSorted/HoeGenericPickup/PickupInteractionArea"] [editable path="YSorted/CanGenericPickup"] -[editable path="YSorted/CanGenericPickup/InteractionArea2"] +[editable path="YSorted/CanGenericPickup/PickupInteractionArea"] [editable path="YSorted/RakeGenericPickup"] -[editable path="YSorted/RakeGenericPickup/InteractionArea2"] +[editable path="YSorted/RakeGenericPickup/PickupInteractionArea"] [editable path="YSorted/Farm visuals/BaseField"] [editable path="YSorted/Farm visuals/BaseField/FieldBehaviour/BeetRoot"] [editable path="YSorted/Farm visuals/BaseField/FieldBehaviour/BeetRoot/ReadyPlantInventoryItem"] -[editable path="YSorted/Farm visuals/BaseField/FieldBehaviour/BeetRoot/ReadyPlantInventoryItem/InteractionArea2"] +[editable path="YSorted/Farm visuals/BaseField/FieldBehaviour/BeetRoot/ReadyPlantInventoryItem/PickupInteractionArea"] [editable path="YSorted/Farm visuals/BaseField2"] [editable path="YSorted/Farm visuals/BaseField2/FieldBehaviour/BeetRoot"] [editable path="YSorted/Farm visuals/BaseField2/FieldBehaviour/BeetRoot/ReadyPlantInventoryItem"] -[editable path="YSorted/Farm visuals/BaseField2/FieldBehaviour/BeetRoot/ReadyPlantInventoryItem/InteractionArea2"] +[editable path="YSorted/Farm visuals/BaseField2/FieldBehaviour/BeetRoot/ReadyPlantInventoryItem/PickupInteractionArea"] [editable path="YSorted/Farm visuals/BaseField3"] [editable path="YSorted/Farm visuals/BaseField3/FieldBehaviour/BeetRoot"] [editable path="YSorted/Farm visuals/BaseField3/FieldBehaviour/BeetRoot/ReadyPlantInventoryItem"] -[editable path="YSorted/Farm visuals/BaseField3/FieldBehaviour/BeetRoot/ReadyPlantInventoryItem/InteractionArea2"] +[editable path="YSorted/Farm visuals/BaseField3/FieldBehaviour/BeetRoot/ReadyPlantInventoryItem/PickupInteractionArea"] [editable path="YSorted/Farm visuals/BaseField4"] [editable path="YSorted/Farm visuals/BaseField4/FieldBehaviour/BeetRoot"] [editable path="YSorted/Farm visuals/BaseField4/FieldBehaviour/BeetRoot/ReadyPlantInventoryItem"] -[editable path="YSorted/Farm visuals/BaseField4/FieldBehaviour/BeetRoot/ReadyPlantInventoryItem/InteractionArea2"] +[editable path="YSorted/Farm visuals/BaseField4/FieldBehaviour/BeetRoot/ReadyPlantInventoryItem/PickupInteractionArea"] [editable path="YSorted/Farm visuals/BaseField5"] [editable path="YSorted/Farm visuals/BaseField5/FieldBehaviour/BeetRoot"] [editable path="YSorted/Farm visuals/BaseField5/FieldBehaviour/BeetRoot/ReadyPlantInventoryItem"] -[editable path="YSorted/Farm visuals/BaseField5/FieldBehaviour/BeetRoot/ReadyPlantInventoryItem/InteractionArea2"] +[editable path="YSorted/Farm visuals/BaseField5/FieldBehaviour/BeetRoot/ReadyPlantInventoryItem/PickupInteractionArea"] [editable path="YSorted/Farm visuals/BaseField6"] [editable path="YSorted/Farm visuals/BaseField6/FieldBehaviour/BeetRoot"] [editable path="YSorted/Farm visuals/BaseField6/FieldBehaviour/BeetRoot/ReadyPlantInventoryItem"] -[editable path="YSorted/Farm visuals/BaseField6/FieldBehaviour/BeetRoot/ReadyPlantInventoryItem/InteractionArea2"] +[editable path="YSorted/Farm visuals/BaseField6/FieldBehaviour/BeetRoot/ReadyPlantInventoryItem/PickupInteractionArea"] [editable path="CanvasLayer"] diff --git a/scenes/move.gd b/scenes/move.gd new file mode 100644 index 0000000..bcfe9d3 --- /dev/null +++ b/scenes/move.gd @@ -0,0 +1,6 @@ +extends Node2D + +@export var speed:Vector2 + +func _process(delta: float) -> void: + position += speed * delta diff --git a/scenes/move.gd.uid b/scenes/move.gd.uid new file mode 100644 index 0000000..74e32cc --- /dev/null +++ b/scenes/move.gd.uid @@ -0,0 +1 @@ +uid://j6xijojgoo3l diff --git a/scenes/noise.tres b/scenes/noise.tres new file mode 100644 index 0000000..7abcda4 --- /dev/null +++ b/scenes/noise.tres @@ -0,0 +1,16 @@ +[gd_resource type="NoiseTexture2D" load_steps=3 format=3 uid="uid://s6olqfj6ebqk"] + +[sub_resource type="Gradient" id="Gradient_eryax"] +offsets = PackedFloat32Array(0, 0.743902, 1) +colors = PackedColorArray(0.22, 0.1078, 0.16764, 1, 0.443137, 0.4, 0.360784, 1, 0.6, 0.4853, 0.414, 1) + +[sub_resource type="FastNoiseLite" id="FastNoiseLite_wgikv"] +frequency = 0.0296 +fractal_octaves = 7 +fractal_gain = 0.795 +domain_warp_enabled = true + +[resource] +seamless = true +color_ramp = SubResource("Gradient_eryax") +noise = SubResource("FastNoiseLite_wgikv") diff --git a/scenes/othernoise.tres b/scenes/othernoise.tres new file mode 100644 index 0000000..8a605a3 --- /dev/null +++ b/scenes/othernoise.tres @@ -0,0 +1,19 @@ +[gd_resource type="NoiseTexture2D" load_steps=3 format=3 uid="uid://gqnq3iofi13p"] + +[sub_resource type="Gradient" id="Gradient_eryax"] +offsets = PackedFloat32Array(0, 0.677778, 0.946667, 1) +colors = PackedColorArray(1, 1, 1, 0.176471, 1, 1, 1, 0.0823529, 1, 1, 1, 1, 1, 1, 1, 1) + +[sub_resource type="FastNoiseLite" id="FastNoiseLite_wgikv"] +noise_type = 3 +frequency = 0.0081 +fractal_octaves = 3 +fractal_lacunarity = 2.485 +fractal_gain = 0.375 +metadata/_preview_in_3d_space_ = true + +[resource] +seamless = true +seamless_blend_skirt = 0.243 +color_ramp = SubResource("Gradient_eryax") +noise = SubResource("FastNoiseLite_wgikv") diff --git a/shader/swaying_plant.gdshader b/shader/swaying_plant.gdshader index dcaae5a..4f0a68a 100644 --- a/shader/swaying_plant.gdshader +++ b/shader/swaying_plant.gdshader @@ -40,4 +40,10 @@ void vertex() { float time = TIME * speed + sin(float(INSTANCE_ID) * offset); //float time = TIME * speed + pos.x * pos.y ; not working when moving... VERTEX.x += getWind(VERTEX.xy, UV, time); -} \ No newline at end of file +} + +//void fragment(){ +// COLOR.r = UV.y; +// COLOR.g = 0.0f; +// COLOR.b = 0.0f; +//} \ No newline at end of file