diff --git a/src/routes/api.js b/src/routes/api.js index ed14e92e..05f60237 100644 --- a/src/routes/api.js +++ b/src/routes/api.js @@ -256,11 +256,11 @@ const getData = async (perms, filter) => { const size = ``; pokemonData.push({ 'id': { - 'formatted': andOrString, + 'formatted': utils.zeroPad(i, 3), 'sort': i }, 'name': globalIVString, - 'image': `IV-${andOrString}`, + 'image': `${andOrString}`, 'filter': filter, 'size': size, 'type': globalFiltersString, @@ -278,8 +278,8 @@ const getData = async (perms, filter) => { const size = generateSizeButtons(id, 'pokemon-size'); pokemonData.push({ 'id': { - 'formatted': utils.zeroPad(i, 3), - 'sort': i + 5 + 'formatted': utils.zeroPad(i+2, 3), + 'sort': i + 3 }, 'name': sizeString, 'image': { diff --git a/src/views/index.mustache b/src/views/index.mustache index dd7e5d85..f94eb754 100644 --- a/src/views/index.mustache +++ b/src/views/index.mustache @@ -345,7 +345,8 @@ Level Range: L30-35 - Level 30 to 35 Pokemon
Stats: A0-1 & D14 & S15 - Pokemon with 0-1 Attack, 14 Defense & 15 Stamina
CP: CP2000-3000 - All Pokemon with CP of 2000-3000
- NOT: !0-100 - All Pokemon that do not have their IVs scanned

+ NOT: !0-100 - All Pokemon that do not have their IVs scanned
+ PVP: GL1-3 | UL1-3 - Pokemon that are rank 1-3 for either Great League or Ultra League

@@ -365,8 +366,8 @@
Advanced

- Example: (A0-1 & D15 & S15 & (CP1400-1500 | CP2400-2500)) | L34-35 | 90-100
- Returns all Pokemon that have either CP1400-1500 OR CP2400-2500 AND have 0-1 Attack, 15 Defense, 15 Stamina, OR level 34-35 OR 90-100% IVs. + Example: (A0-1 & D15 & S15 & (CP1400-1500 | CP2400-2500)) | L34-35 | 90-100 | GL1-3 | UL1-3
+ Returns all Pokemon that have either CP1400-1500 OR CP2400-2500 AND have 0-1 Attack, 15 Defense, 15 Stamina, OR level 34-35 OR 90-100% IVs OR PVP Great or Ultra league rank betwen 1-3.

diff --git a/static/js/index.js b/static/js/index.js index 1af8aab8..5638486e 100644 --- a/static/js/index.js +++ b/static/js/index.js @@ -5127,7 +5127,9 @@ function getTimeSince (date) { return str; } -const ivFilterPrompt = 'Please enter an IV and/or Level Filter. Examples:\n(A0-1 & D15 & S15 & (CP1400-1500 | CP2400-2500)) | L34-35 | 90-100 | GL1-3 | UL1-3'; +const ivFilterPrompt = '• Use this to enter a specific filter for this Pokemon.\n• These values override any global filters!\n• Refer to the Help button if you are unsure of how to use this. \nExamples:\n((L30-35 & 90-100) | (CP2500-4000 & A15 & D10 S10)) | GL1-10 | UL1-10'; + +const globalFilterPrompt = `• Use AND when you want to filter the Pokemon you\'ve already selected below.\n• Use OR when you want to set a base filter for all Pokemon, regardless if you\'ve selected them below or not.\n\nIf you are unsure what to put here, click the Help button below.` function manageIVPopup (id, filter) { const result = prompt(ivFilterPrompt, filter[id].filter); @@ -5182,7 +5184,7 @@ function manageColorPopup (id, filter) { } function manageGlobalIVPopup (id, filter) { - const result = prompt(ivFilterPrompt, filter['iv_' + id].filter); + const result = prompt(globalFilterPrompt, filter['iv_' + id].filter); if (result === null) { return false; } else if (checkIVFilterValid(result)) { diff --git a/static/locales/_en.json b/static/locales/_en.json index b17ebbb9..ead64193 100644 --- a/static/locales/_en.json +++ b/static/locales/_en.json @@ -67,7 +67,7 @@ "filter_nest_table_empty": "No matching Nests found", "filter_device_table_empty": "No matching Devices found", "filter_global_filters": "Global Filters", - "filter_global_iv": "IV/Level Limit", + "filter_global_iv": "Stats Filter", "filter_global_avg": "Nest Avg Limit", "filter_global_candy_count": "Rare Candy Limit", "filter_global_stardust_count": "Stardust Limit",