Change passive of Solrock

Author: sylvainpolletvillard

app/models/colyseus-models/pokemon.ts

@@ -5817,7 +5817,7 @@ export class Solrock extends Pokemon {
   maxPP = 80
   range = 2
   skill = Ability.COSMIC_POWER_SUN
-  passive = Passive.DROUGHT
+  passive = Passive.DROUGHT_OR_ZENITH
 }
 
 export class Regirock extends Pokemon {

app/public/dist/client/changelog/patch-6.9.md

@@ -72,6 +72,7 @@
 - Change Astral Barrage: now rush into backline while shooting. PP 80 → 100
 - Adjust Bounce Damage (Spoink, Mantyke): 10/20/30 → 15/20/25
 - Scale Shot (Roaring Moon) can now be cancelled if Roaring Moon is asleep, frozen or resurrecting during the cast. Roaring Moon PP 140 → 130
+- Change passive of Solrock: now changes the weather to DROUGHT or ZENITH based on your dominant synergy between FIRE and LIGHT
 
 # Changes to Items
 

app/public/dist/client/locales/en/translation.json

@@ -3151,6 +3151,7 @@
 		"TORNADUS": "Change weather to WINDY or SNOW based on your dominant synergy between FLYING and ICE",
 		"ENAMORUS": "Change weather to MISTY or WINDY based on your dominant synergy between FAIRY and FLYING",
 		"DROUGHT_OR_SANDSTORM": "Change weather to DROUGHT or SANDSTORM based on your dominant synergy between FIRE and GROUND",
+		"DROUGHT_OR_ZENITH": "Change weather to DROUGHT or ZENITH based on your dominant synergy between FIRE and LIGHT",
 		"RAIN_OR_STORM": "Change weather to RAIN or STORM based on your dominant synergy between WATER and ELECTRIC",
 		"AIRLOCK": "Change weather to NEUTRAL",
 		"SHARED_VISION": "Shared Vision: All Pokémon with Shared Vision will attack the same target, if at range",

app/public/dist/client/locales/fr/translation.json

@@ -3103,6 +3103,7 @@
 		"TORNADUS": "Change la météo en WINDY ou SNOW selon votre synergie dominante entre FLYING et ICE.",
 		"ENAMORUS": "Change la météo en MISTY ou WINDY selon votre synergie dominante entre FAIRY et FLYING.",
 		"DROUGHT_OR_SANDSTORM": "Change la météo en DROUGHT ou SANDSTORM selon votre synergie dominante entre FIRE et GROUND.",
+		"DROUGHT_OR_ZENITH": "Change la météo en DROUGHT ou ZENITH selon votre synergie dominante entre FIRE et LIGHT.",
 		"RAIN_OR_STORM": "Change la météo en RAIN ou STORM selon votre synergie dominante entre WATER et ELECTRIC.",
 		"AIRLOCK": "Neutralise tous les effets météorologiques, retourne à une météo NEUTRAL.",
 		"SHARED_VISION": "Vision Partagée : Tous les Pokémon avec le passif Vision Partagée attaqueront la même cible, si elle est à portée.",

app/types/enum/Passive.ts

@@ -30,6 +30,7 @@ export enum Passive {
   WINDY = "WINDY",
   ZENITH = "ZENITH",
   DROUGHT_OR_SANDSTORM = "DROUGHT_OR_SANDSTORM",
+  DROUGHT_OR_ZENITH = "DROUGHT_OR_ZENITH",
   RAIN_OR_STORM = "RAIN_OR_STORM",
   AIRLOCK = "AIRLOCK",
   WURMPLE = "WURMPLE",

app/utils/weather.ts

@@ -4,12 +4,14 @@ import Player from "../models/colyseus-models/player"
 import { Pokemon } from "../models/colyseus-models/pokemon"
 import { WeatherByWeatherRocks } from "../types/enum/Item"
 import { Passive } from "../types/enum/Passive"
+import { Synergy } from "../types/enum/Synergy"
 import {
   PassivesAssociatedToWeather,
   Weather,
   WeatherAssociatedToSynergy
 } from "../types/enum/Weather"
 import { hasKey } from "./map"
+import { values } from "./schemas"
 
 export function getWeather(
   bluePlayer: Player,
@@ -215,6 +217,18 @@ export function getWeather(
             (boardWeatherScore.get(dominant) ?? 0) + 100
           )
         }
+
+        if (pkm.passive === Passive.DROUGHT_OR_ZENITH) {
+          const nbLight = values(board).filter((p) =>
+            p.types.has(Synergy.LIGHT)
+          )
+          const nbFire = values(board).filter((p) => p.types.has(Synergy.FIRE))
+          const dominant = nbLight >= nbFire ? Weather.ZENITH : Weather.DROUGHT
+          boardWeatherScore.set(
+            dominant,
+            (boardWeatherScore.get(dominant) ?? 0) + 100
+          )
+        }
       }
     })
   }