From b8e456f7efdbe3503a3b367ea6d00dbe9d81a36c Mon Sep 17 00:00:00 2001 From: kziolkowski Date: Sat, 14 Jun 2025 10:29:41 +0200 Subject: [PATCH] moved player2D prefab --- .../Player2D.tscn | 0 project.godot | 8 +++--- scenes/Babushka_scene_farm_outside_2d.tscn | 26 +++++++++++-------- scenes/IndoorTest.tscn | 2 +- scenes/IndoorTest2.tscn | 2 +- scenes/testing/abandoned_street_2D.tscn | 2 +- 6 files changed, 23 insertions(+), 17 deletions(-) rename prefabs/{interactions => characters}/Player2D.tscn (100%) diff --git a/prefabs/interactions/Player2D.tscn b/prefabs/characters/Player2D.tscn similarity index 100% rename from prefabs/interactions/Player2D.tscn rename to prefabs/characters/Player2D.tscn diff --git a/project.godot b/project.godot index 8ea2825..b5df15e 100644 --- a/project.godot +++ b/project.godot @@ -23,17 +23,19 @@ InventoryManager="*res://scripts/CSharp/Common/Inventory/InventoryManager.cs" [dialogic] directories/dch_directory={ +"Yeli": "res://dialog/Yeli.dch", "defaulty_the_default_character": "res://dialog/defaulty_the_default_character.dch", "semi_cat": "res://dialog/semi_cat.dch" } directories/dtl_directory={ "semi_cat": "res://dialog/semi_cat.dtl", -"test_time_line": "res://dialog/test_time_line.dtl" +"test_time_line": "res://dialog/test_time_line.dtl", +"yeli_intro_01": "res://dialog/yeli_intro_01.dtl" } variables={} glossary/default_case_sensitive=true -layout/style_list=[] -layout/default_style="Default" +layout/style_list=["res://dialog/speechbubble.tres"] +layout/default_style="res://dialog/speechbubble.tres" extensions_folder="res://addons/dialogic_additions" text/letter_speed=0.01 text/initial_text_reveal_skippable=true diff --git a/scenes/Babushka_scene_farm_outside_2d.tscn b/scenes/Babushka_scene_farm_outside_2d.tscn index 45d3dda..ad04397 100644 --- a/scenes/Babushka_scene_farm_outside_2d.tscn +++ b/scenes/Babushka_scene_farm_outside_2d.tscn @@ -1,6 +1,6 @@ -[gd_scene load_steps=58 format=3 uid="uid://gigb28qk8t12"] +[gd_scene load_steps=59 format=3 uid="uid://gigb28qk8t12"] -[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/interactions/Player2D.tscn" id="1_7wfwe"] +[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"] [ext_resource type="Texture2D" uid="uid://c7f3t65jskd6v" path="res://art/mockups/house_prototype.png" id="2_lhtpe"] [ext_resource type="Texture2D" uid="uid://be1nofeo7an0" path="res://art/mockups/Kenney_Backgrounds/PNG/cloud2.png" id="3_r34wi"] @@ -26,6 +26,7 @@ [ext_resource type="Texture2D" uid="uid://btea6eyucsyxj" path="res://art/farm/farming/farmobjekte/zaun/tilable fence middle part.png" id="20_if5vh"] [ext_resource type="Texture2D" uid="uid://3ed3dgq3irn2" path="res://art/farm/farming/farmobjekte/zaun/tilable fence end part2.png" id="21_if5vh"] [ext_resource type="Texture2D" uid="uid://dg7rlugnq0t45" path="res://art/farm/farming/farmobjekte/brünnen.png" id="21_ualyd"] +[ext_resource type="PackedScene" uid="uid://dfvgp1my5rydh" path="res://prefabs/characters/Yeli.tscn" id="24_wtdui"] [ext_resource type="Script" uid="uid://dhxtdhfqx3bte" path="res://scripts/CSharp/Common/Farming/FieldService2D.cs" id="25_0qu0h"] [ext_resource type="PackedScene" uid="uid://dpbbroif2tnil" path="res://prefabs/interactions/generic_item_on_ground_2d.tscn" id="25_hukxv"] [ext_resource type="Resource" uid="uid://c5yg3lx756v4v" path="res://resources/items/hoe.tres" id="26_ipqaa"] @@ -123,11 +124,11 @@ shader_parameter/brightness_add = 0.0 shader_parameter/contrast_mult = 0.913 [sub_resource type="RectangleShape2D" id="RectangleShape2D_2nee2"] -size = Vector2(14208, 1176) +size = Vector2(12082, 1176) [sub_resource type="RectangleShape2D" id="RectangleShape2D_p6n74"] resource_local_to_scene = true -size = Vector2(5415, 1192) +size = Vector2(7340, 1192) [node name="BabushkaSceneFarmOutside2d" type="Node2D"] @@ -799,6 +800,9 @@ shape = SubResource("RectangleShape2D_klb81") z_index = 1 y_sort_enabled = true +[node name="Yeli" parent="YSorted" instance=ExtResource("24_wtdui")] +position = Vector2(6173, 2648) + [node name="Vesna" parent="YSorted" node_paths=PackedStringArray("_fieldParent") instance=ExtResource("1_7wfwe")] z_index = 1 position = Vector2(3180, 2125) @@ -810,7 +814,7 @@ _wateringCan = ExtResource("28_ipqaa") z_index = 1 y_sort_enabled = true material = SubResource("ShaderMaterial_2vojv") -position = Vector2(9376, 3296) +position = Vector2(7237, 3307) texture = ExtResource("21_ualyd") offset = Vector2(0, -800) @@ -829,7 +833,7 @@ position = Vector2(80, -368) shape = SubResource("CircleShape2D_p6n74") [node name="HoeGenericPickup" parent="YSorted" instance=ExtResource("25_hukxv")] -position = Vector2(8234, 2076) +position = Vector2(6095, 2087) [node name="SpawnWithItem" parent="YSorted/HoeGenericPickup" index="0"] _blueprint = ExtResource("26_ipqaa") @@ -838,7 +842,7 @@ _blueprint = ExtResource("26_ipqaa") shape = SubResource("CircleShape2D_2nee2") [node name="CanGenericPickup" parent="YSorted" instance=ExtResource("25_hukxv")] -position = Vector2(8841, 3496) +position = Vector2(6702, 3507) [node name="SpawnWithItem" parent="YSorted/CanGenericPickup" index="0"] _blueprint = ExtResource("28_ipqaa") @@ -847,7 +851,7 @@ _blueprint = ExtResource("28_ipqaa") shape = SubResource("CircleShape2D_ipqaa") [node name="RakeGenericPickup" parent="YSorted" instance=ExtResource("25_hukxv")] -position = Vector2(11091, 2060) +position = Vector2(8628, 2060) [node name="SpawnWithItem" parent="YSorted/RakeGenericPickup" index="0"] _blueprint = ExtResource("28_6b2nr") @@ -865,7 +869,7 @@ _blueprint = ExtResource("29_wtdui") shape = SubResource("CircleShape2D_ipqaa") [node name="ShovelGenericPickup" parent="YSorted" instance=ExtResource("25_hukxv")] -position = Vector2(7593, 2038) +position = Vector2(5454, 2049) [node name="SpawnWithItem" parent="YSorted/ShovelGenericPickup" index="0"] _blueprint = ExtResource("27_ipqaa") @@ -907,11 +911,11 @@ collision_mask = 5 collision_priority = 10.0 [node name="CollisionShape2D" type="CollisionShape2D" parent="YSorted/Farm visuals/FieldParent/Area2D"] -position = Vector2(1536, 2949) +position = Vector2(473, 2949) shape = SubResource("RectangleShape2D_2nee2") [node name="CollisionShape2D2" type="CollisionShape2D" parent="YSorted/Farm visuals/FieldParent/Area2D"] -position = Vector2(12955.5, 2960) +position = Vector2(11993, 2960) shape = SubResource("RectangleShape2D_p6n74") [node name="CanvasLayer" parent="." instance=ExtResource("32_2nee2")] diff --git a/scenes/IndoorTest.tscn b/scenes/IndoorTest.tscn index cd2f000..5c9f3be 100644 --- a/scenes/IndoorTest.tscn +++ b/scenes/IndoorTest.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://chvc0e4441o2k"] [ext_resource type="Texture2D" uid="uid://ejq7h5pgxl84" path="res://art/indoor/küchenraum.png" id="2_ttdge"] -[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/interactions/Player2D.tscn" id="3_oibke"] +[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Player2D.tscn" id="3_oibke"] [node name="IndoorTest" type="Node2D"] diff --git a/scenes/IndoorTest2.tscn b/scenes/IndoorTest2.tscn index c5a9d3d..3900788 100644 --- a/scenes/IndoorTest2.tscn +++ b/scenes/IndoorTest2.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=19 format=3 uid="uid://bm21nqepnwaik"] -[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/interactions/Player2D.tscn" id="2_a2ood"] +[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Player2D.tscn" id="2_a2ood"] [ext_resource type="Texture2D" uid="uid://waqmjrxduxfq" path="res://art/indoor/room export/Room_01_walls.png" id="3_a2ood"] [ext_resource type="Texture2D" uid="uid://cnhsxxps2cw5" path="res://art/indoor/room export/Room_01_table.png" id="3_je1cl"] [ext_resource type="Texture2D" uid="uid://blg50is4kuh2f" path="res://art/indoor/room export/Room_01_chair.png" id="4_hjjhl"] diff --git a/scenes/testing/abandoned_street_2D.tscn b/scenes/testing/abandoned_street_2D.tscn index 0c2e79c..a30ed4c 100644 --- a/scenes/testing/abandoned_street_2D.tscn +++ b/scenes/testing/abandoned_street_2D.tscn @@ -10,7 +10,7 @@ [ext_resource type="Texture2D" uid="uid://bradm5u7vjjxq" path="res://art/mockups/trees/darktree8.png" id="9_viosu"] [ext_resource type="Texture2D" uid="uid://bryqg0hb4f0ry" path="res://art/mockups/trees/darktree9.png" id="10_clutx"] [ext_resource type="Texture2D" uid="uid://c1iyeflkwaqxf" path="res://art/testingground/mushroom1.png" id="11_ovtse"] -[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/interactions/Player2D.tscn" id="12_k41x3"] +[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Player2D.tscn" id="12_k41x3"] [node name="AbandonedStreet" type="Node2D"]