From d7eefa488135c477f39ea0953b032c7dcdad8bc7 Mon Sep 17 00:00:00 2001 From: Sophia Pearson Date: Sat, 26 Nov 2022 10:08:44 +0100 Subject: scripts: perform code cleanup actions --- Scripts/Game/Commands/LookCommand.cs | 91 ++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 46 deletions(-) (limited to 'Scripts/Game/Commands/LookCommand.cs') diff --git a/Scripts/Game/Commands/LookCommand.cs b/Scripts/Game/Commands/LookCommand.cs index 22ba77e..c66fa43 100644 --- a/Scripts/Game/Commands/LookCommand.cs +++ b/Scripts/Game/Commands/LookCommand.cs @@ -1,58 +1,57 @@ using System.Linq; using Texty.Scripts.Game; -namespace Texty.Scripts.Commands +namespace Texty.Scripts.Commands; + +public enum LookModifier +{ + At, + Around +} + +public partial class LookCommand : Command { - public enum LookModifier + public LookCommand() { - At, - Around } - public partial class LookCommand : Command + public LookCommand(string[] arguments) : base(CommandType.Look, arguments) { - public LookCommand() - { - } + (Modifier, arguments) = TryParseModifier(arguments); + Target = string.Join(" ", arguments); + } - public LookCommand(string[] arguments) : base(CommandType.Look, arguments) - { - (Modifier, arguments) = TryParseModifier(arguments); - Target = string.Join(" ", arguments); - } - - public string Target { get; } - public LookModifier? Modifier { get; } - - /// - /// Access this LookCommand's modifier as a string. - /// - /// - /// This function is provided as a means for testing the modifier parsing from GDScript. - /// - private string ModifierAsString => Modifier?.ToString(); - - public override string ToString() - { - return $"look {ModifierAsString?.ToLower()} {string.Join(" ", Target)}"; - } - - /// - /// Try to parse this LookCommand's modifier from the given arguments. - /// - /// The arguments given to this look commands - /// A pair consisting of the parse modifier and the remaining arguments - private static (LookModifier?, string[]) TryParseModifier(string[] arguments) + public string Target { get; } + public LookModifier? Modifier { get; } + + /// + /// Access this LookCommand's modifier as a string. + /// + /// + /// This function is provided as a means for testing the modifier parsing from GDScript. + /// + private string ModifierAsString => Modifier?.ToString(); + + public override string ToString() + { + return $"look {ModifierAsString?.ToLower()} {string.Join(" ", Target)}"; + } + + /// + /// Try to parse this LookCommand's modifier from the given arguments. + /// + /// The arguments given to this look commands + /// A pair consisting of the parse modifier and the remaining arguments + private static (LookModifier?, string[]) TryParseModifier(string[] arguments) + { + if (arguments.Length == 0) + return (null, arguments); + + return arguments[0].ToLower() switch { - 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) - }; - } + "at" => (LookModifier.At, arguments.Skip(1).ToArray()), + "around" => (LookModifier.Around, new string[] { }), + _ => (null, arguments) + }; } } \ No newline at end of file -- cgit v1.2.3