mirrors/breakout71
1
0
Fork 0
mirror of https://gitlab.com/lecarore/breakout71.git synced 2025-05-04 10:49:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

wip

Browse source
This commit is contained in:
Renan LE CARO 2025-05-03 16:42:03 +02:00
parent ca1c75a5a1
commit 94ffb80f49
19 changed files with 186 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Readme.md
View file

@ -13,25 +13,27 @@ Break colourful bricks, catch bouncing coins and select powerful upgrades !
# Changelog
## To do
- +1 upgrade per gold medal, but they are all applied to the selected perk
## Done
- reworked level up screen :
- bigger "level X / Y cleared"
- upgardes need to all be spent on the same list of perks (to avoid reading too much)
- instead of rerolls, you get a longer list of choices to pick from with gold medals
- clarified challenges, only show them when you pass one of them
- removed the "sides bounce" challenge, bouncing on sides shouldn't be punished
- once you reach high score of 1000, level unlock hints appear, and required / forbidden upgrades and colored gold/red
- added tooltip on most items on that screen, that can be triggered on mobile by tapping the text
- when you earn multiple upgrade points, they all need to be put on the same perk
- wait for bricks to respawn before leveling up
- creative mode : removed tooltips for perks as they were getting in the way on mobile
- unlocked upgrades and levels : split item description (with tooltip) and "try" button
- unlocked level: removed progress bars as there's no real progress
- bigger "level X of Y cleared"
- clarify challenges but only show them when you pass one of them
- removed the "sides bounce" challenge, bouncing on sides shouldn't be punished
- upgrades list now uses numbers instead of bars, looks better with limitless
- somehow score clicks didn't register while the game was playing, that's solved
- creative mode : removed tooltips for perks as they were getting in the way on mobile
- Fix: removed progress bars from unlocked level as there's no real progress
- Fix :upgrades list now uses numbers instead of bars, looks better with limitless
- Fix :somehow score clicks didn't register while the game was playing, that's solved
- Fix : click tooltip to open on mobile, click anywhere to close
- Can't press help buttons in Creative Menu
- Fix: Can't press help buttons in Creative Menu
- Fix: wait for bricks to respawn before leveling up
- UX : score and menu button look extra clickable until you tap them 3 times and restart the app
## 29097764

4
app/build.gradle.kts
View file

