diff --git a/Scenes/InteractiveDialog.tscn b/Scenes/InteractiveDialog.tscn index d717c52..ac9a883 100644 --- a/Scenes/InteractiveDialog.tscn +++ b/Scenes/InteractiveDialog.tscn @@ -11,3 +11,5 @@ script = ExtResource( 1 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"] shape = SubResource( 1 ) + +[connection signal="area_exited" from="Area2D" to="Area2D" method="_on_Area2D_area_exited"] diff --git a/Story/Ch1S2.tscn b/Story/Ch1S2.tscn index ee8328f..87d6c3a 100644 --- a/Story/Ch1S2.tscn +++ b/Story/Ch1S2.tscn @@ -98,13 +98,16 @@ position = Vector2( 380, 380 ) [node name="Alistair" parent="FG" instance=ExtResource( 3 )] position = Vector2( 165, 150 ) -[node name="dialog" parent="FG/Alistair" instance=ExtResource( 13 )] -position = Vector2( 0, 27 ) -scale = Vector2( 4, 2 ) +[node name="Node2D" parent="FG/Alistair" instance=ExtResource( 13 )] +position = Vector2( 0, 4 ) -[node name="Area2D" parent="FG/Alistair/dialog" index="0"] +[node name="Area2D" parent="FG/Alistair/Node2D" index="0"] +scale = Vector2( 3, 1.5 ) timeline = "timeline-1642498159.json" +[node name="CollisionShape2D" parent="FG/Alistair/Node2D/Area2D" index="0"] +position = Vector2( 0, 18 ) + [node name="Kettle" type="Sprite" parent="FG"] position = Vector2( 653, 156 ) texture = ExtResource( 4 ) @@ -123,6 +126,4 @@ cell_size = Vector2( 30, 30 ) format = 1 tile_data = PoolIntArray( 458755, 52, 0 ) -[connection signal="area_exited" from="FG/Alistair/dialog/Area2D" to="FG/Alistair/dialog/Area2D" method="_on_Area2D_area_exited"] - -[editable path="FG/Alistair/dialog"] +[editable path="FG/Alistair/Node2D"] diff --git a/dialogic/characters/character-1642550408.json b/dialogic/characters/character-1642550408.json new file mode 100644 index 0000000..3bcc128 --- /dev/null +++ b/dialogic/characters/character-1642550408.json @@ -0,0 +1,20 @@ +{ + "color": "#ffce915b", + "description": "", + "display_name": "", + "display_name_bool": false, + "id": "character-1642550408.json", + "mirror_portraits": false, + "name": "james", + "nickname": "", + "nickname_bool": false, + "offset_x": 0, + "offset_y": 0, + "portraits": [ + { + "name": "Default", + "path": "" + } + ], + "scale": 100 +} diff --git a/dialogic/folder_structure.json b/dialogic/folder_structure.json index d37f85c..82bb25e 100644 --- a/dialogic/folder_structure.json +++ b/dialogic/folder_structure.json @@ -5,7 +5,8 @@ "folders": { "Characters": { "files": [ - "character-1642498039.json" + "character-1642498039.json", + "character-1642550408.json" ], "folders": { diff --git a/dialogic/themes/default-theme.cfg b/dialogic/themes/default-theme.cfg index ffc0195..7068d11 100644 --- a/dialogic/themes/default-theme.cfg +++ b/dialogic/themes/default-theme.cfg @@ -1,3 +1,63 @@ [settings] name="Default Theme" + +[buttons] + +normal=[ false, Color( 1, 1, 1, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://addons/dialogic/Example Assets/backgrounds/background-2.png", false, Color( 1, 1, 1, 1 ) ] +hover=[ false, Color( 1, 1, 1, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://addons/dialogic/Example Assets/backgrounds/background-2.png", false, Color( 1, 1, 1, 1 ) ] +pressed=[ false, Color( 1, 1, 1, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://addons/dialogic/Example Assets/backgrounds/background-2.png", false, Color( 1, 1, 1, 1 ) ] +disabled=[ false, Color( 1, 1, 1, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://addons/dialogic/Example Assets/backgrounds/background-2.png", false, Color( 1, 1, 1, 1 ) ] + +[audio] + +typing={ +"allow_interrupt": true, +"audio_bus": "Master", +"enable": false, +"path": "res://addons/dialogic/Example Assets/Sound Effects/Beep.wav", +"pitch": 1.0, +"pitch_rand_range": 0.0, +"volume": 0.0, +"volume_rand_range": 0.0 +} +waiting={ +"allow_interrupt": true, +"audio_bus": "Master", +"enable": false, +"path": "res://addons/dialogic/Example Assets/Sound Effects/Beep.wav", +"pitch": 1.0, +"pitch_rand_range": 0.0, +"volume": 0.0, +"volume_rand_range": 0.0 +} +passing={ +"allow_interrupt": true, +"audio_bus": "Master", +"enable": false, +"path": "res://addons/dialogic/Example Assets/Sound Effects/Beep.wav", +"pitch": 1.0, +"pitch_rand_range": 0.0, +"volume": 0.0, +"volume_rand_range": 0.0 +} +hovering={ +"allow_interrupt": true, +"audio_bus": "Master", +"enable": false, +"path": "res://addons/dialogic/Example Assets/Sound Effects/Beep.wav", +"pitch": 1.0, +"pitch_rand_range": 0.0, +"volume": 0.0, +"volume_rand_range": 0.0 +} +selecting={ +"allow_interrupt": true, +"audio_bus": "Master", +"enable": false, +"path": "res://addons/dialogic/Example Assets/Sound Effects/Beep.wav", +"pitch": 1.0, +"pitch_rand_range": 0.0, +"volume": 0.0, +"volume_rand_range": 0.0 +}