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

Merge remote-tracking branch 'origin/c_sharp_setup' into inventory

Browse Source
This commit is contained in:
cblech
2025-04-07 18:44:38 +02:00
parent daa53e4aef 8622f2d38d
commit dacf48b9fd
1173 changed files with 19845 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files
prefabs/Mushrooms/Mushroom1.tscn
+1 -1
View File
@@ -1,6 +1,6 @@
[gd_scene load_steps=2 format=3 uid="uid://bs02r12yhvse3"]
[ext_resource type="Texture2D" uid="uid://cj1bfgpunfsoq" path="res://graphics/testingground/mushroom3.png" id="2_t84c7"]
[ext_resource type="Texture2D" uid="uid://cj1bfgpunfsoq" path="res://art/testingground/mushroom3.png" id="2_t84c7"]
[node name="Mushroom1" type="Node2D"]
z_as_relative = false
prefabs/Mushrooms/Mushroom2.tscn
+1 -1
View File
@@ -1,6 +1,6 @@
[gd_scene load_steps=2 format=3 uid="uid://b1pbkxawpcwxc"]
[ext_resource type="Texture2D" uid="uid://bnb3bjk274vgn" path="res://graphics/testingground/mushroom4.png" id="1_dm7r2"]
[ext_resource type="Texture2D" uid="uid://bnb3bjk274vgn" path="res://art/testingground/mushroom4.png" id="1_dm7r2"]
[node name="Mushroom1" type="Node2D"]
z_as_relative = false
prefabs/Mushrooms/Mushroom3.tscn
+1 -1
View File
@@ -1,6 +1,6 @@
[gd_scene load_steps=2 format=3 uid="uid://u5slo32os2oo"]
[ext_resource type="Texture2D" uid="uid://0oy8by6pd2wg" path="res://graphics/testingground/mushroom5.png" id="1_k1qpa"]
[ext_resource type="Texture2D" uid="uid://0oy8by6pd2wg" path="res://art/testingground/mushroom5.png" id="1_k1qpa"]
[node name="Mushroom1" type="Node2D"]
z_as_relative = false
prefabs/Mushrooms/Mushroom4.tscn
+1 -1
View File
@@ -1,6 +1,6 @@
[gd_scene load_steps=2 format=3 uid="uid://cqnpqk1kg0hrc"]
[ext_resource type="Texture2D" uid="uid://b1h55mnc1giqu" path="res://graphics/testingground/mushroom6.png" id="1_qtwer"]
[ext_resource type="Texture2D" uid="uid://b1h55mnc1giqu" path="res://art/testingground/mushroom6.png" id="1_qtwer"]
[node name="Mushroom1" type="Node2D"]
z_as_relative = false
prefabs/Mushrooms/Mushroom5.tscn
+1 -1
View File
@@ -1,6 +1,6 @@
[gd_scene load_steps=2 format=3 uid="uid://dblpcx0gljvxl"]
[ext_resource type="Texture2D" uid="uid://c5lsjern0iqmc" path="res://graphics/testingground/mushroom7.png" id="1_um1sv"]
[ext_resource type="Texture2D" uid="uid://c5lsjern0iqmc" path="res://art/testingground/mushroom7.png" id="1_um1sv"]
[node name="Mushroom1" type="Node2D"]
z_as_relative = false
prefabs/Mushrooms/Mushroom6.tscn
+1 -1
View File
@@ -1,6 +1,6 @@
[gd_scene load_steps=2 format=3 uid="uid://cmmfoduf37cd5"]
[ext_resource type="Texture2D" uid="uid://bg465y2vkrvfm" path="res://graphics/testingground/mushroom8.png" id="1_y728e"]
[ext_resource type="Texture2D" uid="uid://bg465y2vkrvfm" path="res://art/testingground/mushroom8.png" id="1_y728e"]
[node name="Mushroom1" type="Node2D"]
z_as_relative = false
prefabs/Mushrooms/Mushroom7.tscn
+1 -1
View File
@@ -1,6 +1,6 @@
[gd_scene load_steps=2 format=3 uid="uid://dhclggadclwm5"]
[ext_resource type="Texture2D" uid="uid://6xxebx7ry6o8" path="res://graphics/testingground/mushroom9.png" id="1_dhs3m"]
[ext_resource type="Texture2D" uid="uid://6xxebx7ry6o8" path="res://art/testingground/mushroom9.png" id="1_dhs3m"]
[node name="Mushroom1" type="Node2D"]
z_as_relative = false
prefabs/Mushrooms/Mushroom8.tscn
+1 -1
View File
@@ -1,6 +1,6 @@
[gd_scene load_steps=2 format=3 uid="uid://cn77bho6ohd18"]
[ext_resource type="Texture2D" uid="uid://bednd2jncey0i" path="res://graphics/testingground/mushroom10.png" id="1_kcu8g"]
[ext_resource type="Texture2D" uid="uid://bednd2jncey0i" path="res://art/testingground/mushroom10.png" id="1_kcu8g"]
[node name="Mushroom1" type="Node2D"]
z_as_relative = false
prefabs/Mushrooms/Mushroom9.tscn
+1 -1
View File
@@ -1,6 +1,6 @@
[gd_scene load_steps=2 format=3 uid="uid://bq58bkfjh4x7p"]
[ext_resource type="Texture2D" uid="uid://cam7x7byvqtb2" path="res://graphics/testingground/mushroom11.png" id="1_smq5e"]
[ext_resource type="Texture2D" uid="uid://cam7x7byvqtb2" path="res://art/testingground/mushroom11.png" id="1_smq5e"]
[node name="Mushroom1" type="Node2D"]
z_as_relative = false
prefabs/Player3D.tscn
+1314 -20
View File
File diff suppressed because it is too large Load Diff
prefabs/farming/base_field.tscn
+34
View File
@@ -0,0 +1,34 @@
[gd_scene load_steps=6 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="PackedScene" uid="uid://bjhj1wa5olwcu" path="res://prefabs/farming/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="Sprite3D" type="Sprite3D" parent="."]
transform = Transform3D(0.5, 0, 0, 0, -2.18557e-08, -0.5, 0, 0.5, -2.18557e-08, 0, 0, 0)
pixel_size = 0.004
texture = ExtResource("1_2cisk")
script = ExtResource("2_u7egi")
Tilled = ExtResource("1_2cisk")
FieldState = 1
[node name="BasePlant" parent="Sprite3D" 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)
[connection signal="Interacted" from="InteractionArea" to="Sprite3D/BasePlant" method="Grow"]
[editable path="InteractionArea"]
prefabs/farming/base_plant.tscn
+170
View File
@@ -0,0 +1,170 @@
[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_l3nrf"]
[ext_resource type="Texture2D" uid="uid://dtr4uga5uspg" path="res://art/farm/farming/farmobjekte/tomaten/tomaten baby.png" id="2_7tw6v"]
[ext_resource type="Texture2D" uid="uid://b2gu6ur2xc7s4" path="res://art/farm/farming/farmobjekte/tomaten/tomaten blume.png" id="3_6u2og"]
[ext_resource type="Texture2D" uid="uid://cnwd3mb3jnuxm" path="res://art/farm/farming/farmobjekte/tomaten/teen adulte tomaten.png" id="4_1pcfs"]
[ext_resource type="PackedScene" uid="uid://ob04y3syvo0e" path="res://prefabs/interaction_area.tscn" id="5_6kt4q"]
[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_l3nrf")
_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_7tw6v")
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_7tw6v")
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_7tw6v")
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_7tw6v")
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_7tw6v")
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_7tw6v")
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_7tw6v")
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_6u2og")
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_6u2og")
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_6u2og")
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_6u2og")
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_1pcfs")
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_1pcfs")
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_1pcfs")
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_1pcfs")
region_enabled = true
region_rect = Rect2(1167, 863, 528, 785)
[node name="InteractionArea" parent="." instance=ExtResource("5_6kt4q")]
[node name="CollisionShape3D" parent="InteractionArea/Area3D" index="0"]
shape = SubResource("SphereShape3D_l3nrf")
[connection signal="Interacted" from="InteractionArea" to="." method="Grow"]
[editable path="InteractionArea"]
prefabs/interaction_area.tscn
+16 -10
View File
@@ -1,12 +1,15 @@
[gd_scene load_steps=3 format=3 uid="uid://ob04y3syvo0e"]
[ext_resource type="Script" uid="uid://bfwe1vlfyknm7" path="res://scripts/GdScript/interaction_area.gd" id="1_26v5g"]
[ext_resource type="Script" uid="uid://dumwt7lledufm" path="res://scripts/CSharp/Common/CharacterControls/InteractionArea.cs" id="1_b15wn"]
[sub_resource type="SphereShape3D" id="SphereShape3D_i8sim"]
radius = 1.0
resource_local_to_scene = true
radius = 2.0
[node name="InteractionArea" type="Node3D"]
script = ExtResource("1_26v5g")
[node name="InteractionArea" type="Node3D" node_paths=PackedStringArray("_area", "_label")]
script = ExtResource("1_b15wn")
_area = NodePath("Area3D")
_label = NodePath("Label3D")
[node name="Area3D" type="Area3D" parent="."]
collision_mask = 16
@@ -15,14 +18,17 @@ collision_mask = 16
shape = SubResource("SphereShape3D_i8sim")
[node name="Label3D" type="Label3D" parent="."]
visible = false
sorting_offset = 100.0
pixel_size = 0.001
pixel_size = 0.01
billboard = 1
no_depth_test = true
fixed_size = true
text = "<E>"
font_size = 98
outline_size = 22
render_priority = 100
outline_render_priority = 99
text = "[E]"
font_size = 20
outline_size = 8
[connection signal="body_entered" from="Area3D" to="Label3D" method="show"]
[connection signal="body_exited" from="Area3D" to="Label3D" method="hide"]
[connection signal="body_entered" from="Area3D" to="." method="OnPlayerEntered"]
[connection signal="body_exited" from="Area3D" to="." method="OnPlayerExited"]
prefabs/interactions/sprite_switcher.gdshader
+14
View File
@@ -0,0 +1,14 @@
shader_type spatial;
void vertex() {
// Called for every vertex the material is visible on.
}
void fragment() {
// Called for every pixel the material is visible on.
}
//void light() {
// // Called for every pixel for every light affecting the material.
// // Uncomment to replace the default light processing function with this one.
//}
prefabs/interactions/sprite_switcher.gdshader.uid
+1
View File
@@ -0,0 +1 @@
uid://dn6jmboabfrb2
prefabs/interactions/sprite_switcher.tscn
+40
View File
@@ -0,0 +1,40 @@
[gd_scene load_steps=5 format=3 uid="uid://cf0jpuio8tgim"]
[ext_resource type="Script" uid="uid://v34pl0nlp4x" path="res://scripts/CSharp/Common/SpriteSwitcher.cs" id="1_scmhv"]
[ext_resource type="Texture2D" uid="uid://c4ggew55w0icj" path="res://art/farm/farming/farmobjekte/harke.png" id="2_jv400"]
[sub_resource type="SphereMesh" id="SphereMesh_0ptl4"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_scmhv"]
transparency = 1
blend_mode = 3
emission_enabled = true
emission = Color(1, 1, 1, 1)
[node name="SpriteSwitcher" type="Node3D" node_paths=PackedStringArray("_trueSprite", "_falseSprite")]
script = ExtResource("1_scmhv")
_trueSprite = NodePath("Hoe on")
_falseSprite = NodePath("Hoe off")
[node name="Hoe on" type="Sprite3D" parent="."]
modulate = Color(0, 0.996078, 0, 1)
pixel_size = 0.001
billboard = 1
texture = ExtResource("2_jv400")
region_rect = Rect2(484, 143, 365, 1317)
[node name="Hoe off" type="Sprite3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, -8.47033e-22, 0, 8.47033e-22, 1, 0.106585, 0, 0.0173626)
visible = false
modulate = Color(1, 0, 0, 1)
pixel_size = 0.001
billboard = 1
texture = ExtResource("2_jv400")
region_rect = Rect2(421, 0, 539, 965)
[node name="CSGMesh3D" type="CSGMesh3D" parent="."]
transparency = 0.5
cast_shadow = 0
calculate_tangents = false
mesh = SubResource("SphereMesh_0ptl4")
material = SubResource("StandardMaterial3D_scmhv")
prefabs/player.tscn
+4 -4
View File
@@ -1,10 +1,10 @@
[gd_scene load_steps=6 format=3 uid="uid://dd3giw31imfk4"]
[ext_resource type="Script" uid="uid://c3itdui8uq68b" path="res://scripts/GdScript/player.gd" id="1_rhqwr"]
[ext_resource type="Texture2D" uid="uid://cumdgxn0ibpv7" path="res://graphics/mockups/TakeThatCandy.png" id="2_eul5n"]
[ext_resource type="Texture2D" uid="uid://dj1syhq0dmf3p" path="res://graphics/mockups/Doll.png" id="3_mpdnl"]
[ext_resource type="Texture2D" uid="uid://bcah7lrg2oae1" path="res://graphics/mockups/IveSeenSomeShit.png" id="4_631ct"]
[ext_resource type="Texture2D" uid="uid://cvn2p215jq2am" path="res://graphics/mockups/concerned.png" id="5_ayafy"]
[ext_resource type="Texture2D" uid="uid://cumdgxn0ibpv7" path="res://art/mockups/TakeThatCandy.png" id="2_eul5n"]
[ext_resource type="Texture2D" uid="uid://dj1syhq0dmf3p" path="res://art/mockups/Doll.png" id="3_mpdnl"]
[ext_resource type="Texture2D" uid="uid://bcah7lrg2oae1" path="res://art/mockups/IveSeenSomeShit.png" id="4_631ct"]
[ext_resource type="Texture2D" uid="uid://cvn2p215jq2am" path="res://art/mockups/concerned.png" id="5_ayafy"]
[node name="player" type="Node2D"]
z_as_relative = false