diff --git a/Dialogue/Characters/Cirno.dch b/Dialogue/Characters/Cirno.dch index 1c916081..e09016b5 100644 --- a/Dialogue/Characters/Cirno.dch +++ b/Dialogue/Characters/Cirno.dch @@ -2,7 +2,7 @@ "@path": "res://addons/dialogic/Resources/character.gd", "@subpath": NodePath(""), &"_translation_id": "", -&"color": Color(1, 1, 1, 1), +&"color": Color(0.537255, 0.85098, 0.85098, 1), &"custom_info": { "sound_mood_default": "", "sound_moods": {}, diff --git a/Dialogue/Characters/Colonel.dch b/Dialogue/Characters/Colonel.dch index 39d481aa..c3a0a09f 100644 --- a/Dialogue/Characters/Colonel.dch +++ b/Dialogue/Characters/Colonel.dch @@ -2,7 +2,7 @@ "@path": "res://addons/dialogic/Resources/character.gd", "@subpath": NodePath(""), &"_translation_id": "", -&"color": Color(1, 1, 1, 1), +&"color": Color(0.27451, 0.419608, 0.364706, 1), &"custom_info": { "sound_mood_default": "", "sound_moods": {}, @@ -15,15 +15,6 @@ &"nicknames": [""], &"offset": Vector2(0, 0), &"portraits": { -"Default": { -"export_overrides": { -"image": "\"res://Sprites/Portraits/Colonel.png\"" -}, -"mirror": false, -"offset": Vector2(0, 0), -"scale": 1, -"scene": "" -}, "Explaining": { "export_overrides": { "image": "\"res://Sprites/Expression/Colonel/Colonel01.png\"" diff --git a/Dialogue/Characters/ICE.dch b/Dialogue/Characters/ICE.dch index c7f50177..2b67eff0 100644 --- a/Dialogue/Characters/ICE.dch +++ b/Dialogue/Characters/ICE.dch @@ -2,7 +2,7 @@ "@path": "res://addons/dialogic/Resources/character.gd", "@subpath": NodePath(""), &"_translation_id": "", -&"color": Color(1, 1, 1, 1), +&"color": Color(0.254902, 0.529412, 0.568627, 1), &"custom_info": { "sound_mood_default": "", "sound_moods": {}, @@ -15,15 +15,6 @@ &"nicknames": [""], &"offset": Vector2(0, 0), &"portraits": { -"Default": { -"export_overrides": { -"image": "\"res://Sprites/Portraits/ICE.png\"" -}, -"mirror": false, -"offset": Vector2(0, 0), -"scale": 1, -"scene": "" -}, "Happy": { "export_overrides": { "image": "\"res://Sprites/Expression/ICE/ICE02.png\"" diff --git a/Dialogue/Characters/Rumia.dch b/Dialogue/Characters/Rumia.dch index 10857b60..9e68c594 100644 --- a/Dialogue/Characters/Rumia.dch +++ b/Dialogue/Characters/Rumia.dch @@ -2,7 +2,7 @@ "@path": "res://addons/dialogic/Resources/character.gd", "@subpath": NodePath(""), &"_translation_id": "", -&"color": Color(1, 1, 1, 1), +&"color": Color(0.831373, 0.65098, 0.227451, 1), &"custom_info": { "sound_mood_default": "", "sound_moods": {}, diff --git a/Dialogue/Styles/Textbox_style.tres b/Dialogue/Styles/Textbox_style.tres index a94aa910..e98570f4 100644 --- a/Dialogue/Styles/Textbox_style.tres +++ b/Dialogue/Styles/Textbox_style.tres @@ -4,9 +4,9 @@ [ext_resource type="Script" uid="uid://dh4po8pgey4yv" path="res://addons/dialogic/Resources/dialogic_style_layer.gd" id="1_5pbjb"] [ext_resource type="PackedScene" uid="uid://c1k5m0w3r40xf" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_FullBackground/full_background_layer.tscn" id="2_6fieu"] [ext_resource type="PackedScene" uid="uid://cn674foxwedqu" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_Input/full_advance_input_layer.tscn" id="3_uwd3s"] -[ext_resource type="PackedScene" uid="uid://by6waso0mjpjp" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_SpeakerPortraitTextbox/textbox_with_speaker_portrait.tscn" id="4_m8ph6"] [ext_resource type="PackedScene" uid="uid://dsbwnp5hegnu3" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_Glossary/glossary_popup_layer.tscn" id="5_xqoux"] [ext_resource type="PackedScene" uid="uid://dhk6j6eb6e3q" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Choices/vn_choice_layer.tscn" id="6_6flnb"] +[ext_resource type="PackedScene" uid="uid://cx6y8bri11i6d" path="res://Resources/Styles/Textbox_Style_Custom_Textbox/TextboxWithPortrait/custom_textbox_with_portrait_.tscn" id="6_kdmoh"] [ext_resource type="PackedScene" uid="uid://cvgf4c6gg0tsy" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_TextInput/text_input_layer.tscn" id="7_qp31f"] [ext_resource type="PackedScene" uid="uid://lx24i8fl6uo" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_History/history_layer.tscn" id="8_ckc0n"] [ext_resource type="Script" uid="uid://dfja8ptqdlfix" path="res://addons/dialogic/Resources/dialogic_style.gd" id="9_qfqf2"] @@ -15,8 +15,8 @@ script = ExtResource("1_5pbjb") scene = ExtResource("1_4vo3k") overrides = { -"global_font": "\"res://fonts/at01.ttf\"", -"global_font_size": "16.0" +"global_font": "\"res://fonts/Silver.ttf\"", +"global_font_size": "19.0" } [sub_resource type="Resource" id="Resource_fuhfn"] @@ -31,11 +31,12 @@ overrides = {} [sub_resource type="Resource" id="Resource_seyn7"] script = ExtResource("1_5pbjb") -scene = ExtResource("4_m8ph6") +scene = ExtResource("6_kdmoh") overrides = { "box_distance": "0.0", -"box_panel": "\"res://Dialogue/Styles/square_stylebox.tres\"", +"box_panel": "\"res://Resources/Styles/PixelStyleBoxRed_SquareBackground.tres\"", "box_size": "Vector2(300, 80)", +"name_label_color_mode": "1", "name_label_custom_size": "10.0", "text_custom_size": "6.0" } @@ -76,4 +77,4 @@ layer_info = { } base_overrides = {} layers = Array[ExtResource("1_5pbjb")]([]) -metadata/_latest_layer = "12" +metadata/_latest_layer = "" diff --git a/Dialogue/Styles/VN.tres b/Dialogue/Styles/VN.tres index 071b38b1..7fb737c9 100644 --- a/Dialogue/Styles/VN.tres +++ b/Dialogue/Styles/VN.tres @@ -14,8 +14,8 @@ [sub_resource type="Resource" id="Resource_mqh25"] script = ExtResource("1_47mos") overrides = { -"global_font": "\"res://fonts/at01.ttf\"", -"global_font_size": "16.0" +"global_font": "\"res://fonts/Silver.ttf\"", +"global_font_size": "19.0" } [sub_resource type="Resource" id="Resource_5h7h2"] diff --git a/Resources/Credits.tres b/Resources/Credits.tres index 3a12ba63..33adda64 100644 --- a/Resources/Credits.tres +++ b/Resources/Credits.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="CreditsCollection" load_steps=21 format=3 uid="uid://cojsc1rtf41i1"] +[gd_resource type="Resource" script_class="CreditsCollection" load_steps=22 format=3 uid="uid://cojsc1rtf41i1"] [ext_resource type="Script" uid="uid://buq8eurx510ps" path="res://Scripts/Resources/CreditsCollection.cs" id="1_0bwsf"] [ext_resource type="Script" uid="uid://bc4f4ggvk3ktf" path="res://Scripts/Resources/CreditsEntry.cs" id="1_aaqha"] @@ -111,7 +111,13 @@ Name = "Neoqueto" Contribution = "Fonts" metadata/_custom_type_script = "uid://bc4f4ggvk3ktf" +[sub_resource type="Resource" id="Resource_k4ucw"] +script = ExtResource("1_aaqha") +Name = "Poppy Works" +Contribution = "Silver Font" +metadata/_custom_type_script = "uid://bc4f4ggvk3ktf" + [resource] script = ExtResource("1_0bwsf") -Credits = Array[ExtResource("1_aaqha")]([SubResource("Resource_ep84i"), SubResource("Resource_ianh3"), SubResource("Resource_m7fsk"), SubResource("Resource_ans3w"), SubResource("Resource_1cmaw"), SubResource("Resource_vda0h"), SubResource("Resource_daaek"), SubResource("Resource_8vv0q"), SubResource("Resource_321dv"), SubResource("Resource_j7pkh"), SubResource("Resource_aaqha"), SubResource("Resource_gr2tg"), SubResource("Resource_b8hlh"), SubResource("Resource_gbaov"), SubResource("Resource_jkmrk"), SubResource("Resource_ivgyk"), SubResource("Resource_n6vk1")]) +Credits = Array[ExtResource("1_aaqha")]([SubResource("Resource_ep84i"), SubResource("Resource_ianh3"), SubResource("Resource_m7fsk"), SubResource("Resource_ans3w"), SubResource("Resource_1cmaw"), SubResource("Resource_vda0h"), SubResource("Resource_daaek"), SubResource("Resource_8vv0q"), SubResource("Resource_321dv"), SubResource("Resource_j7pkh"), SubResource("Resource_aaqha"), SubResource("Resource_gr2tg"), SubResource("Resource_b8hlh"), SubResource("Resource_gbaov"), SubResource("Resource_jkmrk"), SubResource("Resource_ivgyk"), SubResource("Resource_n6vk1"), SubResource("Resource_k4ucw")]) metadata/_custom_type_script = "uid://buq8eurx510ps" diff --git a/Resources/Styles/Dialogic_TextBox_Custom/DefaultLayoutBase/custom_default_layout_base.tscn b/Resources/Styles/Dialogic_TextBox_Custom/DefaultLayoutBase/custom_default_layout_base.tscn new file mode 100644 index 00000000..ee99b611 --- /dev/null +++ b/Resources/Styles/Dialogic_TextBox_Custom/DefaultLayoutBase/custom_default_layout_base.tscn @@ -0,0 +1,8 @@ +[gd_scene load_steps=2 format=3 uid="uid://ch1q7fv72saii"] + +[ext_resource type="Script" uid="uid://bcowue6w1sdxs" path="res://addons/dialogic/Modules/DefaultLayoutParts/Base_Default/default_layout_base.gd" id="1_ifsho"] + +[node name="DefaultLayoutBase" type="CanvasLayer"] +script = ExtResource("1_ifsho") +global_font = "uid://cc3bdt3rt8a1o" +global_font_size = 19 diff --git a/Resources/Styles/Dialogic_TextBox_Custom/DefaultLayoutBase/default_layout_base.gd b/Resources/Styles/Dialogic_TextBox_Custom/DefaultLayoutBase/default_layout_base.gd new file mode 100644 index 00000000..4562d68f --- /dev/null +++ b/Resources/Styles/Dialogic_TextBox_Custom/DefaultLayoutBase/default_layout_base.gd @@ -0,0 +1,19 @@ +@tool +extends DialogicLayoutBase + +## The default layout base scene. + +@export var canvas_layer: int = 1 +@export var follow_viewport: bool = false + +@export_subgroup("Global") +@export var global_bg_color: Color = Color(0, 0, 0, 0.9) +@export var global_font_color: Color = Color("white") +@export_file('*.ttf', '*.tres') var global_font: String = "" +@export var global_font_size: int = 18 + + +func _apply_export_overrides() -> void: + # apply layer + set(&'layer', canvas_layer) + set(&'follow_viewport_enabled', follow_viewport) diff --git a/Resources/Styles/Dialogic_TextBox_Custom/DefaultLayoutBase/default_layout_base.gd.uid b/Resources/Styles/Dialogic_TextBox_Custom/DefaultLayoutBase/default_layout_base.gd.uid new file mode 100644 index 00000000..87cd8438 --- /dev/null +++ b/Resources/Styles/Dialogic_TextBox_Custom/DefaultLayoutBase/default_layout_base.gd.uid @@ -0,0 +1 @@ +uid://bwvf4nl2tw8tl diff --git a/Resources/Styles/Dialogue/CustomTextboxStyle/custom_textbox_style.tscn b/Resources/Styles/Dialogue/CustomTextboxStyle/custom_textbox_style.tscn new file mode 100644 index 00000000..672d22e3 --- /dev/null +++ b/Resources/Styles/Dialogue/CustomTextboxStyle/custom_textbox_style.tscn @@ -0,0 +1,105 @@ +[gd_scene load_steps=17 format=3 uid="uid://c88rhk1uktibh"] + +[ext_resource type="Script" uid="uid://bcowue6w1sdxs" path="res://addons/dialogic/Modules/DefaultLayoutParts/Base_Default/default_layout_base.gd" id="1_ifsho"] +[ext_resource type="PackedScene" uid="uid://c1k5m0w3r40xf" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_FullBackground/full_background_layer.tscn" id="2_4ap2k"] +[ext_resource type="Script" uid="uid://c7frh5xu7x34r" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_FullBackground/full_background_layer.gd" id="3_t6u6x"] +[ext_resource type="PackedScene" uid="uid://cn674foxwedqu" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_Input/full_advance_input_layer.tscn" id="4_dtw0c"] +[ext_resource type="Script" uid="uid://bqc33k65j5ioy" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_Input/full_advance_input_layer.gd" id="5_ixcfc"] +[ext_resource type="PackedScene" uid="uid://by6waso0mjpjp" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_SpeakerPortraitTextbox/textbox_with_speaker_portrait.tscn" id="6_2i86k"] +[ext_resource type="Script" uid="uid://dmxeo7lm8ftsi" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_SpeakerPortraitTextbox/speaker_portrait_textbox_layer.gd" id="7_vwcvu"] +[ext_resource type="PackedScene" uid="uid://dsbwnp5hegnu3" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_Glossary/glossary_popup_layer.tscn" id="8_vlnng"] +[ext_resource type="Script" uid="uid://dbbd73i5odrjs" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_Glossary/glossary_popup_layer.gd" id="9_puffk"] +[ext_resource type="PackedScene" uid="uid://dhk6j6eb6e3q" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Choices/vn_choice_layer.tscn" id="10_15qnt"] +[ext_resource type="Script" uid="uid://c8we4ppbftu0e" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Choices/vn_choice_layer.gd" id="11_cnlur"] +[ext_resource type="PackedScene" uid="uid://cvgf4c6gg0tsy" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_TextInput/text_input_layer.tscn" id="12_2f1ul"] +[ext_resource type="Script" uid="uid://i5l4pdftho0h" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_TextInput/text_input_layer.gd" id="13_pitac"] +[ext_resource type="PackedScene" uid="uid://lx24i8fl6uo" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_History/history_layer.tscn" id="14_nj00e"] +[ext_resource type="Script" uid="uid://jlhgg7cs1iap" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_History/history_layer.gd" id="15_dj8ph"] +[ext_resource type="PackedScene" uid="uid://cuoywrmvda1yg" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_History/example_history_item.tscn" id="16_8capi"] + +[node name="Custom" type="CanvasLayer"] +script = ExtResource("1_ifsho") +global_font = "uid://cc3bdt3rt8a1o" +global_font_size = 19 + +[node name="BackgroundLayer" type="Control" parent="." instance=ExtResource("2_4ap2k")] +layout_direction = 2 +layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +script = ExtResource("3_t6u6x") +apply_overrides_on_ready = true + +[node name="FullAdvanceInputLayer" type="Control" parent="." instance=ExtResource("4_dtw0c")] +layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +mouse_filter = 2 +script = ExtResource("5_ixcfc") +apply_overrides_on_ready = true + +[node name="TextboxWithSpeakerPortrait" type="Control" parent="." instance=ExtResource("6_2i86k")] +layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +mouse_filter = 2 +script = ExtResource("7_vwcvu") +text_custom_size = 6 +name_label_custom_size = 10 +box_panel = "res://Resources/Styles/PixelStyleBoxRed_SquareBackground.tres" +box_size = Vector2(300, 80) +box_distance = 0 +apply_overrides_on_ready = true + +[node name="Glossary" type="Control" parent="." instance=ExtResource("8_vlnng")] +layout_mode = 3 +anchors_preset = 0 +mouse_filter = 2 +script = ExtResource("9_puffk") +apply_overrides_on_ready = true + +[node name="VN_ChoiceLayer" type="Control" parent="." instance=ExtResource("10_15qnt")] +layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +mouse_filter = 2 +script = ExtResource("11_cnlur") +apply_overrides_on_ready = true + +[node name="TextInputLayer" type="Control" parent="." instance=ExtResource("12_2f1ul")] +layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +mouse_filter = 2 +script = ExtResource("13_pitac") +apply_overrides_on_ready = true + +[node name="ExampleHistoryScene" type="Control" parent="." instance=ExtResource("14_nj00e")] +layout_direction = 1 +layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 +mouse_filter = 2 +script = ExtResource("15_dj8ph") +HistoryItem = ExtResource("16_8capi") +apply_overrides_on_ready = true diff --git a/Resources/Styles/Silver_Text.tres b/Resources/Styles/Silver_Text.tres new file mode 100644 index 00000000..64335523 --- /dev/null +++ b/Resources/Styles/Silver_Text.tres @@ -0,0 +1,10 @@ +[gd_resource type="LabelSettings" load_steps=2 format=3 uid="uid://ct4jf3wlfmc4w"] + +[ext_resource type="FontFile" uid="uid://cc3bdt3rt8a1o" path="res://fonts/Silver.ttf" id="1_y5rfn"] + +[resource] +line_spacing = 1.0 +font = ExtResource("1_y5rfn") +font_size = 19 +outline_size = 4 +outline_color = Color(0, 0, 0, 1) diff --git a/Resources/Styles/Textbox_Style_Custom_Textbox/TextboxWithPortrait/custom_textbox_with_portrait_.tscn b/Resources/Styles/Textbox_Style_Custom_Textbox/TextboxWithPortrait/custom_textbox_with_portrait_.tscn new file mode 100644 index 00000000..b7304e5e --- /dev/null +++ b/Resources/Styles/Textbox_Style_Custom_Textbox/TextboxWithPortrait/custom_textbox_with_portrait_.tscn @@ -0,0 +1,131 @@ +[gd_scene load_steps=8 format=3 uid="uid://cx6y8bri11i6d"] + +[ext_resource type="Script" uid="uid://cfcx0of1aekhk" path="res://addons/dialogic/Modules/Character/node_portrait_container.gd" id="1_4jxq7"] +[ext_resource type="Script" uid="uid://dmxeo7lm8ftsi" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_SpeakerPortraitTextbox/speaker_portrait_textbox_layer.gd" id="1_7jt4d"] +[ext_resource type="Script" uid="uid://be3h8wr0w68dx" path="res://addons/dialogic/Modules/Text/node_name_label.gd" id="2_y0h34"] +[ext_resource type="Script" uid="uid://ddkvkdb6nxtyi" path="res://addons/dialogic/Modules/Text/node_dialog_text.gd" id="3_11puy"] +[ext_resource type="FontFile" uid="uid://cc3bdt3rt8a1o" path="res://fonts/Silver.ttf" id="4_5grjp"] +[ext_resource type="Script" uid="uid://bkfrnlul8c6cv" path="res://addons/dialogic/Modules/Text/node_type_sound.gd" id="5_sr2qw"] + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_dmg1w"] +bg_color = Color(0.254902, 0.254902, 0.254902, 1) +skew = Vector2(0.073, 0) +corner_radius_top_left = 3 +corner_radius_top_right = 3 +corner_radius_bottom_right = 3 +corner_radius_bottom_left = 3 + +[node name="TextboxWithSpeakerPortrait" type="Control"] +layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +mouse_filter = 2 +script = ExtResource("1_7jt4d") +text_custom_size = 19 +box_panel = "res://addons/dialogic/Modules/DefaultLayoutParts/Layer_SpeakerPortraitTextbox/default_stylebox.tres" + +[node name="Anchor" type="Control" parent="."] +layout_mode = 1 +anchors_preset = 7 +anchor_left = 0.5 +anchor_top = 1.0 +anchor_right = 0.5 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 0 +mouse_filter = 2 + +[node name="Panel" type="PanelContainer" parent="Anchor"] +unique_name_in_owner = true +self_modulate = Color(0.533333, 0.376471, 0.176471, 1) +layout_mode = 1 +anchors_preset = 7 +anchor_left = 0.5 +anchor_top = 1.0 +anchor_right = 0.5 +anchor_bottom = 1.0 +offset_left = -250.0 +offset_top = -200.0 +offset_right = 250.0 +offset_bottom = -50.0 +grow_horizontal = 2 +grow_vertical = 0 +mouse_filter = 2 + +[node name="HBox" type="HBoxContainer" parent="Anchor/Panel"] +layout_mode = 2 +mouse_filter = 2 +theme_override_constants/separation = 15 + +[node name="PortraitPanel" type="Panel" parent="Anchor/Panel/HBox"] +unique_name_in_owner = true +clip_children = 1 +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_stretch_ratio = 0.3 +mouse_filter = 2 +theme_override_styles/panel = SubResource("StyleBoxFlat_dmg1w") + +[node name="PortraitBackgroundColor" type="ColorRect" parent="Anchor/Panel/HBox/PortraitPanel"] +unique_name_in_owner = true +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +offset_left = -7.0 +offset_top = -3.0 +offset_right = 7.0 +offset_bottom = 3.0 +grow_horizontal = 2 +grow_vertical = 2 +mouse_filter = 2 +color = Color(0, 0, 0, 0.231373) + +[node name="DialogicNode_PortraitContainer" type="Control" parent="Anchor/Panel/HBox/PortraitPanel/PortraitBackgroundColor"] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +offset_top = 4.0 +grow_horizontal = 2 +grow_vertical = 2 +mouse_filter = 2 +script = ExtResource("1_4jxq7") +mode = 1 +container_ids = PackedStringArray("1") + +[node name="VBoxContainer" type="VBoxContainer" parent="Anchor/Panel/HBox"] +layout_mode = 2 +size_flags_horizontal = 3 +mouse_filter = 2 +theme_override_constants/separation = -6 + +[node name="DialogicNode_NameLabel" type="Label" parent="Anchor/Panel/HBox/VBoxContainer"] +unique_name_in_owner = true +layout_mode = 2 +theme_override_constants/line_spacing = -8 +theme_override_fonts/font = ExtResource("4_5grjp") +theme_override_font_sizes/font_size = 19 +text = "Name" +script = ExtResource("2_y0h34") + +[node name="DialogicNode_DialogText" type="RichTextLabel" parent="Anchor/Panel/HBox/VBoxContainer" node_paths=PackedStringArray("textbox_root")] +unique_name_in_owner = true +layout_mode = 2 +size_flags_vertical = 3 +theme_override_constants/line_separation = -8 +theme_override_fonts/normal_font = ExtResource("4_5grjp") +theme_override_font_sizes/normal_font_size = 19 +bbcode_enabled = true +text = "Some text +on two lines" +scroll_following = true +visible_characters_behavior = 1 +script = ExtResource("3_11puy") +textbox_root = NodePath("../../..") + +[node name="DialogicNode_TypeSounds" type="AudioStreamPlayer" parent="Anchor/Panel/HBox/VBoxContainer/DialogicNode_DialogText"] +script = ExtResource("5_sr2qw") diff --git a/Resources/Styles/Textbox_Style_Custom_Textbox/TextboxWithPortrait/speaker_portrait_textbox_layer.gd b/Resources/Styles/Textbox_Style_Custom_Textbox/TextboxWithPortrait/speaker_portrait_textbox_layer.gd new file mode 100644 index 00000000..61e3714b --- /dev/null +++ b/Resources/Styles/Textbox_Style_Custom_Textbox/TextboxWithPortrait/speaker_portrait_textbox_layer.gd @@ -0,0 +1,129 @@ +@tool +extends DialogicLayoutLayer + +enum Alignments {LEFT, CENTER, RIGHT} +enum LimitedAlignments {LEFT=0, RIGHT=1} + +@export_group('Text') +@export_subgroup("Text") +@export var text_alignment: Alignments = Alignments.LEFT +@export_subgroup('Size') +@export var text_use_global_size: bool = true +@export var text_custom_size: int = 15 +@export_subgroup('Color') +@export var text_use_global_color: bool = true +@export var text_custom_color: Color = Color.WHITE +@export_subgroup('Fonts') +@export var use_global_fonts: bool = true +@export_file('*.ttf', '*.tres') var custom_normal_font: String = "" +@export_file('*.ttf', '*.tres') var custom_bold_font: String = "" +@export_file('*.ttf', '*.tres') var custom_italic_font: String = "" +@export_file('*.ttf', '*.tres') var custom_bold_italic_font: String = "" + +@export_group('Name Label') +@export_subgroup("Color") +enum NameLabelColorModes {GLOBAL_COLOR, CHARACTER_COLOR, CUSTOM_COLOR} +@export var name_label_color_mode: NameLabelColorModes = NameLabelColorModes.GLOBAL_COLOR +@export var name_label_custom_color: Color = Color.WHITE +@export_subgroup("Behaviour") +@export var name_label_alignment: Alignments = Alignments.LEFT +@export var name_label_hide_when_no_character: bool = false +@export_subgroup("Font & Size") +@export var name_label_use_global_size: bool = true +@export var name_label_custom_size: int = 15 +@export var name_label_use_global_font: bool = true +@export_file('*.ttf', '*.tres') var name_label_customfont: String = "" + +@export_group('Box') +@export_subgroup("Box") +@export_file('*.tres') var box_panel: String = this_folder.path_join("default_stylebox.tres") +@export var box_modulate_global_color: bool = true +@export var box_modulate_custom_color: Color = Color(0.47247135639191, 0.31728461384773, 0.16592600941658) +@export var box_size: Vector2 = Vector2(600, 160) +@export var box_distance: int = 25 + +@export_group('Portrait') +@export_subgroup('Portrait') +@export var portrait_stretch_factor: float = 0.3 +@export var portrait_position: LimitedAlignments = LimitedAlignments.LEFT +@export var portrait_bg_modulate: Color = Color(0, 0, 0, 0.5137255191803) + + +## Called by dialogic whenever export overrides might change +func _apply_export_overrides() -> void: + ## FONT SETTINGS + var dialog_text: DialogicNode_DialogText = %DialogicNode_DialogText + dialog_text.alignment = text_alignment as DialogicNode_DialogText.Alignment + + var text_size: int = text_custom_size + if text_use_global_size: + text_size = get_global_setting(&'font_size', text_custom_size) + + dialog_text.add_theme_font_size_override(&"normal_font_size", text_size) + dialog_text.add_theme_font_size_override(&"bold_font_size", text_size) + dialog_text.add_theme_font_size_override(&"italics_font_size", text_size) + dialog_text.add_theme_font_size_override(&"bold_italics_font_size", text_size) + + + var text_color: Color = text_custom_color + if text_use_global_color: + text_color = get_global_setting(&'font_color', text_custom_color) + dialog_text.add_theme_color_override(&"default_color", text_color) + + var normal_font: String = custom_normal_font + if use_global_fonts and ResourceLoader.exists(get_global_setting(&'font', '') as String): + normal_font = get_global_setting(&'font', '') + + if !normal_font.is_empty(): + dialog_text.add_theme_font_override(&"normal_font", load(normal_font) as Font) + if !custom_bold_font.is_empty(): + dialog_text.add_theme_font_override(&"bold_font", load(custom_bold_font) as Font) + if !custom_italic_font.is_empty(): + dialog_text.add_theme_font_override(&"italics_font", load(custom_italic_font) as Font) + if !custom_bold_italic_font.is_empty(): + dialog_text.add_theme_font_override(&"bold_italics_font", load(custom_bold_italic_font) as Font) + + ## BOX SETTINGS + var panel: PanelContainer = %Panel + var portrait_panel: Panel = %PortraitPanel + if box_modulate_global_color: + panel.self_modulate = get_global_setting(&'bg_color', box_modulate_custom_color) + else: + panel.self_modulate = box_modulate_custom_color + panel.size = box_size + panel.position = Vector2(-box_size.x/2, -box_size.y-box_distance) + portrait_panel.size_flags_stretch_ratio = portrait_stretch_factor + + var stylebox: StyleBox = load(box_panel) + panel.add_theme_stylebox_override(&'panel', stylebox) + + ## PORTRAIT SETTINGS + var portrait_background_color: ColorRect = %PortraitBackgroundColor + portrait_background_color.color = portrait_bg_modulate + + portrait_panel.get_parent().move_child(portrait_panel, portrait_position) + + ## NAME LABEL SETTINGS + var name_label: DialogicNode_NameLabel = %DialogicNode_NameLabel + if name_label_use_global_size: + name_label.add_theme_font_size_override(&"font_size", get_global_setting(&'font_size', name_label_custom_size) as int) + else: + name_label.add_theme_font_size_override(&"font_size", name_label_custom_size) + + var name_label_font: String = name_label_customfont + if name_label_use_global_font and ResourceLoader.exists(get_global_setting(&'font', '') as String): + name_label_font = get_global_setting(&'font', '') + if !name_label_font.is_empty(): + name_label.add_theme_font_override(&'font', load(name_label_font) as Font) + + name_label.use_character_color = false + match name_label_color_mode: + NameLabelColorModes.GLOBAL_COLOR: + name_label.add_theme_color_override(&"font_color", get_global_setting(&'font_color', name_label_custom_color) as Color) + NameLabelColorModes.CUSTOM_COLOR: + name_label.add_theme_color_override(&"font_color", name_label_custom_color) + NameLabelColorModes.CHARACTER_COLOR: + name_label.use_character_color = true + + name_label.horizontal_alignment = name_label_alignment as HorizontalAlignment + name_label.hide_when_empty = name_label_hide_when_no_character diff --git a/Resources/Styles/Textbox_Style_Custom_Textbox/TextboxWithPortrait/speaker_portrait_textbox_layer.gd.uid b/Resources/Styles/Textbox_Style_Custom_Textbox/TextboxWithPortrait/speaker_portrait_textbox_layer.gd.uid new file mode 100644 index 00000000..f6697b0d --- /dev/null +++ b/Resources/Styles/Textbox_Style_Custom_Textbox/TextboxWithPortrait/speaker_portrait_textbox_layer.gd.uid @@ -0,0 +1 @@ +uid://hafbuna061kh diff --git a/Resources/Styles/cirno_square_stylebox.tres b/Resources/Styles/cirno_square_stylebox.tres new file mode 100644 index 00000000..7d4f9490 --- /dev/null +++ b/Resources/Styles/cirno_square_stylebox.tres @@ -0,0 +1,12 @@ +[gd_resource type="StyleBoxFlat" format=3 uid="uid://d1vblh0fnhuhf"] + +[resource] +content_margin_left = 10.0 +content_margin_top = 10.0 +content_margin_right = 10.0 +content_margin_bottom = 10.0 +bg_color = Color(1, 1, 1, 1) +corner_radius_top_left = 10 +corner_radius_top_right = 10 +corner_radius_bottom_right = 10 +corner_radius_bottom_left = 10 diff --git a/Scenes/HUD/HUD.tscn b/Scenes/HUD/HUD.tscn index 2001cb2d..27b8a9dc 100644 --- a/Scenes/HUD/HUD.tscn +++ b/Scenes/HUD/HUD.tscn @@ -18,8 +18,8 @@ [ext_resource type="Texture2D" uid="uid://bhmtp6i2g2f1c" path="res://Sprites/UI/ShieldBar.png" id="12_n0pka"] [ext_resource type="Texture2D" uid="uid://cihsd5rw8i5xm" path="res://Sprites/UI/ShieldBar_Foreground.png" id="13_j6myr"] [ext_resource type="StyleBox" uid="uid://24hh6h4juk3r" path="res://Resources/Styles/PixelStyleBoxRed_SquareBackground.tres" id="13_sjdna"] -[ext_resource type="Texture2D" uid="uid://d4lqqgx8yvp5" path="res://Sprites/Portraits/Status_Cirno.png" id="15_bkqle"] [ext_resource type="Script" uid="uid://cwd3sksjqpuy3" path="res://Scripts/Utils/FpsCounterLabel.cs" id="15_x61tu"] +[ext_resource type="Texture2D" uid="uid://cid62phhew3ep" path="res://Sprites/UI/StatusSprite02.png" id="19_n0pka"] [sub_resource type="LabelSettings" id="LabelSettings_a7f6n"] font = ExtResource("2_0xmx2") @@ -206,7 +206,6 @@ offset_right = 226.0 offset_bottom = 144.0 [node name="InventoryMenu" type="TabContainer" parent="."] -visible = false offset_left = 16.0 offset_top = 9.0 offset_right = 305.0 @@ -214,11 +213,12 @@ offset_bottom = 153.0 mouse_filter = 2 theme = ExtResource("9_sx5r0") theme_override_fonts/font = ExtResource("6_sk1eq") -current_tab = 0 +current_tab = 4 script = ExtResource("11_7pulb") metadata/_edit_group_ = true [node name="Weapons" type="ItemList" parent="InventoryMenu"] +visible = false layout_mode = 2 theme = ExtResource("9_sx5r0") theme_override_styles/panel = ExtResource("13_sjdna") @@ -266,7 +266,6 @@ ItemsFilter = Array[int]([0, 1, 2, 13, 10, 11, 12]) metadata/_tab_index = 3 [node name="Status" type="PanelContainer" parent="InventoryMenu"] -visible = false layout_mode = 2 theme = ExtResource("9_sx5r0") theme_override_styles/panel = ExtResource("13_sjdna") @@ -300,7 +299,7 @@ label_settings = SubResource("LabelSettings_bkqle") [node name="TextureRect" type="TextureRect" parent="InventoryMenu/Status/HBoxContainer/VBoxContainer"] layout_mode = 2 size_flags_vertical = 3 -texture = ExtResource("15_bkqle") +texture = ExtResource("19_n0pka") expand_mode = 1 stretch_mode = 3 diff --git a/Scenes/HUD/IntroLogos.tscn b/Scenes/HUD/IntroLogos.tscn index 93860d4a..77e8adc6 100644 --- a/Scenes/HUD/IntroLogos.tscn +++ b/Scenes/HUD/IntroLogos.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" uid="uid://catf2cx0f8cnu" path="res://Scripts/UI/IntroLogos.cs" id="1_p43sh"] [ext_resource type="Texture2D" uid="uid://dfncwtgc4ae6e" path="res://Sprites/UI/MaddoLogo.png" id="1_rm3c6"] -[ext_resource type="LabelSettings" uid="uid://buk3e7bbwmnv1" path="res://Resources/Styles/Hud_Text_Style.tres" id="2_ryg35"] +[ext_resource type="LabelSettings" uid="uid://ct4jf3wlfmc4w" path="res://Resources/Styles/Silver_Text.tres" id="3_p43sh"] [sub_resource type="Gradient" id="Gradient_p43sh"] colors = PackedColorArray(0.027451, 0.0941176, 0.129412, 1, 0.027451, 0.0941176, 0.129412, 1) @@ -22,7 +22,15 @@ grow_horizontal = 2 grow_vertical = 2 texture = SubResource("GradientTexture1D_ahpdu") +[node name="TextureRect2" type="TextureRect" parent="."] +offset_left = 80.0 +offset_top = -47.0 +offset_right = 240.0 +offset_bottom = 97.0 +texture = ExtResource("1_rm3c6") + [node name="CenterContainer" type="CenterContainer" parent="."] +visible = false anchors_preset = 5 anchor_left = 0.5 anchor_right = 0.5 @@ -31,10 +39,6 @@ offset_right = 80.0 offset_bottom = 144.0 grow_horizontal = 2 -[node name="TextureRect" type="TextureRect" parent="CenterContainer"] -layout_mode = 2 -texture = ExtResource("1_rm3c6") - [node name="VBoxContainer" type="VBoxContainer" parent="."] anchors_preset = 7 anchor_left = 0.5 @@ -50,13 +54,14 @@ theme_override_constants/separation = -1 [node name="Label" type="Label" parent="VBoxContainer"] layout_mode = 2 -text = "This is a non official Touhou Project game. -Original By" -label_settings = ExtResource("2_ryg35") +text = "This is a non official Touhou Project fangame. +Original By:" +label_settings = ExtResource("3_p43sh") horizontal_alignment = 1 [node name="Label2" type="Label" parent="VBoxContainer"] layout_mode = 2 -text = "上海アリス幻樂団" -label_settings = ExtResource("2_ryg35") +text = "Team Shanghai Alice +上海アリス幻樂団" +label_settings = ExtResource("3_p43sh") horizontal_alignment = 1 diff --git a/Scenes/Maps/PlayerFSMTest.tscn b/Scenes/Maps/PlayerFSMTest.tscn index 3ff929f3..9b21466a 100644 --- a/Scenes/Maps/PlayerFSMTest.tscn +++ b/Scenes/Maps/PlayerFSMTest.tscn @@ -61,7 +61,7 @@ [sub_resource type="Resource" id="Resource_6wo78"] script = ExtResource("4_u1i8n") EggIndex = 0 -StartingEquipment = Array[ExtResource("5_u1i8n")]([]) +StartingEquipment = [] [sub_resource type="RectangleShape2D" id="RectangleShape2D_rff8l"] size = Vector2(30, 52.5) diff --git a/Scenes/test.tscn b/Scenes/test.tscn index d48a92e7..b9c7aef0 100644 --- a/Scenes/test.tscn +++ b/Scenes/test.tscn @@ -575,7 +575,7 @@ IsEnabled = true Target = NodePath("../DebugTeleporter") [node name="DebugTeleporter" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("30_8fdby")] -position = Vector2(-1498, -111) +position = Vector2(-1078, -97) Invisible = true metadata/_edit_group_ = true @@ -1063,7 +1063,7 @@ position = Vector2(-2000, -736) [node name="ControlPad8" parent="Parallax2D/Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Targets") instance=ExtResource("12_hfkf1")] position = Vector2(-2027, -735) Targets = [NodePath("../HorizontalForceField")] -Requirements = Array[ExtResource("6_8tdlb")]([ExtResource("84_ma1ta")]) +Requirements = [ExtResource("84_ma1ta")] [node name="Ammo6" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("34_17pjh")] position = Vector2(-872, -220) diff --git a/Sprites/Expression/Cirno/Cirno10.png b/Sprites/Expression/Cirno/Cirno10.png index 18b583ec..e0bf0f75 100644 --- a/Sprites/Expression/Cirno/Cirno10.png +++ b/Sprites/Expression/Cirno/Cirno10.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:240ba8856006937c6aee9c82da01893a8bc2d661541b54567e29baed8ee88f2a -size 4968 +oid sha256:0bcdaa8ccbd676529c9bc153691dd1e391fb4aa328a83ec1ee6cde88de411a97 +size 4962 diff --git a/Sprites/Expression/Cirno/Cirno11.png b/Sprites/Expression/Cirno/Cirno11.png index 444fb9bc..c90bc786 100644 --- a/Sprites/Expression/Cirno/Cirno11.png +++ b/Sprites/Expression/Cirno/Cirno11.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f5f87ab361bdb4c767a40175be6d8ea056cc556488040cdeeeb4f068e51b1d76 +oid sha256:5b3380221e3d16dccf6827ba233b3413f4468177514b30c89f7831e1a4b16f02 size 4950 diff --git a/addons/dialogic/Modules/DefaultLayoutParts/Base_Default/default_layout_base.gd b/addons/dialogic/Modules/DefaultLayoutParts/Base_Default/default_layout_base.gd index af6878ca..4562d68f 100644 --- a/addons/dialogic/Modules/DefaultLayoutParts/Base_Default/default_layout_base.gd +++ b/addons/dialogic/Modules/DefaultLayoutParts/Base_Default/default_layout_base.gd @@ -17,5 +17,3 @@ func _apply_export_overrides() -> void: # apply layer set(&'layer', canvas_layer) set(&'follow_viewport_enabled', follow_viewport) - - diff --git a/fonts/Silver.ttf b/fonts/Silver.ttf new file mode 100644 index 00000000..7c06c406 Binary files /dev/null and b/fonts/Silver.ttf differ diff --git a/fonts/Silver.ttf.import b/fonts/Silver.ttf.import new file mode 100644 index 00000000..0c9264f7 --- /dev/null +++ b/fonts/Silver.ttf.import @@ -0,0 +1,35 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://cc3bdt3rt8a1o" +path="res://.godot/imported/Silver.ttf-e86112895925d94211f102ce0cc558b8.fontdata" + +[deps] + +source_file="res://fonts/Silver.ttf" +dest_files=["res://.godot/imported/Silver.ttf-e86112895925d94211f102ce0cc558b8.fontdata"] + +[params] + +Rendering=null +antialiasing=1 +generate_mipmaps=false +disable_embedded_bitmaps=true +multichannel_signed_distance_field=false +msdf_pixel_range=8 +msdf_size=48 +allow_system_fallback=true +force_autohinter=false +hinting=1 +subpixel_positioning=4 +keep_rounding_remainders=true +oversampling=0.0 +Fallbacks=null +fallbacks=[] +Compress=null +compress=true +preload=[] +language_support={} +script_support={} +opentype_features={}