diff --git a/Readme.md b/Readme.md
index b7eaa81..d9a48b4 100644
--- a/Readme.md
+++ b/Readme.md
@@ -27,27 +27,23 @@ At the end of the last level of each run, they can start a new loop. They'll be
to level 1, with only one of their perks, leveled up. All the other perks they used in the run
will be banned from the pool. The perk they decide to keep will gain one level, even if it was
already maxed out.
-
-# Todo before next release
- - b71 white border around dark coins
-
-- [jaceys] Counters for coins lost, misses, and boundary bounces, as well as a timer.
+
+# next
+
- wind : move coins based on puck movement not position
-- show -N points in red when combo resets
-- Top down /read: punishing now, maybe only reset if you hit the lowest populate row of the level, if it's not a full width row
- [jaceys] Move the restart button out of the menu, so that it is more easily accessible
- [jaceys] A visual indication of whether a ball has hit a brick this serve
+- Top down /reach: punishing now, maybe only reset if you hit the lowest populate row of the level, if it's not a full width row
-- scale concave_puck
-- scale instant_upgrade
-- scale etherealcoins (0 grav, maybe then start floting like helium ? maybe less viscosity)
-- scale shocks (maybe spawn balls during the explosion ? maybe bigger explosions for this)
-- scale ghost_coins : pass through bricks will less friction ?
-- scale clairvoyant
+
+
+# Todo before next release
+
# 29 march 2025
-
+- [jaceys] Counters for coins lost, misses, and boundary bounces, as well as a timer.
+- added a white border around all coins, to make dark ones visible on dark bg
- Removed all previous loop only hazards
- Looping now bans all your perks except one. That one can level up beyond the normal max.
- Adjusted many perks to work beyond the max
@@ -66,6 +62,8 @@ already maxed out.
- soft reset : same math as shunt
- smaller puck : now the puck can get as small as a ball
- Unbounded : at level 2+, the top of the level is gone too
+ - concave_puck : ball bounces straighter and straighter, to the point where you can't move it without another perk
+ - shocks lvl 2+ make bigger explosions
- Make fullscreen an option and turn it back on when playing
- Made the "combo lost" text last 500ms instead of the pointless 150ms
diff --git a/dist/index.html b/dist/index.html
index 47f2511..67cc90e 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -68,6 +68,18 @@ body {
transition: color 10ms;
}
+#score span {
+ color: #333;
+}
+
+#score span.great {
+ color: #90ee90;
+}
+
+#score span.good {
+ color: #fff;
+}
+
#menu {
left: 0;
}
@@ -354,6 +366,7 @@ h2.histogram-title strong {
+
diff --git a/src/game.less b/src/game.less
index 1a9a375..602a33f 100644
--- a/src/game.less
+++ b/src/game.less
@@ -61,6 +61,17 @@ body {
color: gold;
transition: color 0.01s;
}
+
+ span{
+ color: #333;
+
+ &.great{
+ color: lightgreen;
+ }
+ &.good{
+ color: white;
+ }
+ }
}
#menu {
@@ -352,3 +363,22 @@ h2.histogram-title strong {
mix-blend-mode: luminosity;
}
}
+
+//#statsdisplay{
+// z-index: 1;
+// white-space: nowrap;
+// line-height: 20px;
+// pointer-events: none;
+// user-select: none;
+// color: white;
+// position: fixed;
+// padding: 0;
+// bottom: -20px;
+// right: 0;
+// width: 20px;
+// overflow: visible;
+//
+// transform-origin: top left;
+// transform: rotate(-90deg);
+//
+//}
\ No newline at end of file
diff --git a/src/game.ts b/src/game.ts
index 4f8aeb4..88e17db 100644
--- a/src/game.ts
+++ b/src/game.ts
@@ -160,11 +160,14 @@ setInterval(() => {
fitSize();
}, 1000);
-export async function openShortRunUpgradesPicker(gameState: GameState) {
+export async function openUpgradesPicker(gameState: GameState) {
+
const catchRate =
(gameState.score - gameState.levelStartScore) /
(gameState.levelSpawnedCoins || 1);
+
+
let repeats = 1;
let timeGain = "",
@@ -983,10 +986,16 @@ restart(
(window.location.search.includes("stressTest") && {
level: "Bird",
perks: {
- pierce: 1,
- sapper: 1,
- implosions: 3,
- streak_shots:1
+ shocks:10,
+ multiball:6,
+ telekinesis:2,
+ ghost_coins:1,
+ pierce:4,
+ clairvoyant:3,
+ bigger_explosions:2,
+ sapper:2,
+ unbounded:1
+
},
levelsPerLoop: 2,
}) ||
diff --git a/src/gameStateMutators.ts b/src/gameStateMutators.ts
index e654376..5fb32b4 100644
--- a/src/gameStateMutators.ts
+++ b/src/gameStateMutators.ts
@@ -36,7 +36,7 @@ import {icons, upgrades} from "./loadGameData";
import {addToTotalScore, getCurrentMaxCoins, getCurrentMaxParticles,} from "./settings";
import {background} from "./render";
import {gameOver} from "./gameOver";
-import {brickIndex, fitSize, gameState, hasBrick, hitsSomething, openShortRunUpgradesPicker, pause,} from "./game";
+import {brickIndex, fitSize, gameState, hasBrick, hitsSomething, openUpgradesPicker, pause,} from "./game";
import {stopRecording} from "./recording";
import {isOptionOn} from "./options";
import {isPremium} from "./premium";
@@ -124,13 +124,13 @@ export function normalizeGameState(gameState: GameState) {
(gameState.gameZoneWidth / 12) *
Math.min(12, 3 - gameState.perks.smaller_puck + gameState.perks.bigger_puck));
- const corner = gameState.levelTime ? gameState.perks.corner_shot : 0
+ const corner = gameState.levelTime ? gameState.perks.corner_shot : 0
- let minX = gameState.offsetXRoundedDown + gameState.puckWidth / 2 - gameState.puckWidth * corner
+ let minX = gameState.offsetXRoundedDown + gameState.puckWidth / 2 - gameState.puckWidth * corner
- let maxX =gameState.offsetXRoundedDown +
- gameState.gameZoneWidthRoundedUp -
- gameState.puckWidth / 2 + gameState.puckWidth * corner;
+ let maxX = gameState.offsetXRoundedDown +
+ gameState.gameZoneWidthRoundedUp -
+ gameState.puckWidth / 2 + gameState.puckWidth * corner;
gameState.puckPosition = clamp(gameState.puckPosition, minX, maxX);
@@ -179,7 +179,7 @@ export function resetCombo(
}
if (typeof x !== "undefined" && typeof y !== "undefined") {
- makeText(gameState, x, y, "red", "-" + lost, 20, 500+clamp(lost, 0,500));
+ makeText(gameState, x, y, "red", "-" + lost, 20, 500 + clamp(lost, 0, 500));
}
}
return lost;
@@ -198,7 +198,7 @@ export function decreaseCombo(
if (lost) {
schedulGameSound(gameState, "comboDecrease", x, 1);
if (typeof x !== "undefined" && typeof y !== "undefined") {
- makeText(gameState, x, y, "red", "-" + lost, 20, 400+lost);
+ makeText(gameState, x, y, "red", "-" + lost, 20, 400 + lost);
}
}
}
@@ -256,8 +256,11 @@ export function explosionAt(
x: number,
y: number,
ball: Ball,
+ extraSize: number = 0
) {
- const size = 1 + gameState.perks.bigger_explosions + Math.max(1,gameState.perks.implosions) - 1;
+ const size = 1 + gameState.perks.bigger_explosions +
+ Math.max(0, gameState.perks.implosions - 1) + extraSize
+ ;
schedulGameSound(gameState, "explode", ball.x, 1);
if (index !== -1) {
const col = index % gameState.gridSize;
@@ -292,7 +295,7 @@ export function explosionAt(
if (gameState.perks.implosions) {
spawnImplosion(
gameState,
- 7 *size ,
+ 7 * size,
x,
y,
"white",
@@ -300,7 +303,7 @@ export function explosionAt(
} else {
spawnExplosion(
gameState,
- 7 *size,
+ 7 * size,
x,
y,
"white",
@@ -332,7 +335,7 @@ export function explodeBrick(
// resetCombo(gameState, x, y);
// }
setBrick(gameState, index, "");
- explosionAt(gameState, index, x, y, ball);
+ explosionAt(gameState, index, x, y, ball, 0);
} else if (color) {
// Even if it bounces we don't want to count that as a miss
@@ -616,7 +619,7 @@ export async function setLevel(gameState: GameState, l: number) {
pause(false);
stopRecording();
if (l > 0) {
- await openShortRunUpgradesPicker(gameState);
+ await openUpgradesPicker(gameState);
}
gameState.currentLevel = l;
@@ -629,6 +632,7 @@ export async function setLevel(gameState: GameState, l: number) {
gameState.lastTickDown = gameState.levelTime;
gameState.levelStartScore = gameState.score;
gameState.levelSpawnedCoins = 0;
+ gameState.levelLostCoins = 0;
gameState.levelMisses = 0;
gameState.runStatistics.levelsPlayed++;
@@ -650,7 +654,7 @@ export async function setLevel(gameState: GameState, l: number) {
gameState.gridSize = lvl.size;
fitSize();
}
- empty(gameState.coins);
+ gameState.levelLostCoins += empty(gameState.coins);
empty(gameState.particles);
empty(gameState.lights);
empty(gameState.texts);
@@ -798,7 +802,16 @@ export function coinBrickHitCheck(gameState: GameState, coin: Coin) {
typeof hhit == "undefined" &&
hitsSomething(x, y, radius)) ||
undefined;
- if (!gameState.perks.ghost_coins) {
+
+ if (gameState.perks.ghost_coins) {
+ // slow down
+ if (typeof (vhit ?? hhit ?? chit) !== "undefined") {
+
+ coin.vy *= 1 - 0.2 / gameState.perks.ghost_coins;
+ coin.vx *= 1 - 0.2 / gameState.perks.ghost_coins;
+ }
+
+ } else {
if (typeof vhit !== "undefined" || typeof chit !== "undefined") {
coin.y = coin.previousY;
coin.vy *= -1;
@@ -988,7 +1001,7 @@ export function gameStateTick(
(gameState.perks.viscosity *
0.03 +
0.005) *
- frames;
+ frames / (1 + gameState.perks.etherealcoins);
coin.vy *= ratio;
coin.vx *= ratio;
@@ -1040,6 +1053,7 @@ export function gameStateTick(
destroy(gameState.coins, coinIndex);
} else if (coin.y > gameState.canvasHeight + coinRadius) {
+ gameState.levelLostCoins+=coin.points
destroy(gameState.coins, coinIndex);
if (gameState.perks.compound_interest) {
resetCombo(gameState, coin.x, coin.y);
@@ -1052,6 +1066,7 @@ export function gameStateTick(
)
) {
// Out of bound on sides
+ gameState.levelLostCoins+=coin.points
destroy(gameState.coins, coinIndex);
}
@@ -1126,7 +1141,7 @@ export function gameStateTick(
((Math.random() - 0.5) * limit) / 3;
let index = brickIndex(x, y);
- explosionAt(gameState, index, x, y, a);
+ explosionAt(gameState, index, x, y, a, Math.max(0, gameState.perks.shocks - 1));
}
}),
);
@@ -1263,7 +1278,7 @@ export function gameStateTick(
forEachLiveOne(gameState.respawns, (r, ri) => {
if (gameState.bricks[r.index]) {
destroy(gameState.respawns, ri)
- } else if (gameState.levelTime>r.time) {
+ } else if (gameState.levelTime > r.time) {
setBrick(gameState, r.index, r.color)
destroy(gameState.respawns, ri)
} else if (!isOptionOn("basic")) {
@@ -1435,7 +1450,7 @@ export function ballTick(gameState: GameState, ball: Ball, delta: number) {
const angle = Math.atan2(
-gameState.puckWidth / 2,
(ball.x - gameState.puckPosition) *
- (gameState.perks.concave_puck ? -0.5 : 1),
+ (gameState.perks.concave_puck ? -1 / (1 + gameState.perks.concave_puck) : 1),
);
ball.vx = speed * Math.cos(angle);
ball.vy = speed * Math.sin(angle);
@@ -1657,7 +1672,8 @@ function makeCoin(
color = "gold",
points = 1,
) {
- let weight = 0.8 + Math.random() * 0.2 + Math.min(2, points * 0.01);
+ let weight = 0.8 + Math.random() * 0.2 + Math.min(2, points * 0.01)
+ weight *= 5 / (5 + gameState.perks.etherealcoins)
append(gameState.coins, (p: Partial