maidraw 0.9.5 → 0.10.1

package/dist/geki/painter/index.d.ts

@@ -0,0 +1,88 @@
+import { z } from "zod/v4";
+import { CanvasRenderingContext2D } from "canvas";
+import ScoreTrackerAdapter from "../lib/adapter";
+import { IScore } from "../type";
+import { Painter, Theme, ThemeManager } from "../../lib/painter";
+export declare abstract class OngekiPainter<Schema extends typeof ThemeManager.BaseObject> extends Painter<ScoreTrackerAdapter, Schema> {
+    constructor({ theme: { schema, searchPaths, defaultTheme }, }: {
+        theme: {
+            schema: Schema;
+            searchPaths: string[];
+            defaultTheme: string;
+        };
+    });
+}
+export declare namespace OngekiPainterModule {
+    namespace Profile {
+        const schema: z.ZodObject<{
+            x: z.ZodNumber;
+            y: z.ZodNumber;
+            type: z.ZodLiteral<"profile">;
+            sprites: z.ZodObject<{
+                ratingNumberMap: z.ZodString;
+                profile: z.ZodObject<{
+                    userplate: z.ZodString;
+                    icon: z.ZodString;
+                }, z.core.$strip>;
+            }, z.core.$strip>;
+        }, z.core.$strip>;
+        function draw(ctx: CanvasRenderingContext2D, theme: Theme<any>, element: z.infer<typeof schema>, username: string, rating: number, profilePicture?: Buffer, type?: "refresh" | "classic"): Promise<void>;
+    }
+    namespace Best50 {
+        namespace ScoreGrid {
+            const schema: z.ZodObject<{
+                x: z.ZodNumber;
+                y: z.ZodNumber;
+                type: z.ZodLiteral<"score-grid">;
+                horizontalSize: z.ZodNumber;
+                verticalSize: z.ZodNumber;
+                region: z.ZodEnum<{
+                    recent: "recent";
+                    new: "new";
+                    old: "old";
+                }>;
+                index: z.ZodNumber;
+                scoreBubble: z.ZodObject<{
+                    width: z.ZodNumber;
+                    height: z.ZodNumber;
+                    margin: z.ZodNumber;
+                    gap: z.ZodUnion<readonly [z.ZodNumber, z.ZodObject<{
+                        x: z.ZodNumber;
+                        y: z.ZodNumber;
+                    }, z.core.$strip>]>;
+                    color: z.ZodObject<{
+                        basic: z.ZodString;
+                        advanced: z.ZodString;
+                        expert: z.ZodString;
+                        master: z.ZodString;
+                        lunatic: z.ZodString;
+                    }, z.core.$strip>;
+                }, z.core.$strip>;
+                sprites: z.ZodObject<{
+                    achievement: z.ZodObject<{
+                        d: z.ZodString;
+                        c: z.ZodString;
+                        b: z.ZodString;
+                        bb: z.ZodString;
+                        bbb: z.ZodString;
+                        a: z.ZodString;
+                        aa: z.ZodString;
+                        aaa: z.ZodString;
+                        s: z.ZodString;
+                        ss: z.ZodString;
+                        sss: z.ZodString;
+                        sssp: z.ZodString;
+                    }, z.core.$strip>;
+                    milestone: z.ZodObject<{
+                        ab: z.ZodString;
+                        abp: z.ZodString;
+                        fc: z.ZodString;
+                        fb: z.ZodString;
+                        none: z.ZodString;
+                    }, z.core.$strip>;
+                }, z.core.$strip>;
+            }, z.core.$strip>;
+            function draw(ctx: CanvasRenderingContext2D, theme: Theme<any>, element: z.infer<typeof schema>, score: IScore, index: number, x: number, y: number, type?: "refresh" | "classic"): Promise<void>;
+        }
+    }
+}

package/dist/geki/painter/index.js

