Skip to content
This repository has been archived by the owner on Mar 3, 2021. It is now read-only.

Add text api #2

Open
wants to merge 1 commit into
base: reactor
Choose a base branch
from
Open

Add text api #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
59 changes: 59 additions & 0 deletions src/Impostor.Api/Innersloth/Palette.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
using System.Collections.Generic;
using System.Drawing;
using Impostor.Api.Innersloth.Customization;

namespace Impostor.Api.Innersloth
{
public static class Palette
{
public static readonly Color DisabledGrey = Color.FromArgb(76, 76, 76);
public static readonly Color DisabledColor = Color.FromArgb(76, 255, 255, 255);
public static readonly Color EnabledColor = Color.FromArgb(255, 255, 255);
public static readonly Color Black = Color.FromArgb(0, 0, 0);
public static readonly Color ClearWhite = Color.FromArgb(0, 255, 255, 255);
public static readonly Color HalfWhite = Color.FromArgb(128, 255, 255, 255);
public static readonly Color White = Color.FromArgb(255, 255, 255);
public static readonly Color LightBlue = Color.FromArgb(128, 128, 255);
public static readonly Color Blue = Color.FromArgb(51, 51, 255);
public static readonly Color Orange = Color.FromArgb(255, 153, 1);
public static readonly Color Purple = Color.FromArgb(153, 26, 153);
public static readonly Color Brown = Color.FromArgb(184, 110, 28);

public static readonly Color CrewmateBlue = Color.FromArgb(140, 255, 255);
public static readonly Color ImpostorRed = Color.FromArgb(255, 25, 25);

public static readonly Dictionary<ColorType, Color> PlayerColors = new Dictionary<ColorType, Color>
{
[ColorType.Red] = Color.FromArgb(198, 17, 17),
[ColorType.Blue] = Color.FromArgb(19, 46, 210),
[ColorType.Green] = Color.FromArgb(17, 128, 45),
[ColorType.Pink] = Color.FromArgb(238, 84, 187),
[ColorType.Orange] = Color.FromArgb(240, 125, 13),
[ColorType.Yellow] = Color.FromArgb(246, 246, 87),
[ColorType.Black] = Color.FromArgb(63, 71, 78),
[ColorType.White] = Color.FromArgb(215, 225, 241),
[ColorType.Purple] = Color.FromArgb(107, 47, 188),
[ColorType.Brown] = Color.FromArgb(113, 73, 30),
[ColorType.Cyan] = Color.FromArgb(56, 255, 221),
[ColorType.Lime] = Color.FromArgb(80, 240, 57),
};

public static readonly Dictionary<ColorType, Color> ShadowColors = new Dictionary<ColorType, Color>
{
[ColorType.Red] = Color.FromArgb(122, 8, 56),
[ColorType.Blue] = Color.FromArgb(9, 21, 142),
[ColorType.Green] = Color.FromArgb(10, 77, 46),
[ColorType.Pink] = Color.FromArgb(172, 43, 174),
[ColorType.Orange] = Color.FromArgb(180, 62, 21),
[ColorType.Yellow] = Color.FromArgb(195, 136, 34),
[ColorType.Black] = Color.FromArgb(30, 31, 38),
[ColorType.White] = Color.FromArgb(132, 149, 192),
[ColorType.Purple] = Color.FromArgb(59, 23, 124),
[ColorType.Brown] = Color.FromArgb(94, 38, 21),
[ColorType.Cyan] = Color.FromArgb(36, 169, 191),
[ColorType.Lime] = Color.FromArgb(21, 168, 66),
};

public static readonly Color VisorColor = Color.FromArgb(149, 202, 220);
}
}
204 changes: 204 additions & 0 deletions src/Impostor.Api/Innersloth/Text/Text.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,204 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Globalization;
using System.Linq;
using System.Text;

