Jonathan/Babushka
2
0
Fork 0
Code Pull Requests 1 Releases Activity

🎨 💄 Created art template for farm plants and reworked existing plant prefabs and inventory resources

Browse Source
This commit is contained in:
Katharina Ziolkowski
2025-09-27 16:54:17 +02:00
parent 0713e334b3
commit e73f13d7d4
30 changed files with 289 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
prefabs/farm/plants/base_plant.tscn
+41 -58
View File
@@ -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")
position = Vector2(0.5, 49.2)
texture = ExtResource("2_oyl0t")
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")
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)
prefabs/farm/plants/beet_plant.tscn
+22 -79
View File
@@ -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"]
prefabs/farm/plants/tomato_plant.tscn
+39 -2
View File
@@ -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"]