From 7e50cb802eabbb21695253e81596c2c4018a3847 Mon Sep 17 00:00:00 2001 From: DaInfLoop Date: Tue, 13 Aug 2024 15:00:01 +0100 Subject: [PATCH] fix part 3 --- assets/communityvs/None.png | 1 + assets/{battlebgs => communityvs}/Stik.png | Bin index.ts | 21 +++++++++++++++------ types.ts | 4 ++++ 4 files changed, 20 insertions(+), 6 deletions(-) create mode 120000 assets/communityvs/None.png rename assets/{battlebgs => communityvs}/Stik.png (100%) diff --git a/assets/communityvs/None.png b/assets/communityvs/None.png new file mode 120000 index 0000000..9750c5f --- /dev/null +++ b/assets/communityvs/None.png @@ -0,0 +1 @@ +assets/battlebgs/None.png \ No newline at end of file diff --git a/assets/battlebgs/Stik.png b/assets/communityvs/Stik.png similarity index 100% rename from assets/battlebgs/Stik.png rename to assets/communityvs/Stik.png diff --git a/index.ts b/index.ts index 5be9522..816bffd 100644 --- a/index.ts +++ b/index.ts @@ -144,7 +144,14 @@ const opponents = { text: "Master OG", colour: ["#FF0000", "#FFFFFF"] }, - [Opponents.Stik]: { +} + +const communityOpponents = { + [Opponents.None]: { + text: "", + colour: ["#FFFFFF", "#FFFFFF"] + }, + [CommunityOpponents.Stik]: { text: "Stik", colour: ["#FF0000", "#000000"] } @@ -277,7 +284,7 @@ const server = createServer(async (req, res) => { const canvas = createCanvas(1920, 1080); const context = canvas.getContext("2d"); - if (!validOpponents.includes(opts.opponent)) opts.opponent = CommunityOpponents.None + if (!validOpponents.includes(opts.opponent)) opts.opponent = Opponents.None const SquadBackground = await loadImage( `./assets/communityvs/${opts.opponent}.png`, @@ -291,9 +298,11 @@ const server = createServer(async (req, res) => { context.textAlign = "center" - context.font = applyText(canvas, opponents[opts.opponent].text, 875) - - drawText([1450, 1000], opponents[opts.opponent].text, opponents[opts.opponent].colour[1], { colour: opponents[opts.opponent].colour[0], width: 20 }, context); + // @ts-ignore shut up + context.font = applyText(canvas, communityOpponents[opts.opponent].text, 875) + + // @ts-ignore shut up + drawText([1450, 1000], communityOpponents[opts.opponent].text, communityOpponents[opts.opponent].colour[1], { colour: communityOpponents[opts.opponent].colour[0], width: 20 }, context); context.font = applyText(canvas, opts.username, 675) @@ -334,7 +343,7 @@ const server = createServer(async (req, res) => { ); } - console.log(`Generating ${opts.action} for ${opts.username}`) + console.log(`Generating ${opts.action}`) // Image dimensions const canvas = createCanvas(1920, 1080); diff --git a/types.ts b/types.ts index 37ecd92..33f4465 100644 --- a/types.ts +++ b/types.ts @@ -127,6 +127,10 @@ export enum Opponents { Dicey2024 = "Dicey2024", CakeDay = "CakeDay", MasterOG = "MasterOG", +} + +export enum CommunityOpponents { + None = "None", Stik = "Stik", }