Merge pull request #898 from EmmaRamirez/release/1.14.0

release: 1.14.0
EmmaRamirez · Feb 18, 2023 · d457160 · d457160
2 parents a864b0c + 0fd3856
commit d457160
Show file tree

Hide file tree

Showing 64 changed files with 207 additions and 974 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nuzlocke-generator",
-  "version": "1.13.0",
+  "version": "1.14.0",
   "description": "A tool for generating nuzlocke team pics from data",
   "main": "dist/bundle.js",
   "type": "commonjs",
@@ -43,6 +43,7 @@
     "@babel/preset-react": "^7.14.5",
     "@babel/preset-typescript": "^7.14.5",
     "@blueprintjs/select": "^3.16.5",
+    "@builder.io/partytown": "^0.7.5",
     "@emmaramirez/dom-to-image": "^3.0.2",
     "@react-hook/debounce": "^3.0.0",
     "@types/react-dnd-html5-backend": "^3.0.2",

diff --git a/src/assets/icons/.DS_Store b/src/assets/icons/.DS_Store
diff --git a/src/assets/icons/alpha-icon.png b/src/assets/icons/alpha-icon.png
diff --git a/src/components/Credits/credits.json b/src/components/Credits/credits.json
@@ -685,6 +685,21 @@
             "role": "Roaring Moon",
             "name": "kenkyu",
             "link": "https://danbooru.donmai.us/posts?tags=eternal_kenkyu&z=1"
+        },
+        {
+            "role": "Garbodor-Gmax",
+            "name": "antoniodraws",
+            "link": "https://twitter.com/Antoniodraws/status/1382704655369711627/photo/1"
+        },
+        {
+            "role": "Grimmsnarl-Gmax",
+            "name": "innovator123",
+            "link": "https://www.deviantart.com/innovator123"
+        },
+        {
+            "role": "Charizard-Gmax",
+            "name": "irictran",
+            "link": "https://www.deviantart.com/irictran"
         }
     ]
 }
