Extended dialogic toggle

prefabs/UI/Inventory/Inventory.tscn

@@ -5,7 +5,7 @@
 [ext_resource type="Texture2D" uid="uid://dcidjcsqk12p1" path="res://art/ui/UI/UI_bag_export_02.png" id="4_df8i8"]
 [ext_resource type="Texture2D" uid="uid://c7wqla0mbu3np" path="res://art/ui/babushka_ui_tmp_inventory_select.png" id="4_tiss4"]
 [ext_resource type="PackedScene" uid="uid://c0kmdjeqkqrwv" path="res://prefabs/UI/Inventory/Slot.tscn" id="5_u7kje"]
-[ext_resource type="Script" uid="uid://cvkw4qd2hxksi" path="res://prefabs/UI/Inventory/dialogic_toggle.gd" id="6_n5apg"]
+[ext_resource type="Script" uid="uid://cvkw4qd2hxksi" path="res://scripts/GdScript/dialogic_toggle.gd" id="6_n5apg"]
 
 [node name="CanvasLayer" type="CanvasLayer"]
 layer = 90

prefabs/characters/Yeli.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=46 format=3 uid="uid://dfvgp1my5rydh"]
+[gd_scene load_steps=47 format=3 uid="uid://dfvgp1my5rydh"]
 
 [ext_resource type="Texture2D" uid="uid://c34012j5ukiuf" path="res://art/animation/Yeli2D/F01-Yeli_Idle/0001.png" id="1_03m0b"]
 [ext_resource type="Script" uid="uid://d2486x6upmwqq" path="res://scripts/GdScript/dialogic_starter.gd" id="1_at1n1"]