namespace Impostor.Api.Innersloth.Text
{
public class Text
{
private readonly List<Text> _children = new List<Text>();

public Text(string content, Color? color = null, string? link = null)
{
Content = content;
Color = color;
Link = link;
}

public string Content { get; private set; }

public Color? Color { get; private set; }

public string? Link { get; private set; }

public IReadOnlyList<Text> Children => _children.AsReadOnly();

public static implicit operator Text(string raw) => Parse(raw);

public static implicit operator string(Text text) => text.ToString();

public static Text Parse(string raw)
{
var root = new Text(string.Empty);
var current = root;

var inBracket = false;

string? color = null;
string? link = null;

foreach (var c in raw)
{
if (inBracket)
{
if (c == ']')
{
inBracket = false;

if (color != null)
{
current.Color = System.Drawing.Color.FromArgb(
int.Parse(color.Substring(6, 2), NumberStyles.HexNumber),
int.Parse(color.Substring(0, 2), NumberStyles.HexNumber),
int.Parse(color.Substring(2, 2), NumberStyles.HexNumber),
int.Parse(color.Substring(4, 2), NumberStyles.HexNumber));
color = null;
}
else if (link != null)
{
current.Link = link;
link = null;
}
else
{
if (!ReferenceEquals(root, current) && current.Content != string.Empty)
{
root.Append(current);
}

current = new Text(string.Empty);
}
}
else if (color != null)
{
color += c.ToString();
}
else if (link != null)
{
link += c.ToString();
}
else if (int.TryParse(c.ToString(), NumberStyles.HexNumber, null, out var number))
{
color = c.ToString();
}
else
{
link = c.ToString();
}
}
else if (c == '[')
{
if (current.Content != string.Empty)
{
if (!ReferenceEquals(root, current) && current.Content != string.Empty)
{
root.Append(current);
}

current = new Text(string.Empty);
}

inBracket = true;
}
else
{
current.Content += c;
}
}

return root;
}

public string ToRawString()
{
var builder = new StringBuilder();

builder.Append(Content);

foreach (var child in _children)
{
builder.Append(child.ToRawString());
}

return builder.ToString();
}

public override string ToString()
{
var builder = new StringBuilder();

if (Color != null)
{
builder.Append("[");
builder.Append($"{Color.Value.R:X2}{Color.Value.G:X2}{Color.Value.B:X2}{Color.Value.A:X2}");
builder.Append("]");
}

if (Link != null)
{
builder.Append("[");
builder.Append(Link);
builder.Append("]");
}

builder.Append(Content);

if (Color != null || Link != null)
{
builder.Append("[]");
}

foreach (var child in _children)
{
builder.Append(child);
}

return builder.ToString();
}

public Text Append(Text text)
{
_children.Add(text);

return this;
}

public Text Append(string content, Color? color = null, string? link = null)
{
return Append(new Text(content, color, link));
}

public override bool Equals(object? obj)
{
if (ReferenceEquals(null, obj))
{
return false;
}

if (ReferenceEquals(this, obj))
{
return true;
}

if (obj.GetType() != this.GetType())
{
return false;
}

return Equals((Text)obj);
}

public override int GetHashCode()
{
return HashCode.Combine(_children, Content, Color, Link);
}

protected bool Equals(Text other)
{
return Content == other.Content && Color?.ToArgb() == other.Color?.ToArgb() && Link == other.Link && _children.SequenceEqual(other._children);
}
}
}
7 changes: 4 additions & 3 deletions src/Impostor.Api/Net/Inner/Objects/IInnerPlayerControl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System.Threading.Tasks;
using Impostor.Api.Innersloth.Customization;
using Impostor.Api.Innersloth.Text;
using Impostor.Api.Net.Inner.Objects.Components;

namespace Impostor.Api.Net.Inner.Objects
Expand Down Expand Up @@ -35,7 +36,7 @@ public interface IInnerPlayerControl : IInnerNetObject
/// </summary>
/// <param name="name">A name for the player.</param>
/// <returns>Task that must be awaited.</returns>
ValueTask SetNameAsync(string name);
ValueTask SetNameAsync(Text name);

