Merge branch 'master' into translation/de-1783846133943

Author: sylvainpolletvillard

.gitignore

@@ -40,5 +40,8 @@ id_digital_ocean.pub
 /app/public/dist/server/app/public/src/assets/atlas.json
 /app/public/dist/server/package.json
 /app/public/dist/server/app/public/src/assets/pokemons/durations.json
+/app/public/dist/server/app/public/dist/client/locales
 .devmode.json
-.assetpack/
+.assetpack/
+app/public/dist/client/recorder.worker.js
+app/public/dist/client/recorder.worker.js.map

app/app.config.ts

@@ -299,6 +299,10 @@ export const server = defineServer({
       res.sendFile(viewsSrc)
     })
 
+    app.get("/replay", (req, res) => {
+      res.sendFile(viewsSrc)
+    })
+
     app.get("/after", (req, res) => {
       res.sendFile(viewsSrc)
     })

app/config/game/experience.ts

@@ -15,5 +15,6 @@ export const ExpTable: { [key: number]: number } = Object.freeze({
   6: 34,
   7: 52,
   8: 72,
-  9: 255
+  9: 72,
+  10: 255
 })

app/config/game/shop.ts

@@ -62,7 +62,8 @@ export const RarityProbabilityPerLevel: { [key: number]: number[] } = {
   6: [0.25, 0.4, 0.3, 0.05, 0],
   7: [0.16, 0.33, 0.35, 0.15, 0.01],
   8: [0.11, 0.27, 0.35, 0.22, 0.05],
-  9: [0.05, 0.2, 0.35, 0.3, 0.1]
+  9: [0.05, 0.2, 0.35, 0.3, 0.1],
+  10: [0.05, 0.2, 0.3, 0.3, 0.15]
 }
 
 /* Special Pokemon rates */

app/config/game/stages.ts

@@ -20,3 +20,4 @@ export const PORTAL_CAROUSEL_BASE_DURATION = 23000
 export const ItemCarouselStages = [4, 12, 17, 22, 27, 34]
 export const AdditionalPicksStages = [5, 8, 11]
 export const PortalCarouselStages = [0, 10, 20]
+export const GiftShopStages = [15, 16, 25, 26]

app/core/abilities/entrainment.ts

