From 38be442bced7c9b1f510ce45509279915b9acdac Mon Sep 17 00:00:00 2001 From: Mygod Date: Sat, 16 Nov 2024 15:56:15 -0800 Subject: [PATCH 1/2] fix: increase wild level to 50 --- config/default.json | 2 +- server/src/filters/pokemon/Backend.js | 2 +- server/src/filters/pokemon/Frontend.js | 2 +- server/src/ui/drawer.js | 2 +- src/features/tutorial/data.js | 10 +++++----- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/config/default.json b/config/default.json index ea0376867..f0b69e250 100644 --- a/config/default.json +++ b/config/default.json @@ -541,7 +541,7 @@ "allPokemon": false, "globalValues": { "iv": [80, 100], - "level": [1, 35], + "level": [1, 50], "atk_iv": [0, 15], "def_iv": [0, 15], "sta_iv": [0, 15], diff --git a/server/src/filters/pokemon/Backend.js b/server/src/filters/pokemon/Backend.js index 021a98141..4d0ac6202 100644 --- a/server/src/filters/pokemon/Backend.js +++ b/server/src/filters/pokemon/Backend.js @@ -312,7 +312,7 @@ class PkmnBackend { ? PkmnBackend.ensureSafe(cp, this.standard.cp[1]) : undefined, level: this.filterKeys.has('level') - ? PkmnBackend.ensureSafe(level, 35) + ? PkmnBackend.ensureSafe(level, 50) : undefined, gender: this.filterKeys.has('gender') ? { min: gender, max: gender } diff --git a/server/src/filters/pokemon/Frontend.js b/server/src/filters/pokemon/Frontend.js index 2b5ebbe41..c3c62b284 100644 --- a/server/src/filters/pokemon/Frontend.js +++ b/server/src/filters/pokemon/Frontend.js @@ -36,7 +36,7 @@ class PokemonFilter extends BaseFilter { this.atk_iv = atk || [0, 15] this.def_iv = def || [0, 15] this.sta_iv = sta || [0, 15] - this.level = level || [1, 35] + this.level = level || [1, 50] this.cp = cp || [10, 5000] this.gender = gender || 0 this.xxs = xxs || false diff --git a/server/src/ui/drawer.js b/server/src/ui/drawer.js index 473decc8f..936ea5083 100644 --- a/server/src/ui/drawer.js +++ b/server/src/ui/drawer.js @@ -108,7 +108,7 @@ function drawer(req, perms) { name: 'level', label: '', min: 1, - max: 35, + max: 50, perm: 'iv', color: 'secondary', }, diff --git a/src/features/tutorial/data.js b/src/features/tutorial/data.js index 9ec4f682c..2cff9f253 100644 --- a/src/features/tutorial/data.js +++ b/src/features/tutorial/data.js @@ -98,7 +98,7 @@ export const tutorialData = /** @type {const} */ ({ great: [1, 100], ultra: [1, 100], iv: [0, 100], - level: [1, 35], + level: [1, 50], }, standard: { enabled: false, @@ -107,7 +107,7 @@ export const tutorialData = /** @type {const} */ ({ atk_iv: [0, 15], def_iv: [0, 15], sta_iv: [0, 15], - level: [1, 35], + level: [1, 50], great: [1, 100], ultra: [1, 100], }, @@ -120,7 +120,7 @@ export const tutorialData = /** @type {const} */ ({ atk_iv: [0, 15], def_iv: [0, 15], sta_iv: [0, 15], - level: [1, 35], + level: [1, 50], great: [1, 100], ultra: [1, 100], }, @@ -132,7 +132,7 @@ export const tutorialData = /** @type {const} */ ({ atk_iv: [0, 15], def_iv: [0, 15], sta_iv: [0, 15], - level: [1, 35], + level: [1, 50], great: [1, 100], ultra: [1, 100], }, @@ -219,7 +219,7 @@ export const tutorialData = /** @type {const} */ ({ name: 'level', label: '', min: 1, - max: 35, + max: 50, disabled: false, color: 'secondary', }, From 9e3e0be4f9831d94fff98c88529d3c90d9eaa249 Mon Sep 17 00:00:00 2001 From: Mygod Date: Sat, 16 Nov 2024 18:45:48 -0800 Subject: [PATCH 2/2] fix: further increase level cap to 55 --- config/default.json | 2 +- server/src/filters/pokemon/Backend.js | 2 +- server/src/filters/pokemon/Frontend.js | 2 +- server/src/ui/drawer.js | 2 +- src/features/tutorial/data.js | 10 +++++----- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/config/default.json b/config/default.json index f0b69e250..91735664e 100644 --- a/config/default.json +++ b/config/default.json @@ -541,7 +541,7 @@ "allPokemon": false, "globalValues": { "iv": [80, 100], - "level": [1, 50], + "level": [1, 55], "atk_iv": [0, 15], "def_iv": [0, 15], "sta_iv": [0, 15], diff --git a/server/src/filters/pokemon/Backend.js b/server/src/filters/pokemon/Backend.js index 4d0ac6202..c305ce660 100644 --- a/server/src/filters/pokemon/Backend.js +++ b/server/src/filters/pokemon/Backend.js @@ -312,7 +312,7 @@ class PkmnBackend { ? PkmnBackend.ensureSafe(cp, this.standard.cp[1]) : undefined, level: this.filterKeys.has('level') - ? PkmnBackend.ensureSafe(level, 50) + ? PkmnBackend.ensureSafe(level) : undefined, gender: this.filterKeys.has('gender') ? { min: gender, max: gender } diff --git a/server/src/filters/pokemon/Frontend.js b/server/src/filters/pokemon/Frontend.js index c3c62b284..0c8befc1e 100644 --- a/server/src/filters/pokemon/Frontend.js +++ b/server/src/filters/pokemon/Frontend.js @@ -36,7 +36,7 @@ class PokemonFilter extends BaseFilter { this.atk_iv = atk || [0, 15] this.def_iv = def || [0, 15] this.sta_iv = sta || [0, 15] - this.level = level || [1, 50] + this.level = level || [1, 55] this.cp = cp || [10, 5000] this.gender = gender || 0 this.xxs = xxs || false diff --git a/server/src/ui/drawer.js b/server/src/ui/drawer.js index 936ea5083..937306491 100644 --- a/server/src/ui/drawer.js +++ b/server/src/ui/drawer.js @@ -108,7 +108,7 @@ function drawer(req, perms) { name: 'level', label: '', min: 1, - max: 50, + max: 55, perm: 'iv', color: 'secondary', }, diff --git a/src/features/tutorial/data.js b/src/features/tutorial/data.js index 2cff9f253..f2c22dd60 100644 --- a/src/features/tutorial/data.js +++ b/src/features/tutorial/data.js @@ -98,7 +98,7 @@ export const tutorialData = /** @type {const} */ ({ great: [1, 100], ultra: [1, 100], iv: [0, 100], - level: [1, 50], + level: [1, 55], }, standard: { enabled: false, @@ -107,7 +107,7 @@ export const tutorialData = /** @type {const} */ ({ atk_iv: [0, 15], def_iv: [0, 15], sta_iv: [0, 15], - level: [1, 50], + level: [1, 55], great: [1, 100], ultra: [1, 100], }, @@ -120,7 +120,7 @@ export const tutorialData = /** @type {const} */ ({ atk_iv: [0, 15], def_iv: [0, 15], sta_iv: [0, 15], - level: [1, 50], + level: [1, 55], great: [1, 100], ultra: [1, 100], }, @@ -132,7 +132,7 @@ export const tutorialData = /** @type {const} */ ({ atk_iv: [0, 15], def_iv: [0, 15], sta_iv: [0, 15], - level: [1, 50], + level: [1, 55], great: [1, 100], ultra: [1, 100], }, @@ -219,7 +219,7 @@ export const tutorialData = /** @type {const} */ ({ name: 'level', label: '', min: 1, - max: 50, + max: 55, disabled: false, color: 'secondary', },