@@ -0,0 +1,448 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OngekiPainterModule = exports.OngekiPainter = void 0;
+const sharp_1 = __importDefault(require("sharp"));
+const color_1 = __importDefault(require("color"));
+const v4_1 = require("zod/v4");
+const canvas_1 = require("canvas");
+const database_1 = require("../lib/database");
+const type_1 = require("../type");
+const util_1 = require("../../lib/util");
+const painter_1 = require("../../lib/painter");
+class OngekiPainter extends painter_1.Painter {
+    constructor({ theme: { schema, searchPaths, defaultTheme }, }) {
+        super({ theme: { schema, searchPaths, defaultTheme } });
+    }
+}
+exports.OngekiPainter = OngekiPainter;
+var OngekiPainterModule;
+(function (OngekiPainterModule) {
+    let Profile;
+    (function (Profile) {
+        Profile.schema = painter_1.ThemeManager.Element.extend({
+            type: v4_1.z.literal("profile"),
+            sprites: v4_1.z.object({
+                ratingNumberMap: v4_1.z.string(),
+                profile: v4_1.z.object({
+                    userplate: v4_1.z.string(),
+                    icon: v4_1.z.string(),
+                }),
+            }),
+        });
+        async function draw(ctx, theme, element, username, rating, profilePicture, type = "refresh") {
+            try {
+                const userplate = (0, sharp_1.default)(theme.getFile(element.sprites.profile.userplate));
+                const upper = await userplate
+                    .resize({
+                    width: 1080,
+                    height: 166,
+                    fit: "cover",
+                    position: "top",
+                })
+                    .png()
+                    .toBuffer();
+                const lower = await userplate
+                    .resize({
+                    width: 1080,
+                    height: 130,
+                    fit: "cover",
+                    position: "bottom",
+                })
+                    .png()
+                    .toBuffer();
+                const upperImage = new canvas_1.Image();
+                const lowerImage = new canvas_1.Image();
+                upperImage.src = upper;
+                lowerImage.src = lower;
+                ctx.drawImage(upperImage, element.x, element.y, theme.content.width, theme.content.width * (166 / 1080));
+                ctx.drawImage(lowerImage, element.x, element.y +
+                    theme.content.height -
+                    theme.content.width * (130 / 1080), theme.content.width, theme.content.width * (130 / 1080));
+            }
+            catch { }
+            /* Begin Profile Picture Draw */
+            {
+                ctx.save();
+                ctx.beginPath();
+                ctx.roundRect(element.x + theme.content.width * (7 / 32) * (233 / 128), element.y + theme.content.width * (3 / 32) * (19 / 64), theme.content.width * (7 / 32) * 0.45, theme.content.width * (7 / 32) * 0.45, [
+                    0,
+                    theme.content.width * (7 / 32) * 0.05,
+                    theme.content.width * (7 / 32) * 0.05,
+                    0,
+                ]);
+                ctx.clip();
+                ctx.fillStyle = "white";
+                ctx.fill();
+                const icon = new canvas_1.Image();
+                try {
+                    (0, sharp_1.default)(profilePicture);
+                }
+                catch {
+                    // Unknown profile picture binary
+                    profilePicture = undefined;
+                }
+                const pfp = profilePicture ||
+                    theme.getFile(element.sprites.profile.icon);
+                const { dominant } = await (0, sharp_1.default)(pfp).stats();
+                icon.src = await (0, sharp_1.default)(pfp).png().toBuffer();
+                const cropSize = Math.min(icon.width, icon.height);
+                ctx.drawImage(icon, (icon.width - cropSize) / 2, (icon.height - cropSize) / 2, cropSize, cropSize, element.x + theme.content.width * (7 / 32) * (233 / 128), element.y + theme.content.width * (3 / 32) * (19 / 64), theme.content.width * (7 / 32) * 0.45, theme.content.width * (7 / 32) * 0.45);
+                if (profilePicture) {
+                    ctx.beginPath();
+                    ctx.roundRect(element.x +
+                        theme.content.width * (7 / 32) * (233 / 128), element.y + theme.content.width * (3 / 32) * (19 / 64), theme.content.width * (7 / 32) * 0.45, theme.content.width * (7 / 32) * 0.45, [
+                        0,
+                        theme.content.width * (7 / 32) * 0.05,
+                        theme.content.width * (7 / 32) * 0.05,
+                        0,
+                    ]);
+                    ctx.strokeStyle = color_1.default.rgb(dominant).darken(0.3).hex();
+                    ctx.lineWidth = (theme.content.width * (7 / 32)) / 128;
+                    ctx.stroke();
+                }
+                ctx.restore();
+            }
+            /* End Profile Picture Draw */
+            /* Begin Username Draw */
+            {
+                ctx.beginPath();
+                ctx.roundRect(element.x + theme.content.width * (7 / 32) * (59 / 128), element.y + theme.content.width * (7 / 32) * (16 / 128), theme.content.width * (7 / 32) * (85 / 64), theme.content.width * (7 / 32) * 0.45, [
+                    theme.content.width * (7 / 32) * 0.05,
+                    0,
+                    0,
+                    theme.content.width * (7 / 32) * 0.05,
+                ]);
+                ctx.fillStyle = "rgba(255, 255, 255, 0.45)";
+                ctx.fill();
+                // const ratingImgBuffer = await this.getRatingNumber(rating, theme);
+                // if (ratingImgBuffer) {
+                //     const { width, height } =
+                //         await sharp(ratingImgBuffer).metadata();
+                //     if (width && height) {
+                //         const aspectRatio = width / height;
+                //         const image = new Image();
+                //         image.src = ratingImgBuffer;
+                //         const drawHeight = (theme.content.width * (7/32) * 7) / 32;
+                //         ctx.drawImage(
+                //             image,
+                //             element.x + theme.content.width * (7/32) * 2.0,
+                //             element.y + theme.content.width * (7/32) * 0.3,
+                //             drawHeight * aspectRatio * 0.8,
+                //             drawHeight
+                //         );
+                //     }
+                // }
+                util_1.Util.drawText(ctx, "Lv.", element.x + theme.content.width * (7 / 32) * (62 / 128), element.y + theme.content.width * (7 / 32) * (49 / 128), (theme.content.width * (7 / 32) * 1) / 16, 0, (((theme.content.width * (7 / 32)) / 3) * 5.108 * 3.1) / 5, "left", "black", "black", "standard-font-username");
+                util_1.Util.drawText(ctx, "99", element.x + theme.content.width * (7 / 32) * (74 / 128), element.y + theme.content.width * (7 / 32) * (49 / 128), (theme.content.width * (7 / 32) * 1) / 11, 0, (((theme.content.width * (7 / 32)) / 3) * 5.108 * 3.1) / 5, "left", "black", "black", "standard-font-username");
+                util_1.Util.drawText(ctx, util_1.Util.HalfFullWidthConvert.toFullWidth(username), element.x + theme.content.width * (7 / 32) * (89 / 128), element.y + theme.content.width * (7 / 32) * (49 / 128), (theme.content.width * (7 / 32) * 1) / 8, 0, theme.content.width * (7 / 32) * (140 / 128), "left", "black", "black", "standard-font-username");
+                util_1.Util.drawText(ctx, "RATING", element.x + theme.content.width * (7 / 32) * (62 / 128), element.y + theme.content.width * (7 / 32) * (70 / 128), (theme.content.width * (7 / 32) * 7) / 88, 0, (((theme.content.width * (7 / 32)) / 3) * 5.108 * 3.1) / 5, "left", "black", "black", "standard-font-username");
+                util_1.Util.drawText(ctx, util_1.Util.truncate(rating, type === "refresh" ? 3 : 2), element.x + theme.content.width * (7 / 32) * (109 / 128), element.y + theme.content.width * (7 / 32) * (70 / 128), (theme.content.width * (7 / 32) * 5) / 44, 0, (((theme.content.width * (7 / 32)) / 3) * 5.108 * 3.1) / 5, "left", "black", "black", "standard-font-username");
+            }
+            /* End Username Draw*/
+        }
+        Profile.draw = draw;
+    })(Profile = OngekiPainterModule.Profile || (OngekiPainterModule.Profile = {}));
+    let Best50;
+    (function (Best50) {
+        let ScoreGrid;
+        (function (ScoreGrid) {
+            ScoreGrid.schema = painter_1.ThemeManager.Element.extend({
+                type: v4_1.z.literal("score-grid"),
+                horizontalSize: v4_1.z.number().min(1),
+                verticalSize: v4_1.z.number().min(1),
+                region: v4_1.z.enum(["recent", "new", "old"]),
+                index: v4_1.z.number().min(0),
+                scoreBubble: v4_1.z.object({
+                    width: v4_1.z.number().min(1),
+                    height: v4_1.z.number().min(1),
+                    margin: v4_1.z.number().min(0),
+                    gap: v4_1.z.union([
+                        v4_1.z.number().min(0),
+                        v4_1.z.object({
+                            x: v4_1.z.number().min(0),
+                            y: v4_1.z.number().min(0),
+                        }),
+                    ]),
+                    color: v4_1.z.object({
+                        basic: util_1.Util.z.color(),
+                        advanced: util_1.Util.z.color(),
+                        expert: util_1.Util.z.color(),
+                        master: util_1.Util.z.color(),
+                        lunatic: util_1.Util.z.color(),
+                    }),
+                }),
+                sprites: v4_1.z.object({
+                    achievement: v4_1.z.object({
+                        d: v4_1.z.string(),
+                        c: v4_1.z.string(),
+                        b: v4_1.z.string(),
+                        bb: v4_1.z.string(),
+                        bbb: v4_1.z.string(),
+                        a: v4_1.z.string(),
+                        aa: v4_1.z.string(),
+                        aaa: v4_1.z.string(),
+                        s: v4_1.z.string(),
+                        ss: v4_1.z.string(),
+                        sss: v4_1.z.string(),
+                        sssp: v4_1.z.string(),
+                    }),
+                    milestone: v4_1.z.object({
+                        ab: v4_1.z.string(),
+                        abp: v4_1.z.string(),
+                        fc: v4_1.z.string(),
+                        fb: v4_1.z.string(),
+                        none: v4_1.z.string(),
+                    }),
+                }),
+            });
+            async function draw(ctx, theme, element, score, index, x, y, type = "refresh") {
+                let curColor = "#FFFFFF";
+                switch (score.chart.difficulty) {
+                    case type_1.EDifficulty.BASIC:
+                        curColor = element.scoreBubble.color.basic;
+                        break;
+                    case type_1.EDifficulty.ADVANCED:
+                        curColor = element.scoreBubble.color.advanced;
+                        break;
+                    case type_1.EDifficulty.EXPERT:
+                        curColor = element.scoreBubble.color.expert;
+                        break;
+                    case type_1.EDifficulty.MASTER:
+                        curColor = element.scoreBubble.color.master;
+                        break;
+                    case type_1.EDifficulty.LUNATIC:
+                        curColor = element.scoreBubble.color.lunatic;
+                        break;
+                }
+                /** Begin Card Draw */
+                ctx.save();
+                ctx.fillStyle = new color_1.default(curColor).lighten(0.4).hexa();
+                ctx.beginPath();
+                ctx.roundRect(x, y, element.scoreBubble.width, element.scoreBubble.height, (element.scoreBubble.height * 0.806) / 7);
+                ctx.strokeStyle = new color_1.default(curColor).darken(0.3).hexa();
+                ctx.lineWidth = element.scoreBubble.margin / 4;
+                ctx.stroke();
+                ctx.fill();
+                ctx.beginPath();
+                ctx.roundRect(x, y, element.scoreBubble.width, element.scoreBubble.height, (element.scoreBubble.height * 0.806) / 7);
+                ctx.clip();
+                /** Begin Main Content Draw */
+                {
+                    ctx.save();
+                    ctx.beginPath();
+                    ctx.roundRect(x, y, element.scoreBubble.width, element.scoreBubble.height * 0.742, (element.scoreBubble.height * 0.806) / 7);
+                    ctx.clip();
+                    ctx.fillStyle = curColor;
+                    ctx.fill();
+                    const jacketSize = Math.min(element.scoreBubble.width, element.scoreBubble.height * 0.742);
+                    const jacketMaskGrad = ctx.createLinearGradient(x + jacketSize / 2, y + jacketSize / 2, x + jacketSize, y + jacketSize / 2);
+                    jacketMaskGrad.addColorStop(0, new color_1.default(curColor).alpha(0).hexa());
+                    jacketMaskGrad.addColorStop(0.25, new color_1.default(curColor).alpha(0.2).hexa());
+                    jacketMaskGrad.addColorStop(1, new color_1.default(curColor).alpha(1).hexa());
+                    const jacketMaskGradDark = ctx.createLinearGradient(x + jacketSize / 2, y + jacketSize / 2, x + jacketSize, y + jacketSize / 2);
+                    jacketMaskGradDark.addColorStop(0, new color_1.default(curColor).darken(0.3).alpha(0).hexa());
+                    jacketMaskGradDark.addColorStop(0.25, new color_1.default(curColor).darken(0.3).alpha(0.2).hexa());
+                    jacketMaskGradDark.addColorStop(1, new color_1.default(curColor).darken(0.3).alpha(1).hexa());
+                    /** Begin Jacket Draw*/
+                    let jacket = await database_1.Database.fetchJacket(score.chart.id);
+                    if (!jacket)
+                        jacket = await database_1.Database.fetchJacket(0);
+                    if (jacket) {
+                        const img = new canvas_1.Image();
+                        img.src = jacket;
+                        ctx.drawImage(img, x, y, jacketSize, jacketSize);
+                    }
+                    else {
+                        ctx.fillStyle = "#b6ffab";
+                        ctx.fillRect(x, y, jacketSize, jacketSize);
+                    }
+                    /** End Jacket Draw*/
+                    /** Begin Jacket Gradient Mask Draw*/ {
+                        ctx.fillStyle = jacketMaskGrad;
+                        ctx.fillRect(x + jacketSize / 2, y, (jacketSize * 3) / 4, jacketSize);
+                    } /** End Jacket Gradient Mask Draw*/
+                    ctx.beginPath();
+                    ctx.roundRect(x + element.scoreBubble.margin, y + element.scoreBubble.margin, element.scoreBubble.width -
+                        element.scoreBubble.margin * 2, element.scoreBubble.height * 0.806 -
+                        element.scoreBubble.margin * 2, (element.scoreBubble.height * 0.806 -
+                        element.scoreBubble.margin * 2) /
+                        7);
+                    /** Begin Title Draw */ {
+                        util_1.Util.drawText(ctx, score.chart.name, x + (jacketSize * 7) / 8, y +
+                            element.scoreBubble.margin +
+                            element.scoreBubble.height * 0.806 * 0.144, element.scoreBubble.height * 0.806 * 0.144, element.scoreBubble.height * 0.806 * 0.04, element.scoreBubble.width -
+                            (jacketSize * 7) / 8 -
+                            element.scoreBubble.margin, "left", "white", jacketMaskGradDark);
+                    } /** End Title Draw */
+                    /** Begin Separation Line Draw */ {
+                        ctx.beginPath();
+                        ctx.roundRect(x + (jacketSize * 13) / 16, y +
+                            element.scoreBubble.margin +
+                            element.scoreBubble.height *
+                                0.806 *
+                                (0.144 + 0.072), element.scoreBubble.width -
+                            (jacketSize * 13) / 16 -
+                            element.scoreBubble.margin * 2, element.scoreBubble.height * 0.806 * 0.02, element.scoreBubble.height * 0.806 * 0.16);
+                        ctx.fillStyle = jacketMaskGradDark;
+                        ctx.fill();
+                    } /** End Separation Line Draw */
+                    /** Begin Achievement Rate Draw */
+                    util_1.Util.drawText(ctx, util_1.Util.truncate(score.score, 0), x -
+                        element.scoreBubble.margin -
+                        element.scoreBubble.height * 0.806 * 0.02 +
+                        element.scoreBubble.width, y +
+                        element.scoreBubble.margin +
+                        element.scoreBubble.height *
+                            0.806 *
+                            (0.144 + 0.144 + 0.208 - 0.04), element.scoreBubble.height * 0.806 * 0.208, element.scoreBubble.height * 0.806 * 0.04, Infinity, "right", "white", new color_1.default(curColor).darken(0.3).hexa());
+                    /** End Achievement Rate Draw */
+                    /** Begin Achievement Rank Draw */
+                    {
+                        let rankImg;
+                        switch (score.rank) {
+                            case type_1.EAchievementTypes.D:
+                                rankImg = theme.getFile(element.sprites.achievement.d);
+                                break;
+                            case type_1.EAchievementTypes.C:
+                                rankImg = theme.getFile(element.sprites.achievement.c);
+                                break;
+                            case type_1.EAchievementTypes.B:
+                                rankImg = theme.getFile(element.sprites.achievement.b);
+                                break;
+                            case type_1.EAchievementTypes.BB:
+                                rankImg = theme.getFile(element.sprites.achievement.bb);
+                                break;
+                            case type_1.EAchievementTypes.BBB:
+                                rankImg = theme.getFile(element.sprites.achievement.bbb);
+                                break;
+                            case type_1.EAchievementTypes.A:
+                                rankImg = theme.getFile(element.sprites.achievement.a);
+                                break;
+                            case type_1.EAchievementTypes.AA:
+                                rankImg = theme.getFile(element.sprites.achievement.aa);
+                                break;
+                            case type_1.EAchievementTypes.AAA:
+                                rankImg = theme.getFile(element.sprites.achievement.aaa);
+                                break;
+                            case type_1.EAchievementTypes.S:
+                                rankImg = theme.getFile(element.sprites.achievement.s);
+                                break;
+                            case type_1.EAchievementTypes.SS:
+                                rankImg = theme.getFile(element.sprites.achievement.ss);
+                                break;
+                            case type_1.EAchievementTypes.SSS:
+                                rankImg = theme.getFile(element.sprites.achievement.sss);
+                                break;
+                            default:
+                                rankImg = theme.getFile(element.sprites.achievement.sssp);
+                        }
+                        const img = new canvas_1.Image();
+                        img.src = rankImg;
+                        ctx.drawImage(img, x + jacketSize * (31 / 32), y +
+                            element.scoreBubble.margin +
+                            element.scoreBubble.height * 0.835 * 0.22, element.scoreBubble.height * 0.835 * 0.24 * 2, element.scoreBubble.height * 0.835 * 0.24);
+                    }
+                    /** End Achievement Rank Draw */
+                    /** Begin Milestone Draw */
+                    {
+                        let comboImg;
+                        switch (score.combo) {
+                            case type_1.EComboTypes.NONE:
+                                comboImg = theme.getFile(element.sprites.milestone.none);
+                                break;
+                            case type_1.EComboTypes.FULL_COMBO:
+                                comboImg = theme.getFile(element.sprites.milestone.fc);
+                                break;
+                            case type_1.EComboTypes.ALL_BREAK:
+                                comboImg = theme.getFile(element.sprites.milestone.ab);
+                                break;
+                            case type_1.EComboTypes.ALL_BREAK_PLUS:
+                                comboImg = theme.getFile(element.sprites.milestone.abp);
+                                break;
+                        }
+                        let bellImg;
+                        switch (score.bell) {
+                            case type_1.EBellTypes.NONE:
+                                bellImg = theme.getFile(element.sprites.milestone.none);
+                                break;
+                            case type_1.EBellTypes.FULL_BELL:
+                                bellImg = theme.getFile(element.sprites.milestone.fb);
+                                break;
+                        }
+                        const comboWidth = element.scoreBubble.height * 0.806 * 0.24 * 3;
+                        const comboBackground = comboWidth * 0.9;
+                        const comboBgRatio = 64 / 272;
+                        const sizeDiff = comboWidth - comboBackground;
+                        ctx.fillStyle = "#e8eaec";
+                        ctx.roundRect(x +
+                            sizeDiff / 2 +
+                            element.scoreBubble.width -
+                            element.scoreBubble.margin -
+                            comboWidth, y +
+                            jacketSize -
+                            (sizeDiff / 2) * comboBgRatio -
+                            element.scoreBubble.margin -
+                            comboWidth * comboBgRatio, comboBackground, comboBackground * comboBgRatio, (comboBackground * comboBgRatio) / 2);
+                        ctx.fill();
+                        ctx.roundRect(x +
+                            sizeDiff / 2 +
+                            element.scoreBubble.width -
+                            1.5 * element.scoreBubble.margin -
+                            2 * comboWidth, y +
+                            jacketSize -
+                            (sizeDiff / 2) * comboBgRatio -
+                            element.scoreBubble.margin -
+                            comboWidth * comboBgRatio, comboBackground, comboBackground * comboBgRatio, (comboBackground * comboBgRatio) / 2);
+                        ctx.fill();
+                        const combo = new canvas_1.Image();
+                        combo.src = comboImg;
+                        const bell = new canvas_1.Image();
+                        bell.src = bellImg;
+                        ctx.drawImage(bell, x +
+                            element.scoreBubble.width -
+                            element.scoreBubble.margin -
+                            comboWidth, y +
+                            jacketSize -
+                            element.scoreBubble.margin -
+                            comboWidth * (84 / 290), comboWidth, comboWidth * (84 / 290));
+                        ctx.drawImage(combo, x +
+                            element.scoreBubble.width -
+                            1.5 * element.scoreBubble.margin -
+                            2 * comboWidth, y +
+                            jacketSize -
+                            element.scoreBubble.margin -
+                            comboWidth * (84 / 290), comboWidth, comboWidth * (84 / 290));
+                    }
+                    /** End Milestone Draw */
+                    /** Begin Bests Index Draw */
+                    {
+                        util_1.Util.drawText(ctx, `#${index + 1}`, x + element.scoreBubble.margin * 2, y + jacketSize - element.scoreBubble.margin * 2, element.scoreBubble.height * 0.806 * 0.128, element.scoreBubble.height * 0.806 * 0.04, Infinity, "left", "white", new color_1.default(curColor).darken(0.3).hexa());
+                    }
+                    /** End Bests Index Draw */
+                    ctx.restore();
+                }
+                /** End Main Content Draw */
+                /** Begin Difficulty & Rating Draw */
+                {
+                    util_1.Util.drawText(ctx, `${util_1.Util.truncate(score.chart.level, 1)}  ↑${util_1.Util.truncate(score.rating, type === "refresh" ? 3 : 2)}`, x + element.scoreBubble.margin * 2, y +
+                        element.scoreBubble.height *
+                            (0.806 + (1 - 0.806) / 2), element.scoreBubble.height * 0.806 * 0.128, element.scoreBubble.height * 0.806 * 0.04, Infinity, "left", "white", new color_1.default(curColor).darken(0.3).hexa());
+                    if (score.platinumScore && score.chart.maxPlatinumScore)
+                        util_1.Util.drawText(ctx, `${score.platinumScore}/${score.chart.maxPlatinumScore}`, x +
+                            element.scoreBubble.width -
+                            element.scoreBubble.margin * 2, y +
+                            element.scoreBubble.height *
+                                (0.806 + (1 - 0.806) / 2), element.scoreBubble.height * 0.806 * 0.128, element.scoreBubble.height * 0.806 * 0.04, Infinity, "right", "white", new color_1.default(curColor).darken(0.3).hexa());
+                }
+                /** End Difficulty & Rating Draw */
+                ctx.restore();
+                /** End Card Draw */
+            }
+            ScoreGrid.draw = draw;
+        })(ScoreGrid = Best50.ScoreGrid || (Best50.ScoreGrid = {}));
+    })(Best50 = OngekiPainterModule.Best50 || (OngekiPainterModule.Best50 = {}));
+})(OngekiPainterModule || (exports.OngekiPainterModule = OngekiPainterModule = {}));
+//# sourceMappingURL=index.js.map

