From 9688d490159f50e7d11fa43a382ad0308b84c94d Mon Sep 17 00:00:00 2001 From: auto-deploy Date: Thu, 30 Nov 2023 01:38:33 +0000 Subject: [PATCH] [v0.10.16] Live website --- docs/index.html | 14 +++++++------- docs/scripts/script.min.js | 25 ++++++++++++------------- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/docs/index.html b/docs/index.html index 3eeaede13f..48892f22b1 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1205,7 +1205,7 @@

PokéClicker

-

bonus

+

bonus

@@ -56467,7 +56467,7 @@
queue slots in the Hatchery.

- When Pokémon are in a Region they're not native to, they will only retain of their total attack.

+ When Pokémon are in a Region they're not native to, they will only retain of their total attack.

Dungeons in the Region will be significantly less likely to drop Epic, Legendary, and Mythic loot.

@@ -57289,9 +57289,9 @@

Daily deals

Set Trade Amount

- - + +
@@ -57499,7 +57499,7 @@

No Pokémon found

-

+

@@ -57686,7 +57686,7 @@

No Pokémon found

-

+

diff --git a/docs/scripts/script.min.js b/docs/scripts/script.min.js index 188942182a..d931d236fe 100644 --- a/docs/scripts/script.min.js +++ b/docs/scripts/script.min.js @@ -6024,7 +6024,7 @@ class AchievementHandler { return sum; } static achievementBonusPercent() { - return `${(100 * AchievementHandler.achievementBonus()).toFixed(2)}%`; + return `${AchievementHandler.achievementBonus().toLocaleString('en-US', { style: 'percent', minimumFractionDigits: 2, maximumFractionDigits: 2 })}`; } static findByName(name) { return AchievementHandler.achievementList.find((achievement) => achievement.name === name && achievement.achievable()); @@ -20892,10 +20892,10 @@ FarmController.additionalInfoTooltip = ko.pureComputed(() => { return; } if (aura() !== 1 && idx !== AuraType.Repel) { - tooltip.push(`${AuraType[idx]}: ×${aura().toFixed(2)}`); + tooltip.push(`${AuraType[idx]}: ×${aura().toLocaleString('en-US', { minimumFractionDigits: 3, maximumFractionDigits: 3 })}`); } else if (aura() !== 0 && idx === AuraType.Repel) { - tooltip.push(`${AuraType[idx]}: ${(aura() * 100).toFixed(2)}%`); + tooltip.push(`${AuraType[idx]}: ${aura().toLocaleString('en-US', { style: 'percent', minimumFractionDigits: 2, maximumFractionDigits: 2 })}`); } }); // Adding header if necessary @@ -22309,10 +22309,10 @@ class Farming { } auraDisplay(berry, stage) { if (App.game.farming.berryData[berry].aura.auraType === AuraType.Repel) { // add other additive auras here with || - return `+${GameConstants.formatNumber(App.game.farming.berryData[berry].aura.auraMultipliers[stage] * 100)}%`; + return `+${App.game.farming.berryData[berry].aura.auraMultipliers[stage].toLocaleString('en-US', { style: 'percent', minimumFractionDigits: 2, maximumFractionDigits: 2 })}`; } else { - return `×${GameConstants.formatNumber(App.game.farming.berryData[berry].aura.auraMultipliers[stage])}`; + return `×${App.game.farming.berryData[berry].aura.auraMultipliers[stage].toLocaleString('en-US', { minimumFractionDigits: 2, maximumFractionDigits: 2 })}`; } } } @@ -22525,7 +22525,7 @@ class Plot { // Aura if (this.emittingAura.type() !== null) { tooltip.push('Aura Emitted:'); - tooltip.push(`${AuraType[this.emittingAura.type()]}: ${this.berry === BerryType.Micle ? `+${(this.emittingAura.value() * 100).toFixed(2)}%` : `×${this.emittingAura.value().toFixed(2)}`}`); + tooltip.push(`${AuraType[this.emittingAura.type()]}: ${this.berry === BerryType.Micle ? `+${this.emittingAura.value().toLocaleString('en-US', { style: 'percent', minimumFractionDigits: 2, maximumFractionDigits: 2 })}` : `×${this.emittingAura.value().toLocaleString('en-US', { minimumFractionDigits: 2, maximumFractionDigits: 2 })}`}`); } const auraStr = this.formattedAuras(); if (auraStr) { @@ -26047,8 +26047,7 @@ class FluteItem extends Item { return true; } getDescription() { - const multiplier = ((this.getMultiplier() - 1) * 100).toFixed(2); - return `+${multiplier}% bonus to ${this.description}`; + return `+${(this.getMultiplier() - 1).toLocaleString('en-US', { style: 'percent', minimumFractionDigits: 2, maximumFractionDigits: 2 })} bonus to ${this.description}`; } getMultiplier() { return (this.multiplyBy - 1) * (AchievementHandler.achievementBonus() + 1) + 1; @@ -26149,7 +26148,7 @@ class HeldItem extends Item { HeldItem.heldItemSelected = ko.observable(undefined); class AttackBonusHeldItem extends HeldItem { constructor(name, basePrice, currency, shopOptions, displayName, _attackBonus, regionUnlocked, pokemonDescription = 'the Pokémon', canUse = (pokemon) => true, applyBonus = () => true, additionDescription = '') { - super(name, basePrice, currency, shopOptions, displayName, `A held item that raises the attack of ${pokemonDescription} by ${((_attackBonus - 1) * 100).toFixed(0)}%${additionDescription}.`, regionUnlocked, canUse); + super(name, basePrice, currency, shopOptions, displayName, `A held item that raises the attack of ${pokemonDescription} by ${((_attackBonus - 1)).toLocaleString('en-US', { style: 'percent', minimumFractionDigits: 0, maximumFractionDigits: 0 })}${additionDescription}.`, regionUnlocked, canUse); this._attackBonus = _attackBonus; this.applyBonus = applyBonus; } @@ -26167,7 +26166,7 @@ class TypeRestrictedAttackBonusHeldItem extends AttackBonusHeldItem { } class EVsGainedBonusHeldItem extends HeldItem { constructor(name, basePrice, currency, shopOptions, displayName, gainedBonus, regionUnlocked) { - super(name, basePrice, currency, shopOptions, displayName, `A held item that increases EV gains for the holding Pokémon by ${((gainedBonus - 1) * 100).toFixed(0)}%.`, regionUnlocked, (pokemon) => { + super(name, basePrice, currency, shopOptions, displayName, `A held item that increases EV gains for the holding Pokémon by ${(gainedBonus - 1).toLocaleString('en-US', { style: 'percent', minimumFractionDigits: 0, maximumFractionDigits: 0 })}.`, regionUnlocked, (pokemon) => { return pokemon.pokerus > GameConstants.Pokerus.Uninfected; }); this.gainedBonus = gainedBonus; @@ -26175,7 +26174,7 @@ class EVsGainedBonusHeldItem extends HeldItem { } class ExpGainedBonusHeldItem extends HeldItem { constructor(name, basePrice, currency, shopOptions, displayName, gainedBonus, regionUnlocked, pokemonDescription = 'the holding Pokémon', canUse = (pokemon) => true) { - super(name, basePrice, currency, shopOptions, displayName, `A held item that earns ${pokemonDescription} ${((gainedBonus - 1) * 100).toFixed(0)}% bonus Experience Points.`, regionUnlocked, canUse); + super(name, basePrice, currency, shopOptions, displayName, `A held item that earns ${pokemonDescription} ${(gainedBonus - 1).toLocaleString('en-US', { style: 'percent', minimumFractionDigits: 0, maximumFractionDigits: 0 })} bonus Experience Points.`, regionUnlocked, canUse); this.gainedBonus = gainedBonus; } } @@ -32388,7 +32387,7 @@ class Quests { questProgressTooltip() { const level = this.level(); const xp = this.xp(); - return { title: `${xp - this.levelToXP(level)} / ${this.levelToXP(level + 1) - this.levelToXP(level)}`, trigger: 'hover' }; + return { title: `${(xp - this.levelToXP(level)).toLocaleString('en-US')} / ${(this.levelToXP(level + 1) - this.levelToXP(level)).toLocaleString('en-US')}`, trigger: 'hover' }; } isDailyQuestsUnlocked() { return QuestLineHelper.isQuestLineCompleted('Tutorial Quests'); @@ -33138,7 +33137,7 @@ class Safari { tooltip.title = 'Max level reached'; } else { - tooltip.title = `${Safari.safariExp() - Safari.expRequiredForLevel(level)} / ${Safari.expRequiredForLevel(level + 1) - Safari.expRequiredForLevel(level)}`; + tooltip.title = `${(Safari.safariExp() - Safari.expRequiredForLevel(level)).toLocaleString('en-US')} / ${(Safari.expRequiredForLevel(level + 1) - Safari.expRequiredForLevel(level)).toLocaleString('en-US')}`; } return tooltip; }