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

Project cleanup: Removed 3D scripts and scenes from project. Also renamed and moved some minor stuff.

Browse Source
This commit is contained in:
Katharina Ziolkowski
2025-05-28 16:02:51 +02:00
committed by cblech
parent 1f17cca62d
commit c6ec99e87a
76 changed files with 35 additions and 5744 deletions
Download Patch File Download Diff File Expand all files Collapse all files
prefabs/farm/base_field.tscn
-38
View File
@@ -1,38 +0,0 @@
[gd_scene load_steps=7 format=3 uid="uid://biwd3jj65qrlh"]
[ext_resource type="Texture2D" uid="uid://c2pirgay3jfnn" path="res://art/farm/tilable grounds/böden/trockene farming erde.png" id="1_2cisk"]
[ext_resource type="Script" uid="uid://histmmyi1wr" path="res://scripts/CSharp/Common/Farming/FieldBehaviour.cs" id="2_u7egi"]
[ext_resource type="Texture2D" uid="uid://ctvdxwgmfaj5c" path="res://art/farm/tilable grounds/böden/nasse farming erde.png" id="4_lsseu"]
[ext_resource type="PackedScene" uid="uid://bjhj1wa5olwcu" path="res://prefabs/farm/base_plant.tscn" id="4_u7egi"]
[ext_resource type="PackedScene" uid="uid://ob04y3syvo0e" path="res://prefabs/interaction_area.tscn" id="4_xc4m0"]
[sub_resource type="SphereShape3D" id="SphereShape3D_u7egi"]
resource_local_to_scene = true
radius = 2.0
[node name="BaseField" type="Node3D"]
[node name="InteractionArea" parent="." instance=ExtResource("4_xc4m0")]
transform = Transform3D(0.939693, -0.34202, 0, 0.34202, 0.939693, 0, 0, 0, 1, 0.00334358, -0.3811, -0.120426)
_showLabel = false
[node name="CollisionShape3D" parent="InteractionArea/Area3D" index="0"]
shape = SubResource("SphereShape3D_u7egi")
[node name="FieldBehaviour" type="Sprite3D" parent="."]
transform = Transform3D(0.4, 0, 0, 0, -1.74846e-08, -0.4, 0, 0.4, -1.74846e-08, 0, 0, 0)
pixel_size = 0.004
script = ExtResource("2_u7egi")
Tilled = ExtResource("1_2cisk")
Watered = ExtResource("4_lsseu")
FieldState = 1
metadata/_custom_type_script = "uid://histmmyi1wr"
[node name="BasePlant" parent="FieldBehaviour" node_paths=PackedStringArray("_seeds", "_smallPlants", "_bigPlants", "_readyPlants") instance=ExtResource("4_u7egi")]
transform = Transform3D(0.5, 0, 0, 0, -2.18557e-08, 0.5, 0, -0.5, -2.18557e-08, 0, 0, 0)
_seeds = [null, null, null]
_smallPlants = [null, null, null, null]
_bigPlants = [null, null, null, null]
_readyPlants = [null, null, null, null]
[editable path="InteractionArea"]
prefabs/farm/base_field_2d.tscn
+1 -1
View File
@@ -1,6 +1,6 @@
[gd_scene load_steps=7 format=3 uid="uid://b1d2e7ely6hyw"]
[ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interaction_area_2d.tscn" id="1_femni"]
[ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interactions/interaction_area_2d.tscn" id="1_femni"]
[ext_resource type="Script" uid="uid://bdffon388rkty" path="res://scripts/CSharp/Common/Farming/FieldBehaviour2D.cs" id="2_femni"]
[ext_resource type="Texture2D" uid="uid://c2pirgay3jfnn" path="res://art/farm/tilable grounds/böden/trockene farming erde.png" id="3_lsfck"]
[ext_resource type="Texture2D" uid="uid://ctvdxwgmfaj5c" path="res://art/farm/tilable grounds/böden/nasse farming erde.png" id="4_cus02"]
prefabs/farm/base_plant.tscn
-170
View File
@@ -1,170 +0,0 @@
[gd_scene load_steps=7 format=3 uid="uid://bjhj1wa5olwcu"]
[ext_resource type="Script" uid="uid://yfnjmuuxs3oq" path="res://scripts/CSharp/Common/Farming/PlantBehaviour.cs" id="1_0sfu3"]
[ext_resource type="Texture2D" uid="uid://dtr4uga5uspg" path="res://art/farm/farming/farmobjekte/tomaten/tomaten baby.png" id="2_l7215"]
[ext_resource type="Texture2D" uid="uid://b2gu6ur2xc7s4" path="res://art/farm/farming/farmobjekte/tomaten/tomaten blume.png" id="3_g3ydi"]
[ext_resource type="Texture2D" uid="uid://cnwd3mb3jnuxm" path="res://art/farm/farming/farmobjekte/tomaten/teen adulte tomaten.png" id="4_7hsvc"]
[ext_resource type="PackedScene" uid="uid://ob04y3syvo0e" path="res://prefabs/interaction_area.tscn" id="5_n6ufi"]
[sub_resource type="SphereShape3D" id="SphereShape3D_l3nrf"]
resource_local_to_scene = true
radius = 2.0
[node name="BasePlant" type="Node3D" node_paths=PackedStringArray("_seeds", "_smallPlants", "_bigPlants", "_readyPlants")]
script = ExtResource("1_0sfu3")
_seeds = [NodePath("Seeds/TomatoSeed"), NodePath("Seeds/TomatoSeed2"), NodePath("Seeds/TomatoSeed3")]
_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("ReadyPlant/01"), NodePath("ReadyPlant/02"), NodePath("ReadyPlant/03"), NodePath("ReadyPlant/04")]
[node name="Seeds" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0)
[node name="TomatoSeed" type="Sprite3D" parent="Seeds"]
visible = false
flip_v = true
billboard = 1
render_priority = 2
texture = ExtResource("2_l7215")
region_enabled = true
region_rect = Rect2(-2, 15, 85, 81)
[node name="TomatoSeed2" type="Sprite3D" parent="Seeds"]
visible = false
flip_v = true
billboard = 1
render_priority = 2
texture = ExtResource("2_l7215")
region_enabled = true
region_rect = Rect2(15, 177, 84, 108)
[node name="TomatoSeed3" type="Sprite3D" parent="Seeds"]
visible = false
flip_v = true
billboard = 1
render_priority = 2
texture = ExtResource("2_l7215")
region_enabled = true
region_rect = Rect2(3, 337, 85, 82)
[node name="SmallPlant" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0)
[node name="01" type="Sprite3D" parent="SmallPlant"]
visible = false
billboard = 1
render_priority = 3
texture = ExtResource("2_l7215")
region_enabled = true
region_rect = Rect2(203, 1, 128, 164)
[node name="02" type="Sprite3D" parent="SmallPlant"]
visible = false
billboard = 1
render_priority = 3
texture = ExtResource("2_l7215")
region_enabled = true
region_rect = Rect2(218, 204, 112, 130)
[node name="03" type="Sprite3D" parent="SmallPlant"]
visible = false
billboard = 1
render_priority = 3
texture = ExtResource("2_l7215")
region_enabled = true
region_rect = Rect2(224, 399, 105, 105)
[node name="04" type="Sprite3D" parent="SmallPlant"]
visible = false
billboard = 1
render_priority = 3
texture = ExtResource("2_l7215")
region_enabled = true
region_rect = Rect2(228, 600, 85, 92)
[node name="BigPlant" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0)
[node name="01" type="Sprite3D" parent="BigPlant"]
visible = false
pixel_size = 0.007
billboard = 1
render_priority = 3
texture = ExtResource("3_g3ydi")
region_enabled = true
region_rect = Rect2(-8, 1, 498, 682)
[node name="02" type="Sprite3D" parent="BigPlant"]
visible = false
pixel_size = 0.007
billboard = 1
render_priority = 3
texture = ExtResource("3_g3ydi")
region_enabled = true
region_rect = Rect2(575, 82, 516, 591)
[node name="03" type="Sprite3D" parent="BigPlant"]
visible = false
pixel_size = 0.007
billboard = 1
render_priority = 3
texture = ExtResource("3_g3ydi")
region_enabled = true
region_rect = Rect2(-25, 694, 521, 687)
[node name="04" type="Sprite3D" parent="BigPlant"]
visible = false
pixel_size = 0.007
billboard = 1
render_priority = 3
texture = ExtResource("3_g3ydi")
region_enabled = true
region_rect = Rect2(546, 697, 535, 687)
[node name="ReadyPlant" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.3, 0)
[node name="01" type="Sprite3D" parent="ReadyPlant"]
visible = false
pixel_size = 0.007
billboard = 1
render_priority = 3
texture = ExtResource("4_7hsvc")
region_enabled = true
region_rect = Rect2(399, 3, 679, 808)
[node name="02" type="Sprite3D" parent="ReadyPlant"]
visible = false
pixel_size = 0.007
billboard = 1
render_priority = 3
texture = ExtResource("4_7hsvc")
region_enabled = true
region_rect = Rect2(1077, 109, 633, 695)
[node name="03" type="Sprite3D" parent="ReadyPlant"]
visible = false
pixel_size = 0.007
billboard = 1
render_priority = 3
texture = ExtResource("4_7hsvc")
region_enabled = true
region_rect = Rect2(415, 838, 639, 817)
[node name="04" type="Sprite3D" parent="ReadyPlant"]
visible = false
pixel_size = 0.007
billboard = 1
render_priority = 3
texture = ExtResource("4_7hsvc")
region_enabled = true
region_rect = Rect2(1167, 863, 528, 785)
[node name="InteractionArea" parent="." instance=ExtResource("5_n6ufi")]
[node name="CollisionShape3D" parent="InteractionArea/Area3D" index="0"]
shape = SubResource("SphereShape3D_l3nrf")
[connection signal="Interacted" from="InteractionArea" to="." method="Grow"]
[editable path="InteractionArea"]
prefabs/farm/base_plant_2d.tscn
+2 -2
View File
@@ -1,11 +1,11 @@
[gd_scene load_steps=11 format=3 uid="uid://c3hwbwo423nbm"]
[ext_resource type="Script" uid="uid://cms357f23fmfy" path="res://scripts/CSharp/Common/Farming/PlantBehaviour2D.cs" id="1_tikj4"]
[ext_resource type="Shader" uid="uid://braevmqauoek7" path="res://prefabs/farm/swaying_plant.gdshader" id="2_goh03"]
[ext_resource type="Shader" uid="uid://braevmqauoek7" path="res://shader/swaying_plant.gdshader" id="2_goh03"]
[ext_resource type="Texture2D" uid="uid://dtr4uga5uspg" path="res://art/farm/farming/farmobjekte/tomaten/tomaten baby.png" id="2_rmjrk"]
[ext_resource type="Texture2D" uid="uid://b2gu6ur2xc7s4" path="res://art/farm/farming/farmobjekte/tomaten/tomaten blume.png" id="3_goh03"]
[ext_resource type="Texture2D" uid="uid://cnwd3mb3jnuxm" path="res://art/farm/farming/farmobjekte/tomaten/teen adulte tomaten.png" id="4_u4cty"]
[ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interaction_area_2d.tscn" id="5_tikj4"]
[ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interactions/interaction_area_2d.tscn" id="5_tikj4"]
[ext_resource type="PackedScene" uid="uid://dpbbroif2tnil" path="res://prefabs/interactions/generic_item_on_ground_2d.tscn" id="6_u4cty"]
[ext_resource type="Resource" uid="uid://blr8tine5m0ma" path="res://resources/items/tomato.tres" id="7_yntkb"]
prefabs/farm/fence_part_01.tscn
-8
View File
@@ -1,8 +0,0 @@
[gd_scene load_steps=2 format=3 uid="uid://bqhnejufg5ei2"]
[ext_resource type="Texture2D" uid="uid://csig0r8rffflt" path="res://art/farm/farming/farmobjekte/zaun/fence part end part.png" id="1_qau34"]
[node name="fence_part_01" type="Sprite3D"]
offset = Vector2(0, 300)
pixel_size = 0.005
texture = ExtResource("1_qau34")
prefabs/farm/fence_part_02.tscn
-8
View File
@@ -1,8 +0,0 @@
[gd_scene load_steps=2 format=3 uid="uid://cxceu5dgq3akw"]
[ext_resource type="Texture2D" uid="uid://3ed3dgq3irn2" path="res://art/farm/farming/farmobjekte/zaun/tilable fence end part2.png" id="1_uxygd"]
[node name="fence_part_02" type="Sprite3D"]
offset = Vector2(0, 300)
pixel_size = 0.005
texture = ExtResource("1_uxygd")
prefabs/farm/fence_part_03.tscn
-8
View File
@@ -1,8 +0,0 @@
[gd_scene load_steps=2 format=3 uid="uid://cm5oekefe6ct3"]
[ext_resource type="Texture2D" uid="uid://btea6eyucsyxj" path="res://art/farm/farming/farmobjekte/zaun/tilable fence middle part.png" id="1_rucex"]
[node name="fence_part_03" type="Sprite3D"]
offset = Vector2(0, 300)
pixel_size = 0.005
texture = ExtResource("1_rucex")
prefabs/farm/swaying_plant.gdshader
-43
View File
@@ -1,43 +0,0 @@
// original wind shader from https://github.com/Maujoe/godot-simple-wind-shader-2d/tree/master/assets/maujoe.simple_wind_shader_2d
// original script modified by HungryProton so that the assets are moving differently : https://pastebin.com/VL3AfV8D
//
// speed - The speed of the wind movement.
// minStrength - The minimal strength of the wind movement.
// maxStrength - The maximal strength of the wind movement.
// strengthScale - Scalefactor for the wind strength.
// interval - The time between minimal and maximal strength changes.
// detail - The detail (number of waves) of the wind movement.
// distortion - The strength of geometry distortion.
// heightOffset - The height where the wind begins to move. By default 0.0.
shader_type canvas_item;
render_mode blend_mix;
// Wind settings.
uniform float speed = 1.0;
uniform float minStrength : hint_range(0.0, 1.0) = 0.05;
uniform float maxStrength : hint_range(0.0, 1.0) = 0.01;
uniform float strengthScale = 100.0;
uniform float interval = 3.5;
uniform float detail = 1.0;
uniform float distortion : hint_range(0.0, 1.0);
uniform float heightOffset : hint_range(0.0, 1.0);
// With the offset value, you can if you want different moves for each asset. Just put a random value (1, 2, 3) in the editor. Don't forget to mark the material as unique if you use this
uniform float offset = 0;
float getWind(vec2 vertex, vec2 uv, float time){
float diff = pow(maxStrength - minStrength, 2.0);
float strength = clamp(minStrength + diff + sin(time / interval) * diff, minStrength, maxStrength) * strengthScale;
float wind = (sin(time) + cos(time * detail)) * strength * max(0.0, (1.0-uv.y) - heightOffset);
return wind;
}
void vertex() {
vec4 pos = MODEL_MATRIX * vec4(0.0, 0.0, 0.0, 1.0);
float time = TIME * speed + offset;
//float time = TIME * speed + pos.x * pos.y ; not working when moving...
VERTEX.x += getWind(VERTEX.xy, UV, time);
}
prefabs/farm/swaying_plant.gdshader.uid
-1
View File
@@ -1 +0,0 @@
uid://braevmqauoek7