Skip to content

Commit

Permalink
[v0.10.16] Live website
Browse files Browse the repository at this point in the history
  • Loading branch information
auto-deploy committed Nov 30, 2023
1 parent 7e2c619 commit 9688d49
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 20 deletions.
14 changes: 7 additions & 7 deletions docs/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1205,7 +1205,7 @@ <h1 id="gameTitle">PokéClicker</h1>
<img src="" data-bind="attr: { src: ItemList[GameConstants.zCrystalItemType[App.game.zMoves.type()]].image, }">
</td>
<td class="p-0 bg-secondary" colspan="4" rowspan="2">
<p class="mb-0" data-bind="text: `${App.game.zMoves.getMultiplier() < 1 ? '' : '+'}${(App.game.zMoves.getMultiplier() - 1) * 100}% Attack to all your ${PokemonType[App.game.zMoves.type()]}-type Pokémon`">bonus</p>
<p class="mb-0" data-bind="text: `${App.game.zMoves.getMultiplier() < 1 ? '' : '+'}${(App.game.zMoves.getMultiplier() - 1).toLocaleString('en-US', { style: 'percent' })} Attack to all your ${PokemonType[App.game.zMoves.type()]}-type Pokémon`">bonus</p>
</td>
</tr>
<tr></tr>
Expand Down Expand Up @@ -56467,7 +56467,7 @@ <h5 class="modal-title" data-bind="text: `Travel to ${GameConstants.camelCaseToS
<strong>There are a few things you should know before you depart:</strong><br/>
You will gain <strong data-bind="text: App.game.breeding.queueSlotsGainedFromRegion(player.highestRegion())"></strong> queue slots in the Hatchery.<br/><br/>
<!-- ko if: App.game.challenges.list.regionalAttackDebuff.active() -->
When Pokémon are in a Region they're not native to, they will only retain <strong data-bind="text: App.game.party.getRegionAttackMultiplier(player.highestRegion() + 1).toLocaleString(undefined,{style: 'percent'})"></strong> of their total attack.<br/><br/>
When Pokémon are in a Region they're not native to, they will only retain <strong data-bind="text: App.game.party.getRegionAttackMultiplier(player.highestRegion() + 1).toLocaleString('en-US',{style: 'percent'})"></strong> of their total attack.<br/><br/>
<!-- /ko -->
<!-- ko if: player.highestRegion() - 2 >= GameConstants.Region.kanto -->
Dungeons in the <strong data-bind="text: GameConstants.camelCaseToString(GameConstants.Region[player.highestRegion() - 2])"></strong> Region will be significantly less likely to drop Epic, Legendary, and Mythic loot.<br /><br/>
Expand Down Expand Up @@ -57289,9 +57289,9 @@ <h4><u>Daily deals</u></h4>
<div class="dropdown-menu text-center p-0">
<p class="small py-2 m-0">Set Trade Amount</p>
<div class="dropdown-divider m-0"></div>
<!-- ko foreach: [10, 25, 50, 75, 100] -->
<button class="dropdown-item small py-1" type="button" data-bind="text: `${$data}%`,
click: () => { App.game.underground.tradeAmount(Math.floor(player.getUndergroundItemAmount($parent.item1.id) * ($data / 100) / $parent.amount1)) }"></button>
<!-- ko foreach: [0.1, 0.25, 0.5, 0.75, 1] -->
<button class="dropdown-item small py-1" type="button" data-bind="text: `${$data.toLocaleString('en-US', { style: 'percent' })}`,
click: () => { App.game.underground.tradeAmount(Math.floor(player.getUndergroundItemAmount($parent.item1.id) * ($data) / $parent.amount1)) }"></button>
<!-- /ko -->
</div>
</div>
Expand Down Expand Up @@ -57499,7 +57499,7 @@ <h4>No Pokémon found</h4>

<!-- ko if: PokedexHelper.filteredList().length != 0 -->
<div class="pokedex-border-bottom pt-2">
<h4 data-bind="text: `Showing ${PokedexHelper.filteredList().length} Pokémon`"></h4>
<h4 data-bind="text: `Showing ${PokedexHelper.filteredList().length.toLocaleString('en-US')} Pokémon`"></h4>
</div>
<!-- /ko -->
</div>
Expand Down Expand Up @@ -57686,7 +57686,7 @@ <h4>No Pokémon found</h4>

<!-- ko if: PokedexHelper.filteredList().length != 0 -->
<div class="pokedex-border-bottom pt-2 d-lg-none d-block">
<h4 data-bind="text: `Showing ${PokedexHelper.filteredList().length} Pokémon`"></h4>
<h4 data-bind="text: `Showing ${PokedexHelper.filteredList().length.toLocaleString('en-US')} Pokémon`"></h4>
</div>
<!-- /ko -->
<div class="scrolling-div-pokedex">
Expand Down
25 changes: 12 additions & 13 deletions docs/scripts/script.min.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 })}`;
}
}
}
Expand Down Expand Up @@ -22525,7 +22525,7 @@ class Plot {
// Aura
if (this.emittingAura.type() !== null) {
tooltip.push('<u>Aura Emitted:</u>');
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) {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand All @@ -26167,15 +26166,15 @@ 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;
}
}
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;
}
}
Expand Down Expand Up @@ -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');
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 9688d49

Please sign in to comment.