Skip to content

Commit 795e9ec

Browse files
committed
Update Calamity Queller placeholder
1 parent 75d5e93 commit 795e9ec

3 files changed

Lines changed: 2482 additions & 2684 deletions

File tree

src/commands/weapons/weapon.ts

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ Note: this command supports fuzzy search.`,
115115
if (weapon == undefined)
116116
return sendMessage(source, "Unable to find weapon")
117117

118-
const hasRefinements = weapon.refinement && weapon.refinement.length > 0 && weapon.refinement[0].length > 0
118+
const hasRefinements = weapon.refinements && weapon.refinements.length > 0
119119

120120
const pages: Bookmarkable[] = [{
121121
bookmarkEmoji: "📝",
@@ -203,14 +203,14 @@ Note: this command supports fuzzy search.`,
203203

204204
getMainWeaponPage(weapon: Weapon, relativePage: number, currentPage: number, maxPages: number): MessageEmbed | undefined {
205205
const { data } = client
206-
const hasRefinements = weapon.refinement && weapon.refinement.length > 0 && weapon.refinement[0].length > 0
206+
const hasRefinements = weapon.refinements && weapon.refinements.length > 0
207207
const embed = new MessageEmbed()
208208
.setTitle(`${weapon.name}: Basic info`)
209209
.setColor(Colors.AQUA)
210210
.setThumbnail(weapon.icon)
211211
.setFooter(`Page ${currentPage} / ${maxPages}`)
212212
.setDescription(weapon.desc + (weapon.placeholder ? "\n\n*This weapon is currently not yet available.*" : ""))
213-
.addField("Basics", `${weapon.stars}${data.emoji(weapon.weaponType)}`)
213+
.addField("Basics", `${weapon.stars}${data.emoji(weapon.weaponType)}`, (weapon.placeholderStats && !weapon.weaponCurve) ? true : false)
214214

215215
const maxAscension = weapon.ascensions?.[weapon.ascensions.length - 1]
216216
if (weapon.weaponCurve && maxAscension)
@@ -225,9 +225,15 @@ Note: this command supports fuzzy search.`,
225225
.map(([name, value]) => `**${name}**: ${data.stat(name, value)}`)
226226
.join("\n")
227227
}`, true)
228-
229-
if (weapon.refinement && hasRefinements)
230-
embed.addField(`${weapon.refinement[0][0].name} (at R1)`, weapon.refinement[0][0].desc)
228+
else if (weapon.placeholderStats) {
229+
embed.addField(`Lv. ${weapon.placeholderStats.level} stats`, `${
230+
Object.entries(weapon.placeholderStats.stats)
231+
.map(([name, value]) => `**${name}**: ${data.stat(name, value)}`)
232+
.join("\n")
233+
}`, true)
234+
}
235+
if (weapon.refinements && hasRefinements)
236+
embed.addField(`${weapon.refinements[0].name} (at R1)`, weapon.refinements[0].desc)
231237
if (weapon.ascensionCosts)
232238
embed.addField("Upgrade material", `Ascensions: ${[
233239
weapon.ascensionCosts.mapping.WeaponAsc2,
@@ -288,9 +294,8 @@ Note: this command supports fuzzy search.`,
288294
.setFooter(`Page ${currentPage} / ${maxPages}`)
289295

290296
embed.setTitle(`${weapon.name}: Refinements`)
291-
for (const ref of weapon.refinement ?? [])
292-
for (const [refinement, info] of Object.entries(ref))
293-
embed.addField(`${info.name} ${+refinement+1}`, info.desc)
297+
for (const [refinement, info] of Object.entries(weapon.refinements ?? []))
298+
embed.addField(`${info.name} R${+refinement+1}`, info.desc)
294299

295300
return embed
296301
}

0 commit comments

Comments
 (0)