mirror of
https://github.com/billsonnn/nitro-renderer.git
synced 2024-11-26 17:30:52 +01:00
Merge branch 'patch/groupbadge-imager' into 'main'
fix image generation when part position is omitted See merge request nitro/nitro-renderer!14
This commit is contained in:
commit
c629f527b8
@ -168,7 +168,7 @@ export class BadgeImageManager implements IDisposable
|
|||||||
private loadGroupBadge(badgeCode: string): void
|
private loadGroupBadge(badgeCode: string): void
|
||||||
{
|
{
|
||||||
const groupBadge = new GroupBadge(badgeCode);
|
const groupBadge = new GroupBadge(badgeCode);
|
||||||
const partMatches = [...badgeCode.matchAll(/[b|s][0-9]{5,6}/g)];
|
const partMatches = [...badgeCode.matchAll(/[b|s][0-9]{4,6}/g)];
|
||||||
|
|
||||||
for(const partMatch of partMatches)
|
for(const partMatch of partMatches)
|
||||||
{
|
{
|
||||||
@ -177,7 +177,7 @@ export class BadgeImageManager implements IDisposable
|
|||||||
const partType = partCode[0];
|
const partType = partCode[0];
|
||||||
const partId = parseInt(partCode.slice(1, shortMethod ? 3 : 4));
|
const partId = parseInt(partCode.slice(1, shortMethod ? 3 : 4));
|
||||||
const partColor = parseInt(partCode.slice(shortMethod ? 3 : 4, shortMethod ? 5 : 6));
|
const partColor = parseInt(partCode.slice(shortMethod ? 3 : 4, shortMethod ? 5 : 6));
|
||||||
const partPosition = parseInt(partCode.slice(shortMethod ? 5 : 6, shortMethod ? 6 : 7));
|
const partPosition = partCode.length < 6 ? 0 : parseInt(partCode.slice(shortMethod ? 5 : 6, shortMethod ? 6 : 7)); // sometimes position is ommitted
|
||||||
const part = new GroupBadgePart(partType, partId, partColor, partPosition);
|
const part = new GroupBadgePart(partType, partId, partColor, partPosition);
|
||||||
|
|
||||||
groupBadge.parts.push(part);
|
groupBadge.parts.push(part);
|
||||||
|
Loading…
Reference in New Issue
Block a user