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
addons/dialogic/vesna_style.tres
+12 -21
View File
@@ -1,4 +1,4 @@
[gd_resource type="Resource" script_class="DialogicStyle" load_steps=20 format=3 uid="uid://benfqi2myyn58"]
[gd_resource type="Resource" script_class="DialogicStyle" load_steps=21 format=3 uid="uid://benfqi2myyn58"]
[ext_resource type="Script" uid="uid://dfx2htp24tuvm" path="res://addons/dialogic/Resources/dialogic_style_layer.gd" id="1_kc0s3"]
[ext_resource type="PackedScene" uid="uid://c1k5m0w3r40xf" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_FullBackground/full_background_layer.tscn" id="2_wjopr"]
@@ -15,9 +15,8 @@
script = ExtResource("1_kc0s3")
overrides = {
"global_bg_color": "Color(0.898039, 0.917647, 0.835294, 1)",
"global_font": "\"res://fonts/ShantellSans/static/ShantellSans-Regular.ttf\"",
"global_font_color": "Color(0.258824, 0.12549, 0.054902, 1)",
"global_font_size": "45.0"
"global_font_size": "30.0"
}
[sub_resource type="Resource" id="Resource_awdqn"]
@@ -27,9 +26,6 @@ scene = ExtResource("2_wjopr")
[sub_resource type="Resource" id="Resource_5pou4"]
script = ExtResource("1_kc0s3")
scene = ExtResource("3_depsi")
overrides = {
"portrait_size_mode": "0"
}
[sub_resource type="Resource" id="Resource_6xrvb"]
script = ExtResource("1_kc0s3")
@@ -39,24 +35,14 @@ scene = ExtResource("4_wy5ku")
script = ExtResource("1_kc0s3")
scene = ExtResource("5_6srh5")
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_color_custom": "Color(0.88, 0.6688, 0.73568, 1)",
"box_color_use_global": "false",
"box_panel": "\"vn_textbox_default_panel.tres\"",
"box_size": "Vector2(1920, 300)",
"italics_font": "\"res://fonts/ShantellSans/static/ShantellSans-Italic.ttf\"",
"name_label_box_modulate": "Color(1, 1, 1, 1)",
"name_label_box_offset": "Vector2(200, 0)",
"name_label_box_panel": "\"Babushka_NPC_Namebox_background.tres\"",
"name_label_custom_font_size": "40.0",
"name_label_font": "\"res://fonts/HomemadeApple/HomemadeApple-Regular.ttf\"",
"name_label_box_panel": "\"res://dialog/Babushka_NPC_Namebox_background.tres\"",
"name_label_custom_font_size": "30.0",
"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_size": "40.0",
"typing_sounds_end_sound": "\"res://audio/sfx/UI/Dialog/SFX_Dialog_Open_01.wav\"",
@@ -87,10 +73,14 @@ scene = ExtResource("8_4ig6v")
script = ExtResource("1_kc0s3")
scene = ExtResource("9_gni8k")
[sub_resource type="Resource" id="Resource_uu1x2"]
script = ExtResource("1_kc0s3")
scene = ExtResource("6_iipq0")
[resource]
script = ExtResource("10_l174f")
name = "vesna_style"
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_qnla8"),
"10": SubResource("Resource_awdqn"),
@@ -100,6 +90,7 @@ layer_info = {
"14": SubResource("Resource_qtijl"),
"15": SubResource("Resource_nalij"),
"16": SubResource("Resource_ymn1b"),
"17": SubResource("Resource_8j3qh")
"17": SubResource("Resource_8j3qh"),
"18": SubResource("Resource_uu1x2")
}
metadata/_latest_layer = "13"