@@ -43,6 +43,7 @@
 [ext_resource type="Texture2D" uid="uid://droj8w1mbm5k3" path="res://art/animation/Yeli2D/F02-Yeli_Talk/0019.png" id="39_vg7xi"]
 [ext_resource type="Texture2D" uid="uid://by5vtadhdwwag" path="res://art/animation/Yeli2D/F02-Yeli_Talk/0020.png" id="40_ipyxb"]
 [ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interactions/interaction_area_2d.tscn" id="42_ahrat"]
+[ext_resource type="Script" uid="uid://cvkw4qd2hxksi" path="res://scripts/GdScript/dialogic_toggle.gd" id="44_aqu1t"]
 
 [sub_resource type="CircleShape2D" id="CircleShape2D_at1n1"]
 resource_local_to_scene = true
@@ -182,18 +183,23 @@ animations = [{
 }]
 
 [node name="Yeli" type="Node2D"]
+y_sort_enabled = true
 script = ExtResource("1_at1n1")
 
 [node name="InteractionArea" parent="." instance=ExtResource("42_ahrat")]
-scale = Vector2(1.72, 1.72)
+scale = Vector2(2.805, 2.805)
 
 [node name="CollisionShape3D" parent="InteractionArea/Area2D" index="0"]
 shape = SubResource("CircleShape2D_at1n1")
 
 [node name="Label" parent="InteractionArea" index="1"]
-visible = true
+top_level = true
-offset_left = -48.2558
+custom_minimum_size = Vector2(10, 10)
-offset_right = 4.74419
+offset_left = -94.0
+offset_top = 83.0
+offset_right = -39.65
+offset_bottom = 113.0
+scale = Vector2(3, 3)
 text = "[E] talk"
 
 [node name="TalkingControl" type="Node2D" parent="." node_paths=PackedStringArray("_sprite")]
@@ -203,11 +209,17 @@ _timelinesToPlay = PackedStringArray("yeli_intro_01")
 
 [node name="AnimatedSprite" type="AnimatedSprite2D" parent="TalkingControl"]
 y_sort_enabled = true
+position = Vector2(0, 450)
 sprite_frames = SubResource("SpriteFrames_f6hss")
 animation = &"idle"
 frame_progress = 0.437711
+offset = Vector2(0, -450)
+
+[node name="DialogicToggle" type="Node2D" parent="."]
+script = ExtResource("44_aqu1t")
 
 [connection signal="Interacted" from="InteractionArea" to="TalkingControl" method="ToggleTalking"]
 [connection signal="Talking" from="TalkingControl" to="." method="open"]
+[connection signal="timelineEnded" from="DialogicToggle" to="TalkingControl" method="ToggleTalking"]
 
 [editable path="InteractionArea"]

scenes/Babushka_scene_farm_outside_2d.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=59 format=3 uid="uid://gigb28qk8t12"]
+[gd_scene load_steps=60 format=3 uid="uid://gigb28qk8t12"]
 
 [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"]
@@ -37,13 +37,21 @@
 [ext_resource type="Resource" uid="uid://datee0flk1e84" path="res://resources/items/scythe.tres" id="29_wtdui"]
 [ext_resource type="PackedScene" uid="uid://cgjc4wurbgimy" path="res://prefabs/UI/Inventory/Inventory.tscn" id="32_2nee2"]
 
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_xy0kg"]
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_wtdui"]
 shader = ExtResource("13_7p0hq")
-shader_parameter/hue_shift = -0.981
+shader_parameter/hue_shift = -0.229
-shader_parameter/saturation_mult = 1.65
+shader_parameter/saturation_mult = 0.542
-shader_parameter/value_mult = 0.514
+shader_parameter/value_mult = 1.0
-shader_parameter/brightness_add = -0.145
+shader_parameter/brightness_add = 0.0
-shader_parameter/contrast_mult = 0.679
+shader_parameter/contrast_mult = 1.0
+
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_8ey8m"]
+shader = ExtResource("13_7p0hq")
+shader_parameter/hue_shift = -0.076
+shader_parameter/saturation_mult = 0.939
+shader_parameter/value_mult = 0.401
+shader_parameter/brightness_add = 0.0
+shader_parameter/contrast_mult = 1.0
 
 [sub_resource type="Gradient" id="Gradient_kt1wx"]
 colors = PackedColorArray(0.348791, 0.400092, 0.435264, 1, 0.219333, 0.251087, 0.329259, 1)
@@ -98,7 +106,7 @@ shader_parameter/hue_shift = 0.0
 shader_parameter/saturation_mult = 1.0
 shader_parameter/value_mult = 1.0
 shader_parameter/brightness_add = 0.0
-shader_parameter/contrast_mult = 1.398
+shader_parameter/contrast_mult = 1.183
 
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_0sfl7"]
 size = Vector2(728, 368)
@@ -299,7 +307,7 @@ scale = Vector2(1.7404, 1.77563)
 texture = ExtResource("11_vbdb2")
 
 [node name="background layer 4" type="ParallaxLayer" parent="ParallaxBackground"]
-position = Vector2(0, -256)
+position = Vector2(0, -82)
 motion_scale = Vector2(0.5, 0.5)
 motion_mirroring = Vector2(10500, 0)
 
@@ -417,22 +425,25 @@ scale = Vector2(3.008, 2.76803)
 texture = ExtResource("14_d53cn")
 
 [node name="JelenaMockupBg02" type="Sprite2D" parent="ParallaxBackground/background layer 4"]
+material = SubResource("ShaderMaterial_wtdui")
 position = Vector2(2668, 726)
 scale = Vector2(1.3, 1.3)
 texture = ExtResource("13_0qu0h")
 
 [node name="JelenaMockupBg03" type="Sprite2D" parent="ParallaxBackground/background layer 4"]
+material = SubResource("ShaderMaterial_wtdui")
 position = Vector2(7965, 728)
 scale = Vector2(1.3, 1.3)
 texture = ExtResource("13_0qu0h")
 
 [node name="back back trees layer" type="ParallaxLayer" parent="ParallaxBackground"]
+visible = false
 position = Vector2(0, -256)
 motion_scale = Vector2(0.7, 0.7)
 motion_mirroring = Vector2(9965, 0)
 
 [node name="hills" type="Sprite2D" parent="ParallaxBackground/back back trees layer"]
-modulate = Color(0.216853, 0.38, 0.2052, 1)
+modulate = Color(0.345703, 0.360648, 0.242876, 1)
 position = Vector2(993, 1576)
 scale = Vector2(5, 5)
 texture = ExtResource("7_sbyqw")
@@ -440,7 +451,7 @@ centered = false
 offset = Vector2(-200, -80)
 
 [node name="hills 1" type="Sprite2D" parent="ParallaxBackground/back back trees layer"]
-modulate = Color(0.216853, 0.38, 0.2052, 1)
+modulate = Color(0.345703, 0.360648, 0.242876, 1)
 position = Vector2(5961, 1582)
 scale = Vector2(5, 5)
 texture = ExtResource("8_kt1wx")
@@ -448,8 +459,7 @@ centered = false
 offset = Vector2(-200, -80)
 
 [node name="tree" type="Sprite2D" parent="ParallaxBackground/back back trees layer"]
-modulate = Color(0.216853, 0.38, 0.2052, 1)
+material = SubResource("ShaderMaterial_8ey8m")
-material = SubResource("ShaderMaterial_xy0kg")
 position = Vector2(3017.3, 536.15)
 scale = Vector2(1.7, 1.7)
 texture = ExtResource("13_1uen0")
@@ -457,8 +467,7 @@ region_enabled = true
 region_rect = Rect2(770, 3, 304, 979)
 
 [node name="tree2" type="Sprite2D" parent="ParallaxBackground/back back trees layer"]
-modulate = Color(0.216853, 0.38, 0.2052, 1)
+material = SubResource("ShaderMaterial_8ey8m")
-material = SubResource("ShaderMaterial_xy0kg")
 position = Vector2(1807.5, 1408)
 scale = Vector2(1.7, 1.7)
 texture = ExtResource("13_1uen0")
@@ -466,8 +475,7 @@ region_enabled = true
 region_rect = Rect2(399, 420, 228, 493)
 
 [node name="tree4" type="Sprite2D" parent="ParallaxBackground/back back trees layer"]
-modulate = Color(0.216853, 0.38, 0.2052, 1)
+material = SubResource("ShaderMaterial_8ey8m")
-material = SubResource("ShaderMaterial_xy0kg")
 position = Vector2(3321.3, 600.15)
 scale = Vector2(1.7, 1.7)
 texture = ExtResource("13_1uen0")
@@ -475,8 +483,7 @@ region_enabled = true
 region_rect = Rect2(1770, -4, 289, 930)
 
 [node name="tree11" type="Sprite2D" parent="ParallaxBackground/back back trees layer"]
-modulate = Color(0.216853, 0.38, 0.2052, 1)
+material = SubResource("ShaderMaterial_8ey8m")
-material = SubResource("ShaderMaterial_xy0kg")
 position = Vector2(460, 622)
 scale = Vector2(1.7, 1.7)
 texture = ExtResource("13_1uen0")
@@ -484,8 +491,7 @@ region_enabled = true
 region_rect = Rect2(1770, -4, 289, 930)
 
 [node name="tree5" type="Sprite2D" parent="ParallaxBackground/back back trees layer"]
-modulate = Color(0.216853, 0.38, 0.2052, 1)
+material = SubResource("ShaderMaterial_8ey8m")
-material = SubResource("ShaderMaterial_xy0kg")
 position = Vector2(5081.3, 696.15)
 scale = Vector2(1.7, 1.7)
 texture = ExtResource("13_1uen0")
@@ -493,8 +499,7 @@ region_enabled = true
 region_rect = Rect2(2283, 2, 186, 840)
 
 [node name="tree10" type="Sprite2D" parent="ParallaxBackground/back back trees layer"]
-modulate = Color(0.216853, 0.38, 0.2052, 1)
+material = SubResource("ShaderMaterial_8ey8m")
-material = SubResource("ShaderMaterial_xy0kg")
 position = Vector2(8470, 694)
 scale = Vector2(1.7, 1.7)
 texture = ExtResource("13_1uen0")
@@ -502,8 +507,7 @@ region_enabled = true
 region_rect = Rect2(2283, 2, 186, 840)
 
 [node name="tree3" type="Sprite2D" parent="ParallaxBackground/back back trees layer"]
-modulate = Color(0.216853, 0.38, 0.2052, 1)
+material = SubResource("ShaderMaterial_8ey8m")
-material = SubResource("ShaderMaterial_xy0kg")
 position = Vector2(6596.8, 1566.35)
 scale = Vector2(1.7, 1.7)
 texture = ExtResource("13_1uen0")
@@ -511,8 +515,7 @@ region_enabled = true
 region_rect = Rect2(399, 420, 228, 493)
 
 [node name="tree8" type="Sprite2D" parent="ParallaxBackground/back back trees layer"]
-modulate = Color(0.216853, 0.38, 0.2052, 1)
+material = SubResource("ShaderMaterial_8ey8m")
-material = SubResource("ShaderMaterial_xy0kg")
 position = Vector2(8110.6, 758.5)
 scale = Vector2(1.7, 1.7)
 texture = ExtResource("13_1uen0")
@@ -520,8 +523,7 @@ region_enabled = true
 region_rect = Rect2(1770, -4, 289, 930)
 
 [node name="tree9" type="Sprite2D" parent="ParallaxBackground/back back trees layer"]
-modulate = Color(0.216853, 0.38, 0.2052, 1)
+material = SubResource("ShaderMaterial_8ey8m")
-material = SubResource("ShaderMaterial_xy0kg")
 position = Vector2(10240, 850)
 scale = Vector2(1.7, 1.7)
 texture = ExtResource("13_1uen0")
@@ -529,8 +531,7 @@ region_enabled = true
 region_rect = Rect2(2283, 2, 186, 840)
 
 [node name="tree6" type="Sprite2D" parent="ParallaxBackground/back back trees layer"]
-modulate = Color(0.216853, 0.38, 0.2052, 1)
+material = SubResource("ShaderMaterial_8ey8m")
-material = SubResource("ShaderMaterial_xy0kg")
 position = Vector2(5641.3, 1168.15)
 scale = Vector2(1.7, 1.7)
 texture = ExtResource("13_1uen0")
@@ -538,8 +539,7 @@ region_enabled = true
 region_rect = Rect2(2609, 434, 304, 467)
 
 [node name="tree7" type="Sprite2D" parent="ParallaxBackground/back back trees layer"]
-modulate = Color(0.216853, 0.38, 0.2052, 1)
+material = SubResource("ShaderMaterial_8ey8m")
-material = SubResource("ShaderMaterial_xy0kg")
 position = Vector2(5161.3, 608.15)
 scale = Vector2(1.7, 1.7)
 texture = ExtResource("13_1uen0")
@@ -547,16 +547,14 @@ region_enabled = true
 region_rect = Rect2(3111, -4, 167, 949)
 
 [node name="bush" type="Sprite2D" parent="ParallaxBackground/back back trees layer"]
-modulate = Color(0.216853, 0.38, 0.2052, 1)
+material = SubResource("ShaderMaterial_8ey8m")
-material = SubResource("ShaderMaterial_xy0kg")
 position = Vector2(3239.5, 1288)
 texture = ExtResource("14_mrwmr")
 region_enabled = true
 region_rect = Rect2(149, 15, 464, 478)
 
 [node name="bush2" type="Sprite2D" parent="ParallaxBackground/back back trees layer"]
-modulate = Color(0.216853, 0.38, 0.2052, 1)
+material = SubResource("ShaderMaterial_8ey8m")
-material = SubResource("ShaderMaterial_xy0kg")
 position = Vector2(1791.5, 1448)
 texture = ExtResource("14_mrwmr")
 flip_h = true
@@ -564,8 +562,7 @@ region_enabled = true
 region_rect = Rect2(149, 15, 464, 478)
 
 [node name="bush3" type="Sprite2D" parent="ParallaxBackground/back back trees layer"]
-modulate = Color(0.216853, 0.38, 0.2052, 1)
+material = SubResource("ShaderMaterial_8ey8m")
-material = SubResource("ShaderMaterial_xy0kg")
 position = Vector2(1255.5, 1392)
 texture = ExtResource("14_mrwmr")
 flip_h = true
@@ -573,8 +570,7 @@ region_enabled = true
 region_rect = Rect2(-6, 996, 467, 429)
 
 [node name="bush4" type="Sprite2D" parent="ParallaxBackground/back back trees layer"]
-modulate = Color(0.216853, 0.38, 0.2052, 1)
+material = SubResource("ShaderMaterial_8ey8m")
-material = SubResource("ShaderMaterial_xy0kg")
 position = Vector2(5471.5, 1432)
 texture = ExtResource("14_mrwmr")
 flip_h = true
@@ -582,16 +578,14 @@ region_enabled = true
 region_rect = Rect2(2319, 1079, 353, 327)
 
 [node name="bush5" type="Sprite2D" parent="ParallaxBackground/back back trees layer"]
-modulate = Color(0.216853, 0.38, 0.2052, 1)
+material = SubResource("ShaderMaterial_8ey8m")
-material = SubResource("ShaderMaterial_xy0kg")
 position = Vector2(5007.5, 1312)
 texture = ExtResource("14_mrwmr")
 region_enabled = true
 region_rect = Rect2(2489, 707, 269, 224)
 
 [node name="bush6" type="Sprite2D" parent="ParallaxBackground/back back trees layer"]
-modulate = Color(0.216853, 0.38, 0.2052, 1)
+material = SubResource("ShaderMaterial_8ey8m")
-material = SubResource("ShaderMaterial_xy0kg")
 position = Vector2(3583.5, 1248)
 scale = Vector2(0.575, 0.575)
 texture = ExtResource("14_mrwmr")
@@ -600,6 +594,7 @@ region_enabled = true
 region_rect = Rect2(605, 877, 597, 537)
 
 [node name="back tree bois layer 5" type="ParallaxLayer" parent="ParallaxBackground"]
+visible = false
 position = Vector2(28, -28)
 motion_mirroring = Vector2(10000, 0)
 
@@ -833,6 +828,7 @@ position = Vector2(80, -368)
 shape = SubResource("CircleShape2D_p6n74")
 
 [node name="HoeGenericPickup" parent="YSorted" instance=ExtResource("25_hukxv")]
+visible = false
 position = Vector2(6095, 2087)
 
 [node name="SpawnWithItem" parent="YSorted/HoeGenericPickup" index="0"]
@@ -860,6 +856,7 @@ _blueprint = ExtResource("28_6b2nr")
 shape = SubResource("CircleShape2D_ipqaa")
 
 [node name="ScytheGenericPickup" parent="YSorted" instance=ExtResource("25_hukxv")]
+visible = false
 position = Vector2(15642, 2158)
 
 [node name="SpawnWithItem" parent="YSorted/ScytheGenericPickup" index="0"]
@@ -869,6 +866,7 @@ _blueprint = ExtResource("29_wtdui")
 shape = SubResource("CircleShape2D_ipqaa")
 
 [node name="ShovelGenericPickup" parent="YSorted" instance=ExtResource("25_hukxv")]
+visible = false
 position = Vector2(5454, 2049)
 
 [node name="SpawnWithItem" parent="YSorted/ShovelGenericPickup" index="0"]

scripts/GdScript/dialogic_toggle.gd

@@ -3,12 +3,19 @@ class_name dialogic_toggle
 
 @export var itemToToggle: CanvasItem
 
+signal timelineStarted
+signal timelineEnded
+
 func _ready() -> void:
 	Dialogic.timeline_ended.connect(_on_timeline_ended)
 	Dialogic.timeline_started.connect(_start_dialog)
 
 func _start_dialog() -> void:
-	itemToToggle.visible = false
+	if itemToToggle:
+		itemToToggle.visible = false
+	timelineStarted.emit()
 
 func _on_timeline_ended() -> void:
-	itemToToggle.visible = true
+	if itemToToggle:
+		itemToToggle.visible = true
+	timelineEnded.emit()