From c058d180ae8eaf3095c6c4bf757acdac6600c95b Mon Sep 17 00:00:00 2001
From: Toastie <toastie@toastiet0ast.com>
Date: Sun, 30 Mar 2025 15:38:40 +1300
Subject: [PATCH] added prices to .nczoom .nc resized to 250x125
---
.../Modules/Games/NCanvas/NCanvasCommands.cs | 107 +++++++++++-------
.../Modules/Games/NCanvas/NCanvasService.cs | 33 +++++-
.../_common/Services/Impl/FontProvider.cs | 6 +-
src/EllieBot/data/commandlist.json | 3 +-
src/EllieBot/strings/aliases.yml | 1 +
5 files changed, 101 insertions(+), 49 deletions(-)
diff --git a/src/EllieBot/Modules/Games/NCanvas/NCanvasCommands.cs b/src/EllieBot/Modules/Games/NCanvas/NCanvasCommands.cs
index bcce32d..bf0e589 100644
--- a/src/EllieBot/Modules/Games/NCanvas/NCanvasCommands.cs
+++ b/src/EllieBot/Modules/Games/NCanvas/NCanvasCommands.cs
@@ -35,17 +35,22 @@ public partial class Games
public async Task NCanvas()
{
var pixels = await _service.GetCanvas();
- var image = new Image<Rgba32>(_service.GetWidth(), _service.GetHeight());
+ var w = _service.GetWidth();
+ var h = _service.GetHeight();
+ var image = new Image<Rgba32>(w * 2, h * 2);
Parallel.For(0,
- image.Height,
+ h * 2,
y =>
{
var pixelAccessor = image.DangerousGetPixelRowMemory(y);
var row = pixelAccessor.Span;
- for (int x = 0; x < image.Width; x++)
+ for (var x = 0; x < image.Width; x += 2)
{
- row[x] = new Rgba32(pixels[(y * image.Width) + x]);
+ var pi = pixels[(y / 2 * w) + x / 2];
+
+ row[x] = new Rgba32(pi);
+ row[x + 1] = new Rgba32(pi);
}
});
@@ -53,15 +58,15 @@ public partial class Games
var hint = GetText(strs.nc_hint(prefix, _service.GetWidth(), _service.GetHeight()));
await Response()
- .File(stream, "ncanvas.png")
- .Embed(CreateEmbed()
- .WithOkColor()
+ .File(stream, "ncanvas.png")
+ .Embed(CreateEmbed()
+ .WithOkColor()
#if GLOBAL_ELLIE
.WithDescription("This is not available yet.")
#endif
- .WithFooter(hint)
- .WithImageUrl("attachment://ncanvas.png"))
- .SendAsync();
+ .WithFooter(hint)
+ .WithImageUrl("attachment://ncanvas.png"))
+ .SendAsync();
}
[Cmd]
@@ -85,8 +90,8 @@ public partial class Games
var eb = CreateEmbed()
.WithOkColor()
.WithImageUrl($"attachment://zoom_{position}.png")
- .WithFooter($"`.ncs code color` to set. (.ncs abc green)" );
-
+ .WithFooter($"`.ncs code color` to set. (.ncs abc green)");
+
await Response()
.Embed(eb)
.File(stream, $"zoom_{position}.png")
@@ -106,11 +111,13 @@ public partial class Games
const float fontSize = 30;
var posFont = _fonts.NotoSans.CreateFont(fontSize, FontStyle.Bold);
+ var priceFont = _fonts.Symbola.CreateFont(25, FontStyle.Bold);
+
var size = TextMeasurer.MeasureSize("wwww", new TextOptions(posFont));
var scale = 100f / size.Width;
if (scale < 1)
posFont = _fonts.NotoSans.CreateFont(fontSize * scale, FontStyle.Bold);
- var outlinePen = new SolidPen(SixLabors.ImageSharp.Color.Black, 1f);
+ var outlinePen = new SolidPen(SixLabors.ImageSharp.Color.Black, 0.5f);
Parallel.For(0,
pixels.Length,
@@ -128,14 +135,26 @@ public partial class Games
image.Mutate(x =>
{
x.DrawText(new RichTextOptions(posFont)
- {
- HorizontalAlignment = HorizontalAlignment.Center,
- VerticalAlignment = VerticalAlignment.Center,
- Origin = new(startX + 50, startY + 50)
- },
+ {
+ HorizontalAlignment = HorizontalAlignment.Center,
+ VerticalAlignment = VerticalAlignment.Center,
+ Origin = new(startX + 50, startY + 30)
+ },
((kwum)pix.Position).ToString().PadLeft(2, '2'),
Brushes.Solid(SixLabors.ImageSharp.Color.White),
outlinePen);
+
+ x.DrawText(new RichTextOptions(priceFont)
+ {
+ HorizontalAlignment = HorizontalAlignment.Center,
+ VerticalAlignment = VerticalAlignment.Center,
+ Origin = new(startX + 50, startY + 80)
+ },
+ // "", Brushes.Solid(SixLabors.ImageSharp.Color.White), outlinePen);
+ pix.Price + "💵",
+ // CurrencyHelper.N(pix.Price, Culture, _gcs.Data.Currency.Sign),
+ Brushes.Solid(SixLabors.ImageSharp.Color.White),
+ outlinePen);
});
});
@@ -165,8 +184,8 @@ public partial class Games
_gcs.Data.Currency.Sign))));
if (!await PromptUserConfirmAsync(CreateEmbed()
- .WithPendingColor()
- .WithDescription(prompt)))
+ .WithPendingColor()
+ .WithDescription(prompt)))
{
return;
}
@@ -193,12 +212,12 @@ public partial class Games
await using var stream = await img.ToStreamAsync();
await Response()
- .Embed(CreateEmbed()
- .WithOkColor()
- .WithDescription(GetText(strs.nc_pixel_set(Format.Code(position.ToString()))))
- .WithImageUrl($"attachment://zoom_{position}.png"))
- .File(stream, $"zoom_{position}.png")
- .SendAsync();
+ .Embed(CreateEmbed()
+ .WithOkColor()
+ .WithDescription(GetText(strs.nc_pixel_set(Format.Code(position.ToString()))))
+ .WithImageUrl($"attachment://zoom_{position}.png"))
+ .File(stream, $"zoom_{position}.png")
+ .SendAsync();
}
[Cmd]
@@ -230,18 +249,18 @@ public partial class Games
var pos = new kwum(pixel.Position);
await Response()
- .File(stream, $"{pixel.Position}.png")
- .Embed(CreateEmbed()
- .WithOkColor()
- .WithDescription(string.IsNullOrWhiteSpace(pixel.Text) ? string.Empty : pixel.Text)
- .WithTitle(GetText(strs.nc_pixel(pos)))
- .AddField(GetText(strs.nc_position),
- $"{pixel.Position % _service.GetWidth()} {pixel.Position / _service.GetWidth()}",
- true)
- .AddField(GetText(strs.price), pixel.Price.ToString(), true)
- .AddField(GetText(strs.color), "#" + new Rgba32(pixel.Color).ToHex())
- .WithImageUrl($"attachment://{pixel.Position}.png"))
- .SendAsync();
+ .File(stream, $"{pixel.Position}.png")
+ .Embed(CreateEmbed()
+ .WithOkColor()
+ .WithDescription(string.IsNullOrWhiteSpace(pixel.Text) ? string.Empty : pixel.Text)
+ .WithTitle(GetText(strs.nc_pixel(pos)))
+ .AddField(GetText(strs.nc_position),
+ $"{pixel.Position % _service.GetWidth()} {pixel.Position / _service.GetWidth()}",
+ true)
+ .AddField(GetText(strs.price), pixel.Price.ToString(), true)
+ .AddField(GetText(strs.color), "#" + new Rgba32(pixel.Color).ToHex())
+ .WithImageUrl($"attachment://{pixel.Position}.png"))
+ .SendAsync();
}
[Cmd]
@@ -264,9 +283,9 @@ public partial class Games
}
if (!await PromptUserConfirmAsync(CreateEmbed()
- .WithDescription(
- "This will reset the canvas to the specified image. All prices, text and colors will be reset.\n\n"
- + "Are you sure you want to continue?")))
+ .WithDescription(
+ "This will reset the canvas to the specified image. All prices, text and colors will be reset.\n\n"
+ + "Are you sure you want to continue?")))
return;
using var http = _http.CreateClient();
@@ -294,9 +313,9 @@ public partial class Games
await _service.ResetAsync();
if (!await PromptUserConfirmAsync(CreateEmbed()
- .WithDescription(
- "This will delete all pixels and reset the canvas.\n\n"
- + "Are you sure you want to continue?")))
+ .WithDescription(
+ "This will delete all pixels and reset the canvas.\n\n"
+ + "Are you sure you want to continue?")))
return;
await ctx.OkAsync();
diff --git a/src/EllieBot/Modules/Games/NCanvas/NCanvasService.cs b/src/EllieBot/Modules/Games/NCanvas/NCanvasService.cs
index f76c7df..fb48ca1 100644
--- a/src/EllieBot/Modules/Games/NCanvas/NCanvasService.cs
+++ b/src/EllieBot/Modules/Games/NCanvas/NCanvasService.cs
@@ -20,8 +20,8 @@ public sealed class NCanvasService : INCanvasService, IReadyExecutor, IEService
private readonly ICurrencyService _cs;
private readonly QuestService _quests;
- public const int CANVAS_WIDTH = 500;
- public const int CANVAS_HEIGHT = 350;
+ public const int CANVAS_WIDTH = 250;
+ public const int CANVAS_HEIGHT = 125;
public const int INITIAL_PRICE = 3;
public NCanvasService(
@@ -45,8 +45,35 @@ public sealed class NCanvasService : INCanvasService, IReadyExecutor, IEService
await using var uow = _db.GetDbContext();
- if (await uow.GetTable<NCPixel>().CountAsyncLinqToDB() > 0)
+ var count = await uow.GetTable<NCPixel>().CountAsync();
+ if (count == CANVAS_WIDTH * CANVAS_HEIGHT)
return;
+
+ var oldWidth = 500;
+ var oldHeight = 250;
+ if (count == oldWidth * oldHeight)
+ {
+ await uow.GetTable<NCPixel>()
+ .Where(x => x.Position % (oldWidth * 2) % 2 != 0 // x is odd
+ || (x.Position / oldWidth) % 2 != 0) // or y is odd
+ .DeleteAsync();
+
+ await uow.GetTable<NCPixel>()
+ .Where(x => x.Position % (oldWidth * 2) % 2 == 0
+ && (x.Position / oldWidth) % 2 == 0)
+ .UpdateAsync(old => new()
+ {
+ Position = (old.Position % oldWidth) / 2
+ + ((old.Position / oldWidth) / 2) * CANVAS_WIDTH,
+ Price = INITIAL_PRICE,
+ Text = old.Text,
+ OwnerId = old.OwnerId,
+ Color = old.Color,
+ });
+
+ return;
+ }
+
await ResetAsync();
}
diff --git a/src/EllieBot/_common/Services/Impl/FontProvider.cs b/src/EllieBot/_common/Services/Impl/FontProvider.cs
index e5d51b5..e9cdbbb 100644
--- a/src/EllieBot/_common/Services/Impl/FontProvider.cs
+++ b/src/EllieBot/_common/Services/Impl/FontProvider.cs
@@ -6,6 +6,7 @@ namespace EllieBot.Services;
public class FontProvider : IEService
{
public FontFamily NotoSans { get; }
+ public FontFamily Symbola { get; }
public List<FontFamily> FallBackFonts { get; }
private readonly FontCollection _fonts;
@@ -14,6 +15,7 @@ public class FontProvider : IEService
_fonts = new();
NotoSans = _fonts.Add("data/fonts/NotoSans-Bold.ttf");
+ Symbola = _fonts.Add("data/fonts/Symbola-10.24.ttf");
FallBackFonts = new();
@@ -27,7 +29,9 @@ public class FontProvider : IEService
FallBackFonts.AddRange(_fonts.AddCollection(Path.Combine(fontsfolder, "msgothic.ttc")));
FallBackFonts.AddRange(_fonts.AddCollection(Path.Combine(fontsfolder, "segoe.ttc")));
}
- catch { }
+ catch
+ {
+ }
}
// any fonts present in data/fonts should be added as fallback fonts
diff --git a/src/EllieBot/data/commandlist.json b/src/EllieBot/data/commandlist.json
index fdc1d00..8324dad 100644
--- a/src/EllieBot/data/commandlist.json
+++ b/src/EllieBot/data/commandlist.json
@@ -4315,7 +4315,8 @@
"Aliases": [
".ncsetpixel",
".ncsp",
- ".ncs"
+ ".ncs",
+ ".ncset"
],
"Description": "Sets a pixel's color and text on the nCanvas.\nYou must specify the position of the pixel to set in alphanumeric format.\nYou can obtain alphanumeric position of the pixel by using `nczoom` or `ncp <x> <y>`",
"Usage": [
diff --git a/src/EllieBot/strings/aliases.yml b/src/EllieBot/strings/aliases.yml
index 0f5d61d..3fc6067 100644
--- a/src/EllieBot/strings/aliases.yml
+++ b/src/EllieBot/strings/aliases.yml
@@ -1484,6 +1484,7 @@ ncsetpixel:
- ncsetpixel
- ncsp
- ncs
+ - ncset
nczoom:
- nczoom
- ncz