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

shorter comment next to the code line

Browse Source
This commit is contained in:
Greenlamp 2024-05-09 03:45:15 +02:00
parent 39001823e2
commit bd7d85d745
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/modifier/modifier.ts
View File

@ -2181,8 +2181,7 @@ export class EnemyFusionChanceModifier extends EnemyPersistentModifier {
export function modifiersOverride(scene: Phaser.Scene, player: boolean = true): void { export function modifiersOverride(scene: Phaser.Scene, player: boolean = true): void {
const modifierOverride = player ? STARTING_MODIFIER_OVERRIDE : OPP_MODIFIER_OVERRIDE; const modifierOverride = player ? STARTING_MODIFIER_OVERRIDE : OPP_MODIFIER_OVERRIDE;
// if no override, do nothing if (!modifierOverride || modifierOverride.length === 0 || !scene) return; // if no override, do nothing
if (!modifierOverride || modifierOverride.length === 0 || !scene) return;
// if it's the opponent, we clear all his current modifiers to avoid stacking // if it's the opponent, we clear all his current modifiers to avoid stacking
if (!player) { if (!player) {
scene.enemyModifiers = []; scene.enemyModifiers = [];
@ -2191,8 +2190,7 @@ export function modifiersOverride(scene: Phaser.Scene, player: boolean = true):
modifierOverride.forEach(item => { modifierOverride.forEach(item => {
const modifierName = item[0]; const modifierName = item[0];
const qty = item[1] || 1; const qty = item[1] || 1;
// if the modifier does not exist, we skip it if (!modifierTypes.hasOwnProperty(modifierName)) return; // if the modifier does not exist, we skip it
if (!modifierTypes.hasOwnProperty(modifierName)) return;
const modifierType = modifierTypes[modifierName](); const modifierType = modifierTypes[modifierName]();
const modifier = modifierType.withIdFromFunc(modifierTypes[modifierName]).newModifier() as PersistentModifier; const modifier = modifierType.withIdFromFunc(modifierTypes[modifierName]).newModifier() as PersistentModifier;
modifier.stackCount = qty; modifier.stackCount = qty;
@ -2206,22 +2204,17 @@ export function modifiersOverride(scene: Phaser.Scene, player: boolean = true):
export function itemHeldsOverride(scene: Phaser.Scene, pokemon: Pokemon, player: boolean = true): void { export function itemHeldsOverride(scene: Phaser.Scene, pokemon: Pokemon, player: boolean = true): void {
const heldItemsOverride = player ? STARTING_HELD_ITEMS_OVERRIDE : OPP_HELD_ITEMS_OVERRIDE; const heldItemsOverride = player ? STARTING_HELD_ITEMS_OVERRIDE : OPP_HELD_ITEMS_OVERRIDE;
// if no override, do nothing if (!heldItemsOverride || heldItemsOverride.length === 0 || !scene) return; // if no override, do nothing
if (!heldItemsOverride || heldItemsOverride.length === 0 || !scene) return;
// we loop through all the itemName given in the override file // we loop through all the itemName given in the override file
heldItemsOverride.forEach(item => { heldItemsOverride.forEach(item => {
const itemName = item[0]; const itemName = item[0];
const qty = item[1] || 1; const qty = item[1] || 1;
// if the item does not exist, we skip it if (!modifierTypes.hasOwnProperty(itemName)) return; // if the item does not exist, we skip it
if (!modifierTypes.hasOwnProperty(itemName)) return; const modifierType = modifierTypes[itemName](); // we retrieve the item in the list
// we retrieve the item in the list
const modifierType = modifierTypes[itemName]();
// we create the item // we create the item
const itemModifier = modifierType.withIdFromFunc(modifierTypes[itemName]).newModifier((pokemon) as PersistentModifier) as PokemonHeldItemModifier; const itemModifier = modifierType.withIdFromFunc(modifierTypes[itemName]).newModifier((pokemon) as PersistentModifier) as PokemonHeldItemModifier;
// we assign the created item to the pokemon itemModifier.pokemonId = pokemon.id; // we assign the created item to the pokemon
itemModifier.pokemonId = pokemon.id; itemModifier.stackCount = qty; // we say how many items we want
// we say how many items we want
itemModifier.stackCount = qty;
if (player) { if (player) {
scene.addModifier(itemModifier as PokemonHeldItemModifier, true, false, false, true); scene.addModifier(itemModifier as PokemonHeldItemModifier, true, false, false, true);
} else { } else {