From 2f3abbb6f1141f15ef77ac27e431bc66bb0c7899 Mon Sep 17 00:00:00 2001
From: Sophia Pearson <codergal89@gmail.com>
Date: Sun, 4 Sep 2022 15:43:12 +0200
Subject: game: adapt scripts to new design

---
 Scripts/Command.cs                   | 25 -------------
 Scripts/CommandParser.cs             | 23 ------------
 Scripts/Commands/LookCommand.cs      | 57 -----------------------------
 Scripts/Game/Command.cs              | 25 +++++++++++++
 Scripts/Game/CommandParser.cs        | 23 ++++++++++++
 Scripts/Game/Commands/LookCommand.cs | 58 ++++++++++++++++++++++++++++++
 Scripts/Game/Game.cs                 | 25 +++++++++++++
 Scripts/Game/Input.cs                | 29 +++++++++++++++
 Scripts/Game/Output.cs               | 43 ++++++++++++++++++++++
 Scripts/Game/OutputBlock.cs          | 28 +++++++++++++++
 Scripts/Game/StatusLine.cs           | 45 +++++++++++------------
 Scripts/InputContainer.cs            | 50 --------------------------
 Scripts/OutputContainer.cs           | 52 ---------------------------
 Scripts/OutputRow.cs                 | 69 ------------------------------------
 Scripts/StartMenu.cs                 | 46 ------------------------
 15 files changed, 252 insertions(+), 346 deletions(-)
 delete mode 100644 Scripts/Command.cs
 delete mode 100644 Scripts/CommandParser.cs
 delete mode 100644 Scripts/Commands/LookCommand.cs
 create mode 100644 Scripts/Game/Command.cs
 create mode 100644 Scripts/Game/CommandParser.cs
 create mode 100644 Scripts/Game/Commands/LookCommand.cs
 create mode 100644 Scripts/Game/Game.cs
 create mode 100644 Scripts/Game/Input.cs
 create mode 100644 Scripts/Game/Output.cs
 create mode 100644 Scripts/Game/OutputBlock.cs
 delete mode 100644 Scripts/InputContainer.cs
 delete mode 100644 Scripts/OutputContainer.cs
 delete mode 100644 Scripts/OutputRow.cs
 delete mode 100644 Scripts/StartMenu.cs

(limited to 'Scripts')

