From 402af184dbe79c7dc7d1252af4aaf43573ecba1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1lint=20M=C3=B3r=C3=A1sz?= Date: Tue, 10 Oct 2023 20:20:44 +0000 Subject: [PATCH] add pancel to felszereles --- src/pdf/character.pdf.ts | 41 ++++++++++++++++++++++-------------- src/pdf/karakter_pdf_view.ts | 2 +- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/src/pdf/character.pdf.ts b/src/pdf/character.pdf.ts index b91b005..287ce45 100644 --- a/src/pdf/character.pdf.ts +++ b/src/pdf/character.pdf.ts @@ -180,6 +180,14 @@ function DrawKepzettsegek(draw: (text: string, x: number, y: number) => void, ke } } +function DrawFelszereles(draw: (text: string, x: number, y:number) => void, felszereles: string[]) { + const startFrom = 337 + for (let i = 0; i < felszereles.length; i++) { + const item = felszereles[i]; + draw(item, 390, startFrom - (i * 18)) + } +} + function DrawMagic(page: PDFPage, fontSizeBase: number, pdfFont: PDFFont, napiVarazslatok: number[], varazsMentokNF: number[]){ for(let i = 0; i < 6; i++) { const y = 247 - (i*18) @@ -262,7 +270,21 @@ export async function CreatePDF(karakter: KarakterPdfView) { y: 495, size: fontSizeBase * 3, font: pdfFont, - color: rgb(0.75, 0.75, 0.75), + color: rgb(0, 0, 0), + }) + page.drawText(karakter.PancelVO.toString(), { + x: 512, + y: 515, + size: fontSizeBase * 2, + font: pdfFont, + color: rgb(0, 0, 0), + }) + page.drawText(karakter.PajzsVO.toString(), { + x: 512, + y: 482, + size: fontSizeBase * 2, + font: pdfFont, + color: rgb(0, 0, 0), }) const kozelharciTB = karakter.KozelharciTB.map(SignedNumberToText).join("/") @@ -313,22 +335,9 @@ export async function CreatePDF(karakter: KarakterPdfView) { const nextKepzettsegFrom = 337 - (karakter.Kepzettsegek.length * 18) DrawKepzettsegek(drawText, karakter.TolvajKepzettsegek, nextKepzettsegFrom) - DrawMagic(page, fontSizeBase, pdfFont, karakter.NapiMemorizalhatoVarazslatok, karakter.VarazslatMentokNF) + DrawFelszereles(drawText, karakter.Felszereles) - page.drawText(karakter.PancelVO.toString(), { - x: 512, - y: 515, - size: fontSizeBase * 2, - font: pdfFont, - color: rgb(0, 0, 0), - }) - page.drawText(karakter.PajzsVO.toString(), { - x: 512, - y: 482, - size: fontSizeBase * 2, - font: pdfFont, - color: rgb(0, 0, 0), - }) + DrawMagic(page, fontSizeBase, pdfFont, karakter.NapiMemorizalhatoVarazslatok, karakter.VarazslatMentokNF) const secondPage = pdfDoc.addPage() DrawSecondPage(secondPage, pdfFont, karakter) diff --git a/src/pdf/karakter_pdf_view.ts b/src/pdf/karakter_pdf_view.ts index 752dc47..88d5779 100644 --- a/src/pdf/karakter_pdf_view.ts +++ b/src/pdf/karakter_pdf_view.ts @@ -98,7 +98,7 @@ export function KarakterInputToPdfView(karakter: KarakterInputs): KarakterPdfVie NapiMemorizalhatoVarazslatok, VarazslatMentokNF, - Felszereles: [pajzs?.Name, pancel?.Name].filter(x => !!x) as string[], + Felszereles: [pancel?.Name, pajzs?.Name].filter(x => !!x) as string[], PajzsVO: pajzs?.VO ?? 0, PancelVO: pancel?.VO ?? 0, }