@@ -20,9 +20,9 @@ export class EntrainmentStrategy extends AbilityStrategy {
       const potentialTargets: { x: number; y: number; value: PokemonEntity }[] =
         []
       board.forEach(
-        (x: number, y: number, value: PokemonEntity | undefined) => {
-          if (value && value.team !== pokemon.team && value.hp > 0) {
-            potentialTargets.push({ x, y, value })
+        (x: number, y: number, entity?: PokemonEntity) => {
+          if (entity && entity.team !== pokemon.team && entity.hp > 0 && entity.skill !== Ability.ENTRAINMENT) {
+            potentialTargets.push({ x, y, value: entity })
           }
         }
       )

app/core/abilities/petal-dance.ts

@@ -2,49 +2,54 @@ import { AttackType } from "../../types/enum/Game"
 import { distanceM } from "../../utils/distance"
 import type { Board } from "../board"
 import type { PokemonEntity } from "../pokemon-entity"
+import { DelayedCommand } from "../simulation-command"
 import { AbilityStrategy } from "./ability-strategy"
 
 export class PetalDanceStrategy extends AbilityStrategy {
   requiresTarget = false
   process(pokemon: PokemonEntity, board: Board, target: null, crit: boolean) {
-    super.process(pokemon, board, target, crit, true)
+    super.process(pokemon, board, target, crit)
 
     const damage = [20, 30, 50, 100][pokemon.stars - 1] ?? 100
     const count = [3, 4, 5, 6][pokemon.stars - 1] ?? 6
 
-    const enemies = board.cells.filter(
-      (p) => p && p.team !== pokemon.team
-    ) as PokemonEntity[]
-    const enemiesHit = enemies
-      .sort(
-        (a, b) =>
-          distanceM(
-            a.positionX,
-            a.positionY,
-            pokemon.positionX,
-            pokemon.positionY
-          ) -
-          distanceM(
-            b.positionX,
-            b.positionY,
-            pokemon.positionX,
-            pokemon.positionY
-          )
-      )
-      .slice(0, count)
+    const enemies = board.cells
+      .filter((p): p is PokemonEntity => p != null && p.team !== pokemon.team)
+      .map((entity) => ({
+        entity,
+        distance: distanceM(
+          entity.positionX,
+          entity.positionY,
+          pokemon.positionX,
+          pokemon.positionY
+        )
+      }))
+      .sort((a, b) => a.distance - b.distance)
+
+    const projectileSpeed = 10
 
-    enemiesHit.forEach((enemy) => {
-      enemy.handleSpecialDamage(
-        damage,
-        board,
-        AttackType.SPECIAL,
-        pokemon,
-        crit
+    for (let i = 0; i < count; i++) {
+      const { entity: enemy, distance } = enemies[i % enemies.length]
+      pokemon.commands.push(
+        new DelayedCommand(() => {
+          if (enemy.hp > 0) {
+            enemy.handleSpecialDamage(
+              damage,
+              board,
+              AttackType.SPECIAL,
+              pokemon,
+              crit
+            )
+          }
+        }, i * 100 + (distance * 1000 / projectileSpeed))
       )
+
       pokemon.broadcastAbility({
-        positionX: enemy.positionX,
-        positionY: enemy.positionY
+        skill: "PETAL_DANCE_PROJECTILE",
+        targetX: enemy.positionX,
+        targetY: enemy.positionY,
+        delay: i * 100
       })
-    })
+    }
   }
 }

app/core/matchmaking.ts

@@ -71,15 +71,57 @@ function completeMatchupCombination(
         remainingPlayers.includes(m.redPlayer)
     )
     if (remainingMatchups.length === 0) {
-      // no more matchups, need to complete with a ghost matchup
-      return completeMatchupCombination([...combination], matchups, players)
+      /* 
+       No more matchups but at least 2 players without matchup
+       this case should only happen in double up mode,
+       when you got AB-CD-EF as player teams and get into the case AD-BC-EF matchup combination.
+       E and F are in the same team so zero matchups remain and 2 players still have no match 
+       returning empty array to the flatMap excludes that branch of matchups completely
+       */
+      return []
     }
     return remainingMatchups.flatMap((m) =>
       completeMatchupCombination([...combination, m], matchups, players)
     )
   }
 }
 
+export function selectDoubleUpMatchups(state: GameState): Matchup[] {
+  const players = shuffleArray(
+    schemaValues(state.players).filter((p) => p.alive)
+  )
+  if (players.length <= 1) return []
+
+  // Same pipeline as selectMatchups, but teammates are never paired
+  const matchups = getAllPossibleMatchups(players).filter(
+    (m) => m.bluePlayer.doubleUpTeamId !== m.redPlayer.doubleUpTeamId
+  )
+
+  const matchupCombinations: Matchup[][] = completeMatchupCombination(
+    [],
+    matchups,
+    players
+  )
+
+  const matchupCombinationsCount = matchupCombinations.map((combination) =>
+    sum(combination.map((m) => m.count))
+  )
+  const lowestTotalCount = Math.min(...matchupCombinationsCount)
+  const lowestTotalCountMatchupCombinations = matchupCombinations.filter(
+    (matchups, index) => matchupCombinationsCount[index] === lowestTotalCount
+  )
+
+  const matchupCombinationsDistance = lowestTotalCountMatchupCombinations.map(
+    (combination) => sum(combination.map((m) => m.distance))
+  )
+  const maxDistance = Math.max(...matchupCombinationsDistance)
+  const mostDistantMatchups = lowestTotalCountMatchupCombinations.filter(
+    (matchups, index) => matchupCombinationsDistance[index] === maxDistance
+  )
+
+  return pickRandomIn(mostDistantMatchups)
+}
+
 export function selectMatchups(state: GameState): Matchup[] {
   /* step 1) establish all the matchups possible with players alive and their associated count
   count = number of times A fought B or his ghost) + (number of times B fought A or his ghost) */

app/core/pokemon-entity.ts

@@ -147,6 +147,7 @@ export class PokemonEntity extends Schema implements IPokemonEntity {
   refToBoardPokemon: IPokemon
   commands = new Array<SimulationCommand>()
   effectsSet = new Set<EffectClass>()
+  sourcePlayer: Player | undefined = undefined // used to distinguish entities from double up partners joining the board
 
   constructor(
     pokemon: IPokemon,
@@ -206,16 +207,17 @@ export class PokemonEntity extends Schema implements IPokemonEntity {
     this.shieldDamageTaken = 0
     this.healDone = 0
     this.shieldDone = 0
+
+    pokemon.types.forEach((type) => {
+      this.types.add(type)
+    })
+
     if (this.types.has(Synergy.DARK) && this.range === 1) {
       this.cooldown = 300 // ensure dark assassins move first
     } else {
       this.resetCooldown(500)
     }
 
-    pokemon.types.forEach((type) => {
-      this.types.add(type)
-    })
-
     this.passive = Passive.NONE
     this.changePassive(pokemon.passive)
   }
@@ -284,6 +286,7 @@ export class PokemonEntity extends Schema implements IPokemonEntity {
   }
 
   get player(): Player | undefined {
+    if (this.sourcePlayer) return this.sourcePlayer
     const player =
       this.baseTeam === Team.BLUE_TEAM
         ? this.simulation.bluePlayer
@@ -1617,7 +1620,7 @@ export class PokemonEntity extends Schema implements IPokemonEntity {
         break
       case Item.PECHA_BERRY:
         heal(100)
-        this.status.poisonOrigin = undefined
+        this.status.poisonOrigin = null
         this.status.poisonStacks = 0
         this.status.poisonDamageCooldown = 0
         this.effects.add(EffectEnum.IMMUNITY_POISON)

app/core/pokemon-state.ts

@@ -1103,7 +1103,7 @@ export default abstract class PokemonState {
         attacker: null,
         shouldTargetGainMana: true
       })
-      pokemon.status.triggerBurn(1100, pokemon, null)
+      pokemon.status.triggerBurn(2200, pokemon, null)
     }
   }