vaporvee/RPG-Test
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

answerbox now updates correctly

Browse Source
This commit is contained in:
Yannik
2023-02-07 22:28:02 +01:00
parent cf307869d6
commit fe1c63c3bf
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scenes/gui/dialog_bubble.tscn
View File

@@ -97,6 +97,3 @@ theme_override_constants/margin_left = 40
theme_override_constants/margin_top = 30 theme_override_constants/margin_top = 30
theme_override_constants/margin_right = 60 theme_override_constants/margin_right = 60
theme_override_constants/margin_bottom = 30 theme_override_constants/margin_bottom = 30
[node name="v_box_container" type="VBoxContainer" parent="box/panel_container/margin_container"]
layout_mode = 2

13
src/scene-scripts/dialogue-system/dialog_bubble.cs
View File

@@ -43,7 +43,7 @@ public partial class dialog_bubble : CanvasLayer
{ {
if (Input.IsActionJustPressed("ui_cancel") && Visible) richText.VisibleCharacters = richText.Text.Length; if (Input.IsActionJustPressed("ui_cancel") && Visible) richText.VisibleCharacters = richText.Text.Length;
if (Input.IsActionJustPressed("ui_accept") && GetNode<PanelContainer>("box/panel_container").Visible == false && Visible if (Input.IsActionJustPressed("ui_accept") && Visible
&& richText.VisibleCharacters == -1 | Regex.Replace(richText.Text, @"\[[^]]+\]", "").Length <= richText.VisibleCharacters) && richText.VisibleCharacters == -1 | Regex.Replace(richText.Text, @"\[[^]]+\]", "").Length <= richText.VisibleCharacters)
{ {
if (dlgPointer < dlgLines.AsGodotArray().Count) if (dlgPointer < dlgLines.AsGodotArray().Count)
@@ -57,7 +57,6 @@ public partial class dialog_bubble : CanvasLayer
else if (dlgLines.AsGodotArray()[dlgPointer].VariantType == Variant.Type.Dictionary) else if (dlgLines.AsGodotArray()[dlgPointer].VariantType == Variant.Type.Dictionary)
{ {
MakeAnswerBox(Json.ParseString(dlgLines.AsGodotArray()[dlgPointer].AsGodotDictionary().Keys.ToString()).AsStringArray()); MakeAnswerBox(Json.ParseString(dlgLines.AsGodotArray()[dlgPointer].AsGodotDictionary().Keys.ToString()).AsStringArray());
GetNode<PanelContainer>("box/panel_container").Visible = true;
} }
} }
dlgPointer++; dlgPointer++;
@@ -73,12 +72,16 @@ public partial class dialog_bubble : CanvasLayer
} }
public void MakeAnswerBox(string[] dialogOptions) public void MakeAnswerBox(string[] dialogOptions)
{ {
var parent = GetNode("box/panel_container/margin_container/v_box_container"); var parent = GetNode("box/panel_container/margin_container");
if (parent.GetChildCount() == 1)
parent.GetChild(0).Free();
parent.AddChild(new VBoxContainer());
parent = parent.GetChild(0);
for (int i = 0; parent.GetChildCount() < dialogOptions.Length; i++) for (int i = 0; parent.GetChildCount() < dialogOptions.Length; i++)
{ {
parent.AddChild(GD.Load<PackedScene>("res://scenes/gui/dlg_answer_button.tscn").Instantiate()); parent.AddChild(GD.Load<PackedScene>("res://scenes/gui/dlg_answer_button.tscn").Instantiate());
}
for (int i = 0; i < dialogOptions.Length; i++)
parent.GetChild<Button>(i).Text = dialogOptions[i]; parent.GetChild<Button>(i).Text = dialogOptions[i];
} }
GetNode<PanelContainer>("box/panel_container").Visible = true;
}
} }