merge silvally forms (#2358)

* change manaphy & phione anims * merge silvally forms
keldaanCommunity · Oct 22, 2024 · 847ea10 · 847ea10
1 parent 4b07011
commit 847ea10
Show file tree

Hide file tree

Showing 25 changed files with 251 additions and 731 deletions.
diff --git a/app/core/abilities/abilities.ts b/app/core/abilities/abilities.ts
@@ -8305,15 +8305,17 @@ export class MultiAttackStrategy extends AbilityStrategy {
     crit: boolean
   ) {
     super.process(pokemon, state, board, target, crit)
-    const silvallyType = values(pokemon.types).at(-1)
+    let synergyLevelsCount = 0
     const synergies = pokemon.player?.synergies
-    let synergyLevelCount = 0
-
-    if (synergies && silvallyType && synergies.has(silvallyType)) {
-      synergyLevelCount = synergies.get(silvallyType)!
+    if (synergies) {
+      pokemon.types.forEach((type) => {
+        if (type !== Synergy.ARTIFICIAL) {
+          synergyLevelsCount += synergies.get(type) ?? 0
+        }
+      })
     }
-    const damage = 15 * synergyLevelCount
 
+    const damage = 15 * synergyLevelsCount
     board
       .getAdjacentCells(pokemon.positionX, pokemon.positionY)
       .map((v) => v.value)