diff --git a/art/farm/farming/farmobjekte/beetroot/beetroot_icon.png b/art/farm/farming/farmobjekte/beetroot/beetroot_icon.png deleted file mode 100644 index 1adc85d..0000000 Binary files a/art/farm/farming/farmobjekte/beetroot/beetroot_icon.png and /dev/null differ diff --git a/art/farm/farming/farmobjekte/beetroot/beetroot_seeds_icon.png b/art/farm/farming/farmobjekte/beetroot/beetroot_seeds_icon.png deleted file mode 100644 index ae2b26f..0000000 Binary files a/art/farm/farming/farmobjekte/beetroot/beetroot_seeds_icon.png and /dev/null differ diff --git a/art/farm/farming/farmobjekte/beetroot/beetroot_template.png b/art/farm/farming/farmobjekte/beetroot/beetroot_template.png new file mode 100644 index 0000000..9316351 Binary files /dev/null and b/art/farm/farming/farmobjekte/beetroot/beetroot_template.png differ diff --git a/art/farm/farming/farmobjekte/beetroot/beetroot_icon.png.import b/art/farm/farming/farmobjekte/beetroot/beetroot_template.png.import similarity index 72% rename from art/farm/farming/farmobjekte/beetroot/beetroot_icon.png.import rename to art/farm/farming/farmobjekte/beetroot/beetroot_template.png.import index b844853..2af70d5 100644 --- a/art/farm/farming/farmobjekte/beetroot/beetroot_icon.png.import +++ b/art/farm/farming/farmobjekte/beetroot/beetroot_template.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://b5ade1s2ijunu" -path="res://.godot/imported/beetroot_icon.png-aef760d681bd7ef4c12802c6da8d93f5.ctex" +uid="uid://bmcs8bmwb5nti" +path="res://.godot/imported/beetroot_template.png-fb068996df8536deae290d1895ce0ea5.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://art/farm/farming/farmobjekte/beetroot/beetroot_icon.png" -dest_files=["res://.godot/imported/beetroot_icon.png-aef760d681bd7ef4c12802c6da8d93f5.ctex"] +source_file="res://art/farm/farming/farmobjekte/beetroot/beetroot_template.png" +dest_files=["res://.godot/imported/beetroot_template.png-fb068996df8536deae290d1895ce0ea5.ctex"] [params] diff --git a/art/farm/farming/farmobjekte/plant_template.png b/art/farm/farming/farmobjekte/plant_template.png new file mode 100644 index 0000000..fd199bc Binary files /dev/null and b/art/farm/farming/farmobjekte/plant_template.png differ diff --git a/art/farm/farming/farmobjekte/beetroot/beetroot_seeds_icon.png.import b/art/farm/farming/farmobjekte/plant_template.png.import similarity index 64% rename from art/farm/farming/farmobjekte/beetroot/beetroot_seeds_icon.png.import rename to art/farm/farming/farmobjekte/plant_template.png.import index 5369f26..11b5f07 100644 --- a/art/farm/farming/farmobjekte/beetroot/beetroot_seeds_icon.png.import +++ b/art/farm/farming/farmobjekte/plant_template.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dvwj5esdepda8" -path="res://.godot/imported/beetroot_seeds_icon.png-4cbd7d4aed7c86eb95b5de677325d4fe.ctex" +uid="uid://mrnc81ukugh6" +path="res://.godot/imported/plant_template.png-37e6b051a10ecd9e81ba89f8794363f1.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://art/farm/farming/farmobjekte/beetroot/beetroot_seeds_icon.png" -dest_files=["res://.godot/imported/beetroot_seeds_icon.png-4cbd7d4aed7c86eb95b5de677325d4fe.ctex"] +source_file="res://art/farm/farming/farmobjekte/plant_template.png" +dest_files=["res://.godot/imported/plant_template.png-37e6b051a10ecd9e81ba89f8794363f1.ctex"] [params] diff --git a/art/farm/farming/farmobjekte/plant_template.png~ b/art/farm/farming/farmobjekte/plant_template.png~ new file mode 100644 index 0000000..b04c879 Binary files /dev/null and b/art/farm/farming/farmobjekte/plant_template.png~ differ diff --git a/art/farm/farming/farmobjekte/tomaten/teen adulte tomaten.png b/art/farm/farming/farmobjekte/tomaten/teen adulte tomaten.png index dde86fd..3945bbb 100644 Binary files a/art/farm/farming/farmobjekte/tomaten/teen adulte tomaten.png and b/art/farm/farming/farmobjekte/tomaten/teen adulte tomaten.png differ diff --git a/art/farm/farming/farmobjekte/tomaten/teen adulte tomaten.png~ b/art/farm/farming/farmobjekte/tomaten/teen adulte tomaten.png~ new file mode 100644 index 0000000..dde86fd Binary files /dev/null and b/art/farm/farming/farmobjekte/tomaten/teen adulte tomaten.png~ differ diff --git a/art/farm/farming/farmobjekte/tomaten/tomaten_template.png b/art/farm/farming/farmobjekte/tomaten/tomaten_template.png new file mode 100644 index 0000000..1cc150f Binary files /dev/null and b/art/farm/farming/farmobjekte/tomaten/tomaten_template.png differ diff --git a/art/farm/farming/farmobjekte/tomaten/tomaten_template.png.import b/art/farm/farming/farmobjekte/tomaten/tomaten_template.png.import new file mode 100644 index 0000000..7e3c11c --- /dev/null +++ b/art/farm/farming/farmobjekte/tomaten/tomaten_template.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cyyxqmphcrjj" +path="res://.godot/imported/tomaten_template.png-ec9351e1f99057077a67ecd23ac43d8c.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://art/farm/farming/farmobjekte/tomaten/tomaten_template.png" +dest_files=["res://.godot/imported/tomaten_template.png-ec9351e1f99057077a67ecd23ac43d8c.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/art/farm/farming/farmobjekte/tomaten/tomaten_template.png~ b/art/farm/farming/farmobjekte/tomaten/tomaten_template.png~ new file mode 100644 index 0000000..a20ca3f Binary files /dev/null and b/art/farm/farming/farmobjekte/tomaten/tomaten_template.png~ differ diff --git a/art/ui/UI/icons/icon-seed-tomatoe.png.import b/art/test_tomatos.png.import similarity index 66% rename from art/ui/UI/icons/icon-seed-tomatoe.png.import rename to art/test_tomatos.png.import index 25b7b20..821515b 100644 --- a/art/ui/UI/icons/icon-seed-tomatoe.png.import +++ b/art/test_tomatos.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://ce04nexh36uwe" -path="res://.godot/imported/icon-seed-tomatoe.png-f99f14181586ef4f8a8e12cfb3c0a0d0.ctex" +uid="uid://b4krfobwq3r3h" +path="res://.godot/imported/test_tomatos.png-46b768c505412676f924a2c122f4df61.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://art/ui/UI/icons/icon-seed-tomatoe.png" -dest_files=["res://.godot/imported/icon-seed-tomatoe.png-f99f14181586ef4f8a8e12cfb3c0a0d0.ctex"] +source_file="res://art/test_tomatos.png" +dest_files=["res://.godot/imported/test_tomatos.png-46b768c505412676f924a2c122f4df61.ctex"] [params] diff --git a/art/ui/UI/icons/icon-fruit-beetroot.png b/art/ui/UI/icons/icon-fruit-beetroot.png new file mode 100644 index 0000000..50e1b98 Binary files /dev/null and b/art/ui/UI/icons/icon-fruit-beetroot.png differ diff --git a/art/ui/UI/icons/icon-fruit-beetroot.png.import b/art/ui/UI/icons/icon-fruit-beetroot.png.import new file mode 100644 index 0000000..0048f0a --- /dev/null +++ b/art/ui/UI/icons/icon-fruit-beetroot.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://djewfwrdt4iv3" +path="res://.godot/imported/icon-fruit-beetroot.png-75fa09af63bd298716dc0f3f16587a05.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://art/ui/UI/icons/icon-fruit-beetroot.png" +dest_files=["res://.godot/imported/icon-fruit-beetroot.png-75fa09af63bd298716dc0f3f16587a05.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/ui/UI/icons/icon-seed-beetroot.png b/art/ui/UI/icons/icon-seed-beetroot.png new file mode 100644 index 0000000..ad21eb4 Binary files /dev/null and b/art/ui/UI/icons/icon-seed-beetroot.png differ diff --git a/art/ui/UI/icons/icon-seed-beetroot.png.import b/art/ui/UI/icons/icon-seed-beetroot.png.import new file mode 100644 index 0000000..befbc8a --- /dev/null +++ b/art/ui/UI/icons/icon-seed-beetroot.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b4pa77olxr14q" +path="res://.godot/imported/icon-seed-beetroot.png-2fc33feff3be637327ca65cd50543877.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://art/ui/UI/icons/icon-seed-beetroot.png" +dest_files=["res://.godot/imported/icon-seed-beetroot.png-2fc33feff3be637327ca65cd50543877.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/ui/UI/icons/icon-seed-tomato.png b/art/ui/UI/icons/icon-seed-tomato.png new file mode 100644 index 0000000..7f456ea Binary files /dev/null and b/art/ui/UI/icons/icon-seed-tomato.png differ diff --git a/art/ui/UI/icons/icon-seed-tomato.png.import b/art/ui/UI/icons/icon-seed-tomato.png.import new file mode 100644 index 0000000..d5eb484 --- /dev/null +++ b/art/ui/UI/icons/icon-seed-tomato.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b51j84idxe7hr" +path="res://.godot/imported/icon-seed-tomato.png-b3b4a4deb75c8279987c6b7277b3544b.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://art/ui/UI/icons/icon-seed-tomato.png" +dest_files=["res://.godot/imported/icon-seed-tomato.png-b3b4a4deb75c8279987c6b7277b3544b.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/ui/UI/icons/icon-seed-tomatoe.png b/art/ui/UI/icons/icon-seed-tomatoe.png deleted file mode 100644 index ac255bc..0000000 Binary files a/art/ui/UI/icons/icon-seed-tomatoe.png and /dev/null differ diff --git a/export_presets.cfg b/export_presets.cfg index 969cc74..7a58afc 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -9,7 +9,7 @@ custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="_builds/Babushka.exe" +export_path="_builds/Babushka_win_0_5/Babushka.exe" patches=PackedStringArray() encryption_include_filters="" encryption_exclude_filters="" @@ -79,7 +79,7 @@ custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="_builds/Babushka_showcase_lux_04/Babushka.x86_64" +export_path="_builds/Babushka_linux_0_5/Babushka.x86_64" patches=PackedStringArray() encryption_include_filters="" encryption_exclude_filters="" diff --git a/prefabs/farm/plants/base_plant.tscn b/prefabs/farm/plants/base_plant.tscn index 7fc7174..0b9ea30 100644 --- a/prefabs/farm/plants/base_plant.tscn +++ b/prefabs/farm/plants/base_plant.tscn @@ -1,13 +1,11 @@ -[gd_scene load_steps=13 format=3 uid="uid://gishbn0a8eke"] +[gd_scene load_steps=11 format=3 uid="uid://gishbn0a8eke"] [ext_resource type="Script" uid="uid://cms357f23fmfy" path="res://scripts/CSharp/Common/Farming/PlantBehaviour2D.cs" id="1_66p1c"] -[ext_resource type="Texture2D" uid="uid://dtr4uga5uspg" path="res://art/farm/farming/farmobjekte/tomaten/tomaten baby.png" id="2_vjw4j"] +[ext_resource type="Texture2D" uid="uid://mrnc81ukugh6" path="res://art/farm/farming/farmobjekte/plant_template.png" id="2_oyl0t"] [ext_resource type="Shader" uid="uid://braevmqauoek7" path="res://shader/swaying_plant.gdshader" id="3_7hdur"] -[ext_resource type="Texture2D" uid="uid://b2gu6ur2xc7s4" path="res://art/farm/farming/farmobjekte/tomaten/tomaten blume.png" id="4_hmj2d"] [ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interactions/interaction_area_2d.tscn" id="5_3j24b"] [ext_resource type="PackedScene" uid="uid://dpbbroif2tnil" path="res://prefabs/interactions/generic_item_on_ground_2d.tscn" id="6_gdrin"] [ext_resource type="Resource" uid="uid://blr8tine5m0ma" path="res://resources/items/tomato.tres" id="7_vjw4j"] -[ext_resource type="Texture2D" uid="uid://cnwd3mb3jnuxm" path="res://art/farm/farming/farmobjekte/tomaten/teen adulte tomaten.png" id="8_evgr8"] [ext_resource type="Texture2D" uid="uid://bleimj6jr1jka" path="res://art/general/rectangle.png" id="9_vjw4j"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_u4cty"] @@ -35,9 +33,9 @@ z_index = 1 y_sort_enabled = true script = ExtResource("1_66p1c") _seeds = [NodePath("Seeds/Seed1"), NodePath("Seeds/Seed2"), NodePath("Seeds/Seed3")] -_smallPlants = [NodePath("SmallPlant/01"), NodePath("SmallPlant/02"), NodePath("SmallPlant/03"), NodePath("SmallPlant/04")] -_bigPlants = [NodePath("BigPlant/01"), NodePath("BigPlant/02"), NodePath("BigPlant/03"), NodePath("BigPlant/04")] -_readyPlants = [NodePath("ReadyPlantInventoryItem/ReadyPlant/01"), NodePath("ReadyPlantInventoryItem/ReadyPlant/02"), NodePath("ReadyPlantInventoryItem/ReadyPlant/03"), NodePath("ReadyPlantInventoryItem/ReadyPlant/04")] +_smallPlants = [NodePath("SmallPlant/01"), NodePath("SmallPlant/02"), NodePath("SmallPlant/03")] +_bigPlants = [NodePath("BigPlant/01"), NodePath("BigPlant/02"), NodePath("BigPlant/03")] +_readyPlants = [NodePath("ReadyPlantInventoryItem/ReadyPlant/01"), NodePath("ReadyPlantInventoryItem/ReadyPlant/02"), NodePath("ReadyPlantInventoryItem/ReadyPlant/03")] _harvestablePlant = NodePath("ReadyPlantInventoryItem") _magicEffect = NodePath("magic vfx") _magicWordNeeded = false @@ -48,26 +46,26 @@ position = Vector2(0, 0.5) [node name="Seed1" type="Sprite2D" parent="Seeds"] visible = false y_sort_enabled = true -texture = ExtResource("2_vjw4j") -flip_v = true +position = Vector2(2.5, -56.5) +texture = ExtResource("2_oyl0t") region_enabled = true -region_rect = Rect2(-2, 15, 85, 81) +region_rect = Rect2(524, 1182, 294, 284) [node name="Seed2" type="Sprite2D" parent="Seeds"] visible = false y_sort_enabled = true -texture = ExtResource("2_vjw4j") -flip_v = true +position = Vector2(2.5, -56.5) +texture = ExtResource("2_oyl0t") region_enabled = true -region_rect = Rect2(15, 177, 84, 108) +region_rect = Rect2(930, 1182, 296, 289) [node name="Seed3" type="Sprite2D" parent="Seeds"] visible = false y_sort_enabled = true -texture = ExtResource("2_vjw4j") -flip_v = true +position = Vector2(2.5, -56.5) +texture = ExtResource("2_oyl0t") region_enabled = true -region_rect = Rect2(3, 337, 85, 82) +region_rect = Rect2(1328, 1184, 282, 292) [node name="SmallPlant" type="Node2D" parent="."] position = Vector2(0, 0.5) @@ -76,33 +74,28 @@ position = Vector2(0, 0.5) visible = false y_sort_enabled = true material = SubResource("ShaderMaterial_u4cty") -texture = ExtResource("2_vjw4j") +position = Vector2(2.5, -56.5) +texture = ExtResource("2_oyl0t") region_enabled = true -region_rect = Rect2(203, 1, 128, 164) +region_rect = Rect2(1810, 1190, 258, 299) [node name="02" type="Sprite2D" parent="SmallPlant"] visible = false y_sort_enabled = true material = SubResource("ShaderMaterial_u4cty") -texture = ExtResource("2_vjw4j") +position = Vector2(2.5, -56.5) +texture = ExtResource("2_oyl0t") region_enabled = true -region_rect = Rect2(218, 204, 112, 130) +region_rect = Rect2(2206, 1182, 274, 306) [node name="03" type="Sprite2D" parent="SmallPlant"] visible = false y_sort_enabled = true material = SubResource("ShaderMaterial_u4cty") -texture = ExtResource("2_vjw4j") +position = Vector2(2.5, -56.5) +texture = ExtResource("2_oyl0t") 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_vjw4j") -region_enabled = true -region_rect = Rect2(228, 600, 85, 92) +region_rect = Rect2(2588, 1178, 282, 300) [node name="BigPlant" type="Node2D" parent="."] position = Vector2(0, -300) @@ -111,33 +104,28 @@ position = Vector2(0, -300) visible = false y_sort_enabled = true material = SubResource("ShaderMaterial_u4cty") -texture = ExtResource("4_hmj2d") +position = Vector2(2.5, -56.5) +texture = ExtResource("2_oyl0t") region_enabled = true -region_rect = Rect2(-8, 1, 498, 682) +region_rect = Rect2(3454, 133, 850, 895) [node name="02" type="Sprite2D" parent="BigPlant"] visible = false y_sort_enabled = true material = SubResource("ShaderMaterial_u4cty") -texture = ExtResource("4_hmj2d") +position = Vector2(12.5, -44.5) +texture = ExtResource("2_oyl0t") region_enabled = true -region_rect = Rect2(575, 82, 516, 591) +region_rect = Rect2(4498, 134, 764, 903) [node name="03" type="Sprite2D" parent="BigPlant"] visible = false y_sort_enabled = true material = SubResource("ShaderMaterial_u4cty") -texture = ExtResource("4_hmj2d") +position = Vector2(16.5, -37.5) +texture = ExtResource("2_oyl0t") 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("4_hmj2d") -region_enabled = true -region_rect = Rect2(546, 697, 535, 687) +region_rect = Rect2(5416, 136, 647, 895) [node name="GrowingInteractionArea" parent="." instance=ExtResource("5_3j24b")] position = Vector2(0, 2.3) @@ -178,33 +166,28 @@ position = Vector2(0, -400) visible = false y_sort_enabled = true material = SubResource("ShaderMaterial_u4cty") -texture = ExtResource("8_evgr8") +position = Vector2(-24.5, 50.2) +texture = ExtResource("2_oyl0t") region_enabled = true -region_rect = Rect2(399, 3, 679, 808) +region_rect = Rect2(474, 130, 752, 887) [node name="02" type="Sprite2D" parent="ReadyPlantInventoryItem/ReadyPlant"] visible = false y_sort_enabled = true material = SubResource("ShaderMaterial_u4cty") -texture = ExtResource("8_evgr8") +position = Vector2(-1.5, 49.2) +texture = ExtResource("2_oyl0t") region_enabled = true -region_rect = Rect2(1077, 109, 633, 695) +region_rect = Rect2(1418, 134, 843, 887) [node name="03" type="Sprite2D" parent="ReadyPlantInventoryItem/ReadyPlant"] visible = false y_sort_enabled = true material = SubResource("ShaderMaterial_u4cty") -texture = ExtResource("8_evgr8") -region_enabled = true -region_rect = Rect2(415, 838, 639, 817) - -[node name="04" type="Sprite2D" parent="ReadyPlantInventoryItem/ReadyPlant"] -visible = false -y_sort_enabled = true -material = SubResource("ShaderMaterial_u4cty") -texture = ExtResource("8_evgr8") +position = Vector2(0.5, 49.2) +texture = ExtResource("2_oyl0t") region_enabled = true -region_rect = Rect2(1167, 863, 528, 785) +region_rect = Rect2(2461, 134, 841, 878) [node name="magic vfx" type="CPUParticles2D" parent="."] position = Vector2(-133, -347) diff --git a/prefabs/farm/plants/beet_plant.tscn b/prefabs/farm/plants/beet_plant.tscn index 8868d4a..8f6dedc 100644 --- a/prefabs/farm/plants/beet_plant.tscn +++ b/prefabs/farm/plants/beet_plant.tscn @@ -1,120 +1,63 @@ -[gd_scene load_steps=7 format=3 uid="uid://dp8ielst8et4c"] +[gd_scene load_steps=6 format=3 uid="uid://d20oftcb5qso6"] -[ext_resource type="PackedScene" uid="uid://gishbn0a8eke" path="res://prefabs/farm/plants/base_plant.tscn" id="1_y42lq"] -[ext_resource type="Texture2D" uid="uid://diln6yxym4vsj" path="res://art/farm/farming/farmobjekte/beetroot_01.png" id="3_lixhh"] -[ext_resource type="Resource" uid="uid://0mnsr4anoaiq" path="res://resources/items/beet.tres" id="3_xrha8"] -[ext_resource type="Texture2D" uid="uid://b5ade1s2ijunu" path="res://art/farm/farming/farmobjekte/beetroot/beetroot_icon.png" id="4_betqv"] +[ext_resource type="PackedScene" uid="uid://gishbn0a8eke" path="res://prefabs/farm/plants/base_plant.tscn" id="1_2u3jr"] +[ext_resource type="Texture2D" uid="uid://bmcs8bmwb5nti" path="res://art/farm/farming/farmobjekte/beetroot/beetroot_template.png" id="2_agmuy"] +[ext_resource type="Resource" uid="uid://0mnsr4anoaiq" path="res://resources/items/beet.tres" id="3_agmuy"] -[sub_resource type="CircleShape2D" id="CircleShape2D_dxqox"] +[sub_resource type="CircleShape2D" id="CircleShape2D_hiixr"] resource_local_to_scene = true radius = 300.0 -[sub_resource type="CircleShape2D" id="CircleShape2D_4fw1t"] +[sub_resource type="CircleShape2D" id="CircleShape2D_ae08q"] resource_local_to_scene = true radius = 300.0 -[node name="BeetPlant" instance=ExtResource("1_y42lq")] +[node name="Beet2" instance=ExtResource("1_2u3jr")] [node name="Seed1" parent="Seeds" index="0"] -scale = Vector2(2, 2) -texture = ExtResource("3_lixhh") -offset = Vector2(0, 40) -region_rect = Rect2(204, 213, 59, 55) +texture = ExtResource("2_agmuy") [node name="Seed2" parent="Seeds" index="1"] -scale = Vector2(2, 2) -texture = ExtResource("3_lixhh") -offset = Vector2(0, 40) -region_rect = Rect2(206, 213, 56, 60) +texture = ExtResource("2_agmuy") [node name="Seed3" parent="Seeds" index="2"] -scale = Vector2(2, 2) -texture = ExtResource("3_lixhh") -offset = Vector2(0, 40) -region_rect = Rect2(204, 213, 54, 57) - -[node name="SmallPlant" parent="." index="1"] -scale = Vector2(2, 2) +texture = ExtResource("2_agmuy") [node name="01" parent="SmallPlant" index="0"] -texture = ExtResource("3_lixhh") -offset = Vector2(0, 20) -region_rect = Rect2(307, 179, 75, 87) +texture = ExtResource("2_agmuy") [node name="02" parent="SmallPlant" index="1"] -texture = ExtResource("3_lixhh") -offset = Vector2(0, 20) -region_rect = Rect2(399, 222, 24, 27) +texture = ExtResource("2_agmuy") [node name="03" parent="SmallPlant" index="2"] -texture = ExtResource("3_lixhh") -offset = Vector2(0, 20) -region_rect = Rect2(510, 210, 40, 57) - -[node name="04" parent="SmallPlant" index="3"] -texture = ExtResource("3_lixhh") -offset = Vector2(0, 20) -region_rect = Rect2(581, 183, 79, 81) +texture = ExtResource("2_agmuy") [node name="01" parent="BigPlant" index="0"] -scale = Vector2(2, 2) -texture = ExtResource("3_lixhh") -offset = Vector2(0, 150) -region_rect = Rect2(28, 27, 150, 123) +texture = ExtResource("2_agmuy") [node name="02" parent="BigPlant" index="1"] -scale = Vector2(2, 2) -texture = ExtResource("3_lixhh") -offset = Vector2(0, 150) -region_rect = Rect2(179, 28, 134, 115) +texture = ExtResource("2_agmuy") [node name="03" parent="BigPlant" index="2"] -scale = Vector2(2, 2) -texture = ExtResource("3_lixhh") -offset = Vector2(0, 150) -region_rect = Rect2(312, 27, 133, 121) - -[node name="04" parent="BigPlant" index="3"] -scale = Vector2(2, 2) -texture = ExtResource("3_lixhh") -offset = Vector2(0, 150) -region_rect = Rect2(458, 31, 118, 112) +texture = ExtResource("2_agmuy") [node name="CollisionShape3D" parent="GrowingInteractionArea/Area2D" index="0"] -shape = SubResource("CircleShape2D_dxqox") +shape = SubResource("CircleShape2D_hiixr") [node name="SpawnWithItem" parent="ReadyPlantInventoryItem" index="0"] -_blueprint = ExtResource("3_xrha8") +_blueprint = ExtResource("3_agmuy") [node name="CollisionShape3D" parent="ReadyPlantInventoryItem/PickupInteractionArea/Area2D" index="0"] -shape = SubResource("CircleShape2D_4fw1t") - -[node name="Icon" parent="ReadyPlantInventoryItem" index="4"] -texture = ExtResource("4_betqv") +shape = SubResource("CircleShape2D_ae08q") [node name="01" parent="ReadyPlantInventoryItem/ReadyPlant" index="0"] -scale = Vector2(4, 4) -texture = ExtResource("3_lixhh") -offset = Vector2(0, 80) -region_rect = Rect2(582, 19, 142, 126) +texture = ExtResource("2_agmuy") [node name="02" parent="ReadyPlantInventoryItem/ReadyPlant" index="1"] -scale = Vector2(4, 4) -texture = ExtResource("3_lixhh") -offset = Vector2(0, 80) -region_rect = Rect2(311, 32, 136, 117) +texture = ExtResource("2_agmuy") [node name="03" parent="ReadyPlantInventoryItem/ReadyPlant" index="2"] -scale = Vector2(4, 4) -texture = ExtResource("3_lixhh") -offset = Vector2(0, 80) -region_rect = Rect2(175, 28, 136, 117) - -[node name="04" parent="ReadyPlantInventoryItem/ReadyPlant" index="3"] -scale = Vector2(4, 4) -texture = ExtResource("3_lixhh") -offset = Vector2(0, 80) -region_rect = Rect2(26, 24, 147, 123) +texture = ExtResource("2_agmuy") [editable path="GrowingInteractionArea"] [editable path="ReadyPlantInventoryItem"] diff --git a/prefabs/farm/plants/tomato_plant.tscn b/prefabs/farm/plants/tomato_plant.tscn index 63205fa..5df96ea 100644 --- a/prefabs/farm/plants/tomato_plant.tscn +++ b/prefabs/farm/plants/tomato_plant.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=4 format=3 uid="uid://n8tv8gafsrfo"] +[gd_scene load_steps=5 format=3 uid="uid://n8tv8gafsrfo"] [ext_resource type="PackedScene" uid="uid://gishbn0a8eke" path="res://prefabs/farm/plants/base_plant.tscn" id="1_ooshk"] +[ext_resource type="Texture2D" uid="uid://cyyxqmphcrjj" path="res://art/farm/farming/farmobjekte/tomaten/tomaten_template.png" id="2_gdicx"] [sub_resource type="CircleShape2D" id="CircleShape2D_on0x0"] resource_local_to_scene = true @@ -10,7 +11,34 @@ radius = 300.0 resource_local_to_scene = true radius = 300.0 -[node name="BasePlant" instance=ExtResource("1_ooshk")] +[node name="TomatoPlant" instance=ExtResource("1_ooshk")] + +[node name="Seed1" parent="Seeds" index="0"] +texture = ExtResource("2_gdicx") + +[node name="Seed2" parent="Seeds" index="1"] +texture = ExtResource("2_gdicx") + +[node name="Seed3" parent="Seeds" index="2"] +texture = ExtResource("2_gdicx") + +[node name="01" parent="SmallPlant" index="0"] +texture = ExtResource("2_gdicx") + +[node name="02" parent="SmallPlant" index="1"] +texture = ExtResource("2_gdicx") + +[node name="03" parent="SmallPlant" index="2"] +texture = ExtResource("2_gdicx") + +[node name="01" parent="BigPlant" index="0"] +texture = ExtResource("2_gdicx") + +[node name="02" parent="BigPlant" index="1"] +texture = ExtResource("2_gdicx") + +[node name="03" parent="BigPlant" index="2"] +texture = ExtResource("2_gdicx") [node name="CollisionShape3D" parent="GrowingInteractionArea/Area2D" index="0"] shape = SubResource("CircleShape2D_on0x0") @@ -18,6 +46,15 @@ shape = SubResource("CircleShape2D_on0x0") [node name="CollisionShape3D" parent="ReadyPlantInventoryItem/PickupInteractionArea/Area2D" index="0"] shape = SubResource("CircleShape2D_gkatd") +[node name="01" parent="ReadyPlantInventoryItem/ReadyPlant" index="0"] +texture = ExtResource("2_gdicx") + +[node name="02" parent="ReadyPlantInventoryItem/ReadyPlant" index="1"] +texture = ExtResource("2_gdicx") + +[node name="03" parent="ReadyPlantInventoryItem/ReadyPlant" index="2"] +texture = ExtResource("2_gdicx") + [editable path="GrowingInteractionArea"] [editable path="ReadyPlantInventoryItem"] [editable path="ReadyPlantInventoryItem/PickupInteractionArea"] diff --git a/resources/items/beet.tres b/resources/items/beet.tres index b5d871a..d8c4391 100644 --- a/resources/items/beet.tres +++ b/resources/items/beet.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="ItemResource" load_steps=3 format=3 uid="uid://0mnsr4anoaiq"] -[ext_resource type="Texture2D" uid="uid://b5ade1s2ijunu" path="res://art/farm/farming/farmobjekte/beetroot/beetroot_icon.png" id="1_wddc8"] +[ext_resource type="Texture2D" uid="uid://djewfwrdt4iv3" path="res://art/ui/UI/icons/icon-fruit-beetroot.png" id="1_wddc8"] [ext_resource type="Script" uid="uid://cbskymrxs6ksu" path="res://scripts/CSharp/Common/Inventory/ItemResource.cs" id="2_5t85d"] [resource] diff --git a/resources/items/beet_seed.tres b/resources/items/beet_seed.tres index a22efad..72853e9 100644 --- a/resources/items/beet_seed.tres +++ b/resources/items/beet_seed.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="ItemResource" load_steps=3 format=3 uid="uid://duq7tshxv6uhp"] -[ext_resource type="Texture2D" uid="uid://dvwj5esdepda8" path="res://art/farm/farming/farmobjekte/beetroot/beetroot_seeds_icon.png" id="1_umigy"] +[ext_resource type="Texture2D" uid="uid://b4pa77olxr14q" path="res://art/ui/UI/icons/icon-seed-beetroot.png" id="1_umigy"] [ext_resource type="Script" uid="uid://cbskymrxs6ksu" path="res://scripts/CSharp/Common/Inventory/ItemResource.cs" id="2_hrv3l"] [resource] diff --git a/resources/items/tomato_seed.tres b/resources/items/tomato_seed.tres index e778349..d66cfd9 100644 --- a/resources/items/tomato_seed.tres +++ b/resources/items/tomato_seed.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" script_class="ItemResource" load_steps=3 format=3 uid="uid://d1uuxp1lp4aro"] [ext_resource type="Script" uid="uid://cbskymrxs6ksu" path="res://scripts/CSharp/Common/Inventory/ItemResource.cs" id="1_dustj"] -[ext_resource type="Texture2D" uid="uid://ce04nexh36uwe" path="res://art/ui/UI/icons/icon-seed-tomatoe.png" id="1_u15c2"] +[ext_resource type="Texture2D" uid="uid://b51j84idxe7hr" path="res://art/ui/UI/icons/icon-seed-tomato.png" id="1_u15c2"] [resource] script = ExtResource("1_dustj") diff --git a/scenes/Babushka_scene_farm_outside_2d.tscn b/scenes/Babushka_scene_farm_outside_2d.tscn index 63689a6..037df54 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=115 format=3 uid="uid://gigb28qk8t12"] +[gd_scene load_steps=116 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"] @@ -39,6 +39,7 @@ [ext_resource type="Resource" uid="uid://d1uuxp1lp4aro" path="res://resources/items/tomato_seed.tres" id="35_64mdn"] [ext_resource type="Texture2D" uid="uid://65e44yde224q" path="res://art/farm/Babushka_house_01.png" id="36_e5b7x"] [ext_resource type="Resource" uid="uid://duq7tshxv6uhp" path="res://resources/items/beet_seed.tres" id="36_fv1t2"] +[ext_resource type="Texture2D" uid="uid://b4krfobwq3r3h" path="res://art/test_tomatos.png" id="36_l7ekk"] [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"] @@ -1105,6 +1106,10 @@ shape = SubResource("CircleShape2D_tm0yg") [node name="Icon" parent="YSorted/SeedPickup" index="4"] scale = Vector2(1, 1) +[node name="Sprite2D" type="Sprite2D" parent="YSorted/SeedPickup"] +texture = ExtResource("36_l7ekk") +region_enabled = true + [node name="SeedPickup2" parent="YSorted" instance=ExtResource("25_hukxv")] visible = false position = Vector2(10892, 2469) diff --git a/scenes/Babushka_scene_outside_beets.tscn b/scenes/Babushka_scene_outside_beets.tscn index 8e5cfcf..6b44b2b 100644 --- a/scenes/Babushka_scene_outside_beets.tscn +++ b/scenes/Babushka_scene_outside_beets.tscn @@ -36,7 +36,7 @@ [ext_resource type="Texture2D" uid="uid://h2b5aufaaw7w" path="res://art/nature/grass/grass-2.png" id="40_67iq1"] [ext_resource type="PackedScene" uid="uid://b1d2e7ely6hyw" path="res://prefabs/farm/base_field.tscn" id="40_efblm"] [ext_resource type="Texture2D" uid="uid://b644ofy7fml5w" path="res://art/nature/grass/grass-5.png" id="41_0irm8"] -[ext_resource type="PackedScene" uid="uid://dp8ielst8et4c" path="res://prefabs/farm/plants/beet_plant.tscn" id="41_3kije"] +[ext_resource type="PackedScene" uid="uid://d20oftcb5qso6" path="res://prefabs/farm/plants/beet_plant.tscn" id="41_vyqmy"] [ext_resource type="Texture2D" uid="uid://badnnid7dgnpk" path="res://art/nature/grass/grass-4.png" id="42_7jeth"] [ext_resource type="Texture2D" uid="uid://ct7ea8ikor5rf" path="res://art/nature/grass/grass-3.png" id="43_g8k4k"] [ext_resource type="Texture2D" uid="uid://d3dwl6ph0pu1d" path="res://art/nature/grass/grass-6.png" id="44_jgrpl"] @@ -1697,7 +1697,7 @@ scale = Vector2(1, 1.00622) [node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField" index="0"] FieldState = 3 -[node name="BeetPlant" parent="YSorted/Farm visuals/FieldParent/BaseField/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_3kije")] +[node name="Beet2" parent="YSorted/Farm visuals/FieldParent/BaseField/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_vyqmy")] _state = 2 _field = NodePath("../..") @@ -1708,8 +1708,8 @@ scale = Vector2(1, 1.00622) [node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField2" index="0"] FieldState = 3 -[node name="BeetPlant" parent="YSorted/Farm visuals/FieldParent/BaseField2/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_3kije")] -_state = 2 +[node name="Beet2" parent="YSorted/Farm visuals/FieldParent/BaseField2/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_vyqmy")] +_state = 1 _field = NodePath("../..") [node name="BaseField3" parent="YSorted/Farm visuals/FieldParent" instance=ExtResource("40_efblm")] @@ -1719,7 +1719,7 @@ scale = Vector2(1, 1.00622) [node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField3" index="0"] FieldState = 3 -[node name="BeetPlant" parent="YSorted/Farm visuals/FieldParent/BaseField3/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_3kije")] +[node name="Beet2" parent="YSorted/Farm visuals/FieldParent/BaseField3/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_vyqmy")] _state = 2 _field = NodePath("../..") @@ -1730,7 +1730,7 @@ scale = Vector2(1, 1.00622) [node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField4" index="0"] FieldState = 3 -[node name="BeetPlant" parent="YSorted/Farm visuals/FieldParent/BaseField4/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_3kije")] +[node name="Beet2" parent="YSorted/Farm visuals/FieldParent/BaseField4/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_vyqmy")] _state = 2 _field = NodePath("../..") @@ -1741,7 +1741,7 @@ scale = Vector2(1, 1.00622) [node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField5" index="0"] FieldState = 3 -[node name="BeetPlant" parent="YSorted/Farm visuals/FieldParent/BaseField5/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_3kije")] +[node name="Beet2" parent="YSorted/Farm visuals/FieldParent/BaseField5/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_vyqmy")] _state = 2 _field = NodePath("../..") @@ -1752,8 +1752,8 @@ scale = Vector2(1, 1.00622) [node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField6" index="0"] FieldState = 3 -[node name="BeetPlant" parent="YSorted/Farm visuals/FieldParent/BaseField6/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_3kije")] -_state = 2 +[node name="Beet2" parent="YSorted/Farm visuals/FieldParent/BaseField6/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_vyqmy")] +_state = 1 _field = NodePath("../..") [node name="BaseField7" parent="YSorted/Farm visuals/FieldParent" instance=ExtResource("40_efblm")] @@ -1763,7 +1763,7 @@ scale = Vector2(1, 1.00622) [node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField7" index="0"] FieldState = 3 -[node name="BeetPlant" parent="YSorted/Farm visuals/FieldParent/BaseField7/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_3kije")] +[node name="Beet2" parent="YSorted/Farm visuals/FieldParent/BaseField7/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_vyqmy")] _state = 2 _field = NodePath("../..") @@ -1774,7 +1774,7 @@ scale = Vector2(1, 1.00622) [node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField8" index="0"] FieldState = 3 -[node name="BeetPlant" parent="YSorted/Farm visuals/FieldParent/BaseField8/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_3kije")] +[node name="Beet2" parent="YSorted/Farm visuals/FieldParent/BaseField8/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_vyqmy")] _state = 2 _field = NodePath("../..") @@ -1785,8 +1785,8 @@ scale = Vector2(1, 1.00622) [node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField9" index="0"] FieldState = 3 -[node name="BeetPlant" parent="YSorted/Farm visuals/FieldParent/BaseField9/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_3kije")] -_state = 2 +[node name="Beet2" parent="YSorted/Farm visuals/FieldParent/BaseField9/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_vyqmy")] +_state = 1 _field = NodePath("../..") [node name="Blocker" type="Node2D" parent="YSorted"] diff --git a/shader/swaying_plant.gdshader b/shader/swaying_plant.gdshader index dcaae5a..01c04ce 100644 --- a/shader/swaying_plant.gdshader +++ b/shader/swaying_plant.gdshader @@ -35,9 +35,21 @@ float getWind(vec2 vertex, vec2 uv, float time){ return wind; } +float hash(vec2 p) { + return fract(sin(dot(p, vec2(12.9898,78.233))) * 43758.5453123); +} + +float noise(vec2 x) { + vec2 p = floor(x); + vec2 f = fract(x); + f = f * f * (3.0 - 2.0 * f); + vec2 a = vec2(1.0, 0.0); + return mix(mix(hash(p + a.yy), hash(p + a.xy), f.x), mix(hash(p + a.yx), hash(p + a.xx), f.x), f.y); +} + void vertex() { vec4 pos = MODEL_MATRIX * vec4(0.0, 0.0, 0.0, 1.0); - float time = TIME * speed + sin(float(INSTANCE_ID) * offset); - //float time = TIME * speed + pos.x * pos.y ; not working when moving... + //float time = TIME * speed + sin(VERTEX.x * noise(VERTEX.xy) * offset); + float time = TIME * speed + sin(pos.x * offset) * cos( pos.x * offset) ; VERTEX.x += getWind(VERTEX.xy, UV, time); -} \ No newline at end of file +}