Uploading progress to fix another project rq

This commit is contained in:
RedstonewolfX 2024-09-19 09:52:24 -04:00
parent 9062925cf8
commit 0b94a3b849
2 changed files with 4 additions and 2 deletions

View File

@ -5,6 +5,7 @@ import { PlayerPokemon } from "../field/pokemon";
import { Starter } from "../ui/starter-select-ui-handler";
import * as Utils from "../utils";
import PokemonSpecies, { PokemonSpeciesForm, getPokemonSpecies, getPokemonSpeciesForm, speciesStarters } from "./pokemon-species";
import Overrides from "#app/overrides";
export interface DailyRunConfig {
seed: integer;
@ -61,7 +62,7 @@ export function getDailyRunStarters(scene: BattleScene, seed: string): Starter[]
function getDailyRunStarter(scene: BattleScene, starterSpeciesForm: PokemonSpeciesForm, startingLevel: integer): Starter {
const starterSpecies = starterSpeciesForm instanceof PokemonSpecies ? starterSpeciesForm : getPokemonSpecies(starterSpeciesForm.speciesId);
const formIndex = starterSpeciesForm instanceof PokemonSpecies ? undefined : starterSpeciesForm.formIndex;
const pokemon = new PlayerPokemon(scene, starterSpecies, startingLevel, undefined, formIndex, undefined, undefined, undefined, undefined, undefined, undefined);
const pokemon = new PlayerPokemon(scene, starterSpecies, startingLevel, undefined, formIndex, undefined, Overrides.SHINY_OVERRIDE ? Overrides.SHINY_OVERRIDE : undefined, Overrides.VARIANT_OVERRIDE ? Overrides.VARIANT_OVERRIDE : undefined, undefined, undefined, undefined);
const starter: Starter = {
species: starterSpecies,
dexAttr: pokemon.getDexAttr(),

View File

@ -8,6 +8,7 @@ import { GameModes, getGameMode } from "#app/game-mode";
import { Starter } from "#app/ui/starter-select-ui-handler";
import { Species } from "#enums/species";
import Battle, { BattleType } from "#app/battle";
import Overrides from "#app/overrides";
/** Function to convert Blob to string */
export function blobToString(blob) {
@ -41,7 +42,7 @@ export function generateStarter(scene, species?: Species[]) {
const starterGender = starter.species.malePercent !== null
? !starterProps.female ? Gender.MALE : Gender.FEMALE
: Gender.GENDERLESS;
const starterPokemon = scene.addPlayerPokemon(starter.species, startingLevel, starter.abilityIndex, starterFormIndex, starterGender, starterProps.shiny, starterProps.variant, undefined, starter.nature);
const starterPokemon = scene.addPlayerPokemon(starter.species, startingLevel, starter.abilityIndex, starterFormIndex, starterGender, Overrides.SHINY_OVERRIDE || starterProps.shiny, Overrides.VARIANT_OVERRIDE ? Overrides.VARIANT_OVERRIDE : starterProps.variant, undefined, starter.nature);
starter.moveset = starterPokemon.moveset;
}
return starters;