mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2025-07-19 14:52:19 +02:00
More modifier stuff
This commit is contained in:
parent
1a56f43c29
commit
bb7bf170ef
@ -1015,12 +1015,12 @@ export class MetronomeChallenge extends Challenge {
|
|||||||
}
|
}
|
||||||
|
|
||||||
override applyStarterModify(pokemon: Pokemon): boolean {
|
override applyStarterModify(pokemon: Pokemon): boolean {
|
||||||
pokemon.moveset = [new PokemonMove(Moves.METRONOME)];
|
pokemon.moveset = [new PokemonMove(Moves.METRONOME, 0, 3)];
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
override applyEnemyPokemonModify(pokemon: EnemyPokemon): boolean {
|
override applyEnemyPokemonModify(pokemon: EnemyPokemon): boolean {
|
||||||
pokemon.moveset = [new PokemonMove(Moves.METRONOME)];
|
pokemon.moveset = [new PokemonMove(Moves.METRONOME, 0, 3)];
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1037,38 +1037,26 @@ export class MetronomeChallenge extends Challenge {
|
|||||||
if (poolType !== ModifierPoolType.PLAYER) {
|
if (poolType !== ModifierPoolType.PLAYER) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
const common_block = ["TM_COMMON", "ETHER"];
|
const common_block = ["TM_COMMON", "ETHER", "MAX_ETHER"];
|
||||||
const great_block = ["ETHER", "MAX_ETHER", "ELIXIR", "MAX_ELIXIR", "PP_UP", "MEMORY_MUSHROOM", "TM_GREAT"];
|
const great_block = ["ELIXIR", "MAX_ELIXIR", "PP_UP", "MEMORY_MUSHROOM", "TM_GREAT"];
|
||||||
const ultra_block = ["TM_ULTRA", "PP_MAX"];
|
const ultra_block = ["TM_ULTRA", "PP_MAX"];
|
||||||
|
|
||||||
common_block.map(b => {
|
common_block.map(b => {
|
||||||
const idx = modifierPool[ModifierTier.COMMON].findIndex(
|
const idx = modifierPool[ModifierTier.COMMON].findIndex(p => p.modifierType.id === b);
|
||||||
p => p.modifierType === getModifierType(getModifierTypeFuncById(b)),
|
|
||||||
);
|
|
||||||
if (idx >= 0) {
|
if (idx >= 0) {
|
||||||
modifierPool[ModifierTier.COMMON].splice(idx, 1);
|
modifierPool[ModifierTier.COMMON].splice(idx, 1);
|
||||||
} else {
|
|
||||||
console.log(`${b} not found in Common tier!`);
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
great_block.map(b => {
|
great_block.map(b => {
|
||||||
const idx = modifierPool[ModifierTier.GREAT].findIndex(
|
const idx = modifierPool[ModifierTier.GREAT].findIndex(p => p.modifierType.id === b);
|
||||||
p => p.modifierType === getModifierType(getModifierTypeFuncById(b)),
|
|
||||||
);
|
|
||||||
if (idx >= 0) {
|
if (idx >= 0) {
|
||||||
modifierPool[ModifierTier.GREAT].splice(idx, 1);
|
modifierPool[ModifierTier.GREAT].splice(idx, 1);
|
||||||
} else {
|
|
||||||
console.log(`${b} not found in Great tier!`);
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
ultra_block.map(b => {
|
ultra_block.map(b => {
|
||||||
const idx = modifierPool[ModifierTier.ULTRA].findIndex(
|
const idx = modifierPool[ModifierTier.ULTRA].findIndex(p => p.modifierType.id === b);
|
||||||
p => p.modifierType === getModifierType(getModifierTypeFuncById(b)),
|
|
||||||
);
|
|
||||||
if (idx >= 0) {
|
if (idx >= 0) {
|
||||||
modifierPool[ModifierTier.ULTRA].splice(idx, 1);
|
modifierPool[ModifierTier.ULTRA].splice(idx, 1);
|
||||||
} else {
|
|
||||||
console.log(`${b} not found in Ultra tier!`);
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
return true;
|
return true;
|
||||||
@ -1078,7 +1066,7 @@ export class MetronomeChallenge extends Challenge {
|
|||||||
const removals = ["ETHER", "MAX_ETHER", "ELIXIR", "MAX_ELIXIR", "MEMORY_MUSHROOM"];
|
const removals = ["ETHER", "MAX_ETHER", "ELIXIR", "MAX_ELIXIR", "MEMORY_MUSHROOM"];
|
||||||
const opstart = options.length;
|
const opstart = options.length;
|
||||||
removals.map(r => {
|
removals.map(r => {
|
||||||
const idx = options.findIndex(o => o.type === getModifierType(getModifierTypeFuncById(r)));
|
const idx = options.findIndex(o => o.type.localeKey.split(".")[1] === r); // I don't wanna hear it!
|
||||||
if (idx >= 0) {
|
if (idx >= 0) {
|
||||||
options.splice(idx, 1);
|
options.splice(idx, 1);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user