cdnutter
/
pokerogue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor final boss tweak and color hidden ability on catch/hatch info

pull/31/head
Flashfyre 2024-04-03 17:18:32 -04:00
parent 563ff21ad4
commit 382b70ed60
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/form-change-phase.ts
View File

@ -270,7 +270,8 @@ export class QuietFormChangePhase extends BattlePhase {
end(): void {
if (this.pokemon.scene.currentBattle.battleSpec === BattleSpec.FINAL_BOSS && this.pokemon instanceof EnemyPokemon) {
this.scene.playBgm();
this.scene.unshiftPhase(new PokemonHealPhase(this.scene, this.pokemon.getBattlerIndex(), this.pokemon.getMaxHp(), null, false));
this.pokemon.summonData.battleStats = [ 0, 0, 0, 0, 0, 0, 0 ];
this.scene.unshiftPhase(new PokemonHealPhase(this.scene, this.pokemon.getBattlerIndex(), this.pokemon.getMaxHp(), null, false, false, false, true));
this.pokemon.bossSegments = 5;
this.pokemon.bossSegmentIndex = 4;
this.pokemon.initBattleInfo();

9
src/ui/pokemon-info-container.ts
View File

@ -3,7 +3,7 @@ import BattleScene from "../battle-scene";
import { Gender, getGenderColor, getGenderSymbol } from "../data/gender";
import Pokemon from "../field/pokemon";
import { StatsContainer } from "./stats-container";
import { TextStyle, addBBCodeTextObject, addTextObject } from "./text";
import { TextStyle, addBBCodeTextObject, addTextObject, getTextColor } from "./text";
import { addWindow } from "./ui-theme";
import { getNatureName } from "../data/nature";
import * as Utils from "../utils";
@ -120,7 +120,12 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container {
} else
this.pokemonGenderText.setVisible(false);
this.pokemonAbilityText.setText(pokemon.getAbility(true).name);
const ability = pokemon.getAbility(true);
const abilityTextStyle = ability.id === pokemon.getSpeciesForm().abilityHidden ? TextStyle.MONEY : TextStyle.WINDOW;
this.pokemonAbilityText.setText(ability.name);
this.pokemonAbilityText.setText(getTextColor(abilityTextStyle));
this.pokemonAbilityText.setShadowColor(getTextColor(abilityTextStyle, true));
this.pokemonNatureText.setText(getNatureName(pokemon.getNature(), true));
const originalIvs: integer[] = this.scene.gameData.dexData[pokemon.species.speciesId].caughtAttr