Skip to content

Commit 827cb33

Browse files
Fix style list defaults (crash) and character text info (#1690)
* Small fix for character style section * Fix style_list defaults Created a crash when styles had never been edited.
1 parent b4d5afa commit 827cb33

File tree

5 files changed

+25
-13
lines changed

5 files changed

+25
-13
lines changed

addons/dialogic/Modules/Style/character_settings_style.gd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ func _save_changes(character:DialogicCharacter) -> DialogicCharacter:
1919

2020

2121
func get_style_suggestions(filter:String="") -> Dictionary:
22-
var styles := ProjectSettings.get_setting('dialogic/layout/styles', {})
22+
var styles := ProjectSettings.get_setting('dialogic/layout/styles', {'Default':{}})
2323
var suggestions := {}
2424
for i in styles:
2525
suggestions[i] = {'value': i, 'editor_icon': ["PopupMenu", "EditorIcons"]}

addons/dialogic/Modules/Style/character_settings_style.tscn

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,20 @@
1-
[gd_scene load_steps=3 format=3 uid="uid://fgplvp0f3giu"]
1+
[gd_scene load_steps=6 format=3 uid="uid://fgplvp0f3giu"]
22

33
[ext_resource type="Script" path="res://addons/dialogic/Modules/Style/character_settings_style.gd" id="2"]
44
[ext_resource type="PackedScene" uid="uid://dpwhshre1n4t6" path="res://addons/dialogic/Editor/Events/Fields/ComplexPicker.tscn" id="2_a46q0"]
5+
[ext_resource type="PackedScene" uid="uid://dbpkta2tjsqim" path="res://addons/dialogic/Editor/Common/hint_tooltip_icon.tscn" id="3_xynex"]
6+
7+
[sub_resource type="Image" id="Image_b41ba"]
8+
data = {
9+
"data": PackedByteArray(255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 94, 94, 127, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 93, 93, 255, 255, 94, 94, 127, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 94, 94, 127, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 94, 94, 127, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 231, 255, 94, 94, 54, 255, 94, 94, 57, 255, 93, 93, 233, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 231, 255, 94, 94, 54, 255, 94, 94, 57, 255, 93, 93, 233, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 97, 97, 42, 255, 255, 255, 0, 255, 255, 255, 0, 255, 97, 97, 42, 255, 93, 93, 233, 255, 93, 93, 232, 255, 93, 93, 41, 255, 255, 255, 0, 255, 255, 255, 0, 255, 97, 97, 42, 255, 93, 93, 233, 255, 93, 93, 232, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 96, 96, 45, 255, 93, 93, 44, 255, 255, 255, 0, 255, 97, 97, 42, 255, 97, 97, 42, 255, 255, 255, 0, 255, 96, 96, 45, 255, 93, 93, 44, 255, 255, 255, 0, 255, 97, 97, 42, 255, 97, 97, 42, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 96, 96, 45, 255, 93, 93, 235, 255, 94, 94, 234, 255, 95, 95, 43, 255, 255, 255, 0, 255, 255, 255, 0, 255, 96, 96, 45, 255, 93, 93, 235, 255, 94, 94, 234, 255, 95, 95, 43, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 235, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 233, 255, 95, 95, 59, 255, 96, 96, 61, 255, 93, 93, 235, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 233, 255, 95, 95, 59, 255, 96, 96, 61, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0),
10+
"format": "RGBA8",
11+
"height": 16,
12+
"mipmaps": false,
13+
"width": 16
14+
}
15+
16+
[sub_resource type="ImageTexture" id="ImageTexture_q0dt5"]
17+
image = SubResource("Image_b41ba")
518

619
[node name="Style" type="VBoxContainer"]
720
offset_right = 280.0
@@ -20,9 +33,8 @@ text = "Style:"
2033
unique_name_in_owner = true
2134
layout_mode = 2
2235

23-
[node name="InfoLabel" type="Label" parent="."]
36+
[node name="HintTooltip" parent="Style" instance=ExtResource("3_xynex")]
2437
layout_mode = 2
25-
size_flags_vertical = 0
26-
theme_type_variation = &"DialogicHintText"
27-
text = "Whenever this character speaks, dialogic will switch to this style. It has to be defined in the layout scene and is a pretty advanced feature."
28-
autowrap_mode = 3
38+
texture = SubResource("ImageTexture_q0dt5")
39+
hint_text = "Whenever this character speaks, dialogic will switch to this style.
40+
For this it's best to use a variation of the same layout to avoid instancing a lot."

addons/dialogic/Modules/Style/event_style.gd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func build_event_editor():
6161

6262

6363
func get_style_suggestions(filter:String="") -> Dictionary:
64-
var styles := ProjectSettings.get_setting('dialogic/layout/styles', {})
64+
var styles := ProjectSettings.get_setting('dialogic/layout/styles', {'Default':{}})
6565
var suggestions := {}
6666
suggestions['<Default Style>'] = {'value':'', 'editor_icon':["MenuBar", "EditorIcons"]}
6767
for i in styles:

addons/dialogic/Modules/Style/subsystem_styles.gd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ func load_game_state():
2121
####################################################################################################
2222

2323
func add_layout_style(style_name:="") -> Node:
24-
var styles_info := ProjectSettings.get_setting('dialogic/layout/styles', {})
24+
var styles_info := ProjectSettings.get_setting('dialogic/layout/styles', {'Default':{}})
2525
if style_name.is_empty() or !style_name in styles_info:
26-
style_name = ProjectSettings.get_setting('dialogic/layout/default_style')
26+
style_name = ProjectSettings.get_setting('dialogic/layout/default_style', 'Default')
2727

2828
var layout_path := DialogicUtil.get_inherited_style_layout(style_name)
2929
var layout := Dialogic._add_layout_node(layout_path)

addons/dialogic/Other/DialogicUtil.gd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ static func get_default_layout_scene() -> String:
200200

201201

202202
static func get_inherited_style_overrides(style_name:String) -> Dictionary:
203-
var styles_info := ProjectSettings.get_setting('dialogic/layout/styles', {})
203+
var styles_info := ProjectSettings.get_setting('dialogic/layout/styles', {'Default':{}})
204204
if !style_name in styles_info:
205205
return {}
206206

@@ -217,13 +217,13 @@ static func get_inherited_style_overrides(style_name:String) -> Dictionary:
217217

218218

219219
static func get_inherited_style_layout(style_name:String="") -> String:
220-
var style_list := ProjectSettings.get_setting('dialogic/layout/styles', {})
220+
var style_list := ProjectSettings.get_setting('dialogic/layout/styles', {'Default':{}})
221221
if style_name.is_empty(): return get_default_layout_scene()
222222
return style_list[get_inheritance_style_list(style_name)[-1]].get('layout', get_default_layout_scene())
223223

224224

225225
static func get_inheritance_style_list(style_name:String) -> Array:
226-
var style_list := ProjectSettings.get_setting('dialogic/layout/styles', {})
226+
var style_list := ProjectSettings.get_setting('dialogic/layout/styles', {'Default':{}})
227227
if !style_name in style_list:
228228
return []
229229
var list := [style_name]

0 commit comments

Comments
 (0)