diff --git a/Dialogue.gd b/Dialogue.gd index 083a030..9aff8fd 100644 --- a/Dialogue.gd +++ b/Dialogue.gd @@ -1,6 +1,7 @@ extends Control func _ready(): + $RichTextLabel/Logo.hide() $VBoxContainer/ButtonTemplate.hide() func continue_dialogue(): @@ -12,7 +13,7 @@ func continue_dialogue(): $Wol.resume() func _on_Wol_line(line): - $RichTextLabel.text = line.text + $RichTextLabel.bbcode_text = line.text $Tween.remove_all() $Tween.interpolate_property( diff --git a/Dialogue.tscn b/Dialogue.tscn index 964a0cd..5c470b1 100644 --- a/Dialogue.tscn +++ b/Dialogue.tscn @@ -1,8 +1,46 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=12 format=2] -[ext_resource path="res://addons/Wol/Ostrich Sans Font.tres" type="DynamicFont" id=1] -[ext_resource path="res://addons/Wol/Wol.gd" type="Script" id=2] +[ext_resource path="res://addons/Wol/Wol.gd" type="Script" id=1] +[ext_resource path="res://addons/Wol/logo.svg" type="Texture" id=3] +[ext_resource path="res://addons/Wol/font/Italic.tres" type="DynamicFont" id=4] +[ext_resource path="res://addons/Wol/font/Regular.tres" type="DynamicFont" id=5] +[ext_resource path="res://addons/Wol/font/Bold.tres" type="DynamicFont" id=6] [ext_resource path="res://Dialogue.gd" type="Script" id=7] +[ext_resource path="res://addons/Wol/font/ItalicBold.tres" type="DynamicFont" id=8] + +[sub_resource type="StyleBoxFlat" id=2] +bg_color = Color( 0.705882, 0.709804, 0.74902, 1 ) +corner_radius_top_left = 32 +corner_radius_top_right = 32 +corner_radius_bottom_right = 32 +corner_radius_bottom_left = 32 + +[sub_resource type="StyleBoxFlat" id=4] +bg_color = Color( 0.2914, 0.29295, 0.31, 1 ) +corner_radius_top_left = 32 +corner_radius_top_right = 32 +corner_radius_bottom_right = 32 +corner_radius_bottom_left = 32 + +[sub_resource type="StyleBoxFlat" id=3] +bg_color = Color( 0.490196, 0.501961, 0.619608, 1 ) +border_width_left = 2 +border_width_top = 2 +border_width_right = 2 +border_width_bottom = 2 +border_color = Color( 0.705, 0.70875, 0.75, 1 ) +corner_radius_top_left = 32 +corner_radius_top_right = 32 +corner_radius_bottom_right = 32 +corner_radius_bottom_left = 32 + +[sub_resource type="StyleBoxFlat" id=1] +bg_color = Color( 0, 0, 0, 1 ) +border_blend = true +corner_radius_top_left = 32 +corner_radius_top_right = 32 +corner_radius_bottom_right = 32 +corner_radius_bottom_left = 32 [node name="Dialogue" type="Control"] anchor_right = 1.0 @@ -12,13 +50,36 @@ __meta__ = { "_edit_use_anchors_": false } +[node name="Background" type="ColorRect" parent="."] +anchor_right = 1.0 +anchor_bottom = 1.0 +__meta__ = { +"_edit_use_anchors_": false +} + [node name="Wol" type="Node" parent="."] -script = ExtResource( 2 ) +script = ExtResource( 1 ) path = "res://dialogue.yarn" auto_start = true variable_storage = { } +[node name="Logo" type="TextureRect" parent="."] +anchor_left = 1.0 +anchor_top = 1.0 +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = -198.0 +margin_top = -98.0 +margin_right = -16.0 +margin_bottom = -16.0 +texture = ExtResource( 3 ) +expand = true +stretch_mode = 6 +__meta__ = { +"_edit_use_anchors_": false +} + [node name="RichTextLabel" type="RichTextLabel" parent="."] anchor_right = 1.0 anchor_bottom = 1.0 @@ -26,10 +87,30 @@ margin_left = 16.0 margin_top = 16.0 margin_right = -16.0 margin_bottom = -256.0 -custom_fonts/normal_font = ExtResource( 1 ) +custom_colors/default_color = Color( 0, 0, 0, 1 ) +custom_fonts/bold_italics_font = ExtResource( 8 ) +custom_fonts/italics_font = ExtResource( 4 ) +custom_fonts/bold_font = ExtResource( 6 ) +custom_fonts/normal_font = ExtResource( 5 ) +bbcode_enabled = true +bbcode_text = "Here is where the [i]dialogue[/i] will go. + +[b]Run the scene[/b] in order to see how works." text = "Here is where the dialogue will go. -Run the scene in order to see how \"wol\" works." +Run the scene in order to see how works." +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="Logo" type="TextureRect" parent="RichTextLabel"] +margin_left = 790.0 +margin_top = 139.0 +margin_right = 875.0 +margin_bottom = 181.0 +texture = ExtResource( 3 ) +expand = true +stretch_mode = 6 __meta__ = { "_edit_use_anchors_": false } @@ -46,8 +127,12 @@ __meta__ = { [node name="ButtonTemplate" type="Button" parent="VBoxContainer"] margin_right = 992.0 -margin_bottom = 66.0 -custom_fonts/font = ExtResource( 1 ) +margin_bottom = 63.0 +custom_fonts/font = ExtResource( 6 ) +custom_styles/hover = SubResource( 2 ) +custom_styles/pressed = SubResource( 4 ) +custom_styles/focus = SubResource( 3 ) +custom_styles/normal = SubResource( 1 ) text = "This is a dialogue option" [node name="Tween" type="Tween" parent="."] diff --git a/addons/Wol/Ostrich Sans Font.tres b/addons/Wol/Ostrich Sans Font.tres deleted file mode 100644 index 6710887..0000000 --- a/addons/Wol/Ostrich Sans Font.tres +++ /dev/null @@ -1,11 +0,0 @@ -[gd_resource type="DynamicFont" load_steps=2 format=2] - -[ext_resource path="res://addons/Wol/OstrichSans-Heavy.otf" type="DynamicFontData" id=1] - -[resource] -size = 64 -use_mipmaps = true -use_filter = true -extra_spacing_top = 8 -extra_spacing_bottom = 8 -font_data = ExtResource( 1 ) diff --git a/addons/Wol/Ostrich Sans Heavy LICENSE OFL.txt b/addons/Wol/Ostrich Sans Heavy LICENSE OFL.txt deleted file mode 100644 index f1a20ac..0000000 --- a/addons/Wol/Ostrich Sans Heavy LICENSE OFL.txt +++ /dev/null @@ -1,97 +0,0 @@ -Copyright (c) , (), -with Reserved Font Name . -Copyright (c) , (), -with Reserved Font Name . -Copyright (c) , (). - -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/addons/Wol/OstrichSans-Heavy.otf b/addons/Wol/OstrichSans-Heavy.otf deleted file mode 100644 index e93aed3..0000000 Binary files a/addons/Wol/OstrichSans-Heavy.otf and /dev/null differ diff --git a/addons/Wol/Wol.gd b/addons/Wol/Wol.gd index 8aa3946..dd6f04b 100644 --- a/addons/Wol/Wol.gd +++ b/addons/Wol/Wol.gd @@ -1,6 +1,5 @@ tool extends Node -class_name Wol signal node_started(node) signal node_finished(node) diff --git a/addons/Wol/assets/.!11279!icon.png b/addons/Wol/assets/.!11279!icon.png deleted file mode 100644 index e69de29..0000000 diff --git a/addons/Wol/assets/.!11280!.DS_Store b/addons/Wol/assets/.!11280!.DS_Store deleted file mode 100644 index e69de29..0000000 diff --git a/addons/Wol/assets/icon.png b/addons/Wol/assets/icon.png deleted file mode 100644 index c52b1db..0000000 Binary files a/addons/Wol/assets/icon.png and /dev/null differ diff --git a/addons/Wol/font/Aileron-Black.otf b/addons/Wol/font/Aileron-Black.otf new file mode 100644 index 0000000..c5eb31f Binary files /dev/null and b/addons/Wol/font/Aileron-Black.otf differ diff --git a/addons/Wol/font/Aileron-BlackItalic.otf b/addons/Wol/font/Aileron-BlackItalic.otf new file mode 100644 index 0000000..4fdd167 Binary files /dev/null and b/addons/Wol/font/Aileron-BlackItalic.otf differ diff --git a/addons/Wol/font/Aileron-Bold.otf b/addons/Wol/font/Aileron-Bold.otf new file mode 100644 index 0000000..c2bfaab Binary files /dev/null and b/addons/Wol/font/Aileron-Bold.otf differ diff --git a/addons/Wol/font/Aileron-BoldItalic.otf b/addons/Wol/font/Aileron-BoldItalic.otf new file mode 100644 index 0000000..0de2da9 Binary files /dev/null and b/addons/Wol/font/Aileron-BoldItalic.otf differ diff --git a/addons/Wol/font/Aileron-Heavy.otf b/addons/Wol/font/Aileron-Heavy.otf new file mode 100644 index 0000000..86adc32 Binary files /dev/null and b/addons/Wol/font/Aileron-Heavy.otf differ diff --git a/addons/Wol/font/Aileron-HeavyItalic.otf b/addons/Wol/font/Aileron-HeavyItalic.otf new file mode 100644 index 0000000..5a7b44b Binary files /dev/null and b/addons/Wol/font/Aileron-HeavyItalic.otf differ diff --git a/addons/Wol/font/Aileron-Italic.otf b/addons/Wol/font/Aileron-Italic.otf new file mode 100644 index 0000000..4fcf7e0 Binary files /dev/null and b/addons/Wol/font/Aileron-Italic.otf differ diff --git a/addons/Wol/font/Aileron-Light.otf b/addons/Wol/font/Aileron-Light.otf new file mode 100644 index 0000000..ec44343 Binary files /dev/null and b/addons/Wol/font/Aileron-Light.otf differ diff --git a/addons/Wol/font/Aileron-LightItalic.otf b/addons/Wol/font/Aileron-LightItalic.otf new file mode 100644 index 0000000..5a095ab Binary files /dev/null and b/addons/Wol/font/Aileron-LightItalic.otf differ diff --git a/addons/Wol/font/Aileron-Regular.otf b/addons/Wol/font/Aileron-Regular.otf new file mode 100644 index 0000000..4248f6f Binary files /dev/null and b/addons/Wol/font/Aileron-Regular.otf differ diff --git a/addons/Wol/font/Aileron-SemiBold.otf b/addons/Wol/font/Aileron-SemiBold.otf new file mode 100644 index 0000000..b1f507d Binary files /dev/null and b/addons/Wol/font/Aileron-SemiBold.otf differ diff --git a/addons/Wol/font/Aileron-SemiBoldItalic.otf b/addons/Wol/font/Aileron-SemiBoldItalic.otf new file mode 100644 index 0000000..2b7924e Binary files /dev/null and b/addons/Wol/font/Aileron-SemiBoldItalic.otf differ diff --git a/addons/Wol/font/Aileron-Thin.otf b/addons/Wol/font/Aileron-Thin.otf new file mode 100644 index 0000000..39b6e99 Binary files /dev/null and b/addons/Wol/font/Aileron-Thin.otf differ diff --git a/addons/Wol/font/Aileron-ThinItalic.otf b/addons/Wol/font/Aileron-ThinItalic.otf new file mode 100644 index 0000000..df40ebf Binary files /dev/null and b/addons/Wol/font/Aileron-ThinItalic.otf differ diff --git a/addons/Wol/font/Aileron-UltraLight.otf b/addons/Wol/font/Aileron-UltraLight.otf new file mode 100644 index 0000000..4131241 Binary files /dev/null and b/addons/Wol/font/Aileron-UltraLight.otf differ diff --git a/addons/Wol/font/Aileron-UltraLightItalic.otf b/addons/Wol/font/Aileron-UltraLightItalic.otf new file mode 100644 index 0000000..17d762e Binary files /dev/null and b/addons/Wol/font/Aileron-UltraLightItalic.otf differ diff --git a/addons/Wol/font/Bold.tres b/addons/Wol/font/Bold.tres new file mode 100644 index 0000000..8dd8577 --- /dev/null +++ b/addons/Wol/font/Bold.tres @@ -0,0 +1,9 @@ +[gd_resource type="DynamicFont" load_steps=2 format=2] + +[ext_resource path="res://addons/Wol/font/Aileron-SemiBold.otf" type="DynamicFontData" id=1] + +[resource] +size = 52 +use_mipmaps = true +use_filter = true +font_data = ExtResource( 1 ) diff --git a/addons/Wol/font/Italic.tres b/addons/Wol/font/Italic.tres new file mode 100644 index 0000000..d6f30de --- /dev/null +++ b/addons/Wol/font/Italic.tres @@ -0,0 +1,9 @@ +[gd_resource type="DynamicFont" load_steps=2 format=2] + +[ext_resource path="res://addons/Wol/font/Aileron-LightItalic.otf" type="DynamicFontData" id=1] + +[resource] +size = 52 +use_mipmaps = true +use_filter = true +font_data = ExtResource( 1 ) diff --git a/addons/Wol/font/ItalicBold.tres b/addons/Wol/font/ItalicBold.tres new file mode 100644 index 0000000..b873a36 --- /dev/null +++ b/addons/Wol/font/ItalicBold.tres @@ -0,0 +1,9 @@ +[gd_resource type="DynamicFont" load_steps=2 format=2] + +[ext_resource path="res://addons/Wol/font/Aileron-SemiBoldItalic.otf" type="DynamicFontData" id=1] + +[resource] +size = 52 +use_mipmaps = true +use_filter = true +font_data = ExtResource( 1 ) diff --git a/addons/Wol/font/Regular.tres b/addons/Wol/font/Regular.tres new file mode 100644 index 0000000..f86f0e3 --- /dev/null +++ b/addons/Wol/font/Regular.tres @@ -0,0 +1,9 @@ +[gd_resource type="DynamicFont" load_steps=2 format=2] + +[ext_resource path="res://addons/Wol/font/Aileron-Light.otf" type="DynamicFontData" id=1] + +[resource] +size = 52 +use_mipmaps = true +use_filter = true +font_data = ExtResource( 1 ) diff --git a/addons/Wol/icon-white-with-stroke.svg b/addons/Wol/icon-white-with-stroke.svg new file mode 100644 index 0000000..5437668 --- /dev/null +++ b/addons/Wol/icon-white-with-stroke.svg @@ -0,0 +1,76 @@ + + diff --git a/addons/Wol/icon-white-with-stroke.svg.import b/addons/Wol/icon-white-with-stroke.svg.import new file mode 100644 index 0000000..4036dc4 --- /dev/null +++ b/addons/Wol/icon-white-with-stroke.svg.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/icon-white-with-stroke.svg-2fdadd9c0464018b0aea56f84a74a9b6.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://addons/Wol/icon-white-with-stroke.svg" +dest_files=[ "res://.import/icon-white-with-stroke.svg-2fdadd9c0464018b0aea56f84a74a9b6.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/addons/Wol/icon-white.svg b/addons/Wol/icon-white.svg new file mode 100644 index 0000000..12decdc --- /dev/null +++ b/addons/Wol/icon-white.svg @@ -0,0 +1,76 @@ + + diff --git a/addons/Wol/icon-white.svg.import b/addons/Wol/icon-white.svg.import new file mode 100644 index 0000000..3a9607a --- /dev/null +++ b/addons/Wol/icon-white.svg.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/icon-white.svg-c9027de825c45801066398a50f83be46.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://addons/Wol/icon-white.svg" +dest_files=[ "res://.import/icon-white.svg-c9027de825c45801066398a50f83be46.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=0.3 diff --git a/addons/Wol/icon.svg b/addons/Wol/icon.svg new file mode 100644 index 0000000..3e4bad5 --- /dev/null +++ b/addons/Wol/icon.svg @@ -0,0 +1,76 @@ + + diff --git a/addons/Wol/assets/icon.png.import b/addons/Wol/icon.svg.import similarity index 72% rename from addons/Wol/assets/icon.png.import rename to addons/Wol/icon.svg.import index 76d43f9..999b438 100644 --- a/addons/Wol/assets/icon.png.import +++ b/addons/Wol/icon.svg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/icon.png-79ec48c27aef60cbae9d34f0545addad.stex" +path="res://.import/icon.svg-df71f9fa105bf9f1f19c23a7a9986838.stex" metadata={ "vram_texture": false } [deps] -source_file="res://addons/Wol/assets/icon.png" -dest_files=[ "res://.import/icon.png-79ec48c27aef60cbae9d34f0545addad.stex" ] +source_file="res://addons/Wol/icon.svg" +dest_files=[ "res://.import/icon.svg-df71f9fa105bf9f1f19c23a7a9986838.stex" ] [params] diff --git a/addons/Wol/logo.svg b/addons/Wol/logo.svg new file mode 100644 index 0000000..84293dc --- /dev/null +++ b/addons/Wol/logo.svg @@ -0,0 +1,85 @@ + + diff --git a/addons/Wol/logo.svg.import b/addons/Wol/logo.svg.import new file mode 100644 index 0000000..a8ba6aa --- /dev/null +++ b/addons/Wol/logo.svg.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/logo.svg-2b0b087c9dfe071a47003cdf4fc4b536.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://addons/Wol/logo.svg" +dest_files=[ "res://.import/logo.svg-2b0b087c9dfe071a47003cdf4fc4b536.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/addons/Wol/plugin.gd b/addons/Wol/plugin.gd index 8e18e20..fb9984d 100644 --- a/addons/Wol/plugin.gd +++ b/addons/Wol/plugin.gd @@ -6,7 +6,7 @@ func _enter_tree(): 'Wol', 'Node', load('res://addons/Wol/Wol.gd'), - load('res://addons/Wol/assets/icon.png') + load('res://addons/Wol/icon-white.svg') ) func _exit_tree(): diff --git a/project.godot b/project.godot index aa96519..a351bd7 100644 --- a/project.godot +++ b/project.godot @@ -8,16 +8,6 @@ config_version=4 -_global_script_classes=[ { -"base": "Node", -"class": "Wol", -"language": "GDScript", -"path": "res://addons/Wol/Wol.gd" -} ] -_global_script_class_icons={ -"Wol": "" -} - [application] config/name="Wol"