Botcoins followup #66
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
RedSparr0w
approved these changes
Oct 30, 2024
| @@ -36,9 +37,10 @@ const defaultEndFunction = (title, image, description) => async (m, e) => { | |||
| m.channel.send({ embeds: [embed] }).catch((...args) => warn('Unable to post quiz answer', ...args)); | |||
| }; | |||
| const getPokemonByName = name => pokemonList.find(p => p.name == name); | |||
| const pokemonNameNormalized = (name) => name.replace(/\s?\(.+\)$/, '').replace(/.*(Magikarp).*/, '$1').replace(/\W/g, '.?').replace(/(Valencian|Pinkan|Pink|Handout|Charity|Blessing|Crystal|Titan)\s*/gi, '($1)?').replace(/Noble\s*/g, '(Noble|Hisuian)?\\s*'); | |||
| const pokemonNameNormalized = (name) => name.replace(/\s?\(.+\)$/, '').replace(/.*(Magikarp).*/, '$1').replace(/\W/g, '.?').replace(/.*((Segin|Schedar|Segin|Ruchbah|Caph)\.\?Starmobile).*/, '($1)|(Revavroom)').replace(/(Valencian|Pinkan|Pink|Handout|Charity|Blessing|Crystal|Titan)\s*/gi, '($1)?').replace(/Noble\s*/g, '(Noble|Hisuian)?\\s*'); | |||
There was a problem hiding this comment.
Not sure if this was intentional?
It's currently looking for a Pokémon with the name Caph.?Starmobile as you've put a backslash before it, I'm presuming you want to replace anything that has Caph(any character here)Starmobile though?
Suggested change
| const pokemonNameNormalized = (name) => name.replace(/\s?\(.+\)$/, '').replace(/.*(Magikarp).*/, '$1').replace(/\W/g, '.?').replace(/.*((Segin|Schedar|Segin|Ruchbah|Caph)\.\?Starmobile).*/, '($1)|(Revavroom)').replace(/(Valencian|Pinkan|Pink|Handout|Charity|Blessing|Crystal|Titan)\s*/gi, '($1)?').replace(/Noble\s*/g, '(Noble|Hisuian)?\\s*'); | |
| const pokemonNameNormalized = (name) => name.replace(/\s?\(.+\)$/, '').replace(/.*(Magikarp).*/, '$1').replace(/\W/g, '.?').replace(/.*((Segin|Schedar|Segin|Ruchbah|Caph).?Starmobile).*/, '($1)|(Revavroom)').replace(/(Valencian|Pinkan|Pink|Handout|Charity|Blessing|Crystal|Titan)\s*/gi, '($1)?').replace(/Noble\s*/g, '(Noble|Hisuian)?\\s*'); |
Comment on lines
+179
to
+183
|
|
||
| const title = `${levelEvolution.length > 0 ? 'Level' : ''}` + | ||
| `${levelEvolution.length > 0 && itemEvolution.length > 0 ? ' or ' : ''}` + | ||
| `${itemEvolution.length > 0 ? 'Item' : ''}`; | ||
| const description = [`What ${title} is needed to evolve this Pokémon?`]; |
| @@ -639,12 +690,13 @@ const pokemonGymLeader = () => { | |||
| const pokemon = pokemonList.find(p => p.name == pokemonName); | |||
| const gyms = allGyms.filter(g => GymList[g].pokemons.find(p => p.name == pokemonName)); | |||
| const leaders = gyms.map(g => GymList[g].leaderName); | |||
| const leadersRegex = leaders.map(l => l.replace(/\W/g, '.?').replace(/(Cipher\.\?Admin)/gi, '($1)?')).join('|'); | |||
| const leadersRegex = leaders.map(l => l.replace(/\d/g, '.?').replace(/\W/g, '.?').replace(/(Cipher\.\?Admin)/gi, '($1)?')).join('|'); | |||
| @@ -850,7 +902,7 @@ const selectWeightedOption = (options_array) => { | |||
| const quizTypes = [ | |||
| new WeightedOption(whosThatPokemon, 150), | |||
| new WeightedOption(pokemonType, 85), | |||
| new WeightedOption(howDoesThisPokemonEvole, 80), | |||
| new WeightedOption(howDoesThisPokemonEvolve, 80), | |||
There was a problem hiding this comment.
How did i never notice this 🤦
| @@ -104,7 +106,52 @@ const whosThatPokemon = () => new Promise(resolve => { | |||
| })(); | |||
| }); | |||
|
|
|||
| const howDoesThisPokemonEvole = () => new Promise(resolve => { | |||
| const whatIsThatBerry = () => new Promise(resolve => { | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A follow up of the previous PR.
Changes