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

Merge branch 'develop' into feature/detection_cross

Browse Source 
# Conflicts:
#	addons/dialogic/vesna_style.tres
#	dialog/NPC_narrative.tres
#	scenes/Babushka_scene_indoor_vesnas_room.tscn
This commit is contained in:
Katharina Ziolkowski
2025-10-29 14:01:55 +01:00
parent 8b7afbcab6 afce4ad0b9
commit 1f13f3ea51
29 changed files with 593 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dialog/NPC_narrative.tres
+11 -20
View File
@@ -1,4 +1,4 @@
[gd_resource type="Resource" script_class="DialogicStyle" load_steps=21 format=3 uid="uid://f7q6jac5tsk8"]
[gd_resource type="Resource" script_class="DialogicStyle" load_steps=22 format=3 uid="uid://f7q6jac5tsk8"]
[ext_resource type="Script" uid="uid://dfx2htp24tuvm" path="res://addons/dialogic/Resources/dialogic_style_layer.gd" id="1_0jwhi"]
[ext_resource type="PackedScene" uid="uid://cqpb3ie51rwl5" path="res://addons/dialogic/Modules/DefaultLayoutParts/Base_Default/default_layout_base.tscn" id="1_8wrfq"]
@@ -17,9 +17,8 @@ script = ExtResource("1_0jwhi")
scene = ExtResource("1_8wrfq")
overrides = {
"global_bg_color": "Color(0.898375, 0.917922, 0.835355, 1)",
"global_font": "\"res://fonts/ShantellSans/static/ShantellSans-Regular.ttf\"",
"global_font_color": "Color(0.257812, 0.125248, 0.0533752, 1)",
"global_font_size": "45.0"
"global_font_size": "30.0"
}
[sub_resource type="Resource" id="Resource_uxnk3"]
@@ -29,9 +28,6 @@ scene = ExtResource("2_8wrfq")
[sub_resource type="Resource" id="Resource_ihoat"]
script = ExtResource("1_0jwhi")
scene = ExtResource("3_t7aeg")
overrides = {
"portrait_size_mode": "0"
}
[sub_resource type="Resource" id="Resource_pw0bl"]
script = ExtResource("1_0jwhi")
@@ -41,27 +37,17 @@ scene = ExtResource("4_85y6g")
script = ExtResource("1_0jwhi")
scene = ExtResource("5_reo2u")
overrides = {
"bold_font": "\"res://fonts/ShantellSans/static/ShantellSans-Bold.ttf\"",
"bold_italics_font": "\"res://fonts/ShantellSans/static/ShantellSans-BoldItalic.ttf\"",
"box_animation_in": "1",
"box_animation_out": "1",
"box_panel": "\"vn_textbox_default_panel.tres\"",
"box_size": "Vector2(1920, 300)",
"italics_font": "\"res://fonts/ShantellSans/static/ShantellSans-Italic.ttf\"",
"name_label_alignment": "2",
"name_label_box_modulate": "Color(1, 1, 1, 1)",
"name_label_box_offset": "Vector2(-200, 0)",
"name_label_box_panel": "\"res://dialog/Babushka_NPC_Namebox_background.tres\"",
"name_label_custom_font_size": "30.0",
"name_label_font": "\"res://fonts/HomemadeApple/HomemadeApple-Regular.ttf\"",
"name_label_use_global_color": "false",
"name_label_use_global_font": "false",
"next_indicator_texture": "\"res://addons/dialogic/Example Assets/next-indicator/next-indicator-dialogic-2.png\"",
"normal_font": "\"res://fonts/ShantellSans/static/ShantellSans-Regular.ttf\"",
"next_indicator_enabled": "false",
"text_alignment": "1",
"text_custom_color": "Color(0.8980392, 0.91764706, 0.8352941, 1)",
"text_size": "40.0",
"text_use_global_font": "false",
"typing_sounds_end_sound": "\"res://audio/sfx/UI/Dialog/SFX_Dialog_Open_01.wav\"",
"typing_sounds_sounds_folder": "\"res://audio/sfx/typing\""
}
@@ -90,10 +76,14 @@ scene = ExtResource("8_h83v4")
script = ExtResource("1_0jwhi")
scene = ExtResource("9_4c2uo")
[sub_resource type="Resource" id="Resource_0jwhi"]
script = ExtResource("1_0jwhi")
scene = ExtResource("6_i6h15")
[resource]
script = ExtResource("10_e3ue2")
name = "NPC_narrative"
layer_list = Array[String](["10", "11", "12", "13", "14", "15", "16", "17"])
layer_list = Array[String](["10", "11", "12", "13", "14", "15", "16", "17", "18"])
layer_info = {
"": SubResource("Resource_wg0yj"),
"10": SubResource("Resource_uxnk3"),
@@ -103,6 +93,7 @@ layer_info = {
"14": SubResource("Resource_clhbu"),
"15": SubResource("Resource_umvdi"),
"16": SubResource("Resource_ci2ul"),
"17": SubResource("Resource_sadu5")
"17": SubResource("Resource_sadu5"),
"18": SubResource("Resource_0jwhi")
}
metadata/_latest_layer = "14"
metadata/_latest_layer = "13"