Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

A bunch of stuff #17

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions FakeUnitTests/fake_unit_test_scene.gd
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,3 @@ extends Control
func _ready() -> void:
Dialogic.Styles.load_style("VisualNovel_Style")
Dialogic.start("t0_overview")


4 changes: 3 additions & 1 deletion FakeUnitTests/t0_overview.dtl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[clear time="0"]
[clear time="0.0"]

Choose a timeline to test.
- Text events, effects & modifiers
Expand All @@ -9,3 +9,5 @@ Choose a timeline to test.
jump t3_variables/
- Styles
jump t4_styles/
- Various
jump t5_various_events/
19 changes: 11 additions & 8 deletions FakeUnitTests/t5_various_events.dtl
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
This timeline tests various events that don't deserver their own timeline.
It will describe the desired effect, then do it.

# WAIT EVENT
[i]Wait event: Will wait for 1 second, hiding the textbox.
[wait time="1"]
label Wait
[i]Wait event\: Will wait for 1 second, hiding the textbox.
[wait time="1.0"]

[i]Wait event: Will wait for 1 second, not hiding the textbox.
[wait time="1" hide_text="false"]
[i]Wait event\: Will wait for 0.5 second, trying to hide the textbox (too short for animation).
[wait time="0.5"]

[i]Wait event\: Will wait for 1 second, not hiding the textbox.
[wait time="1.0" hide_text="false"]

# WAIT INPUT EVENT
[i]Wait input: Will wait for a click.
[wait_input]

label Wait Input
[i]Wait input\: Will wait for a click.
[wait_input]
jump t0_overview/
1 change: 0 additions & 1 deletion FakeUnitTests/unit_test_autoload.gd
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@ extends Node
var var_float := 2.0
var var_string := "Hello World"
var var_array := ["One", "Two", "Three", "Four", "Five", "Six", "Seven", "Eight", "Nine"]

39 changes: 26 additions & 13 deletions FakeUnitTests/unit_test_style_a.tres
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_resource type="Resource" script_class="DialogicStyle" load_steps=19 format=3 uid="uid://bx0u2rpnbroc6"]
[gd_resource type="Resource" script_class="DialogicStyle" load_steps=20 format=3 uid="uid://bx0u2rpnbroc6"]

