Skip to content

Commit

Permalink
Merge pull request #306 from WatWowMap/remove-form
Browse files Browse the repository at this point in the history
Remove form from first line of gym popup
  • Loading branch information
Mygod authored Dec 25, 2020
2 parents 6e244ca + 71bbcd1 commit b219d2a
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions static/js/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3279,12 +3279,7 @@ function getGymPopupContent (gym) {
let hasRaidBoss = gym.raid_pokemon_id !== 0 && gym.raid_pokemon_id !== null;
let pokemonName;
if (hasRaidBoss) {
if (gym.raid_pokemon_form !== 0 && gym.raid_pokemon_form !== null) {
pokemonName = getFormName(gym.raid_pokemon_form) + ' ' + getPokemonName(gym.raid_pokemon_id);
} else {
pokemonName = getPokemonName(gym.raid_pokemon_id);
}
pokemonName += ' ' + getGenderIcon(gym.raid_pokemon_gender);
pokemonName = getPokemonName(gym.raid_pokemon_id) + ' ' + getGenderIcon(gym.raid_pokemon_gender);
} else if (isRaidBattle) {
pokemonName = 'Unknown Raid Boss';
} else {
Expand Down

0 comments on commit b219d2a

Please sign in to comment.