/// <summary>
/// Sets the color of the current <see cref="IInnerPlayerControl"/>.
Expand Down Expand Up @@ -91,7 +92,7 @@ public interface IInnerPlayerControl : IInnerNetObject
/// </summary>
/// <param name="text">The message to send.</param>
/// <returns>Task that must be awaited.</returns>
ValueTask SendChatAsync(string text);
ValueTask SendChatAsync(Text text);

/// <summary>
/// Send a chat message as the current <see cref="IInnerPlayerControl"/>.
Expand All @@ -103,7 +104,7 @@ public interface IInnerPlayerControl : IInnerNetObject
/// When left as null, will send message to self.
/// </param>
/// <returns>Task that must be awaited.</returns>
ValueTask SendChatToPlayerAsync(string text, IInnerPlayerControl? player = null);
ValueTask SendChatToPlayerAsync(Text text, IInnerPlayerControl? player = null);

/// <summary>
/// Sets the current to be murdered by an impostor <see cref="IInnerPlayerControl"/>.
Expand Down
3 changes: 2 additions & 1 deletion src/Impostor.Api/Net/Inner/Objects/IInnerPlayerInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using Impostor.Api.Innersloth;
using Impostor.Api.Innersloth.Text;

namespace Impostor.Api.Net.Inner.Objects
{
Expand All @@ -9,7 +10,7 @@ public interface IInnerPlayerInfo
/// <summary>
/// Gets the name of the player as decided by the host.
/// </summary>
string PlayerName { get; }
Text PlayerName { get; }

/// <summary>
/// Gets the color of the player.
Expand Down
7 changes: 4 additions & 3 deletions src/Impostor.Server/Net/Inner/Objects/InnerPlayerControl.Api.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using Impostor.Api;
using Impostor.Api.Innersloth;
using Impostor.Api.Innersloth.Customization;
using Impostor.Api.Innersloth.Text;
using Impostor.Api.Net;
using Impostor.Api.Net.Inner.Objects;
using Impostor.Api.Net.Inner.Objects.Components;
Expand All @@ -17,7 +18,7 @@ internal partial class InnerPlayerControl : IInnerPlayerControl

IInnerPlayerInfo IInnerPlayerControl.PlayerInfo => PlayerInfo;

public async ValueTask SetNameAsync(string name)
public async ValueTask SetNameAsync(Text name)
{
PlayerInfo.PlayerName = name;

Expand Down Expand Up @@ -82,14 +83,14 @@ public ValueTask SetSkinAsync(SkinType skinType)
return SetSkinAsync((uint)skinType);
}

public async ValueTask SendChatAsync(string text)
public async ValueTask SendChatAsync(Text text)
{
using var writer = _game.StartRpc(NetId, RpcCalls.SendChat);
writer.Write(text);
await _game.FinishRpcAsync(writer);
}

public async ValueTask SendChatToPlayerAsync(string text, IInnerPlayerControl? player = null)
public async ValueTask SendChatToPlayerAsync(Text text, IInnerPlayerControl? player = null)
{
if (player == null)
{
Expand Down
5 changes: 3 additions & 2 deletions src/Impostor.Server/Net/Inner/Objects/InnerPlayerInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System.Collections.Generic;
using Impostor.Api.Games;
using Impostor.Api.Innersloth;
using Impostor.Api.Innersloth.Text;
using Impostor.Api.Net.Messages;

namespace Impostor.Server.Net.Inner.Objects
Expand All @@ -17,7 +18,7 @@ public InnerPlayerInfo(byte playerId)

public byte PlayerId { get; }

public string PlayerName { get; internal set; }
public Text PlayerName { get; internal set; }

public byte ColorId { get; internal set; }

Expand Down Expand Up @@ -56,7 +57,7 @@ public void Serialize(IMessageWriter writer)

public void Deserialize(IMessageReader reader)
{
PlayerName = reader.ReadString();
PlayerName = Text.Parse(reader.ReadString());
ColorId = reader.ReadByte();
HatId = reader.ReadPackedUInt32();
PetId = reader.ReadPackedUInt32();
Expand Down
Loading