diff --git a/config/default.json b/config/default.json index 2a66a00d3..2b2a56cb9 100644 --- a/config/default.json +++ b/config/default.json @@ -519,16 +519,16 @@ "allInvasions": true, "invasionPokemon": true, "rewardTypes": false, - "baseMegaEnergyAmounts": [10, 20, 25], + "baseMegaEnergyAmounts": [], "stardust": { "min": 100, - "max": 2500, + "max": 0, "interval": 100, "enabled": true }, "xp": { "min": 100, - "max": 1000, + "max": 0, "interval": 100, "enabled": true } diff --git a/server/src/filters/builder/pokemon.js b/server/src/filters/builder/pokemon.js index 6a2fc5c58..424db49d6 100644 --- a/server/src/filters/builder/pokemon.js +++ b/server/src/filters/builder/pokemon.js @@ -41,9 +41,10 @@ function buildPokemon(defaults, base, custom) { pokemon.stations[`${id}-${form}`] = new BaseFilter( defaults.stations.pokemon, ) - pokemon.quests[`${id}-${form}`] = new BaseFilter( - defaults.pokestops.pokemon, - ) + if (form !== '0') + pokemon.quests[`${id}-${form}`] = new BaseFilter( + defaults.pokestops.pokemon, + ) if (state.db.filterContext.Pokestop.hasConfirmedInvasions) { pokemon.rocket[`a${id}-${form}`] = new BaseFilter( defaults.pokestops.invasionPokemon,