+ let hasMedals = 0;
+
+ function challengeResult(
+ name: String,
+ description: String,
+ medal: "gold" | "silver" | "no",
+ ) {
+ let choices = 0,
+ up = 0;
+ if (medal === "gold") {
+ choices += choicePerGold;
+ up += upPerGold;
+ } else if (medal === "silver") {
+ choices += choicePerSilver;
+ up += upPerSilver;
+ }
+ if (medal !== "no") {
+ hasMedals++;
+ }
+
+ extraChoices += choices;
+ upgradePoints += up;
+ medals.push(`
${icons["icon:" + medal + "_medal"]}
${name}
- ${{gold: t("level_up.gold"), silver: t("level_up.silver"), no: t("level_up.no")}[medal]}
+ ${
+ up || choices
+ ? t("level_up.challenges.gain", { up, choices })
+ : t("level_up.challenges.no_gain")
+ }
+
`);
- }
+ }
+ challengeResult(
+ t("level_up.challenges.levelTime.name", {
+ value: Math.ceil(gameState.levelTime / 1000),
+ }),
+ t("level_up.challenges.levelTime.description", {
+ silver: levelTimeGood,
+ gold: levelTimeBest,
+ }),
+ (gameState.levelTime < levelTimeBest * 1000 && "gold") ||
+ (gameState.levelTime < levelTimeGood * 1000 && "silver") ||
+ "no",
+ );
- challengeResult(
- t("level_up.challenges.levelTime.name", {
- value: Math.ceil(gameState.levelTime / 1000),
- }),
- t("level_up.challenges.levelTime.description", {
- silver: levelTimeGood,
- gold: levelTimeBest,
- }),
- (gameState.levelTime < levelTimeBest * 1000 && "gold") ||
- (gameState.levelTime < levelTimeGood * 1000 && "silver") ||
- "no",
+ challengeResult(
+ t("level_up.challenges.catchRateGood.name", {
+ value: Math.floor(catchRate * 100),
+ caught: gameState.levelCoughtCoins,
+ total: gameState.levelSpawnedCoins,
+ }),
+ t("level_up.challenges.catchRateGood.description", {
+ silver: catchRateGood,
+ gold: catchRateBest,
+ }),
+ (catchRate > catchRateBest / 100 && "gold") ||
+ (catchRate > catchRateGood / 100 && "silver") ||
+ "no",
+ );
+
+ challengeResult(
+ gameState.levelMisses
+ ? t("level_up.challenges.levelMisses.name", {
+ value: gameState.levelMisses,
+ })
+ : t("level_up.challenges.levelMisses.none"),
+ t("level_up.challenges.levelMisses.description", {
+ silver: missesGood,
+ gold: missesBest,
+ }),
+ (gameState.levelMisses < missesBest && "gold") ||
+ (gameState.levelMisses < missesGood && "silver") ||
+ "no",
+ );
+
+ if (hasMedals == 0) {
+ medals.length = 0;
+ } else if (hasMedals == 1) {
+ medals.unshift(t("level_up.challenges.earned_medal", { count: hasMedals }));
+ } else {
+ medals.unshift(
+ t("level_up.challenges.earned_medal_plural", { count: hasMedals }),
);
+ }
- challengeResult(
- t("level_up.challenges.catchRateGood.name", {
- value: Math.floor(catchRate * 100),
- }),
- t("level_up.challenges.catchRateGood.description", {
- silver: catchRateGood,
- gold: catchRateBest,
- caught: gameState.levelCoughtCoins,
- total: gameState.levelSpawnedCoins,
- }),
- (catchRate > catchRateBest / 100 && "gold") ||
- (catchRate > catchRateGood / 100 && "silver") ||
- "no",
- );
+ const unlockable = getFirstUnlockable(gameState);
- challengeResult(
- t("level_up.challenges.levelMisses.name", {value: gameState.levelMisses}),
- t("level_up.challenges.levelMisses.description", {
- silver: missesGood,
- gold: missesBest,
- }),
- (gameState.levelMisses < missesBest && "gold") ||
- (gameState.levelMisses < missesGood && "silver") ||
- "no",
- );
+ let offered = getPossibleUpgrades(gameState)
+ .map((u) => ({
+ ...u,
+ score: Math.random() + (gameState.lastOffered[u.id] || 0),
+ }))
+ .sort((a, b) => a.score - b.score)
+ .filter((u) => gameState.perks[u.id] < u.max + gameState.perks.limitless)
+ .slice(0, 3 + extraChoices + gameState.perks.one_more_choice);
- gameState.upgrade_points += upgradesWon;
+ offered.forEach((u) => {
+ dontOfferTooSoon(gameState, u.id);
+ });
- let offered: PerkId[] = getPossibleUpgrades(gameState)
- .map((u) => ({
- ...u,
- score: Math.random() + (gameState.lastOffered[u.id] || 0),
- }))
- .sort((a, b) => a.score - b.score)
- .filter((u) => gameState.perks[u.id] < u.max + gameState.perks.limitless)
- .map((u) => u.id);
+ while (true) {
+ let unlockRelatedUpgradesOffered = 0;
- const fromStart = upgrades
- .map((u) => u.id)
- .filter((id) => gameState.perks[id]);
-
- while (true) {
- const updatedChoices = gameState.perks.one_more_choice + choices;
- let list = upgrades.filter(
- (u) =>
- offered.slice(0, updatedChoices).includes(u.id) ||
- gameState.perks[u.id],
- );
-
- list = list
- .filter((u) => fromStart.includes(u.id))
- .concat(list.filter((u) => !fromStart.includes(u.id)));
-
- list.forEach((u) => {
- dontOfferTooSoon(gameState, u.id);
- });
-
- const upgradesActions = list.filter(u => gameState.perks[u.id])
- .map(u => ({
- value: u.id,
- text: u.name + upgradeLevelAndMaxDisplay(u, gameState),
- icon: icons["icon:" + u.id],
- disabled: !gameState.upgrade_points || gameState.perks[u.id] >= u.max + gameState.perks.limitless,
- tooltip: u.help(gameState.perks[u.id]) + u.fullHelp(gameState.perks[u.id])
- }))
-
- const addPerkActions = list.filter(u => !gameState.perks[u.id])
- .map(u => ({
- value: u.id,
- text: u.name,
- icon: icons["icon:" + u.id],
- disabled: !gameState.upgrade_points,
- help: u.help(1),
- tooltip: u.fullHelp(1)
-
- }))
-
-
- const forcePick = !![...upgradesActions, ...addPerkActions].find(a => !a.disabled)
-
- const upgradeId = await requiredAsyncAlert
({
- title: t("level_up.title", {
- level: gameState.currentLevel,
- max: max_levels(gameState),
- }),
- content: [
- {
- disabled: forcePick,
- text: t("level_up.go", {name: gameState.level.name}),
- help: forcePick
- ? t("level_up.go_with_upgrades", {
- count: gameState.upgrade_points,
- })
- : "",
- icon: icons[gameState.level.name],
- value: null,
- },
-
- t("level_up.upgrade_perks"),
- ...upgradesActions,
-
- t("level_up.add_perks"),
- ...addPerkActions,
-
- t("level_up.challenges.intro"),
- ...medals,
- getNearestUnlockHTML(gameState),
- levelsListHTMl(gameState, gameState.currentLevel),
- ``,
- ],
- });
-
- if (upgradeId) {
- gameState.perks[upgradeId]++;
- gameState.runStatistics.upgrades_picked++;
- gameState.upgrade_points--;
- } else {
- return;
+ const upgradesActions = offered.map((u) => {
+ let className = "";
+ if (isOptionOn("level_unlocks_hints")) {
+ if (unlockable?.forbidden?.includes(u.id)) {
+ unlockRelatedUpgradesOffered++;
+ className += " forbidden";
}
+ if (unlockable?.required?.includes(u.id)) {
+ unlockRelatedUpgradesOffered++;
+ className += " required";
+ }
+ }
+ return {
+ value: u.id,
+ disabled: gameState.perks[u.id] >= u.max + gameState.perks.limitless,
+ text:
+ u.name +
+ (gameState.perks[u.id]
+ ? upgradeLevelAndMaxDisplay(u, gameState)
+ : ""),
+ icon: icons["icon:" + u.id],
+ help: u.help(gameState.perks[u.id] || 1),
+ tooltip: u.fullHelp(gameState.perks[u.id] || 1),
+ className,
+ };
+ });
+
+ const upgradeId = await requiredAsyncAlert({
+ title: t("level_up.title", {
+ level: gameState.currentLevel,
+ max: max_levels(gameState),
+ }),
+ content: [
+ t("level_up.upgrade_perks", {
+ coins: gameState.levelCoughtCoins,
+ count: upgradePoints,
+ }),
+ ...upgradesActions,
+ levelsListHTMl(gameState, gameState.currentLevel),
+ unlockRelatedUpgradesOffered ? getNearestUnlockHTML(gameState) : "",
+
+ ...medals,
+ pickedUpgradesHTMl(gameState),
+ ``,
+ ],
+ });
+ upgradePoints--;
+ gameState.perks[upgradeId]++;
+ gameState.runStatistics.upgrades_picked++;
+ if (!upgradePoints) {
+ return;
}
+ }
}
export function dontOfferTooSoon(gameState: GameState, id: PerkId) {
- gameState.lastOffered[id] = Math.round(Date.now() / 1000);
+ gameState.lastOffered[id] = Math.round(Date.now() / 1000);
}
diff --git a/src/options.ts b/src/options.ts
index 0f87b29..49cf1c7 100644
--- a/src/options.ts
+++ b/src/options.ts
@@ -3,7 +3,7 @@ import { t } from "./i18n/i18n";
import { OptionDef, OptionId } from "./types";
import { getSettingValue, setSettingValue } from "./settings";
-import { hoursSpentPlaying } from "./game_utils";
+import {getHighScore, hoursSpentPlaying} from "./game_utils";
export const options = {
sound: {
@@ -90,10 +90,10 @@ export const options = {
name: t("settings.donation_reminder"),
help: t("settings.donation_reminder_help"),
},
- red_miss: {
- default: true,
- name: t("settings.red_miss"),
- help: t("settings.red_miss_help"),
+ level_unlocks_hints: {
+ default: getHighScore()>1000,
+ name: t("settings.level_unlocks_hints"),
+ help: t("settings.level_unlocks_hints_help"),
},
} as const satisfies { [k: string]: OptionDef };
diff --git a/src/pure_functions.ts b/src/pure_functions.ts
index cc830b4..31dbc14 100644
--- a/src/pure_functions.ts
+++ b/src/pure_functions.ts
@@ -97,12 +97,16 @@ export function firstWhere(
export const wallBouncedBest = 2,
wallBouncedGood = 7,
- levelTimeBest = 10,
+ levelTimeBest = 25,
levelTimeGood = 45,
- catchRateBest = 99,
+ catchRateBest = 98,
catchRateGood = 90,
missesBest = 1,
- missesGood = 6;
+ missesGood = 6,
+ choicePerSilver = 1,
+ choicePerGold = 2,
+ upPerSilver = 1,
+ upPerGold = 1;
export const MAX_LEVEL_SIZE = 21;
export const MIN_LEVEL_SIZE = 2;
diff --git a/src/types.d.ts b/src/types.d.ts
index 9859cf2..c576fcd 100644
--- a/src/types.d.ts
+++ b/src/types.d.ts
@@ -280,7 +280,7 @@ export type GameState = {
plouf: { vol: number; x: number };
colorChange: { vol: number; x: number };
};
- upgrade_points: number;
+ rerolls: number;
creative: boolean;
startParams: RunParams;
};
diff --git a/src/upgrades.ts b/src/upgrades.ts
index fcd1cae..99d0662 100644
--- a/src/upgrades.ts
+++ b/src/upgrades.ts
@@ -856,8 +856,7 @@ export const rawUpgrades = [
name: t("upgrades.extra_levels.name"),
help: (lvl: number) =>
t("upgrades.extra_levels.tooltip", { count: lvl + 7 }),
- fullHelp: (lvl: number) =>
- t("upgrades.extra_levels.verbose_description", { lvl }),
+ fullHelp: (lvl: number) => t("upgrades.extra_levels.verbose_description"),
},
{
category: categories.combo_boost,