diff --git a/art/farm/Babushka_house_01.png b/art/farm/Babushka_house_01.png new file mode 100644 index 0000000..6cf13ac Binary files /dev/null and b/art/farm/Babushka_house_01.png differ diff --git a/art/farm/Babushka_house_01.png.import b/art/farm/Babushka_house_01.png.import new file mode 100644 index 0000000..a0f95c6 --- /dev/null +++ b/art/farm/Babushka_house_01.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://65e44yde224q" +path="res://.godot/imported/Babushka_house_01.png-2abdaa4b7145961a1de62ba9271ec19d.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://art/farm/Babushka_house_01.png" +dest_files=["res://.godot/imported/Babushka_house_01.png-2abdaa4b7145961a1de62ba9271ec19d.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/scenes/Babushka_scene_farm_outside_2d.tscn b/scenes/Babushka_scene_farm_outside_2d.tscn index 2588aea..ca55f9c 100644 --- a/scenes/Babushka_scene_farm_outside_2d.tscn +++ b/scenes/Babushka_scene_farm_outside_2d.tscn @@ -1,8 +1,7 @@ -[gd_scene load_steps=69 format=3 uid="uid://gigb28qk8t12"] +[gd_scene load_steps=71 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="Texture2D" uid="uid://c7f3t65jskd6v" path="res://art/mockups/house_prototype.png" id="2_lhtpe"] [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://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"] @@ -38,8 +37,10 @@ [ext_resource type="PackedScene" uid="uid://cgjc4wurbgimy" path="res://prefabs/UI/Inventory/Inventory.tscn" id="32_2nee2"] [ext_resource type="Script" uid="uid://cssdu8viimwm6" path="res://scripts/CSharp/Common/SceneTransition.cs" id="34_e5b7x"] [ext_resource type="PackedScene" uid="uid://bm21nqepnwaik" path="res://scenes/IndoorTest2.tscn" id="35_taxvr"] +[ext_resource type="Texture2D" uid="uid://65e44yde224q" path="res://art/farm/Babushka_house_01.png" id="36_e5b7x"] [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="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="Script" uid="uid://cfnrd5k1k0gxw" path="res://scripts/CSharp/Common/AudioPlayer.cs" id="40_w3jkj"] @@ -113,7 +114,7 @@ shader_parameter/hue_shift = 0.0 shader_parameter/saturation_mult = 1.0 shader_parameter/value_mult = 1.0 shader_parameter/brightness_add = 0.0 -shader_parameter/contrast_mult = 1.183 +shader_parameter/contrast_mult = 1.128 [sub_resource type="RectangleShape2D" id="RectangleShape2D_0sfl7"] size = Vector2(728, 368) @@ -131,12 +132,18 @@ resource_local_to_scene = true radius = 300.0 [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.068 -shader_parameter/brightness_add = 0.0 -shader_parameter/contrast_mult = 0.913 + +[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.154 +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/offset = 1.0 [sub_resource type="RectangleShape2D" id="RectangleShape2D_2nee2"] size = Vector2(5905, 1176) @@ -902,24 +909,56 @@ position = Vector2(-60, 122) position = Vector2(-8213, 84) [node name="House Mockup" type="Sprite2D" parent="YSorted/Farm visuals/Static"] +y_sort_enabled = true material = SubResource("ShaderMaterial_lhtpe") -position = Vector2(5280, 1600) -scale = Vector2(5, 5) -texture = ExtResource("2_lhtpe") +position = Vector2(5986, 1718.25) +scale = Vector2(2.31152, 1.91439) +texture = ExtResource("36_e5b7x") [node name="StaticBody2D" type="StaticBody2D" parent="YSorted/Farm visuals/Static/House Mockup"] collision_layer = 2 collision_mask = 6 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="YSorted/Farm visuals/Static/House Mockup/StaticBody2D"] -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 +position = Vector2(-252.56, 231.32) +polygon = PackedVector2Array(215.94, 279.421, 21.5883, 273.793, -387.163, 276.242, -392.515, 81.5491, -511.819, 78.5182, -539.95, -559.844, -345.984, -769.407, -25.0155, -821.798, 314.426, -909.26, 459.131, -804.479, 723.525, -766.376, 984.841, -536.463, 894.401, -445.97, 896.71, -297.458, 899.404, 87.0292, 775.096, 87.0292, 770.093, 276.242) [node name="EnterHouseInteraction" parent="YSorted/Farm visuals/Static" instance=ExtResource("27_klb81")] -position = Vector2(7178, 1965) +position = Vector2(5839, 2142) scale = Vector2(2.425, 2.425) +[node name="bush" type="Sprite2D" parent="YSorted/Farm visuals/Static"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(4321, 2478) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -237) +region_enabled = true +region_rect = Rect2(222, 0, 342, 474) + +[node name="bush2" type="Sprite2D" parent="YSorted/Farm visuals/Static"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(4616, 2757) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -196) +region_enabled = true +region_rect = Rect2(2897, 130, 477, 391) + +[node name="bush4" type="Sprite2D" parent="YSorted/Farm visuals/Static"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(7308, 2757) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -172) +region_enabled = true +region_rect = Rect2(0, 1029, 422, 389) + +[node name="bush3" type="Sprite2D" parent="YSorted/Farm visuals/Static"] +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(7061, 2736) +texture = ExtResource("14_mrwmr") +offset = Vector2(0, -50) +region_enabled = true +region_rect = Rect2(2495, 714, 246, 197) + [node name="FieldParent" type="Node2D" parent="YSorted/Farm visuals"] position = Vector2(53, 20) scale = Vector2(1, 0.993819) diff --git a/scenes/Babushka_scene_startMenu.tscn b/scenes/Babushka_scene_startMenu.tscn index 001ef84..60e44c2 100644 --- a/scenes/Babushka_scene_startMenu.tscn +++ b/scenes/Babushka_scene_startMenu.tscn @@ -21,6 +21,7 @@ expand_mode = 2 stretch_mode = 6 [node name="Start" type="Button" parent="CanvasLayer/TextureRect"] +layout_mode = 0 offset_left = 571.0 offset_top = 559.0 offset_right = 617.0 diff --git a/shader/swaying_plant.gdshader b/shader/swaying_plant.gdshader index b6a1686..dcaae5a 100644 --- a/shader/swaying_plant.gdshader +++ b/shader/swaying_plant.gdshader @@ -37,7 +37,7 @@ float getWind(vec2 vertex, vec2 uv, float time){ void vertex() { vec4 pos = MODEL_MATRIX * vec4(0.0, 0.0, 0.0, 1.0); - float time = TIME * speed + offset; + 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