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

Merge branch 'develop' into feature/quest_system

Browse Source
This commit is contained in:
cblech
2025-06-16 21:13:33 +02:00
parent c8e67ecf77 937e54e47a
commit d754d0509f
439 changed files with 15734 additions and 7288 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/items/axe.tres
-10
View File
@@ -1,10 +0,0 @@
[gd_resource type="Resource" script_class="ItemResource" load_steps=2 format=3 uid="uid://c7viddcd3kywp"]
[ext_resource type="Script" uid="uid://cbskymrxs6ksu" path="res://scripts/CSharp/Common/Inventory/ItemResource.cs" id="1_t485b"]
[resource]
script = ExtResource("1_t485b")
name = "Axe Deo"
color = Color(0.643898, 0.4587, 0.294335, 1)
maxStack = 1
metadata/_custom_type_script = "uid://cbskymrxs6ksu"
resources/items/hoe.tres
+8 -2
View File
@@ -1,10 +1,16 @@
[gd_resource type="Resource" script_class="ItemResource" load_steps=2 format=3 uid="uid://c5yg3lx756v4v"]
[gd_resource type="Resource" script_class="ItemResource" load_steps=4 format=3 uid="uid://c5yg3lx756v4v"]
[ext_resource type="Script" uid="uid://cbskymrxs6ksu" path="res://scripts/CSharp/Common/Inventory/ItemResource.cs" id="1_06nef"]
[ext_resource type="Texture2D" uid="uid://3pj2q7wtuion" path="res://art/farm/farming/farmobjekte/hoe.png" id="1_jd58x"]
[sub_resource type="AtlasTexture" id="AtlasTexture_i5wdx"]
atlas = ExtResource("1_jd58x")
region = Rect2(995, 190, 328, 1223)
[resource]
script = ExtResource("1_06nef")
name = "Your Mom"
name = "Hoe"
color = Color(0.751421, 0.329615, 0.570911, 1)
icon = SubResource("AtlasTexture_i5wdx")
maxStack = 1
metadata/_custom_type_script = "uid://cbskymrxs6ksu"
resources/items/pickaxe.tres
-9
View File
@@ -1,9 +0,0 @@
[gd_resource type="Resource" script_class="ItemResource" load_steps=2 format=3 uid="uid://datee0flk1e84"]
[ext_resource type="Script" uid="uid://cbskymrxs6ksu" path="res://scripts/CSharp/Common/Inventory/ItemResource.cs" id="1_07aya"]
[resource]
script = ExtResource("1_07aya")
name = "Pick Axe"
color = Color(0.589014, 0.823353, 0.998475, 1)
metadata/_custom_type_script = "uid://cbskymrxs6ksu"
resources/items/rake.tres
+16
View File
@@ -0,0 +1,16 @@
[gd_resource type="Resource" script_class="ItemResource" load_steps=4 format=3 uid="uid://dlcmqfjvgphqu"]
[ext_resource type="Texture2D" uid="uid://c4ggew55w0icj" path="res://art/farm/farming/farmobjekte/harke.png" id="1_imv0i"]
[ext_resource type="Script" uid="uid://cbskymrxs6ksu" path="res://scripts/CSharp/Common/Inventory/ItemResource.cs" id="2_jplkm"]
[sub_resource type="AtlasTexture" id="AtlasTexture_i5wdx"]
atlas = ExtResource("1_imv0i")
region = Rect2(8, 10, 619, 771)
[resource]
script = ExtResource("2_jplkm")
name = "Hoe"
color = Color(0.751421, 0.329615, 0.570911, 1)
icon = SubResource("AtlasTexture_i5wdx")
maxStack = 1
metadata/_custom_type_script = "uid://cbskymrxs6ksu"
resources/items/scythe.tres
+16
View File
@@ -0,0 +1,16 @@
[gd_resource type="Resource" script_class="ItemResource" load_steps=4 format=3 uid="uid://datee0flk1e84"]
[ext_resource type="Texture2D" uid="uid://x8hr8287ff2n" path="res://art/farm/farming/farmobjekte/tools atlas.png" id="1_6rw6x"]
[ext_resource type="Script" uid="uid://cbskymrxs6ksu" path="res://scripts/CSharp/Common/Inventory/ItemResource.cs" id="2_mfb7x"]
[sub_resource type="AtlasTexture" id="AtlasTexture_3wroj"]
atlas = ExtResource("1_6rw6x")
region = Rect2(1049, 0, 550, 1332)
[resource]
script = ExtResource("2_mfb7x")
name = "rake"
color = Color(0.589014, 0.823353, 0.998475, 1)
icon = SubResource("AtlasTexture_3wroj")
maxStack = 1
metadata/_custom_type_script = "uid://cbskymrxs6ksu"
resources/items/shovel.tres
+16
View File
@@ -0,0 +1,16 @@
[gd_resource type="Resource" script_class="ItemResource" load_steps=4 format=3 uid="uid://c7viddcd3kywp"]
[ext_resource type="Texture2D" uid="uid://x8hr8287ff2n" path="res://art/farm/farming/farmobjekte/tools atlas.png" id="1_ih03p"]
[ext_resource type="Script" uid="uid://cbskymrxs6ksu" path="res://scripts/CSharp/Common/Inventory/ItemResource.cs" id="1_t485b"]
[sub_resource type="AtlasTexture" id="AtlasTexture_lo7on"]
atlas = ExtResource("1_ih03p")
region = Rect2(522, 139, 285, 1333)
[resource]
script = ExtResource("1_t485b")
name = "Shovel"
color = Color(0.424722, 0.266026, 0.108459, 1)
icon = SubResource("AtlasTexture_lo7on")
maxStack = 1
metadata/_custom_type_script = "uid://cbskymrxs6ksu"
resources/items/test.tres
+16
View File
@@ -0,0 +1,16 @@
[gd_resource type="Resource" script_class="ItemResource" load_steps=4 format=3 uid="uid://ocmg3fxkxugq"]
[ext_resource type="Texture2D" uid="uid://cnwd3mb3jnuxm" path="res://art/farm/farming/farmobjekte/tomaten/teen adulte tomaten.png" id="1_bqfcn"]
[ext_resource type="Script" uid="uid://cbskymrxs6ksu" path="res://scripts/CSharp/Common/Inventory/ItemResource.cs" id="2_sjbrh"]
[sub_resource type="AtlasTexture" id="AtlasTexture_i5wdx"]
atlas = ExtResource("1_bqfcn")
region = Rect2(418, 854, 630, 794)
[resource]
script = ExtResource("2_sjbrh")
name = "Hoe"
color = Color(0.751421, 0.329615, 0.570911, 1)
icon = SubResource("AtlasTexture_i5wdx")
maxStack = 1
metadata/_custom_type_script = "uid://cbskymrxs6ksu"
resources/items/tomato.tres
+12
View File
@@ -0,0 +1,12 @@
[gd_resource type="Resource" script_class="ItemResource" load_steps=3 format=3 uid="uid://blr8tine5m0ma"]
[ext_resource type="Texture2D" uid="uid://c3wht0nakaki1" path="res://art/ui/UI/icons/icon-fruit-tomatoe.png" id="1_k7rt3"]
[ext_resource type="Script" uid="uid://cbskymrxs6ksu" path="res://scripts/CSharp/Common/Inventory/ItemResource.cs" id="1_olvff"]
[resource]
script = ExtResource("1_olvff")
name = "Tomato"
color = Color(0.941176, 0, 0, 1)
icon = ExtResource("1_k7rt3")
maxStack = 20
metadata/_custom_type_script = "uid://cbskymrxs6ksu"
resources/items/tomato_seed.tres
+3 -1
View File
@@ -1,10 +1,12 @@
[gd_resource type="Resource" script_class="ItemResource" load_steps=2 format=3 uid="uid://d1uuxp1lp4aro"]
[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"]
[resource]
script = ExtResource("1_dustj")
name = "Tomato Seed"
color = Color(0.135039, 0.307214, 0.333128, 1)
icon = ExtResource("1_u15c2")
maxStack = 20
metadata/_custom_type_script = "uid://cbskymrxs6ksu"
resources/items/bucket.tres → resources/items/wateringcan.tres
+8 -2
View File
@@ -1,10 +1,16 @@
[gd_resource type="Resource" script_class="ItemResource" load_steps=2 format=3 uid="uid://cndd64batns31"]
[gd_resource type="Resource" script_class="ItemResource" load_steps=4 format=3 uid="uid://cndd64batns31"]
[ext_resource type="Script" uid="uid://cbskymrxs6ksu" path="res://scripts/CSharp/Common/Inventory/ItemResource.cs" id="1_8k5aa"]
[ext_resource type="Texture2D" uid="uid://x8hr8287ff2n" path="res://art/farm/farming/farmobjekte/tools atlas.png" id="1_roi0v"]
[sub_resource type="AtlasTexture" id="AtlasTexture_tqw18"]
atlas = ExtResource("1_roi0v")
region = Rect2(-4, 1137, 428, 283)
[resource]
script = ExtResource("1_8k5aa")
name = "Buck the Bucket"
name = "Can"
color = Color(0.336269, 0.489145, 0.825324, 1)
icon = SubResource("AtlasTexture_tqw18")
maxStack = 1
metadata/_custom_type_script = "uid://cbskymrxs6ksu"