Skip to content

Commit 4ecf187

Browse files
salianifosalianifo
committed
Fix default duration, add UIDs, add to default styles
1 parent 1c0426f commit 4ecf187

File tree

10 files changed

+31
-11
lines changed

10 files changed

+31
-11
lines changed

‎addons/dialogic/Modules/DefaultLayoutParts/Layer_ScreenShake/screen_shake_layer.gd.uid‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://pf00w14gv64m

‎addons/dialogic/Modules/DefaultLayoutParts/Layer_ScreenShake/screen_shake_layer.gdshader.uid‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://ckbeep0lno2h1

‎addons/dialogic/Modules/DefaultLayoutParts/Layer_ScreenShake/screen_shake_layer.tscn‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[gd_scene load_steps=5 format=3 uid="uid://cdvx2jejg8xln"]
22

3-
[ext_resource type="Script" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_ScreenShake/screen_shake_layer.gd" id="1_l682i"]
4-
[ext_resource type="Shader" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_ScreenShake/screen_shake_layer.gdshader" id="2_7h78g"]
5-
[ext_resource type="Script" path="res://addons/dialogic/Modules/ScreenShake/node_screen_shaker.gd" id="3_uqmkn"]
3+
[ext_resource type="Script" uid="uid://pf00w14gv64m" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_ScreenShake/screen_shake_layer.gd" id="1_l682i"]
4+
[ext_resource type="Shader" uid="uid://ckbeep0lno2h1" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_ScreenShake/screen_shake_layer.gdshader" id="2_7h78g"]
5+
[ext_resource type="Script" uid="uid://bb1ano1eqhunf" path="res://addons/dialogic/Modules/ScreenShake/node_screen_shaker.gd" id="3_uqmkn"]
66

77
[sub_resource type="ShaderMaterial" id="ShaderMaterial_4u8q6"]
88
shader = ExtResource("2_7h78g")

‎addons/dialogic/Modules/DefaultLayoutParts/Style_SpeakerTextbox/speaker_textbox_style.tres‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[gd_resource type="Resource" script_class="DialogicStyle" load_steps=18 format=3 uid="uid://dgkmuyvy5qc35"]
1+
[gd_resource type="Resource" script_class="DialogicStyle" load_steps=20 format=3 uid="uid://dgkmuyvy5qc35"]
22

33
[ext_resource type="PackedScene" uid="uid://c1k5m0w3r40xf" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_FullBackground/full_background_layer.tscn" id="1_sde84"]
44
[ext_resource type="Script" uid="uid://bwg6yncmh2cml" path="res://addons/dialogic/Resources/dialogic_style_layer.gd" id="2_i34tx"]
@@ -8,6 +8,7 @@
88
[ext_resource type="PackedScene" uid="uid://dhk6j6eb6e3q" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Choices/vn_choice_layer.tscn" id="6_36eid"]
99
[ext_resource type="PackedScene" uid="uid://cvgf4c6gg0tsy" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_TextInput/text_input_layer.tscn" id="7_hx5el"]
1010
[ext_resource type="PackedScene" uid="uid://lx24i8fl6uo" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_History/history_layer.tscn" id="8_00chv"]
11+
[ext_resource type="PackedScene" uid="uid://cdvx2jejg8xln" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_ScreenShake/screen_shake_layer.tscn" id="9_nxqau"]
1112
[ext_resource type="Script" uid="uid://dv08k6ljua6fm" path="res://addons/dialogic/Resources/dialogic_style.gd" id="9_sdr6x"]
1213

1314
[sub_resource type="Resource" id="Resource_1cyj6"]
@@ -49,10 +50,15 @@ script = ExtResource("2_i34tx")
4950
scene = ExtResource("8_00chv")
5051
overrides = {}
5152

53+
[sub_resource type="Resource" id="Resource_sw2nc"]
54+
script = ExtResource("2_i34tx")
55+
scene = ExtResource("9_nxqau")
56+
overrides = {}
57+
5258
[resource]
5359
script = ExtResource("9_sdr6x")
5460
name = "Speaker Textbox Style"
55-
layer_list = Array[String](["10", "11", "12", "13", "14", "15", "16"])
61+
layer_list = Array[String](["10", "17", "11", "12", "13", "14", "15", "16"])
5662
layer_info = {
5763
"": SubResource("Resource_1cyj6"),
5864
"10": SubResource("Resource_jk75o"),
@@ -61,7 +67,8 @@ layer_info = {
6167
"13": SubResource("Resource_axty6"),
6268
"14": SubResource("Resource_xh5pc"),
6369
"15": SubResource("Resource_ytmk0"),
64-
"16": SubResource("Resource_yjxtw")
70+
"16": SubResource("Resource_yjxtw"),
71+
"17": SubResource("Resource_sw2nc")
6572
}
6673
base_overrides = {}
6774
layers = Array[ExtResource("2_i34tx")]([])

‎addons/dialogic/Modules/DefaultLayoutParts/Style_VN_Default/default_vn_style.tres‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[gd_resource type="Resource" script_class="DialogicStyle" load_steps=20 format=3 uid="uid://8t1mr302tmqs"]
1+
[gd_resource type="Resource" script_class="DialogicStyle" load_steps=22 format=3 uid="uid://8t1mr302tmqs"]
22

33
[ext_resource type="Script" uid="uid://dv08k6ljua6fm" path="res://addons/dialogic/Resources/dialogic_style.gd" id="1_mvpc0"]
44
[ext_resource type="Script" uid="uid://bwg6yncmh2cml" path="res://addons/dialogic/Resources/dialogic_style_layer.gd" id="2_3b8ue"]
@@ -9,6 +9,7 @@
99
[ext_resource type="PackedScene" uid="uid://dsbwnp5hegnu3" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_Glossary/glossary_popup_layer.tscn" id="7_vw5f4"]
1010
[ext_resource type="PackedScene" uid="uid://dhk6j6eb6e3q" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Choices/vn_choice_layer.tscn" id="8_tc6v1"]
1111
[ext_resource type="PackedScene" uid="uid://cvgf4c6gg0tsy" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_TextInput/text_input_layer.tscn" id="9_tufw5"]
12+
[ext_resource type="PackedScene" uid="uid://cdvx2jejg8xln" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_ScreenShake/screen_shake_layer.tscn" id="10_0qncn"]
1213
[ext_resource type="PackedScene" uid="uid://lx24i8fl6uo" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_History/history_layer.tscn" id="10_8v8jj"]
1314

1415
[sub_resource type="Resource" id="Resource_3dixn"]
@@ -55,10 +56,15 @@ script = ExtResource("2_3b8ue")
5556
scene = ExtResource("10_8v8jj")
5657
overrides = {}
5758

59+
[sub_resource type="Resource" id="Resource_tnh7v"]
60+
script = ExtResource("2_3b8ue")
61+
scene = ExtResource("10_0qncn")
62+
overrides = {}
63+
5864
[resource]
5965
script = ExtResource("1_mvpc0")
6066
name = "Visual Novel Style"
61-
layer_list = Array[String](["10", "11", "12", "13", "14", "15", "16", "17"])
67+
layer_list = Array[String](["10", "11", "18", "12", "13", "14", "15", "16", "17"])
6268
layer_info = {
6369
"": SubResource("Resource_3dixn"),
6470
"10": SubResource("Resource_gen8e"),
@@ -68,8 +74,9 @@ layer_info = {
6874
"14": SubResource("Resource_pvwog"),
6975
"15": SubResource("Resource_spe5r"),
7076
"16": SubResource("Resource_jf1ol"),
71-
"17": SubResource("Resource_gs5pl")
77+
"17": SubResource("Resource_gs5pl"),
78+
"18": SubResource("Resource_tnh7v")
7279
}
7380
base_overrides = {}
7481
layers = Array[ExtResource("2_3b8ue")]([])
75-
metadata/_latest_layer = "17"
82+
metadata/_latest_layer = "18"

‎addons/dialogic/Modules/ScreenShake/event_screen_shake.gd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ var direction := Direction.HORIZONTAL
1818
var fade: float = 0.0
1919
## The time the screen should shake for (excludes fade time).
2020
## Leave at 0 to keep shaking until the next screen shake event.
21-
var duration: float = 0.0
21+
var duration: float = 10.0
2222
## If true, the event will wait for completion before continuing
2323
## (only if duration is greater than 0.0 or fade greater than 0.0 and amplitude is 0.0).
2424
var wait := false

‎addons/dialogic/Modules/ScreenShake/event_screen_shake.gd.uid‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://chapa5hltp6ac

‎addons/dialogic/Modules/ScreenShake/index.gd.uid‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://cpq1bgdnqrmth

‎addons/dialogic/Modules/ScreenShake/node_screen_shaker.gd.uid‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://bb1ano1eqhunf

‎addons/dialogic/Modules/ScreenShake/subsystem_screen_shake.gd.uid‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://l5ry6a5mdtxn

0 commit comments

Comments
 (0)