Merge pull request #890 from EmmaRamirez/release/1.12.0

Release: 1.12.0

README.md

@@ -17,6 +17,8 @@ npm install
 npm run serve
 ```
 
+Node 16 is recommended.
+
 Note: closing the command prompt will stop the server!
 
 You can also click the `Clone or Download` button and select to download it as a zip file. You'll then want to use the `cd` command to navigate to the nuzlocke-generator folder. I'm available on Discord (emma#4085) or through Github issues if you have any questions.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuzlocke-generator",
-  "version": "1.11.0",
+  "version": "1.12.0",
   "description": "A tool for generating nuzlocke team pics from data",
   "main": "dist/bundle.js",
   "scripts": {

src/components/Credits/credits.json

@@ -573,35 +573,35 @@
             "link": "https://www.deviantart.com/erroring/art/totally-tubular-938472137"
         },
         {
-            "role": "",
-            "name": "",
-            "link": ""
+            "role": "Orthworm",
+            "name": "Hypertomi Art",
+            "link": "https://www.pillowfort.social/posts/3101087"
         },
         {
-            "role": "",
-            "name": "",
-            "link": ""
+            "role": "Enamorus",
+            "name": "LordCayy",
+            "link": "https://twitter.com/lordcayy"
         },
         {
-            "role": "",
-            "name": "",
-            "link": ""
+            "role": "Enamorus-Therian",
+            "name": "Hivemind Coroika",
+            "link": "https://www.tumblr.com/hivemindcoroika"
         },
         {
-            "role": "",
-            "name": "",
-            "link": ""
+            "role": "Landorus-Therian",
+            "name": "Salanchu",
+            "link": "https://www.deviantart.com/salanchu"
         },
 
         {
-            "role": "",
-            "name": "",
-            "link": ""
+            "role": "Torandus-Therian",
+            "name": "hwy",
+            "link": "https://www.pinterest.ph/pin/297800594081702545/"
         },
         {
-            "role": "",
-            "name": "",
-            "link": ""
+            "role": "Thundurus-Therian",
+            "name": "ewokakuaaede",
+            "link": "https://danbooru.donmai.us/posts?tags=ewokakukaede&z=1"
         },
         {
             "role": "",

src/components/PokemonEditor/CurrentPokemonEdit.tsx

@@ -209,9 +209,9 @@ CurrentPokemonEditState
 
     private toggleDialog = () => this.setState({ isMoveEditorOpen: !this.state.isMoveEditorOpen });
 
-    private getTypes() {
+    private getTypes(includeShadow = true) {
         const { customTypes, editor } = this.props;
-        return getListOfTypes(customTypes, editor.temtemMode);
+        return getListOfTypes(customTypes, editor.temtemMode).filter(type => includeShadow ?  true : type !== 'Shadow');
     }
 
     public moreInputs(currentPokemon: Pokemon) {
@@ -384,6 +384,14 @@ CurrentPokemonEditState
                         options={listOfGames}
                         key={this.state.selectedId + 'goo'}
                     />
+                    <CurrentPokemonInput
+                        labelName="Tera Type"
+                        inputName="teraType"
+                        value={currentPokemon.teraType}
+                        type="select"
+                        options={this.getTypes(false)}
+                        key={this.state.selectedId + 'teraType'}
+                    />
                 </CurrentPokemonLayoutItem>
                 <CurrentPokemonLayoutItem>
                     <CurrentPokemonInput

src/components/TeamPokemon/TeamPokemon.tsx

@@ -134,6 +134,9 @@ export class TeamPokemonInfo extends React.PureComponent<TeamPokemonInfoProps> {
                                     ? ` @ ${pokemon.item}`
                                     : null}
                             </span>
+                            {Boolean(pokemon.teraType) && <span className="pokemon-teratype">
+                                <img alt={`Tera: ${pokemon.teraType}`} style={{ height: '1rem' }} src={`icons/tera/${pokemon.teraType}.png`} />
+                            </span>}
                             {GenderElement(pokemon.gender)}
                             {pokemon.level ? (
                                 <span className="pokemon-level">lv. {pokemon.level}</span>

src/models/Pokemon.ts

@@ -19,6 +19,7 @@ export interface Pokemon {
     forme?: Forme;
     item?: string;
     types?: [Types, Types];
+    teraType?: Types;
     customImage?: string;
     customIcon?: string;
     customItemImage?: string;
@@ -59,6 +60,7 @@ export const PokemonKeys: Pokemon = {
     forme: 'Normal' as Forme,
     item: '',
     types: [Types.Normal, Types.Normal],
+    teraType: Types.Normal,
     customImage: '',
     customIcon: '',
     customItemImage: '',

src/utils/Forme.ts

@@ -106,4 +106,6 @@ export enum Forme {
 
     School = 'school',
     Pirouette = 'pirouette',
+
+    Therian = 'therian',
 }

src/utils/addForme.ts

@@ -84,6 +84,8 @@ export const addForme = (species: string | undefined, forme?: keyof typeof Forme
 
                 'School',
                 'Pirouette',
+
+                'Therian'
             ].includes(forme)
         ) {
             return `${species}-${forme.replace(/\s/g, '-').replace(/\'/g, '-').toLowerCase()}`;

src/utils/getAdditionalFormes.ts

@@ -80,7 +80,7 @@ export const getAdditionalFormes = (species: string | undefined): string[] => {
     if (s === 'deerling' || s === 'sawsbuck') {
         return ['Spring', 'Summer', 'Autumn', 'Winter'];
     }
-    if (s === 'tornadus' || s === 'thundurus' || s === 'landorus') {
+    if (s === 'tornadus' || s === 'thundurus' || s === 'landorus' || s === 'enamorus') {
         return ['Incarnate', 'Therian'];
     }
     if (s === 'kyurem') {

src/utils/getBadges.ts

@@ -181,6 +181,28 @@ export function getBadges(name: Game): Badge[] {
         ];
     }
 
+    if (name === 'Scarlet' || name === 'Violet') {
+        return [
+            { name: 'Cortondo Gym', image: 'paldea/bug-badge' },
+            { name: 'Stony Cliff Titan', image: 'paldea/rock-badge' },
+            { name: 'Artazon Gym', image: 'paldea/grass-badge' },
+            { name: 'Team Star Dark', image: 'paldea/dark-badge' },
+            { name: 'Levincia Gym', image: 'paldea/electric-badge' },
+            { name: 'Team Star Fire', image: 'paldea/fire-badge' },
+            { name: 'Lurking Steel Titan', image: 'paldea/steel-badge' },
+            { name: 'Cascarrafa Gym', image: 'paldea/water-badge' },
+            { name: 'Team Star Poison', image: 'paldea/poison-badge' },
+            { name: 'Medali Gym', image: 'paldea/normal-badge' },
+            { name: 'Montenevera Gym', image: 'paldea/ghost-badge' },
+            { name: 'Quaking Earth Titan', image: 'paldea/ground-badge' },
+            { name: 'Alfornada Gym', image: 'paldea/psychic-badge' },
+            { name: 'Glaseado Gym', image: 'paldea/ice-badge' },
+            { name: 'Team Star Fairy', image: 'paldea/fairy-badge'},
+            { name: 'False Dragon Titan', image: 'paldea/dragon-badge' },
+            { name: 'Team Star Fighting', image: 'paldea/fighting-badge' },
+        ];
+    }
+
     return [];
 }
 
@@ -204,6 +226,8 @@ export function getAllBadges() {
         ...getBadges('Sword'),
         { name: 'Ghost Badge', image: 'ghost-badge' },
         { name: 'Ice Badge', image: 'ice-badge' },
+        ...getBadges('Violet'),
+        { name: 'Paldea Champion', image: 'paldea-champion-ribbon' },
         { name: 'Empty Badge', image: 'unknown' },
     ];
 }

src/utils/listOfAbilities.ts

@@ -5,8 +5,10 @@ export const listOfAbilities = [
     'Air Lock',
     'Analytic',
     'Anger Point',
+    'Anger Shell',
     'Anticipation',
     'Arena Trap',
+    'Armor Tail',
     'Aroma Veil',
     'As One',
     'Aura Break',
@@ -15,6 +17,7 @@ export const listOfAbilities = [
     'Battery',
     'Battle Armor',
     'Battle Bond',
+    'Beads of Ruin',
     'Beast Boost',
     'Berserk',
     'Big Pecks',
@@ -28,11 +31,14 @@ export const listOfAbilities = [
     'Cloud Nine',
     'Color Change',
     'Comatose',
+    'Commander',
     'Competitive',
     'Compound Eyes',
     'Contrary',
     'Corrosion',
+    'Costar',
     'Cotton Down',
+    'Cud Chew',
     'Curious Medicine',
     'Cursed Body',
     'Cute Charm',
@@ -52,8 +58,10 @@ export const listOfAbilities = [
     'Drought',
     'Dry Skin',
     'Early Bird',
+    'Earth Eater',
     'Effect Spore',
     'Electric Surge',
+    'Electromorphosis',
     'Emergency Exit',
     'Fairy Aura',
     'Filter',
@@ -72,13 +80,16 @@ export const listOfAbilities = [
     'Gale Wings',
     'Galvanize',
     'Gluttony',
+    'Good as Gold',
     'Gooey',
     'Gorilla Tactics',
     'Grass Pelt',
     'Grassy Surge',
     'Grim Neigh',
+    'Guard Dog',
     'Gulp Missile',
     'Guts',
+    'Hadron Engine',
     'Harvest',
     'Healer',
     'Heatproof',
@@ -113,6 +124,7 @@ export const listOfAbilities = [
     'Light Metal',
     'Lightning Rod',
     'Limber',
+    'Lingering Aroma',
     'Liquid Ooze',
     'Liquid Voice',
     'Long Reach',
@@ -135,12 +147,15 @@ export const listOfAbilities = [
     'Multiscale',
     'Multitype',
     'Mummy',
+    'Mycelium Might',
     'Natural Cure',
     'Neuroforce',
     'Neutralizing Gas',
     'No Guard',
     'Normalize',
     'Oblivious',
+    'Opportunist',
+    'Orichalcum Pulse',
     'Overcoat',
     'Overgrow',
     'Own Tempo',
@@ -163,9 +178,12 @@ export const listOfAbilities = [
     'Prism Armor',
     'Propeller Tail',
     'Protean',
+    'Protosynthesis',
     'Psychic Surge',
     'Punk Rock',
     'Pure Power',
+    'Purifying Salt',
+    'Quark Drive',
     'Queenly Majesty',
     'Quick Draw',
     'Quick Feet',
@@ -179,6 +197,7 @@ export const listOfAbilities = [
     'Rivalry',
     'RKS System',
     'Rock Head',
+    'Rocky Payload',
     'Rough Skin',
     'Run Away',
     'Sand Force',
@@ -190,9 +209,11 @@ export const listOfAbilities = [
     'Schooling',
     'Scrappy',
     'Screen Cleaner',
+    'Seed Sower',
     'Serene Grace',
     'Shadow Shield',
     'Shadow Tag',
+    'Sharpness',
     'Shed Skin',
     'Sheer Force',
     'Shell Armor',
@@ -227,22 +248,27 @@ export const listOfAbilities = [
     'Sturdy',
     'Suction Cups',
     'Super Luck',
+    'Supreme Overlord',
     'Surge Surfer',
     'Swarm',
     'Sweet Veil',
     'Swift Swim',
+    'Sword of Ruin',
     'Symbiosis',
     'Synchronize',
+    'Tablets of Ruin',
     'Tangled Feet',
     'Tangling Hair',
     'Technician',
     'Telepathy',
     'Teravolt',
+    'Thermal Exchange',
     'Thick Fat',
     'Tinted Lens',
     'Torrent',
     'Tough Claws',
     'Toxic Boost',
+    'Toxic Debris',
     'Trace',
     'Transistor',
     'Triage',
@@ -252,6 +278,7 @@ export const listOfAbilities = [
     'Unburden',
     'Unnerve',
     'Unseen Fist',
+    'Vessel of Ruin',
     'Victory Star',
     'Vital Spirit',
     'Volt Absorb',
@@ -261,9 +288,13 @@ export const listOfAbilities = [
     'Water Compaction',
     'Water Veil',
     'Weak Armor',
+    'Well-Baked Body',
     'White Smoke',
     'Wimp Out',
+    'Wind Power',
+    'Wind Rider',
     'Wonder Guard',
     'Wonder Skin',
     'Zen Mode',
+    'Zero to Hero',
 ];

src/utils/listOfItems.ts

@@ -423,4 +423,19 @@ export const listOfItems = [
     'Exp. Charm',
     'Armorite Ore',
     'Mark Charm',
+
+    'Mirror Herb',
+    'Covert Cloak',
+    'Loaded Dice',
+    'Tiny Bamboo Shoot',
+    'Big Bamboo Shoot',
+    'Scroll of Darkness',
+    'Scroll of Waters',
+    'Booster Energy',
+    'Ability Shield',
+    'Clear Amulet',
+    'Punching Glove',
+    'Auspicious Armor',
+    'Malicious Armor',
+    'Leader\'s Crest',
 ];

src/utils/listOfLocations.ts

@@ -683,5 +683,6 @@ export const listOfLocations = [
     ...locations.Kalos,
     ...locations.Alola,
     ...locations.Galar,
+    ...locations.Paldea,
     ...locations.Misc,
 ];