diff --git a/Scripts/Command.cs b/Scripts/Command.cs
deleted file mode 100644
index e784576..0000000
--- a/Scripts/Command.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Godot;
-
-namespace Texty.Scripts
-{
-    public enum CommandType
-    {
-        Look
-    }
-
-    public class Command : Object
-    {
-        public Command()
-        {
-        }
-
-        public Command(CommandType type, string[] arguments)
-        {
-            RawArguments = arguments;
-            Type = type;
-        }
-
-        public string[] RawArguments { get; }
-        public CommandType Type { get; }
-    }
-}
\ No newline at end of file
diff --git a/Scripts/CommandParser.cs b/Scripts/CommandParser.cs
deleted file mode 100644
index 97d8025..0000000
--- a/Scripts/CommandParser.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.Linq;
-using Godot;
-using Texty.Scripts.Commands;
-
-namespace Texty.Scripts
-{
-    public class CommandParser : Node
-    {
-        public override void _Ready()
-        {
-        }
-
-        public Command TryParse(string text)
-        {
-            var components = text.Split(' ');
-            return components[0].ToLower() switch
-            {
-                "look" => new LookCommand(components.Skip(1).ToArray()),
-                _ => null
-            };
-        }
-    }
-}
\ No newline at end of file
diff --git a/Scripts/Commands/LookCommand.cs b/Scripts/Commands/LookCommand.cs
deleted file mode 100644
index 08783a9..0000000
--- a/Scripts/Commands/LookCommand.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using System.Linq;
-
-namespace Texty.Scripts.Commands
-{
-    public enum LookModifier
-    {
-        At,
-        Around
-    }
-
-    public class LookCommand : Command
-    {
-        public LookCommand()
-        {
-        }
-
-        public LookCommand(string[] arguments) : base(CommandType.Look, arguments)
-        {
-            (Modifier, arguments) = TryParseModifier(arguments);
-            Target = string.Join(" ", arguments);
-        }
-
-        public string Target { get; }
-        public LookModifier? Modifier { get; }
-
-        /// <summary>
-        ///     Access this <c>LookCommand</c>'s modifier as a string.
-        /// </summary>
-        /// <remarks>
-        ///     This function is provided as a means for testing the modifier parsing from GDScript.
-        /// </remarks>
-        private string ModifierAsString => Modifier?.ToString();
-
-        public override string ToString()
-        {
-            return $"look {ModifierAsString?.ToLower()} {string.Join(" ", Target)}";
-        }
-
-        /// <summary>
-        ///     Try to parse this <c>LookCommand</c>'s modifier from the given arguments.
-        /// </summary>
-        /// <param name="arguments">The arguments given to this look commands</param>
-        /// <returns>A pair consisting of the parse modifier and the remaining arguments</returns>
-        private static (LookModifier?, string[]) TryParseModifier(string[] arguments)
-        {
-            if (arguments.Length == 0)
-                return (null, arguments);
-
-            return arguments[0].ToLower() switch
-            {
-                "at" => (LookModifier.At, arguments.Skip(1).ToArray()),
-                "around" => (LookModifier.Around, new string[] { }),
-                _ => (null, arguments)
-            };
-        }
-    }
-}
\ No newline at end of file
diff --git a/Scripts/Game/Command.cs b/Scripts/Game/Command.cs
new file mode 100644
index 0000000..07d7c84
--- /dev/null
+++ b/Scripts/Game/Command.cs
@@ -0,0 +1,25 @@
+using Godot;
+
+namespace Texty.Scripts.Game
+{
+    public enum CommandType
+    {
+        Look
+    }
+
+    public class Command : Object
+    {
+        public Command()
+        {
+        }
+
+        public Command(CommandType type, string[] arguments)
+        {
+            RawArguments = arguments;
+            Type = type;
+        }
+
+        public string[] RawArguments { get; }
+        public CommandType Type { get; }
+    }
+}
\ No newline at end of file
diff --git a/Scripts/Game/CommandParser.cs b/Scripts/Game/CommandParser.cs
new file mode 100644
index 0000000..5f8249a
--- /dev/null
+++ b/Scripts/Game/CommandParser.cs
@@ -0,0 +1,23 @@
+using System.Linq;
+using Godot;
+using Texty.Scripts.Commands;
+
+namespace Texty.Scripts.Game
+{
+    public class CommandParser : Node
+    {
+        public override void _Ready()
+        {
+        }
+
+        public Command TryParse(string text)
+        {
+            var components = text.Split(' ');
+            return components[0].ToLower() switch
+            {
+                "look" => new LookCommand(components.Skip(1).ToArray()),
+                _ => null
+            };
+        }
+    }
+}
\ No newline at end of file
diff --git a/Scripts/Game/Commands/LookCommand.cs b/Scripts/Game/Commands/LookCommand.cs
new file mode 100644
index 0000000..b7910cc
--- /dev/null
+++ b/Scripts/Game/Commands/LookCommand.cs
@@ -0,0 +1,58 @@
+using System.Linq;
+using Texty.Scripts.Game;
+
+namespace Texty.Scripts.Commands
+{
+    public enum LookModifier
+    {
+        At,
+        Around
+    }
+
+    public class LookCommand : Command
+    {
+        public LookCommand()
+        {
+        }
+
+        public LookCommand(string[] arguments) : base(CommandType.Look, arguments)
+        {
+            (Modifier, arguments) = TryParseModifier(arguments);
+            Target = string.Join(" ", arguments);
+        }
+
+        public string Target { get; }
+        public LookModifier? Modifier { get; }
+
+        /// <summary>
+        ///     Access this <c>LookCommand</c>'s modifier as a string.
+        /// </summary>
+        /// <remarks>
+        ///     This function is provided as a means for testing the modifier parsing from GDScript.
+        /// </remarks>
+        private string ModifierAsString => Modifier?.ToString();
+
+        public override string ToString()
+        {
+            return $"look {ModifierAsString?.ToLower()} {string.Join(" ", Target)}";
+        }
+
+        /// <summary>
+        ///     Try to parse this <c>LookCommand</c>'s modifier from the given arguments.
+        /// </summary>
+        /// <param name="arguments">The arguments given to this look commands</param>
+        /// <returns>A pair consisting of the parse modifier and the remaining arguments</returns>
+        private static (LookModifier?, string[]) TryParseModifier(string[] arguments)
+        {
+            if (arguments.Length == 0)
+                return (null, arguments);
+
+            return arguments[0].ToLower() switch
+            {
+                "at" => (LookModifier.At, arguments.Skip(1).ToArray()),
+                "around" => (LookModifier.Around, new string[] { }),
+                _ => (null, arguments)
+            };
+        }
+    }
+}
\ No newline at end of file
diff --git a/Scripts/Game/Game.cs b/Scripts/Game/Game.cs
new file mode 100644
index 0000000..50db736
--- /dev/null
+++ b/Scripts/Game/Game.cs
@@ -0,0 +1,25 @@
+using Godot;
+
+namespace Texty.Scripts.Game
+{
+    public class Game : Node
+    {
+        private Input Input => GetNodeOrNull<Input>($"%{nameof(Input)}");
+        private Output Output => GetNodeOrNull<Output>($"%{nameof(Output)}");
+        private StatusLine StatusLine => GetNodeOrNull<StatusLine>($"%{nameof(StatusLine)}");
+
+        public override void _Ready()
+        {
+        }
+
+        public void OnCommandSubmitted(Command command)
+        {
+            Output.Push($"! {command}");
+        }
+
+        public void OnUnknownInputSubmitted(string text)
+        {
+            Output.Push($"? {text}");
+        }
+    }
+}
\ No newline at end of file
diff --git a/Scripts/Game/Input.cs b/Scripts/Game/Input.cs
new file mode 100644
index 0000000..2342ac2
--- /dev/null
+++ b/Scripts/Game/Input.cs
@@ -0,0 +1,29 @@
+using Godot;
+
+namespace Texty.Scripts.Game
+{
+    public class Input : PanelContainer
+    {
+        [Signal] public delegate void CommandSubmitted(Command command);
+        [Signal] public delegate void UnknownInputSubmitted(string text);
+
+        private CommandParser CommandParser => GetNodeOrNull<CommandParser>($"%{nameof(CommandParser)}");
+        private Label Prompt => GetNodeOrNull<Label>($"%{nameof(Prompt)}");
+        private LineEdit Text => GetNodeOrNull<LineEdit>($"%{nameof(Text)}");
+
+        public override void _Ready()
+        {
+            Text.GrabFocus();
+        }
+
+        public void OnTextEntered(string text)
+        {
+            Text.Clear();
+            var command = CommandParser.TryParse(text);
+            if (command != null)
+                EmitSignal(nameof(CommandSubmitted), command);
+            else
+                EmitSignal(nameof(UnknownInputSubmitted), text);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Scripts/Game/Output.cs b/Scripts/Game/Output.cs
new file mode 100644
index 0000000..be943f7
--- /dev/null
+++ b/Scripts/Game/Output.cs
@@ -0,0 +1,43 @@
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using Godot;
+using Godot.Collections;
+
+namespace Texty.Scripts.Game
+{
+    public class Output : PanelContainer
+    {
+        [Export(PropertyHint.File, "*.tscn")] public PackedScene OutputBlockScene;
+        public Array<string> TextBlocks => new Array<string>(BlockNodes.ToList().Select(block => block.Content));
+
+        private VBoxContainer LineContainer => GetNodeOrNull<VBoxContainer>($"%{nameof(LineContainer)}");
+
+        private IEnumerable<OutputBlock> BlockNodes =>
+            GD.Range(LineContainer?.GetChildCount() ?? 0)
+                .Select(index => LineContainer.GetChild(index))
+                .Cast<OutputBlock>();
+
+        public override void _Ready()
+        {
+            Debug.Assert(OutputBlockScene != null, "OutputBlockScene has not been configured!");
+            Debug.Assert(OutputBlockScene.CanInstance(), "OutputBlockScene can not be instanced!");
+        }
+
+        public void Clear()
+        {
+            BlockNodes.ToList().ForEach(block =>
+            {
+                LineContainer.RemoveChild(block);
+                block.QueueFree();
+            });
+        }
+
+        public void Push(string text)
+        {
+            var block = OutputBlockScene.Instance<OutputBlock>();
+            block.Content = text;
+            LineContainer.AddChild(block);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Scripts/Game/OutputBlock.cs b/Scripts/Game/OutputBlock.cs
new file mode 100644
index 0000000..491958c
--- /dev/null
+++ b/Scripts/Game/OutputBlock.cs
@@ -0,0 +1,28 @@
+using Godot;
+
+namespace Texty.Scripts.Game
+{
+    public class OutputBlock : MarginContainer
+    {
+        private string _content = "";
+
+        private RichTextLabel ContentLabel => GetNodeOrNull<RichTextLabel>($"%{nameof(ContentLabel)}");
+
+        [Export(PropertyHint.MultilineText)]
+        public string Content
+        {
+            get => ContentLabel?.BbcodeText ?? "";
+            set
+            {
+                _content = value;
+                if (ContentLabel != null)
+                    ContentLabel.BbcodeText = GodotSharp.Singleton.Tr(_content);
+            }
+        }
+
+        public override void _Ready()
+        {
+            Content = _content;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Scripts/Game/StatusLine.cs b/Scripts/Game/StatusLine.cs
index 4a3fb23..ef98a0a 100644
--- a/Scripts/Game/StatusLine.cs
+++ b/Scripts/Game/StatusLine.cs
@@ -2,29 +2,26 @@ using Godot;
 
 namespace Texty.Scripts.Game
 {
-	public class StatusLine : PanelContainer
-	{
-		private string _titleText = "Title Text";
-		
-		[Export]
-		public string Title
-		{
-			get => _titleText;
-			set
-			{
-				if (TitleLabel != null)
-					TitleLabel.Text = value;
-				_titleText = value;
-			}
-		}
+    public class StatusLine : PanelContainer
+    {
+        private string _titleText = "Title Text";
+        private RichTextLabel TitleLabel => GetNodeOrNull<RichTextLabel>($"%{nameof(TitleLabel)}");
 
-		public RichTextLabel TitleLabel;
-		
-		public override void _Ready()
-		{
-			TitleLabel = GetNode<RichTextLabel>($"%{nameof(TitleLabel)}");
-			TitleLabel.Text = _titleText;
-		}
-	}
-}
+        [Export]
+        public string Title
+        {
+            get => _titleText;
+            set
+            {
+                _titleText = value;
+                if (TitleLabel != null)
+                    TitleLabel.Text = GodotSharp.Singleton.Tr(value);
+            }
+        }
 
+        public override void _Ready()
+        {
+            Title = _titleText;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Scripts/InputContainer.cs b/Scripts/InputContainer.cs
deleted file mode 100644
index 300d568..0000000
--- a/Scripts/InputContainer.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using Godot;
-
-namespace Texty.Scripts
-{
-    public abstract class InputContainer : HBoxContainer
-    {
-        [Signal] public delegate void InputSubmitted(string text);
-
-        public LineEdit InputField;
-        public Button SubmitButton;
-
-        public override void _Ready()
-        {
-            InputField = GetNode<LineEdit>(nameof(InputField));
-            SubmitButton = GetNode<Button>(nameof(SubmitButton));
-
-            SubmitButton.Disabled = InputField.Text.Empty();
-        }
-
-        public void OnInputChanged(string newText)
-        {
-            SubmitButton.Disabled = newText.Empty();
-        }
-
-        public void OnInputSubmitted(string newText)
-        {
-            SubmitText(newText);
-        }
-
-        public void OnInputSubmitted()
-        {
-            SubmitText(InputField.Text);
-        }
-
-        public void OnVisibilityChanged()
-        {
-            if (Visible)
-                InputField.GrabFocus();
-            else
-                InputField.ReleaseFocus();
-        }
-
-        private void SubmitText(string newText)
-        {
-            if (newText.Empty()) return;
-            EmitSignal(nameof(InputSubmitted), newText);
-            InputField.Clear();
-        }
-    }
-}
\ No newline at end of file
diff --git a/Scripts/OutputContainer.cs b/Scripts/OutputContainer.cs
deleted file mode 100644
index 5db1fe6..0000000
--- a/Scripts/OutputContainer.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using System.Linq;
-using Godot;
-
-namespace Texty.Scripts
-{
-    public abstract class OutputContainer : PanelContainer
-    {
-        private double _lastScrollLimit;
-
-        private VScrollBar _scrollBar;
-
-        [Export(PropertyHint.Range, "10,40,1")] public int MaximumRows = 20;
-
-        public VBoxContainer OutputRows;
-        public ScrollContainer ScrollContainer;
-
-        public override void _Ready()
-        {
-            ScrollContainer = GetNode<ScrollContainer>(nameof(ScrollContainer));
-            _scrollBar = ScrollContainer.GetVScrollbar();
-            OutputRows = ScrollContainer.GetNode<VBoxContainer>(nameof(OutputRows));
-
-            _lastScrollLimit = _scrollBar.MaxValue;
-            _scrollBar.Connect("changed", this, nameof(OnScrollLimitChanged));
-        }
-
-        public void Add(OutputRow row)
-        {
-            OutputRows.AddChild(row);
-            ExpungeOldRows();
-        }
-
-        public void OnScrollLimitChanged()
-        {
-            if (!(_lastScrollLimit < _scrollBar.MaxValue)) return;
-            _lastScrollLimit = _scrollBar.MaxValue;
-            ScrollContainer.ScrollVertical = (int)_scrollBar.MaxValue;
-        }
-
-        private void ExpungeOldRows()
-        {
-            GD.Range(OutputRows.GetChildCount() - MaximumRows)
-                .Select(idx => OutputRows.GetChild(idx))
-                .ToList()
-                .ForEach(row =>
-                {
-                    OutputRows.RemoveChild(row);
-                    row.QueueFree();
-                });
-        }
-    }
-}
\ No newline at end of file
diff --git a/Scripts/OutputRow.cs b/Scripts/OutputRow.cs
deleted file mode 100644
index cfbb2e7..0000000
--- a/Scripts/OutputRow.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using System;
-using Godot;
-
-namespace Texty.Scripts
-{
-    public abstract class OutputRow : VBoxContainer
-    {
-        [Signal] public delegate void InputTextChanged(string newText);
-        [Signal] public delegate void OutputTextChanged(string newText);
-
-        private string _inputText = "";
-        private string _outputText = "";
-
-        public Label Input;
-        public Label Output;
-
-        [Export]
-        public string InputText
-        {
-            get => _inputText;
-            set => UpdateText(Field.Input, value ?? "");
-        }
-
-        [Export]
-        public string OutputText
-        {
-            get => _outputText;
-            set => UpdateText(Field.Output, value ?? "");
-        }
-
-        public override void _Ready()
-        {
-            Input = GetNode<Label>(nameof(Input));
-            UpdateLabel(Input, _inputText);
-            Output = GetNode<Label>(nameof(Output));
-            UpdateLabel(Output, _outputText);
-        }
-
-        private void UpdateText(Field field, string value)
-        {
-            switch (field)
-            {
-                case Field.Input:
-                    _inputText = value;
-                    EmitSignal(nameof(InputTextChanged), _inputText);
-                    UpdateLabel(Input, value);
-                    break;
-                case Field.Output:
-                    _outputText = value;
-                    EmitSignal(nameof(OutputTextChanged), value);
-                    UpdateLabel(Output, value);
-                    break;
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(field), field, "No such field!");
-            }
-        }
-
-        private static void UpdateLabel(Label label, string value)
-        {
-            if (label != null) label.Text = value;
-        }
-
-        private enum Field
-        {
-            Input,
-            Output
-        }
-    }
-}
\ No newline at end of file
diff --git a/Scripts/StartMenu.cs b/Scripts/StartMenu.cs
deleted file mode 100644
index a1f64cc..0000000
--- a/Scripts/StartMenu.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using Godot;
-
-namespace Texty.Scripts
-{
-    public class StartMenu : MarginContainer
-    {
-        [Signal] public delegate void QuitGame();
-        [Signal] public delegate void ShowCredits();
-        [Signal] public delegate void StartGame();
-
-        public Button CreditsButton;
-        public Button QuitButton;
-        public Button StartButton;
-
-        public override void _Ready()
-        {
-            var buttons = FindNode("Buttons");
-            CreditsButton = buttons.GetNode<Button>(nameof(CreditsButton));
-            QuitButton = buttons.GetNode<Button>(nameof(QuitButton));
-            StartButton = buttons.GetNode<Button>(nameof(StartButton));
-        }
-
-        public void OnCreditsButtonPressed()
-        {
-            EmitSignal(nameof(ShowCredits));
-        }
-
-        public void OnQuitButtonPressed()
-        {
-            EmitSignal(nameof(QuitGame));
-        }
-
-        public void OnStartButtonPressed()
-        {
-            EmitSignal(nameof(StartGame));
-        }
-
-        public void OnVisibilityChanged()
-        {
-            if(Visible)
-                StartButton.GrabFocus();
-            else
-                StartButton.ReleaseFocus();
-        }
-    }
-}
\ No newline at end of file
-- 
cgit v1.2.3