mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-08-09 00:49:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Some minor fixes

Browse Source
This commit is contained in:
Wlowscha 2025-07-12 20:36:13 +02:00
parent 0d2bae0fcc
commit 9925b0c358
No known key found for this signature in database
GPG Key ID: 3C8F1AD330565D04
7 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/data/balance/pokemon-evolutions.ts
View File

@ -13,7 +13,7 @@ import { SpeciesFormKey } from "#enums/species-form-key";
import { TimeOfDay } from "#enums/time-of-day";
import { speciesStarterCosts } from "./starters";
import i18next from "i18next";
import { allMoves } from "#app/data/data-lists";
import { allHeldItems, allMoves } from "#app/data/data-lists";
import { getPokemonSpecies } from "#app/utils/pokemon-utils";
import { HeldItemId } from "#enums/held-item-id";
@ -177,10 +177,7 @@ export class SpeciesEvolutionCondition {
case EvoCondKey.PARTY_TYPE:
return globalScene.getPlayerParty().some(p => p.getTypes(false, false, true).includes(cond.pkmnType))
case EvoCondKey.EVO_TREASURE_TRACKER:
return pokemon.getHeldItems().some(m =>
m.is("EvoTrackerModifier") &&
m.getStackCount() + pokemon.getPersistentTreasureCount() >= cond.value
);
return allHeldItems[HeldItemId.GIMMIGHOUL_EVO_TRACKER].getStackCount(pokemon) >= cond.value;
case EvoCondKey.GENDER:
return pokemon.gender === cond.gender;
case EvoCondKey.SHEDINJA: // Shedinja cannot be evolved into directly

2
src/data/mystery-encounters/encounters/dancing-lessons-encounter.ts
View File

@ -154,7 +154,7 @@ export const DancingLessonsEncounter: MysteryEncounter = MysteryEncounterBuilder
}
const oricorioData = new PokemonData(enemyPokemon);
const oricorio = globalScene.addEnemyPokemon(species, level, TrainerSlot.NONE, false, false, oricorioData);
const oricorio = globalScene.addEnemyPokemon(species, level, TrainerSlot.NONE, false, false, [], oricorioData);
// Adds a real Pokemon sprite to the field (required for the animation)
for (const enemyPokemon of globalScene.getEnemyParty()) {

2
src/items/apply-trainer-items.ts
View File

@ -1,4 +1,4 @@
import { allTrainerItems } from "./all-trainer-items";
import { allTrainerItems } from "#app/data/data-lists";
import {
type BooleanHolderParams,
type NumberHolderParams,

2
src/items/held-item-pool.ts
View File

@ -7,7 +7,7 @@ import { HeldItemPoolType } from "#enums/modifier-pool-type";
import type { PokemonType } from "#enums/pokemon-type";
import { RewardTier } from "#enums/reward-tier";
import { PERMANENT_STATS } from "#enums/stat";
import { allHeldItems } from "./all-held-items";
import { allHeldItems } from "#app/data/data-lists";
import {
type HeldItemConfiguration,
type HeldItemPool,

2
src/items/held-items/item-steal.ts
View File

@ -4,7 +4,7 @@ import type { HeldItemId } from "#enums/held-item-id";
import i18next from "i18next";
import { HeldItemEffect, HeldItem } from "../held-item";
import { getPokemonNameWithAffix } from "#app/messages";
import { allHeldItems } from "../all-held-items";
import { allHeldItems } from "#app/data/data-lists";
import { globalScene } from "#app/global-scene";
export interface ItemStealParams {

2
src/items/trainer-item-pool.ts
View File

@ -2,7 +2,7 @@ import { globalScene } from "#app/global-scene";
import { isNullOrUndefined, pickWeightedIndex } from "#app/utils/common";
import { RewardTier } from "#enums/reward-tier";
import type { TrainerItemId } from "#enums/trainer-item-id";
import { allTrainerItems } from "./all-trainer-items";
import { allTrainerItems } from "#app/data/data-lists";
import type { TrainerItemPool, TrainerItemTieredPool } from "./trainer-item-data-types";
import type { TrainerItemManager } from "./trainer-item-manager";

3
src/phases/berry-phase.ts
View File

@ -6,7 +6,8 @@ import { BooleanHolder } from "#app/utils/common";
import { FieldPhase } from "./field-phase";
import { globalScene } from "#app/global-scene";
import type Pokemon from "#app/field/pokemon";
import { allHeldItems, applyHeldItems } from "#app/items/all-held-items";
import { applyHeldItems } from "#app/items/all-held-items";
import { allHeldItems } from "#app/data/data-lists";
import { HeldItemEffect } from "#app/items/held-item";
import { HeldItemCategoryId, isItemInCategory } from "#enums/held-item-id";