package/dist/geki/painter/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/geki/painter/index.ts"],"names":[],"mappings":"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"}

package/dist/lib/cache.d.ts

@@ -1,4 +1,5 @@
 export declare class Cache {
+    private logger;
     private memCache;
     private redisClient;
     private isRedisAvailable;

package/dist/lib/cache.js

@@ -1,9 +1,14 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Cache = void 0;
 const memory_cache_1 = require("memory-cache");
 const redis_1 = require("redis");
+const util_1 = __importDefault(require("./util"));
 class Cache {
+    logger = util_1.default.buildLogger(["maidraw", "cache"]);
     memCache;
     redisClient;
     isRedisAvailable = true;
@@ -11,7 +16,7 @@ class Cache {
         this.memCache = new memory_cache_1.Cache();
         this.redisClient = (0, redis_1.createClient)();
         this.redisClient.on("error", async (e) => {
-            console.error("Redis connection error, using memory-cache");
+            this.logger.error("Redis connection error, using memory-cache");
             this.isRedisAvailable = false;
             await this.redisClient.disconnect();
         });

package/dist/lib/cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../src/lib/cache.ts"],"names":[],"mappings":";;;AAAA,+CAAiD;AACjD,iCAAqC;AACrC,MAAa,KAAK;IACN,QAAQ,CAAC;IACT,WAAW,CAAC;IAEZ,gBAAgB,GAAG,IAAI,CAAC;IAChC;QACI,IAAI,CAAC,QAAQ,GAAG,IAAI,oBAAQ,EAAe,CAAC;QAC5C,IAAI,CAAC,WAAW,GAAG,IAAA,oBAAY,GAAE,CAAC;QAClC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;YACrC,OAAO,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC;YAC5D,IAAI,CAAC,gBAAgB,GAAG,KAAK,CAAC;YAC9B,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC;QACxC,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;IAC/B,CAAC;IACD,KAAK,CAAC,GAAG,CAAC,GAAW;QACjB,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACxB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACnD,IAAI,UAAU,EAAE,CAAC;gBACb,IAAI,CAAC;oBACD,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;gBAClC,CAAC;gBAAC,MAAM,CAAC;oBACL,OAAO,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;gBAC7C,CAAC;YACL,CAAC;QACL,CAAC;;YAAM,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACzC,CAAC;IACD,KAAK,CAAC,GAAG,CAAC,GAAW,EAAE,KAAU,EAAE,GAAW;QAC1C,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACxB,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBACzB,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;oBACtD,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC;iBAC7B,CAAC,CAAC;YACP,CAAC;iBAAM,CAAC;gBACJ,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;oBACnD,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC;iBAC7B,CAAC,CAAC;YACP,CAAC;QACL,CAAC;;YAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;IAC9C,CAAC;CACJ;AAxCD,sBAwCC"}
+{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../src/lib/cache.ts"],"names":[],"mappings":";;;;;;AAAA,+CAAiD;AACjD,iCAAqC;AACrC,kDAA0B;AAC1B,MAAa,KAAK;IACN,MAAM,GAAG,cAAI,CAAC,WAAW,CAAC,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC;IAEhD,QAAQ,CAAC;IACT,WAAW,CAAC;IAEZ,gBAAgB,GAAG,IAAI,CAAC;IAChC;QACI,IAAI,CAAC,QAAQ,GAAG,IAAI,oBAAQ,EAAe,CAAC;QAC5C,IAAI,CAAC,WAAW,GAAG,IAAA,oBAAY,GAAE,CAAC;QAClC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;YACrC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC;YAChE,IAAI,CAAC,gBAAgB,GAAG,KAAK,CAAC;YAC9B,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC;QACxC,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;IAC/B,CAAC;IACD,KAAK,CAAC,GAAG,CAAC,GAAW;QACjB,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACxB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACnD,IAAI,UAAU,EAAE,CAAC;gBACb,IAAI,CAAC;oBACD,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;gBAClC,CAAC;gBAAC,MAAM,CAAC;oBACL,OAAO,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;gBAC7C,CAAC;YACL,CAAC;QACL,CAAC;;YAAM,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACzC,CAAC;IACD,KAAK,CAAC,GAAG,CAAC,GAAW,EAAE,KAAU,EAAE,GAAW;QAC1C,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACxB,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBACzB,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;oBACtD,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC;iBAC7B,CAAC,CAAC;YACP,CAAC;iBAAM,CAAC;gBACJ,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;oBACnD,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC;iBAC7B,CAAC,CAAC;YACP,CAAC;QACL,CAAC;;YAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;IAC9C,CAAC;CACJ;AA1CD,sBA0CC"}