Shunt now only keeps 25% / 50%/ 75%

Readme.md

@@ -24,6 +24,7 @@ There's also an easy mode for kids (slower ball).
  
 # Next
 
+- render next level behind upgrade picker again 
 - sturdy bricks:  map of remaining hits
 
 # bugs
@@ -122,8 +123,7 @@ There's also an easy mode for kids (slower ball).
 - [colin] bigger ball - self-explanatory
 - [colin] smaller ball - yes.
 - [colin] sturdy ball - does more damage to bricks, to conter sturdy bricks
-- [colin] accumulation - coins aglutinate into bigger coins that hold more value
-
+- [colin] accumulation - coins agglutinate into bigger coins that hold more value
 - [colin] plot - plot the ball's trajectory as you position your puck
 - [colin] golden corners - catch coins at the sides of the puck to double their value
 - [colin] varied diet - your combo grows if you keep hitting different coloured bricks each time
@@ -139,9 +139,7 @@ There's also an easy mode for kids (slower ball).
 - coins avoid ball of different color
 - colored coins only (coins should be of the color of the ball to count )
 - level flips horizontally every time a ball bounces on puck
-- coins that hit the puck disappear, missed ones are scored
-- squirell : keep coins on screen to have a higher combo
-- [colin] peaceful combo - le combo monte chaque seconde tant que les 2+ balles ne se touchent pas OU qu'on ne touche pas de bloc explosif.
+- coins that hit the puck disappear, missed ones are scored 
 - [colin] close quarters - balle attirée par tous les blocs/par un bloc aléatoire, actif à portée de bloc (+1bloc au lvlup)/proportionnel à une force (+puissance au lvlup)…
 - [colin] plusieurs perks qui déclenchent des effets quand une balle est perdue. par ex: +3 combo à chaque balle perdue, 5 blocs transformés en bombe, balle et coins ralentis, blocs régénérés…
 - [colin] faster style - augmente le combo en fonction de la vitesse de la balle

src/gameStateMutators.ts

@@ -501,8 +501,10 @@ export async function setLevel(gameState: GameState, l: number) {
   gameState.runStatistics.levelsPlayed++;
 
   // Reset combo silently
+  const finalCombo=gameState.combo
+  gameState.combo = baseCombo(gameState);
   if (!gameState.perks.shunt) {
-    gameState.combo = baseCombo(gameState);
+    gameState.combo += Math.round(Math.max(0,(finalCombo-gameState.combo)*25*gameState.perks.shunt/100))
   }
   gameState.combo += gameState.perks.hot_start * 15;
 

src/i18n/en.json

@@ -199,7 +199,7 @@
   "upgrades.shocks.help": "Explosive balls collisions",
   "upgrades.shocks.name": "Shocks",
   "upgrades.shunt.fullHelp": "If you also have hot start, the hot start is just added to the current combo",
-  "upgrades.shunt.help": "Combo no longer resets between levels",
+  "upgrades.shunt.help": "Keep {{percent}}% of your combo between levels",
   "upgrades.shunt.name": "Shunt",
   "upgrades.skip_last.fullHelp": "You need to break all bricks to go to the next level. However, it can be hard to get the last ones. \n\nClearing a level early brings extra choices when upgrading. Never missing the bricks is also very beneficial. \n\nSo if you find it difficult to break the last bricks, getting this perk a few time can help.",
   "upgrades.skip_last.help": "The last brick will explode.",

src/i18n/fr.json

@@ -199,7 +199,7 @@
   "upgrades.shocks.help": "Collision explosive entre balles",
   "upgrades.shocks.name": "Choc",
   "upgrades.shunt.fullHelp": "Démarrage à chaud sera simplement ajouté au combo actuel",
-  "upgrades.shunt.help": "Le combo ne se remet plus à zéro en début de niveau",
+  "upgrades.shunt.help": "Garer {{percent}}%  du combo au changement de niveau ",
   "upgrades.shunt.name": "Shunt",
   "upgrades.skip_last.fullHelp": "Vous devez casser toutes les briques pour passer au niveau suivant. \n\nCependant, il peut être difficile d'obtenir les dernières briques.\n\nTerminer un niveau plus tôt permet d'obtenir des choix supplémentaires lors de la mise à niveau. \n\nNe jamais manquer de briques est également très avantageux.\n\nDonc, si vous avez du mal à casser les dernières briques, obtenir cet avantage plusieurs fois peut vous aider.",
   "upgrades.skip_last.help": "La dernière brique s'autodétruit.",

src/upgrades.ts

@@ -406,9 +406,9 @@ export const rawUpgrades = [
     threshold: 80000,
     giftable: false,
     id: "shunt",
-    max: 1,
+    max: 3,
     name: t("upgrades.shunt.name"),
-    help: (lvl: number) => t("upgrades.shunt.help"),
+    help: (lvl: number) => t("upgrades.shunt.help",{percent:lvl*25}),
     fullHelp: t("upgrades.shunt.fullHelp"),
   },
   {