[ext_resource type="PackedScene" uid="uid://c1k5m0w3r40xf" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_FullBackground/full_background_layer.tscn" id="1_cth7r"]
[ext_resource type="Script" path="res://addons/dialogic/Resources/dialogic_style_layer.gd" id="2_rmujo"]
Expand All @@ -11,17 +11,21 @@
[ext_resource type="PackedScene" uid="uid://lx24i8fl6uo" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_History/history_layer.tscn" id="9_i41qw"]
[ext_resource type="Script" path="res://addons/dialogic/Resources/dialogic_style.gd" id="10_pa6ry"]

[sub_resource type="Resource" id="Resource_0c0a5"]
[sub_resource type="Resource" id="Resource_0wyrv"]
script = ExtResource("2_rmujo")
overrides = {}

[sub_resource type="Resource" id="Resource_2wgp1"]
script = ExtResource("2_rmujo")
scene = ExtResource("1_cth7r")
overrides = {}

[sub_resource type="Resource" id="Resource_ut4jp"]
[sub_resource type="Resource" id="Resource_viyaw"]
script = ExtResource("2_rmujo")
scene = ExtResource("3_8m4hw")
overrides = {}

[sub_resource type="Resource" id="Resource_lhwgy"]
[sub_resource type="Resource" id="Resource_u58bk"]
script = ExtResource("2_rmujo")
scene = ExtResource("4_j1nh3")
overrides = {
Expand All @@ -32,37 +36,46 @@ overrides = {
"text_alignment": "1"
}

[sub_resource type="Resource" id="Resource_ns44i"]
[sub_resource type="Resource" id="Resource_0c2vp"]
script = ExtResource("2_rmujo")
scene = ExtResource("5_w6mee")
overrides = {}

[sub_resource type="Resource" id="Resource_1n683"]
[sub_resource type="Resource" id="Resource_1c8hd"]
script = ExtResource("2_rmujo")
scene = ExtResource("6_7pv72")
overrides = {}

[sub_resource type="Resource" id="Resource_7w7q2"]
[sub_resource type="Resource" id="Resource_qxyi4"]
script = ExtResource("2_rmujo")
scene = ExtResource("7_3saxg")
overrides = {}

[sub_resource type="Resource" id="Resource_3j0x6"]
[sub_resource type="Resource" id="Resource_144k3"]
script = ExtResource("2_rmujo")
scene = ExtResource("8_1ohxd")
overrides = {}

[sub_resource type="Resource" id="Resource_1hnnd"]
[sub_resource type="Resource" id="Resource_vd0lh"]
script = ExtResource("2_rmujo")
scene = ExtResource("9_i41qw")
overrides = {}

[resource]
script = ExtResource("10_pa6ry")
name = "UnitTestStyle_A"
base_overrides = {
"global_bg_color": "Color(0.223529, 0.0156863, 0.0156863, 0.956863)",
"global_font_color": "Color(0.976471, 0.792157, 0.6, 1)"
layer_list = Array[String](["10", "11", "12", "13", "14", "15", "16", "17"])
layer_info = {
"": SubResource("Resource_0wyrv"),
"10": SubResource("Resource_2wgp1"),
"11": SubResource("Resource_viyaw"),
"12": SubResource("Resource_u58bk"),
"13": SubResource("Resource_0c2vp"),
"14": SubResource("Resource_1c8hd"),
"15": SubResource("Resource_qxyi4"),
"16": SubResource("Resource_144k3"),
"17": SubResource("Resource_vd0lh")
}
layers = Array[ExtResource("2_rmujo")]([SubResource("Resource_0c0a5"), SubResource("Resource_ut4jp"), SubResource("Resource_lhwgy"), SubResource("Resource_ns44i"), SubResource("Resource_1n683"), SubResource("Resource_7w7q2"), SubResource("Resource_3j0x6"), SubResource("Resource_1hnnd")])
base_overrides = {}
layers = Array[ExtResource("2_rmujo")]([])
metadata/_latest_layer = 2
39 changes: 26 additions & 13 deletions FakeUnitTests/unit_test_style_b.tres
Original file line number Diff line number Diff line change
@@ -1,50 +1,63 @@
[gd_resource type="Resource" script_class="DialogicStyle" load_steps=12 format=3 uid="uid://dfwk1l55ypbbj"]
[gd_resource type="Resource" script_class="DialogicStyle" load_steps=13 format=3 uid="uid://dfwk1l55ypbbj"]

[ext_resource type="Resource" uid="uid://bx0u2rpnbroc6" path="res://FakeUnitTests/unit_test_style_a.tres" id="1_yy0kc"]
[ext_resource type="Script" path="res://addons/dialogic/Resources/dialogic_style_layer.gd" id="2_d3xxp"]
[ext_resource type="Script" path="res://addons/dialogic/Resources/dialogic_style.gd" id="3_r7y4b"]

[sub_resource type="Resource" id="Resource_ex6a2"]
[sub_resource type="Resource" id="Resource_tofcw"]
script = ExtResource("2_d3xxp")
overrides = {}

[sub_resource type="Resource" id="Resource_cmcvq"]
[sub_resource type="Resource" id="Resource_uw1mi"]
script = ExtResource("2_d3xxp")
overrides = {}

[sub_resource type="Resource" id="Resource_701bc"]
script = ExtResource("2_d3xxp")
overrides = {
"portrait_size_mode": "1"
}

[sub_resource type="Resource" id="Resource_y5t4q"]
[sub_resource type="Resource" id="Resource_5rmbw"]
script = ExtResource("2_d3xxp")
overrides = {}

[sub_resource type="Resource" id="Resource_lw3yu"]
[sub_resource type="Resource" id="Resource_7161f"]
script = ExtResource("2_d3xxp")
overrides = {}

[sub_resource type="Resource" id="Resource_gr5fk"]
[sub_resource type="Resource" id="Resource_hkllo"]
script = ExtResource("2_d3xxp")
overrides = {}

[sub_resource type="Resource" id="Resource_cijw1"]
[sub_resource type="Resource" id="Resource_oxef3"]
script = ExtResource("2_d3xxp")
overrides = {}

[sub_resource type="Resource" id="Resource_6iv6n"]
[sub_resource type="Resource" id="Resource_js1oc"]
script = ExtResource("2_d3xxp")
overrides = {}

[sub_resource type="Resource" id="Resource_cnjx0"]
[sub_resource type="Resource" id="Resource_4h8sp"]
script = ExtResource("2_d3xxp")
overrides = {}

[resource]
script = ExtResource("3_r7y4b")
name = "UnitTestStyle_B"
inherits = ExtResource("1_yy0kc")
base_overrides = {
"global_bg_color": "Color(0.12549, 0.2, 0.545098, 0.956863)",
"global_font_color": "Color(0.6, 0.976471, 0.843137, 1)"
layer_list = Array[String](["10", "11", "12", "13", "14", "15", "16", "17"])
layer_info = {
"": SubResource("Resource_tofcw"),
"10": SubResource("Resource_uw1mi"),
"11": SubResource("Resource_701bc"),
"12": SubResource("Resource_5rmbw"),
"13": SubResource("Resource_7161f"),
"14": SubResource("Resource_hkllo"),
"15": SubResource("Resource_oxef3"),
"16": SubResource("Resource_js1oc"),
"17": SubResource("Resource_4h8sp")
}
layers = Array[ExtResource("2_d3xxp")]([SubResource("Resource_ex6a2"), SubResource("Resource_cmcvq"), SubResource("Resource_y5t4q"), SubResource("Resource_lw3yu"), SubResource("Resource_gr5fk"), SubResource("Resource_cijw1"), SubResource("Resource_6iv6n"), SubResource("Resource_cnjx0")])
base_overrides = {}
layers = Array[ExtResource("2_d3xxp")]([])
metadata/_latest_layer = 1
Binary file added MainMenu/Assets/speaker_preview.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 7 additions & 1 deletion MainMenu/Menu.gd
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,13 @@ func _on_smartphone_pressed():
get_tree().change_scene_to_file("res://Smartphone/phone_example.tscn")


func _on_speaker_pressed() -> void:
display_button_ripple(%UnitTests)
await fade()
get_tree().change_scene_to_file("res://SpeakerStyle/speaker_scene.tscn")



func _on_unit_tests_pressed() -> void:
display_button_ripple(%UnitTests)
await fade()
Expand Down Expand Up @@ -94,4 +101,3 @@ func display_button_ripple(button:CanvasItem):
tween.tween_property(button.get_node('Effect').material,"shader_parameter/time",1.0,0.5).from(0.0)
await tween.finished
button.get_child(-1).queue_free()

67 changes: 38 additions & 29 deletions MainMenu/Menu.tscn
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_scene load_steps=15 format=3 uid="uid://cgiiklsftpoau"]
[gd_scene load_steps=16 format=3 uid="uid://cgiiklsftpoau"]

[ext_resource type="Script" path="res://MainMenu/Menu.gd" id="1_tdqfe"]
[ext_resource type="Texture2D" uid="uid://b413ictwywftp" path="res://MainMenu/Dialogic Logo.svg" id="2_u154w"]
Expand All @@ -7,6 +7,7 @@
[ext_resource type="Texture2D" uid="uid://2du0mu0epv6x" path="res://MainMenu/Assets/SmartphonePreview.PNG" id="5_vikv7"]
[ext_resource type="Texture2D" uid="uid://bey4yauaaf03m" path="res://MainMenu/Assets/VN_Preview.PNG" id="5_x0yfe"]
[ext_resource type="Texture2D" uid="uid://bp18h0ibngt7s" path="res://MainMenu/Assets/RPG_Preview.PNG" id="6_e1cue"]
[ext_resource type="Texture2D" uid="uid://bmpqrsapqpgbk" path="res://MainMenu/Assets/speaker_preview.png" id="7_u33qm"]
[ext_resource type="Texture2D" uid="uid://clbquf4p1pjdi" path="res://MainMenu/Assets/unit_tests.png" id="7_ymxpl"]

[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_a307k"]
Expand Down Expand Up @@ -157,17 +158,18 @@ layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
offset_left = 151.0
offset_top = 182.0
offset_right = -151.0
offset_bottom = -181.0
offset_left = 107.0
offset_top = 117.0
offset_right = -101.0
offset_bottom = -66.0
grow_horizontal = 2
grow_vertical = 2
theme_override_constants/separation = -12
theme_override_constants/separation = -10

[node name="HBoxContainer" type="HBoxContainer" parent="MainMenu/VBox"]
layout_mode = 2
size_flags_vertical = 3
theme_override_constants/separation = 40

[node name="DialogicLogo" type="TextureRect" parent="MainMenu/VBox/HBoxContainer"]
layout_mode = 2
Expand All @@ -183,11 +185,11 @@ layout_mode = 2
size_flags_horizontal = 3
size_flags_stretch_ratio = 0.3

[node name="VBoxContainer" type="HBoxContainer" parent="MainMenu/VBox"]
[node name="VBoxContainer" type="GridContainer" parent="MainMenu/VBox"]
show_behind_parent = true
layout_mode = 2
size_flags_vertical = 3
theme_override_constants/separation = 17
columns = 4

[node name="VisualNovel" parent="MainMenu/VBox/VBoxContainer" instance=ExtResource("4_dtbjh")]
unique_name_in_owner = true
Expand Down Expand Up @@ -216,6 +218,15 @@ focus_neighbor_right = NodePath("../VisualNovel")
image = ExtResource("5_vikv7")
title = "Smartphone"

[node name="Speaker" parent="MainMenu/VBox/VBoxContainer" instance=ExtResource("4_dtbjh")]
unique_name_in_owner = true
layout_mode = 2
size_flags_horizontal = 3
focus_neighbor_left = NodePath("../SmallRPG")
focus_neighbor_right = NodePath("../VisualNovel")
image = ExtResource("7_u33qm")
title = "Speakers"

[node name="UnitTests" parent="MainMenu/VBox/VBoxContainer" instance=ExtResource("4_dtbjh")]
unique_name_in_owner = true
layout_mode = 2
Expand All @@ -225,31 +236,28 @@ focus_neighbor_right = NodePath("../VisualNovel")
image = ExtResource("7_ymxpl")
title = "Testing"

[node name="About" type="Button" parent="MainMenu"]
unique_name_in_owner = true
[node name="HBoxContainer" type="HBoxContainer" parent="MainMenu"]
layout_mode = 1
anchors_preset = -1
anchor_left = 0.640625
anchor_top = 0.421296
anchor_right = 0.695313
anchor_bottom = 0.469136
grow_horizontal = 0
anchors_preset = 10
anchor_right = 1.0
offset_left = 7.0
offset_top = 7.0
offset_right = -7.0
offset_bottom = 38.0
grow_horizontal = 2
alignment = 2

[node name="About" type="Button" parent="MainMenu/HBoxContainer"]
unique_name_in_owner = true
layout_mode = 2
size_flags_horizontal = 0
size_flags_vertical = 4
size_flags_vertical = 8
text = "About"
metadata/_edit_use_anchors_ = true

[node name="Quit" type="Button" parent="MainMenu"]
[node name="Quit" type="Button" parent="MainMenu/HBoxContainer"]
unique_name_in_owner = true
layout_mode = 1
anchors_preset = 1
anchor_left = 1.0
anchor_right = 1.0
offset_left = -49.0
offset_top = 9.0
offset_right = -7.0
offset_bottom = 48.0
grow_horizontal = 0
layout_mode = 2
size_flags_horizontal = 0
focus_mode = 0
theme_override_colors/icon_normal_color = Color(1, 1, 1, 0.509804)
Expand All @@ -262,6 +270,7 @@ expand_icon = true
[connection signal="pressed" from="MainMenu/VBox/VBoxContainer/VisualNovel" to="." method="_on_visual_novel_pressed"]
[connection signal="pressed" from="MainMenu/VBox/VBoxContainer/SmallRPG" to="." method="_on_small_rpg_pressed"]
[connection signal="pressed" from="MainMenu/VBox/VBoxContainer/Smartphone" to="." method="_on_smartphone_pressed"]
[connection signal="pressed" from="MainMenu/VBox/VBoxContainer/Speaker" to="." method="_on_speaker_pressed"]
[connection signal="pressed" from="MainMenu/VBox/VBoxContainer/UnitTests" to="." method="_on_unit_tests_pressed"]
[connection signal="pressed" from="MainMenu/About" to="." method="_on_about_pressed"]
[connection signal="pressed" from="MainMenu/Quit" to="." method="_on_quit_pressed"]
[connection signal="pressed" from="MainMenu/HBoxContainer/About" to="." method="_on_about_pressed"]
[connection signal="pressed" from="MainMenu/HBoxContainer/Quit" to="." method="_on_quit_pressed"]
20 changes: 15 additions & 5 deletions SmallRPG/Assets/TextBubbleStyle.tres
Original file line number Diff line number Diff line change
@@ -1,17 +1,22 @@
[gd_resource type="Resource" script_class="DialogicStyle" load_steps=8 format=3 uid="uid://0knl4eg0h4e3"]
[gd_resource type="Resource" script_class="DialogicStyle" load_steps=9 format=3 uid="uid://0knl4eg0h4e3"]

[ext_resource type="PackedScene" uid="uid://syki6k0e6aac" path="res://addons/dialogic/Modules/DefaultLayoutParts/Base_TextBubble/text_bubble_base.tscn" id="1_ex7y2"]
[ext_resource type="PackedScene" uid="uid://cn674foxwedqu" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_Input/full_advance_input_layer.tscn" id="2_tg5sr"]
[ext_resource type="Script" path="res://addons/dialogic/Resources/dialogic_style_layer.gd" id="3_r5hp7"]
[ext_resource type="PackedScene" uid="uid://d2it0xiap3gnt" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_Textbubble/text_bubble_layer.tscn" id="4_42t0a"]
[ext_resource type="Script" path="res://addons/dialogic/Resources/dialogic_style.gd" id="5_q8b32"]

[sub_resource type="Resource" id="Resource_08b7t"]
[sub_resource type="Resource" id="Resource_18iq0"]
script = ExtResource("3_r5hp7")
scene = ExtResource("1_ex7y2")
overrides = {}

[sub_resource type="Resource" id="Resource_ek3c7"]
script = ExtResource("3_r5hp7")
scene = ExtResource("2_tg5sr")
overrides = {}

[sub_resource type="Resource" id="Resource_auogm"]
[sub_resource type="Resource" id="Resource_ed7ub"]
script = ExtResource("3_r5hp7")
scene = ExtResource("4_42t0a")
overrides = {
Expand All @@ -21,7 +26,12 @@ overrides = {
[resource]
script = ExtResource("5_q8b32")
name = "SmallRPG_Style"
base_scene = ExtResource("1_ex7y2")
layer_list = Array[String](["10", "11"])
layer_info = {
"": SubResource("Resource_18iq0"),
"10": SubResource("Resource_ek3c7"),
"11": SubResource("Resource_ed7ub")
}
base_overrides = {}
layers = Array[ExtResource("3_r5hp7")]([SubResource("Resource_08b7t"), SubResource("Resource_auogm")])
layers = Array[ExtResource("3_r5hp7")]([])
metadata/_latest_layer = 1
Loading