diff --git a/addons/dialogic/vesna_style.tres b/addons/dialogic/vesna_style.tres index 34e72b9..905f738 100644 --- a/addons/dialogic/vesna_style.tres +++ b/addons/dialogic/vesna_style.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="DialogicStyle" load_steps=21 format=3 uid="uid://benfqi2myyn58"] +[gd_resource type="Resource" script_class="DialogicStyle" load_steps=20 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"] @@ -50,7 +50,7 @@ overrides = { "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": "\"res://dialog/Babushka_NPC_Namebox_background.tres\"", +"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_use_global_color": "false", @@ -87,14 +87,10 @@ 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", "18"]) +layer_list = Array[String](["10", "11", "12", "13", "14", "15", "16", "17"]) layer_info = { "": SubResource("Resource_qnla8"), "10": SubResource("Resource_awdqn"), @@ -104,7 +100,6 @@ layer_info = { "14": SubResource("Resource_qtijl"), "15": SubResource("Resource_nalij"), "16": SubResource("Resource_ymn1b"), -"17": SubResource("Resource_8j3qh"), -"18": SubResource("Resource_uu1x2") +"17": SubResource("Resource_8j3qh") } metadata/_latest_layer = "13" diff --git a/dialog/Characters/vesna.dch b/dialog/Characters/vesna.dch index bf36aba..65d8148 100644 --- a/dialog/Characters/vesna.dch +++ b/dialog/Characters/vesna.dch @@ -43,6 +43,15 @@ "offset": Vector2(150, 0), "scale": 0.8, "scene": "" +}, +"mute": { +"export_overrides": { +"image": "" +}, +"mirror": false, +"offset": Vector2(0, 0), +"scale": 1.0, +"scene": "" } }, &"scale": 1.0 diff --git a/dialog/NPC_narrative.tres b/dialog/NPC_narrative.tres index 8202caa..9beb54c 100644 --- a/dialog/NPC_narrative.tres +++ b/dialog/NPC_narrative.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="DialogicStyle" load_steps=22 format=3 uid="uid://f7q6jac5tsk8"] +[gd_resource type="Resource" script_class="DialogicStyle" load_steps=21 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"] @@ -90,14 +90,10 @@ 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", "18"]) +layer_list = Array[String](["10", "11", "12", "13", "14", "15", "16", "17"]) layer_info = { "": SubResource("Resource_wg0yj"), "10": SubResource("Resource_uxnk3"), @@ -107,7 +103,6 @@ layer_info = { "14": SubResource("Resource_clhbu"), "15": SubResource("Resource_umvdi"), "16": SubResource("Resource_ci2ul"), -"17": SubResource("Resource_sadu5"), -"18": SubResource("Resource_0jwhi") +"17": SubResource("Resource_sadu5") } -metadata/_latest_layer = "13" +metadata/_latest_layer = "14" diff --git a/prefabs/UI/Inventory/Inventory.tscn b/prefabs/UI/Inventory/Inventory.tscn index e7e6fd2..7a6d4da 100644 --- a/prefabs/UI/Inventory/Inventory.tscn +++ b/prefabs/UI/Inventory/Inventory.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=12 format=3 uid="uid://cgjc4wurbgimy"] +[gd_scene load_steps=13 format=3 uid="uid://cgjc4wurbgimy"] [ext_resource type="Script" uid="uid://hg7jay2kt441" path="res://scripts/CSharp/Common/Inventory/InventoryUi.cs" id="1_6wusm"] [ext_resource type="Script" uid="uid://cvkw4qd2hxksi" path="res://scripts/GdScript/dialogic_toggle.gd" id="1_l3npx"] @@ -10,6 +10,7 @@ [ext_resource type="Texture2D" uid="uid://cxptule8n38ph" path="res://art/ui/UI/UI_bag_export_highlight_03.png" id="7_l3npx"] [ext_resource type="PackedScene" uid="uid://2q1n6g2kj5er" path="res://prefabs/UI/Quest/QuestLog.tscn" id="7_vvo7l"] [ext_resource type="Texture2D" uid="uid://qwia360i1ir1" path="res://art/ui/UI/inventory_active.png" id="8_df8i8"] +[ext_resource type="Texture2D" uid="uid://b2q3xgw8xj880" path="res://art/ui/UI/quest_note.png" id="10_nw1un"] [sub_resource type="LabelSettings" id="LabelSettings_l3npx"] font_size = 50 @@ -476,37 +477,37 @@ label_settings = SubResource("LabelSettings_l3npx") [node name="QuestLogRoot" parent="." instance=ExtResource("7_vvo7l")] -[node name="Control" type="Control" parent="."] +[node name="QuestPostIt" type="Control" parent="."] layout_mode = 3 anchors_preset = 2 anchor_top = 1.0 anchor_bottom = 1.0 grow_vertical = 0 -[node name="ColorRect" type="ColorRect" parent="Control"] -custom_minimum_size = Vector2(200, 200) +[node name="TextureRect" type="TextureRect" parent="QuestPostIt"] layout_mode = 0 offset_left = 150.0 offset_top = -250.0 -offset_right = 350.0 -offset_bottom = -50.0 -color = Color(1, 1, 0.584314, 1) +offset_right = 392.0 +offset_bottom = -37.0 +texture = ExtResource("10_nw1un") script = ExtResource("6_n5apg") _showPosition = Vector2(150, -250) _hidePosition = Vector2(150, 50) -[node name="Text" type="Label" parent="Control/ColorRect"] +[node name="Text" type="Label" parent="QuestPostIt/TextureRect"] layout_mode = 1 anchors_preset = -1 anchor_right = 1.0 anchor_bottom = 1.0 offset_left = 20.0 -offset_top = 20.0 +offset_top = 15.0 offset_right = -20.0 -offset_bottom = -20.0 +offset_bottom = -25.0 grow_horizontal = 2 grow_vertical = 2 theme_override_colors/font_color = Color(0, 0, 0, 1) +theme_override_font_sizes/font_size = 23 text = "[Hier könnte Ihre Werbung stehen]" horizontal_alignment = 1 vertical_alignment = 1