mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-17 22:02:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix gender override default value

Browse Source
This commit is contained in:
Greenlamp 2024-05-21 17:07:54 +02:00
parent b78d91540f
commit fa3b45647e
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/battle-scene.ts
View File

@ -633,7 +633,7 @@ export default class BattleScene extends SceneBase {
if (Overrides.OPP_SPECIES_OVERRIDE) if (Overrides.OPP_SPECIES_OVERRIDE)
species = getPokemonSpecies(Overrides.OPP_SPECIES_OVERRIDE); species = getPokemonSpecies(Overrides.OPP_SPECIES_OVERRIDE);
const pokemon = new EnemyPokemon(this, species, level, trainerSlot, boss, dataSource); const pokemon = new EnemyPokemon(this, species, level, trainerSlot, boss, dataSource);
if (Overrides.OPP_GENDER_OVERRIDE) { if (Overrides.OPP_GENDER_OVERRIDE !== null) {
pokemon.gender = Overrides.OPP_GENDER_OVERRIDE; pokemon.gender = Overrides.OPP_GENDER_OVERRIDE;
} }
overrideModifiers(this, false); overrideModifiers(this, false);

2
src/overrides.ts
View File

@ -60,7 +60,7 @@ export const STARTING_LEVEL_OVERRIDE: integer = 0;
export const STARTER_SPECIES_OVERRIDE: Species | integer = 0; export const STARTER_SPECIES_OVERRIDE: Species | integer = 0;
export const ABILITY_OVERRIDE: Abilities = Abilities.NONE; export const ABILITY_OVERRIDE: Abilities = Abilities.NONE;
export const PASSIVE_ABILITY_OVERRIDE: Abilities = Abilities.NONE; export const PASSIVE_ABILITY_OVERRIDE: Abilities = Abilities.NONE;
export const GENDER_OVERRIDE: Gender = 0; export const GENDER_OVERRIDE: Gender = null;
export const MOVESET_OVERRIDE: Array<Moves> = []; export const MOVESET_OVERRIDE: Array<Moves> = [];
export const SHINY_OVERRIDE: boolean = false; export const SHINY_OVERRIDE: boolean = false;
export const VARIANT_OVERRIDE: Variant = 0; export const VARIANT_OVERRIDE: Variant = 0;

7
src/phases.ts
View File

@ -515,12 +515,13 @@ export class SelectStarterPhase extends Phase {
let starterFormIndex = Math.min(starterProps.formIndex, Math.max(starter.species.forms.length - 1, 0)); let starterFormIndex = Math.min(starterProps.formIndex, Math.max(starter.species.forms.length - 1, 0));
if (!i && Overrides.STARTER_SPECIES_OVERRIDE) if (!i && Overrides.STARTER_SPECIES_OVERRIDE)
starterFormIndex = Overrides.STARTER_FORM_OVERRIDE; starterFormIndex = Overrides.STARTER_FORM_OVERRIDE;
const starterGender = starter.species.malePercent !== null let starterGender = starter.species.malePercent !== null
? !starterProps.female ? Gender.MALE : Gender.FEMALE ? !starterProps.female ? Gender.MALE : Gender.FEMALE
: Gender.GENDERLESS; : Gender.GENDERLESS;
const genderOverride = Overrides.GENDER_OVERRIDE; if (Overrides.GENDER_OVERRIDE !== null)
starterGender = Overrides.GENDER_OVERRIDE
const starterIvs = this.scene.gameData.dexData[starter.species.speciesId].ivs.slice(0); const starterIvs = this.scene.gameData.dexData[starter.species.speciesId].ivs.slice(0);
const starterPokemon = this.scene.addPlayerPokemon(starter.species, this.scene.gameMode.getStartingLevel(), starter.abilityIndex, starterFormIndex, genderOverride || starterGender, starterProps.shiny, starterProps.variant, starterIvs, starter.nature); const starterPokemon = this.scene.addPlayerPokemon(starter.species, this.scene.gameMode.getStartingLevel(), starter.abilityIndex, starterFormIndex, starterGender, starterProps.shiny, starterProps.variant, starterIvs, starter.nature);
starterPokemon.tryPopulateMoveset(starter.moveset); starterPokemon.tryPopulateMoveset(starter.moveset);
if (starter.passive) if (starter.passive)
starterPokemon.passive = true; starterPokemon.passive = true;