some mons have duplicate moves

This commit is contained in:
Jeff Colombo 2019-03-09 23:07:32 -05:00
parent 778f11c376
commit cfff4e7872
8 changed files with 28 additions and 11 deletions

12
dist/app.css vendored
View File

@ -357,7 +357,9 @@
font-size: 1em; }
.MovesExplorer__wrapper__iV8WK .title {
color: #fff;
margin-top: -2em; }
position: absolute;
margin-top: -2em;
margin-bottom: 0; }
.MovesExplorer__legacy__ixKar {
background-image: repeating-linear-gradient(45deg, transparent, transparent 5px, rgba(255, 255, 255, 0.5) 5px, rgba(255, 255, 255, 0.5) 10px);
@ -368,7 +370,8 @@
.MovesDropdown__menu__2yxRm {
width: 425px;
max-height: 450px;
max-height: 454px;
overflow: hidden;
position: fixed;
z-index: 2;
top: 25%;
@ -380,6 +383,7 @@
top: 8px; }
.MovesDropdown__listItem__3fTKH {
overflow: hidden;
display: flex;
justify-content: space-between;
padding-right: 2rem;
@ -397,7 +401,9 @@
font-size: 1em; }
.MovesExplorer__wrapper__iV8WK .title {
color: #fff;
margin-top: -2em; }
position: absolute;
margin-top: -2em;
margin-bottom: 0; }
.MovesExplorer__legacy__ixKar {
background-image: repeating-linear-gradient(45deg, transparent, transparent 5px, rgba(255, 255, 255, 0.5) 5px, rgba(255, 255, 255, 0.5) 10px);

2
dist/db/order.json vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

4
dist/main-bundle.js vendored
View File

@ -38528,7 +38528,9 @@ function (_react_1$default$Comp) {
var onResize = function onResize(contentRect) {
if (typeof contentRect.bounds !== 'undefined') {
_this2.setState({
dimensions: contentRect.bounds
dimensions: Object.assign({}, contentRect.bounds, {
height: Math.min(450, contentRect.bounds.height)
})
});
}
};

View File

@ -49,6 +49,9 @@ export const parseGameMaster = async () => {
.join(' ');
const speciesInfo = await apiService.getPokemonSpeciesInfo(pokemonId, dex, defaultName);
const quickMoves = Array.from(new Set((entry.pokemon_settings.quick_moves || []))).map((id) => ({ id, isLegacy: false }));
const chargeMoves = Array.from(new Set(entry.pokemon_settings.cinematic_moves || [])).map((id) => ({ id, isLegacy: false }));
const mon = {
...speciesInfo,
id: pokemonId,
@ -70,8 +73,8 @@ export const parseGameMaster = async () => {
staminaRank: -1,
},
moves: {
quick: (entry.pokemon_settings.quick_moves || []).map((id) => ({ id, isLegacy: false })),
cinematic: (entry.pokemon_settings.cinematic_moves || []).map((id) => ({ id, isLegacy: false })),
quick: quickMoves,
cinematic: chargeMoves,
}
};

View File

@ -62,7 +62,12 @@ export class MovesDropdown extends React.Component<IMovesDropdownProps, IState>
const { width, height } = this.state.dimensions;
const onResize = (contentRect : ContentRect) => {
if (typeof contentRect.bounds !== 'undefined') {
this.setState({ dimensions: contentRect.bounds });
this.setState({
dimensions: {
...contentRect.bounds,
height: Math.min(450, contentRect.bounds.height),
}
});
}
};

View File

@ -6,7 +6,8 @@
.menu {
width: map-get($container-width, 'desktop');
max-height: 450px;
max-height: 450px + 4px; // +4 for border offset causing issue with .nes-container
overflow: hidden;
position: fixed;
z-index: 2;
top: 25%;