aly/XIV-Character-Cards
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #34 from SocMinarch/fix-for-mimo-and-no-gc

Browse source 
Fixes mounts/minions percentages always showing as `N/A%`, and for crashing when a character has no Grand Company
This commit is contained in:
ArcaneDisgea 2022-10-09 14:02:04 -04:00 committed by GitHub
commit a93d4bacf8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
create-card.js
View file

@ -331,7 +331,7 @@ class CardCreator {
const customImagePromise = customImage != null ? loadImage(customImage) : Promise.resolve(); const customImagePromise = customImage != null ? loadImage(customImage) : Promise.resolve();
const portraitPromise = dataPromise.then(data => loadImage(data.Character.Portrait)); const portraitPromise = dataPromise.then(data => loadImage(data.Character.Portrait));
const deityPromise = dataPromise.then(data => loadImage(`https://xivapi.com/${data.Character.GuardianDeity.Icon}`)); const deityPromise = dataPromise.then(data => loadImage(`https://xivapi.com/${data.Character.GuardianDeity.Icon}`));
const gcRankPromise = dataPromise.then(data => data.Character.GrandCompany.Company != null ? loadImage(`https://xivapi.com/${data.Character.GrandCompany.Rank.Icon}`) : null); const gcRankPromise = dataPromise.then(data => data.Character.GrandCompany.Company != null && data.Character.GrandCompany.Company.Name != null ? loadImage(`https://xivapi.com/${data.Character.GrandCompany.Rank.Icon}`) : null);
const fcCrestPromise = dataPromise.then(data => data.Character.FreeCompanyName != null ? this.createCrest(data.FreeCompany.Crest) : null); const fcCrestPromise = dataPromise.then(data => data.Character.FreeCompanyName != null ? this.createCrest(data.FreeCompany.Crest) : null);
// Build canvas and only await data, when actually needed // Build canvas and only await data, when actually needed
@ -442,10 +442,10 @@ class CardCreator {
let minionsPercentage = "N/A" let minionsPercentage = "N/A"
let mountsPercentage = "N/A" let mountsPercentage = "N/A"
if (Minions != null) { if (Minions != null) {
const minionsPercentage = Math.ceil(((Minions.length ?? 0) / this.minionCount) * 100); minionsPercentage = Math.ceil(((Minions.length ?? 0) / this.minionCount) * 100);
} }
if (Mounts != null) { if (Mounts != null) {
const mountsPercentage = Math.ceil(((Mounts.length ?? 0) / this.mountCount) * 100); mountsPercentage = Math.ceil(((Mounts.length ?? 0) / this.mountCount) * 100);
} }
ctx.font = smed; ctx.font = smed;
@ -469,7 +469,7 @@ class CardCreator {
ctx.fillText(`${Character.Race.Name}, ${Character.Tribe.Name}`, 480, infoTextBigStartY); // Race & Clan ctx.fillText(`${Character.Race.Name}, ${Character.Tribe.Name}`, 480, infoTextBigStartY); // Race & Clan
ctx.fillText(Character.GuardianDeity.Name, 480, infoTextBigStartY + infoTextSpacing); // Guardian ctx.fillText(Character.GuardianDeity.Name, 480, infoTextBigStartY + infoTextSpacing); // Guardian
if (Character.GrandCompany.Company != null) { if (Character.GrandCompany.Company != null && Character.GrandCompany.Company.Name != null) {
ctx.font = small; ctx.font = small;
ctx.fillStyle = primary; ctx.fillStyle = primary;
ctx.fillText(strings.grandCompany, 480, infoTextSmallStartY + infoTextSpacing * 2); // Grand Company ctx.fillText(strings.grandCompany, 480, infoTextSmallStartY + infoTextSpacing * 2); // Grand Company