@ -29,8 +29,8 @@ android {
applicationId = "me.lecaro.breakout"
minSdk = 21
targetSdk = 34
versionCode = 29103645
versionName = "29103645"
versionCode = 29104573
versionName = "29104573"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables {
useSupportLibrary = true

2
app/src/main/assets/index.html
View file

File diff suppressed because one or more lines are too long

67
dist/index.html vendored
View file

File diff suppressed because one or more lines are too long

2
src/PWA/sw-b71.js
View file

@ -1,5 +1,5 @@
// The version of the cache.
const VERSION = "29103645";
const VERSION = "29104573";
// The name of the cache
const CACHE_NAME = `breakout-71-${VERSION}`;

3
src/asyncAlert.ts
View file

@ -12,6 +12,7 @@ export type AsyncAlertAction<t> = {
disabled?: boolean;
icon?: string;
className?: string;
actionLabel?: string;
};
const popupWrap = document.getElementById("popup") as HTMLDivElement;
@ -163,7 +164,7 @@ function addButton<t>(
addto.appendChild(buttonWrap);
if (actionLabel) {
buttonWrap.className = className;
buttonWrap.className = className + " upgrade";
buttonWrap.innerHTML = icon;

2
src/data/version.json
View file

@ -1 +1 @@
"29103645"
"29104573"

20
src/game.less
View file

@ -211,16 +211,15 @@ body:not(.has-alert-open) #popup {
opacity: 0.2;
}
}
&.forbidden {
background: linear-gradient(45deg, darkred, transparent);
}
&.required {
background: linear-gradient(45deg, gold, transparent);
}
}
&.forbidden {
background: linear-gradient(-45deg, #0000, #ff00004a, #0000);
}
&.required {
background: linear-gradient(-45deg, #0000, #ffd3005c, #0000);
}
> button[data-help-content] {
user-select: none;
border-radius: 4px;
@ -414,8 +413,9 @@ h2.histogram-title strong {
.upgrade {
display: flex;
gap: 2px;
margin: 0 0 10px 0;
padding: 5px 5px;
margin: 0 -5px;
width: calc(100% + 10px);
img {
width: 32px;
height: 32px;

2
src/i18n/ar.json
View file

@ -79,6 +79,8 @@
"level_up.challenges.levelTime.description": "",
"level_up.challenges.levelTime.name": "",
"level_up.challenges.no_gain": "",
"level_up.forbidden": "",
"level_up.required": "",
"level_up.title": "لقد انتهيت للتو من المستوى {{level}}/{{max}}.",
"level_up.upgrade_perks": "",
"main_menu.basic": "",

70
src/i18n/b71.babel
View file

@ -2897,6 +2897,76 @@
</concept_node>
</children>
</folder_node>
<concept_node>
<name>forbidden</name>
<description/>
<comment/>
<translations>
<translation>
<language>ar-LB</language>
<approved>false</approved>
</translation>
<translation>
<language>de-DE</language>
<approved>false</approved>
</translation>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-CL</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-FR</language>
<approved>false</approved>
</translation>
<translation>
<language>ru-RU</language>
<approved>false</approved>
</translation>
<translation>
<language>tr-TR</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>required</name>
<description/>
<comment/>
<translations>
<translation>
<language>ar-LB</language>
<approved>false</approved>
</translation>
<translation>
<language>de-DE</language>
<approved>false</approved>
</translation>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-CL</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-FR</language>
<approved>false</approved>
</translation>
<translation>
<language>ru-RU</language>
<approved>false</approved>
</translation>
<translation>
<language>tr-TR</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>title</name>
<description/>

2
src/i18n/de.json
View file

@ -79,6 +79,8 @@
"level_up.challenges.levelTime.description": "",
"level_up.challenges.levelTime.name": "",
"level_up.challenges.no_gain": "",
"level_up.forbidden": "",
"level_up.required": "",
"level_up.title": "Du hast gerade Level {{level}}/{{max}} beendet.",
"level_up.upgrade_perks": "",
"main_menu.basic": "",

2
src/i18n/en.json
View file

@ -79,6 +79,8 @@
"level_up.challenges.levelTime.description": "You'll get a gold medal under {{gold}}s and a silver medal under {{silver}}s. ",
"level_up.challenges.levelTime.name": "{{value}}s play time",
"level_up.challenges.no_gain": "No gain",
"level_up.forbidden": "Picking this perk will prevent you from unlocking the level \"{{levelName}}\" in this game run.",
"level_up.required": "Picking this perk may allow you to unlock level \"{{levelName}}\" in this game run.",
"level_up.title": "Level {{level}}/{{max}} cleared",
"level_up.upgrade_perks": "You caught {{coins}} coins. Pick {{count}} upgrade(s) below. ",
"main_menu.basic": "",

2
src/i18n/es.json
View file

@ -79,6 +79,8 @@
"level_up.challenges.levelTime.description": "",
"level_up.challenges.levelTime.name": "",
"level_up.challenges.no_gain": "",
"level_up.forbidden": "",
"level_up.required": "",
"level_up.title": "Acabas de completar el nivel {{level}}/{{max}}.",
"level_up.upgrade_perks": "",
"main_menu.basic": "Gráficos simplificados",

2
src/i18n/fr.json
View file

@ -79,6 +79,8 @@
"level_up.challenges.levelTime.description": "",
"level_up.challenges.levelTime.name": "",
"level_up.challenges.no_gain": "",
"level_up.forbidden": "",
"level_up.required": "",
"level_up.title": "Vous venez de terminer le niveau {{level}}/{{max}}.",
"level_up.upgrade_perks": "",
"main_menu.basic": "",

2
src/i18n/ru.json
View file

@ -79,6 +79,8 @@
"level_up.challenges.levelTime.description": "",
"level_up.challenges.levelTime.name": "",
"level_up.challenges.no_gain": "",
"level_up.forbidden": "",
"level_up.required": "",
"level_up.title": "Вы только что закончили уровень {{level}}/{{max}}.",
"level_up.upgrade_perks": "",
"main_menu.basic": "",

2
src/i18n/tr.json
View file

@ -79,6 +79,8 @@
"level_up.challenges.levelTime.description": "",
"level_up.challenges.levelTime.name": "",
"level_up.challenges.no_gain": "",
"level_up.forbidden": "",
"level_up.required": "",
"level_up.title": " {{level}}/{{max}}seviyesini yeni bitirdiniz.",
"level_up.upgrade_perks": "",
"main_menu.basic": "",

37
src/openUpgradesPicker.ts
View file

@ -2,12 +2,12 @@ import { GameState, PerkId } from "./types";
import {
catchRateBest,
catchRateGood,
choicePerGold,
choicePerSilver,
levelTimeBest,
levelTimeGood,
missesBest,
missesGood,
choicePerGold,
choicePerSilver,
upPerGold,
upPerSilver,
} from "./pure_functions";
@ -122,34 +122,44 @@ export async function openUpgradesPicker(gameState: GameState) {
);
}
const unlockable = getFirstUnlockable(gameState);
let offered = getPossibleUpgrades(gameState)
let sorted = 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);
offered.forEach((u) => {
dontOfferTooSoon(gameState, u.id);
});
.filter((u) => gameState.perks[u.id] < u.max + gameState.perks.limitless);
while (true) {
// refresh the list if you pick extra one_more_choice
const offered = sorted.slice(
0,
3 + extraChoices + gameState.perks.one_more_choice,
);
offered.forEach((u) => {
dontOfferTooSoon(gameState, u.id);
});
const unlockable = getFirstUnlockable(gameState);
let unlockRelatedUpgradesOffered = 0;
let unlockHint = "";
const upgradesActions = offered.map((u) => {
let className = "";
if (isOptionOn("level_unlocks_hints")) {
if (unlockable?.forbidden?.includes(u.id)) {
if (unlockable?.forbidden?.includes(u.id) && !gameState.perks[u.id]) {
unlockRelatedUpgradesOffered++;
className += " forbidden";
unlockHint = t("level_up.forbidden", {
levelName: unlockable?.l.name || "",
});
}
if (unlockable?.required?.includes(u.id)) {
unlockRelatedUpgradesOffered++;
className += " required";
unlockHint = t("level_up.required", {
levelName: unlockable?.l.name || "",
});
}
}
return {
@ -161,9 +171,10 @@ export async function openUpgradesPicker(gameState: GameState) {
? upgradeLevelAndMaxDisplay(u, gameState)
: ""),
icon: icons["icon:" + u.id],
help: u.help(gameState.perks[u.id] || 1),
help: unlockHint || u.help(gameState.perks[u.id] || 1),
tooltip: u.fullHelp(gameState.perks[u.id] || 1),
className,
actionLabel: gameState.perks[u.id] ? "upgrade" : "pick",
};
});

4
src/options.ts
View file

@ -3,7 +3,7 @@ import { t } from "./i18n/i18n";
import { OptionDef, OptionId } from "./types";
import { getSettingValue, setSettingValue } from "./settings";
import {getHighScore, hoursSpentPlaying} from "./game_utils";
import { getHighScore, hoursSpentPlaying } from "./game_utils";
export const options = {
sound: {
@ -91,7 +91,7 @@ export const options = {
help: t("settings.donation_reminder_help"),
},
level_unlocks_hints: {
default: getHighScore()>1000,
default: getHighScore() > 1000,
name: t("settings.level_unlocks_hints"),
help: t("settings.level_unlocks_hints_help"),
},

6
src/tooltip.ts
View file

@ -19,12 +19,14 @@ function setupMobileTooltips(tooltip: HTMLDivElement) {
console.log("openTooltip", e);
hideAnyTooltip();
const hovering = e.target as HTMLElement;
if (!hovering?.hasAttribute("data-help-content")) {
const tooltipContent =
hovering?.getAttribute("data-help-content")?.trim() || "";
if (!tooltipContent) {
return;
}
e.stopPropagation();
e.preventDefault();
tooltip.innerHTML = hovering.getAttribute("data-help-content") || "";
tooltip.innerHTML = tooltipContent;
tooltip.style.display = "";
const { top } = hovering.getBoundingClientRect();
tooltip.style.transform = `translate(0,${top}px) translate(0,-100%)`;