diff --git a/src/components/Editor/editor.css b/src/components/Editor/editor.css
@@ -189,9 +189,6 @@ html.bp3-dark {
 .current-pokemon-gender {
   width: 6rem;
 }
-.current-pokemon-status {
-  width: 5.5rem;
-}
 .current-pokemon-moves {
   width: 80%;
 }

diff --git a/src/components/PokemonEditor/CurrentPokemonEdit.tsx b/src/components/PokemonEditor/CurrentPokemonEdit.tsx
@@ -37,6 +37,8 @@ import {
     PopoverInteractionKind,
     Button,
     Intent,
+    ButtonGroup,
+    Tooltip,
 } from '@blueprintjs/core';
 import { addPokemon } from 'actions';
 import { State } from 'state';
@@ -95,7 +97,6 @@ const getEvos = (species): string[] | undefined => {
     return EvolutionTree?.[species];
 };
 
-
 export function EvolutionSelection({ currentPokemon, onEvolve }) {
     const evos = getEvos(currentPokemon?.species);
 
@@ -120,7 +121,13 @@ export function EvolutionSelection({ currentPokemon, onEvolve }) {
                 content={
                     <>
                         {evos.map((evo) => (
-                            <div role='button' tabIndex={-2} className={Styles.evoMenuItem} key={evo} onClick={onEvolve(evo)} onKeyPress={onEvolve(evo)}>
+                            <div
+                                role="button"
+                                tabIndex={-2}
+                                className={Styles.evoMenuItem}
+                                key={evo}
+                                onClick={onEvolve(evo)}
+                                onKeyPress={onEvolve(evo)}>
                                 {evo}
                             </div>
                         ))}
@@ -134,11 +141,9 @@ export function EvolutionSelection({ currentPokemon, onEvolve }) {
     }
 }
 
-
-
 export class CurrentPokemonEditBase extends React.Component<
-CurrentPokemonEditProps,
-CurrentPokemonEditState
+    CurrentPokemonEditProps,
+    CurrentPokemonEditState
 > {
     public constructor(props: CurrentPokemonEditProps) {
         super(props);
@@ -172,7 +177,7 @@ CurrentPokemonEditState
     }
 
     public componentDidMount() {
-        getImages().then(res => this.setState({ images: res, }));
+        getImages().then((res) => this.setState({ images: res }));
     }
 
     private copyPokemon = (e) => {
@@ -201,7 +206,20 @@ CurrentPokemonEditState
         const pokemon = this.getCurrentPokemon();
         const edit = {
             species,
-            types: matchSpeciesToTypes(species, (pokemon?.forme || 'Normal') as keyof typeof Forme)
+            types: matchSpeciesToTypes(species, (pokemon?.forme || 'Normal') as keyof typeof Forme),
+        };
+
+        this.props.editPokemon(edit, this.state.selectedId);
+    };
+
+    // levelUp true = +1, false = -1
+    private levelPokemon = (levelUp?: boolean) => () => {
+        const pokemon = this.getCurrentPokemon();
+        // @ts-expect-error data from level can sometimes be a string... whoops
+        const level = Number.parseInt(pokemon?.level ?? '0');
+
+        const edit = {
+            level: (level ?? 0) + (levelUp ? 1 : -1)
         };
 
         this.props.editPokemon(edit, this.state.selectedId);
@@ -211,12 +229,14 @@ CurrentPokemonEditState
 
     private getTypes(includeShadow = true) {
         const { customTypes, editor } = this.props;
-        return getListOfTypes(customTypes, editor.temtemMode).filter(type => includeShadow ?  true : type !== 'Shadow');
+        return getListOfTypes(customTypes, editor.temtemMode).filter((type) =>
+            includeShadow ? true : type !== 'Shadow',
+        );
     }
 
     public moreInputs(currentPokemon: Pokemon) {
-        const {editPokemon, selectPokemon} = this.props;
-        const imageNames = this.state.images?.map(img => img.name ?? '') ?? [];
+        const { editPokemon, selectPokemon } = this.props;
+        const imageNames = this.state.images?.map((img) => img.name ?? '') ?? [];
         const pokemonForLink = this.props.pokemon.map((p) => ({
             key: `${p.nickname} (${p.species})`,
             value: p.id,
@@ -243,12 +263,14 @@ CurrentPokemonEditState
                     key={this.state.selectedId + 'types'}
                 />
                 <span
-                    className={'current-pokemon-input-wrapper current-pokemon-checklist current-pokemon-checkpoints'}>
-                    <label htmlFor='checkpointsInputList'>Checkpoints</label>
+                    className={
+                        'current-pokemon-input-wrapper current-pokemon-checklist current-pokemon-checkpoints'
+                    }>
+                    <label htmlFor="checkpointsInputList">Checkpoints</label>
                     <CheckpointsInputList
                         checkpointsObtained={currentPokemon.checkpoints ?? []}
-                        onChange={checkpoints => editPokemon({checkpoints}, currentPokemon.id)}
-                        buttonText='Award Checkpoints'
+                        onChange={(checkpoints) => editPokemon({ checkpoints }, currentPokemon.id)}
+                        buttonText="Award Checkpoints"
                     />
                 </span>
                 <CurrentPokemonLayoutItem checkboxes>
@@ -287,28 +309,39 @@ CurrentPokemonEditState
                         type="checkbox"
                         key={this.state.selectedId + 'gift'}
                     />
+                    <CurrentPokemonInput
+                        labelName="Alpha"
+                        inputName="alpha"
+                        value={currentPokemon?.alpha}
+                        type="checkbox"
+                        key={this.state.selectedId + 'alpha'}
+                    />
                 </CurrentPokemonLayoutItem>
-                {feature.imageUploads ? <Autocomplete
-                    items={imageNames}
-                    name="customImage"
-                    label="Custom Image"
-                    placeholder="http://..."
-                    value={currentPokemon.customImage || ''}
-                    onChange={(e) => {
-                        const edit = {
-                            customImage: e.target.value,
-                        };
-                        editPokemon(edit, this.state.selectedId);
-                    }}
-                    key={this.state.selectedId + 'customimage'}
-                /> : <CurrentPokemonInput
-                    labelName="Custom Image"
-                    inputName="customImage"
-                    placeholder="http://..."
-                    value={currentPokemon.customImage}
-                    type="text"
-                    key={this.state.selectedId + 'customImage'}
-                />}
+                {feature.imageUploads ? (
+                    <Autocomplete
+                        items={imageNames}
+                        name="customImage"
+                        label="Custom Image"
+                        placeholder="http://..."
+                        value={currentPokemon.customImage || ''}
+                        onChange={(e) => {
+                            const edit = {
+                                customImage: e.target.value,
+                            };
+                            editPokemon(edit, this.state.selectedId);
+                        }}
+                        key={this.state.selectedId + 'customimage'}
+                    />
+                ) : (
+                    <CurrentPokemonInput
+                        labelName="Custom Image"
+                        inputName="customImage"
+                        placeholder="http://..."
+                        value={currentPokemon.customImage}
+                        type="text"
+                        key={this.state.selectedId + 'customImage'}
+                    />
+                )}
                 <CurrentPokemonInput
                     labelName="Custom Icon"
                     inputName="customIcon"
@@ -475,7 +508,15 @@ CurrentPokemonEditState
                         options={this.state.box.map((n) => n.name)}
                         key={this.state.selectedId + 'status'}
                     />
+
                     <div className={cx(Styles.iconBar)}>
+                        <Tooltip content="Level Up/Down">
+                            <ButtonGroup>
+                                <Button onClick={this.levelPokemon(false)} small>-1</Button>
+                                <Button onClick={this.levelPokemon(true)} small>+1</Button>
+                            </ButtonGroup>
+                        </Tooltip>
+
                         <EvolutionSelection
                             currentPokemon={currentPokemon}
                             onEvolve={this.evolvePokemon}
@@ -496,7 +537,7 @@ CurrentPokemonEditState
                             items={(listOfPokemon as unknown) as string[]}
                         />*/}
                         <Autocomplete
-                            items={(listOfPokemon as unknown) as string[]}
+                            items={listOfPokemon as unknown as string[]}
                             name="species"
                             label="Species"
                             disabled={currentPokemon.egg}
@@ -612,7 +653,11 @@ CurrentPokemonEditState
                         type="moves"
                         key={this.state.selectedId + 'moves'}
                     />
-                    <Button className={Styles.moveEditButton} intent={Intent.PRIMARY} onClick={this.toggleDialog} minimal>
+                    <Button
+                        className={Styles.moveEditButton}
+                        intent={Intent.PRIMARY}
+                        onClick={this.toggleDialog}
+                        minimal>
                         Edit Moves
                     </Button>
                 </CurrentPokemonLayoutItem>

diff --git a/src/components/PokemonEditor/styles.ts b/src/components/PokemonEditor/styles.ts
@@ -4,9 +4,7 @@ export const iconBar = css`
     align-items: center;
     display: flex;
     margin-left: auto;
-    * {
-        margin: 0.25rem;
-    }
+    gap: .25rem;
 `;
 
 export const copyButton = css`

diff --git a/src/components/PokemonIcon/PokemonIcon.tsx b/src/components/PokemonIcon/PokemonIcon.tsx
@@ -16,7 +16,7 @@ import { Dispatch } from 'redux';
 import { State } from 'state';
 import { Omit } from 'ramda';
 import { Action } from 'actions';
-import { normalizeSpeciesName } from 'utils/normalizeSpeciesName';
+import { normalizeSpeciesName } from 'utils/getters/normalizeSpeciesName';
 import { PokemonImage } from 'components/Shared/PokemonImage';
 
 interface PokemonIconProps {

diff --git a/src/components/Result/Result.tsx b/src/components/Result/Result.tsx
@@ -27,7 +27,7 @@ import { Button, Classes } from '@blueprintjs/core';
 import { clamp } from 'ramda';
 import { resultSelector } from 'selectors';
 import { PokemonImage } from 'components/Shared/PokemonImage';
-import { normalizeSpeciesName } from 'utils/normalizeSpeciesName';
+import { normalizeSpeciesName } from 'utils/getters/normalizeSpeciesName';
 
 async function load() {
     const resource = await import('@emmaramirez/dom-to-image');

diff --git a/src/components/Shared/ReleaseDialog.tsx b/src/components/Shared/ReleaseDialog.tsx
@@ -2,9 +2,8 @@ import * as React from 'react';
 import { Dialog, Classes, Button, DialogProps } from '@blueprintjs/core';
 import { css, cx } from 'emotion';
 import * as styles from 'components/Result/styles';
-import { Styles, classWithDarkTheme } from 'utils';
+import { Styles, classWithDarkTheme, getPatchlessVersion } from 'utils';
 const ReactMarkdown = require('react-markdown');
-import { getPatchlessVersion } from 'utils/getPatchlessVersion';
 import useSwr from 'swr';
 
 const calyrex = require('assets/icons/pokemon/regular/calyrex.png');
@@ -22,9 +21,12 @@ const arceus = require('assets/icons/pokemon/regular/arceus.png');
 const sprigatito = require('assets/icons/pokemon/regular/sprigatito.png');
 const fuecoco = require('assets/icons/pokemon/regular/fuecoco.png');
 const quaxly = require('assets/icons/pokemon/regular/quaxly.png');
+const miraidon = require('assets/icons/pokemon/regular/miraidon.png');
 
 export const getMascot = v => {
     switch (v) {
+        case '1.14':
+            return miraidon.default;
         case '1.13':
             return quaxly.default;
         case '1.12':

diff --git a/src/components/TeamPokemon/TeamPokemon.tsx b/src/components/TeamPokemon/TeamPokemon.tsx
@@ -134,6 +134,9 @@ export class TeamPokemonInfo extends React.PureComponent<TeamPokemonInfoProps> {
                                     ? ` @ ${pokemon.item}`
                                     : null}
                             </span>
+                            {Boolean(pokemon.alpha) && <span className="pokemon-alpha">
+                                <img alt={'alpha'} style={{ height: '1rem' }} src={'icons/alpha-icon.png'} />
+                            </span>}
                             {Boolean(pokemon.teraType) && <span className="pokemon-teratype">
                                 <img alt={`Tera: ${pokemon.teraType}`} style={{ height: '1rem' }} src={`icons/tera/${pokemon.teraType?.toLowerCase()}.png`} />
                             </span>}

diff --git a/src/components/TopBar/TopBar.tsx b/src/components/TopBar/TopBar.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 import { Button, Classes, Spinner, Intent } from '@blueprintjs/core';
 import { connect } from 'react-redux';
 import * as styles from 'components/Result/styles';
-import { classWithDarkTheme, isEmpty, Styles } from 'utils';
+import { classWithDarkTheme, getPatchlessVersion, Styles } from 'utils';
 import {
     changeEditorSize,
     editStyle,
@@ -16,7 +16,6 @@ import { Pokemon, Editor } from 'models';
 import { ReleaseDialog } from 'components/Shared';
 import { State } from 'state';
 import { isMobile } from 'is-mobile';
-import { getPatchlessVersion } from 'utils/getPatchlessVersion';
 
 export interface TopBarProps {
     onClickDownload: (e?: React.MouseEvent<HTMLElement>) => void;

diff --git a/src/components/TrainerEditor/BadgeInput.tsx b/src/components/TrainerEditor/BadgeInput.tsx
@@ -35,6 +35,7 @@ export function CheckpointsInputList({
         minimal={true}
         content={
             <Menu>
+                {checkpoints.length === 0 && <div style={{ width: '200px'}}>Select a game or configure custom checkpoints to see them here!</div>}
                 {Array.isArray(checkpoints) && checkpoints?.map((badge) => (
                     <Checkbox
                         onChange={(e: any) => {

diff --git a/src/img/charizard-gigantamax.jpg b/src/img/charizard-gigantamax.jpg
diff --git a/src/img/garbodor-gigantamax.jpg b/src/img/garbodor-gigantamax.jpg
diff --git a/src/img/grimmsnarl-gigantamax.jpg b/src/img/grimmsnarl-gigantamax.jpg