aqua sharpedo

Author: ewei068

src/battle/data/abilities.js

@@ -196,7 +196,7 @@ const abilitiesToRegister = Object.freeze({
           eventName: battleEventEnum.TURN_END,
           callback: () => {
             const allyPokemons = target.getPartyPokemon();
-            target.battle.addToLog(
+            battle.addToLog(
               `${target.name}'s Burning Draft increases its allies' combat readiness!`
             );
             allyPokemons.forEach((ally) => {
@@ -214,6 +214,32 @@ const abilitiesToRegister = Object.freeze({
       battle.unregisterListener(properties.listenerId);
     },
   }),
+  [abilityIdEnum.JET_SPEED]: new Ability({
+    id: abilityIdEnum.JET_SPEED,
+    name: "Jet Speed",
+    description:
+      "When the weather is set to rain, increase the user's combat readiness by 20% and raise its Special Attack for 2 turns.",
+    abilityAdd({ battle, target }) {
+      return {
+        listenerId: battle.registerListenerFunction({
+          eventName: battleEventEnum.AFTER_WEATHER_SET,
+          callback: () => {
+            const { weather } = battle;
+            if (weather.weatherId !== weatherConditions.RAIN) {
+              return;
+            }
+
+            battle.addToLog(`${target.name} is pumped by the Rain!`);
+            target.boostCombatReadiness(target, 20);
+            target.applyEffect("spaUp", 2, target, {});
+          },
+        }),
+      };
+    },
+    abilityRemove({ battle, properties }) {
+      battle.unregisterListener(properties.listenerId);
+    },
+  }),
 });
 
 module.exports = {

src/battle/engine/Battle.js

@@ -507,6 +507,8 @@ class Battle {
       return false;
     }
 
+    // TODO: extend/clear weather events? should this be done?
+
     // apply weather
     this.weather = {
       weatherId,
@@ -530,6 +532,8 @@ class Battle {
         break;
     }
 
+    this.emitEvent(battleEventEnum.AFTER_WEATHER_SET, {}); // no args because weather can be retrieved from this.weather
+
     return true;
   }
 

src/config/battleConfig.js

@@ -3094,7 +3094,7 @@ const moveConfig = Object.freeze({
   m88: {
     name: "Rock Throw",
     type: pokemonTypes.ROCK,
-    power: 70,
+    power: 65,
     accuracy: 70,
     cooldown: 0,
     targetType: targetTypes.ENEMY,

src/config/pokemonConfig.js

@@ -6380,6 +6380,27 @@ const pokemonConfigRaw = {
     battleEligible: true,
     rarity: rarities.EPIC,
     growthRate: growthRates.MEDIUMFAST,
+    noGacha: true,
+  },
+  [pokemonIdEnum.AQUAS_SHARPEDO]: {
+    name: "Aqua's Sharpedo",
+    emoji: "<:aquasharpedo:1325287154125111420>",
+    description:
+      "A Sharpedo controlled by Team Aqua. It is said to be able to cause tsunamis where it swims.",
+    type: [types.WATER, types.DARK],
+    baseStats: [80, 100, 50, 145, 60, 115],
+    sprite:
+      "https://raw.githubusercontent.com/ewei068/pokestar/main/media/images/sprites/aqua-sharpedo-resized.gif",
+    shinySprite:
+      "https://raw.githubusercontent.com/ewei068/pokestar/main/media/images/sprites/aqua-sharpedo-shiny-resized.gif",
+    abilities: {
+      [abilityIdEnum.JET_SPEED]: 1,
+    },
+    moveIds: ["m246", "m57", "m399", "m212"],
+    battleEligible: true,
+    rarity: rarities.EPIC,
+    growthRate: growthRates.MEDIUMFAST,
+    noGacha: true,
   },
   320: {
     name: "Wailmer",
@@ -7215,7 +7236,7 @@ const pokemonConfigRaw = {
     abilities: {
       [abilityIdEnum.AQUA_POWER]: 1,
     },
-    moveIds: ["m246", "m347", "m399", moveIdEnum.AQUA_IMPACT],
+    moveIds: ["m239", "m347", "m399", moveIdEnum.AQUA_IMPACT],
     battleEligible: true,
     rarity: rarities.LEGENDARY,
     growthRate: growthRates.SLOW,

src/enums/battleEnums.js

@@ -38,6 +38,7 @@ const abilityIdEnum = Object.freeze({
   ANGER_POINT: "83",
   REGENERATOR: "144",
   BURNING_DRAFT: "20018",
+  JET_SPEED: "20019",
 });
 
 /** @typedef {Enum<battleEventEnum>} BattleEventEnum */
@@ -66,6 +67,7 @@ const battleEventEnum = Object.freeze({
   CALCULATE_TYPE_MULTIPLIER: "calculateTypeMultiplier",
   CALCULATE_MISS: "calculateMiss",
   GET_ELIGIBLE_TARGETS: "getEligibleTargets",
+  AFTER_WEATHER_SET: "afterWeatherSet",
 });
 
 /**
@@ -95,6 +97,7 @@ const battleEventEnum = Object.freeze({
  *  [battleEventEnum.CALCULATE_TYPE_MULTIPLIER]: any,
  *  [battleEventEnum.CALCULATE_MISS]: any,
  *  [battleEventEnum.GET_ELIGIBLE_TARGETS]: any,
+ *  [battleEventEnum.AFTER_WEATHER_SET]: any,
  * }[K]} BattleEventArgsWithoutEventName
  */
 

src/enums/pokemonEnums.js

@@ -230,6 +230,7 @@ const pokemonIdEnum = Object.freeze({
   MANECTRIC: "310",
   CARVANHA: "318",
   SHARPEDO: "319",
+  AQUAS_SHARPEDO: "319-2",
   WAILMER: "320",
   WAILORD: "321",
   NUMEL: "322",