From f9abc50d8bf884f1dd3ad85c02f1a428149137aa Mon Sep 17 00:00:00 2001
From: Tempoanon <163687446+TempsRay@users.noreply.github.com>
Date: Fri, 3 May 2024 22:29:30 -0400
Subject: [PATCH] Add Neutralizing Gas message, display Manaphy egg gacha
 origin, allow catching wonder guard bosses (#322)

* Add Neutralizing Gas message, display Manaphy egg gacha origin, allowcatching wonder guard bosses

* Add edge cases of supressed/overriden wonder guard bosses
---
 src/data/ability.ts | 1 +
 src/data/egg.ts     | 2 --
 src/phases.ts       | 3 ++-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/data/ability.ts b/src/data/ability.ts
index 88695e23f..960818a24 100644
--- a/src/data/ability.ts
+++ b/src/data/ability.ts
@@ -3356,6 +3356,7 @@ export function initAbilities() {
       .attr(UncopiableAbilityAbAttr)
       .attr(UnswappableAbilityAbAttr)
       .attr(NoTransformAbilityAbAttr)
+      .attr(PostSummonMessageAbAttr, (pokemon: Pokemon) => getPokemonMessage(pokemon, '\'s Neutralizing Gas filled the area!'))
       .partial(),
     new Ability(Abilities.PASTEL_VEIL, 8)
       .attr(StatusEffectImmunityAbAttr, StatusEffect.POISON, StatusEffect.TOXIC)
diff --git a/src/data/egg.ts b/src/data/egg.ts
index 08982cd4a..f0d6de26a 100644
--- a/src/data/egg.ts
+++ b/src/data/egg.ts
@@ -77,8 +77,6 @@ export function getEggHatchWavesMessage(hatchWaves: integer): string {
 }
 
 export function getEggGachaTypeDescriptor(scene: BattleScene, egg: Egg): string {
-  if (egg.isManaphyEgg())
-    return '';
   switch (egg.gachaType) {
     case GachaType.LEGENDARY:
       return `Legendary Rate Up (${getPokemonSpecies(getLegendaryGachaSpeciesForTimestamp(scene, egg.timestamp)).getName()})`;
diff --git a/src/phases.ts b/src/phases.ts
index e4ed8d293..3d80b22eb 100644
--- a/src/phases.ts
+++ b/src/phases.ts
@@ -57,6 +57,7 @@ import { fetchDailyRunSeed, getDailyRunStarters } from "./data/daily-run";
 import { GameModes, gameModes } from "./game-mode";
 import { getPokemonSpecies, speciesStarters } from "./data/pokemon-species";
 import i18next from './plugins/i18n';
+import { Abilities } from "./data/enums/abilities";
 import { STARTER_FORM_OVERRIDE, STARTER_SPECIES_OVERRIDE } from './overrides';
 
 export class LoginPhase extends Phase {
@@ -1729,7 +1730,7 @@ export class CommandPhase extends FieldPhase {
             }, null, true);
           } else if (cursor < 5) {
             const targetPokemon = this.scene.getEnemyField().find(p => p.isActive(true));
-            if (targetPokemon.isBoss() && targetPokemon.bossSegmentIndex >= 1 && cursor < PokeballType.MASTER_BALL) {
+            if (targetPokemon.isBoss() && targetPokemon.bossSegmentIndex >= 1 && !targetPokemon.hasAbility(Abilities.WONDER_GUARD, false, true) && cursor < PokeballType.MASTER_BALL) {
               this.scene.ui.setMode(Mode.COMMAND, this.fieldIndex);
               this.scene.ui.setMode(Mode.MESSAGE);
               this.scene.ui.showText(i18next.t('battle:noPokeballStrong'), null, () => {