Skip to content

Commit

Permalink
feat: add SV DLC Pokemon and info
Browse files Browse the repository at this point in the history
  • Loading branch information
EmmaRamirez committed Mar 23, 2024
1 parent 5fb3464 commit 2f0937e
Show file tree
Hide file tree
Showing 54 changed files with 185 additions and 6 deletions.
Binary file added src/assets/icons/pokemon/regular/archaludon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/icons/pokemon/regular/basculegion.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/icons/pokemon/regular/dipplin.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/icons/pokemon/regular/fezandipiti.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/icons/pokemon/regular/gouging-fire.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/icons/pokemon/regular/hydrapple.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/icons/pokemon/regular/iron-boulder.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/icons/pokemon/regular/iron-crown.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/icons/pokemon/regular/iron-leaves.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/icons/pokemon/regular/munkidori.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/icons/pokemon/regular/ogerpon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/icons/pokemon/regular/okidogi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/icons/pokemon/regular/poltchageist.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/icons/pokemon/regular/raging-bolt.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/icons/pokemon/regular/sinistcha.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/icons/pokemon/regular/walking-wake.png
70 changes: 70 additions & 0 deletions src/components/Credits/credits.json
Original file line number Diff line number Diff line change
Expand Up @@ -705,6 +705,76 @@
"role": "Chesnaught",
"name": "fusnryo",
"link": "https://danbooru.donmai.us/posts/5740962"
},
{
"role": "Walking Wake",
"name": "plive",
"link": "https://danbooru.donmai.us/posts/7032110?q=walking_wake"
},
{
"role": "Iron Leaves",
"name": "zeroartwo",
"link": "https://danbooru.donmai.us/posts/7348625?q=iron_leaves"
},
{
"role": "Gouging Fire",
"name": "kelvin trainerk",
"link": "https://danbooru.donmai.us/posts/7047880?q=gouging_fire"
},
{
"role": "Raging Bolt",
"name": "katkichi",
"link": "https://danbooru.donmai.us/posts/6571418?q=raging_bolt"
},
{
"role": "Pecharunt",
"name": "komepan",
"link": "https://danbooru.donmai.us/posts/7299876?q=pecharunt"
},
{
"role": "Archaludon",
"name": "nagi gaming",
"link": "https://danbooru.donmai.us/posts/7243183?q=archaludon"
},
{
"role": "Ogerpon",
"name": "siedorran",
"link": "https://danbooru.donmai.us/posts/7274755?q=ogerpon"
},
{
"role": "Ogerpon-wellspring",
"name": "enden",
"link": "https://danbooru.donmai.us/posts/7221314?q=ogerpon"
},
{
"role": "Ogerpon-heartflame",
"name": "qookidoe",
"link": "https://danbooru.donmai.us/posts/6711472?q=ogerpon"
},
{
"role": "Ogerpon-cornerstone",
"name": "truejakart",
"link": "https://danbooru.donmai.us/posts/7143933?q=ogerpon_%28cornerstone_mask%29+"
},
{
"role": "Hydrapple",
"name": "peace7322",
"link": "https://danbooru.donmai.us/posts/7043422?q=hydrapple+no_humans"
},
{
"role": "Dipplin",
"name": "momopatchi",
"link": "https://danbooru.donmai.us/posts/6667210?q=dipplin+no_humans"
},
{
"role": "Terpagos",
"name": "rei hinkitsu",
"link": "https://danbooru.donmai.us/posts/7068786?q=terapagos+no_humans"
},
{
"role": "Terapagos-terastal",
"name": "arc draws",
"link": "https://danbooru.donmai.us/posts/6108414?q=terapagos+no_humans"
}
]
}
6 changes: 3 additions & 3 deletions src/components/PokemonEditor/PokemonEditor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as React from 'react';
import { connect } from 'react-redux';
import { Pokemon, Box as BoxModel, Boxes, Game } from 'models';
import { State } from 'state';
import { generateEmptyPokemon } from 'utils';
import { generateEmptyPokemon, listOfPokemon, matchSpeciesToTypes } from 'utils';
import { CurrentPokemonEdit } from '.';
import { AddPokemonButton } from 'components/AddPokemonButton';
import { BaseEditor } from 'components/BaseEditor';
Expand All @@ -22,7 +22,7 @@ export interface PokemonEditorProps {

// @NOTE: uncomment this if you need to auto-generate Pokemon
// will create failing tests as a warning to not push this :]
// addPokemon: addPokemon;
addPokemon: addPokemon;
}

export interface PokemonEditorState {
Expand Down Expand Up @@ -78,7 +78,7 @@ export class PokemonEditorBase extends React.Component<PokemonEditorProps, Pokem
// @NOTE: refactor so that there's an easier way to auto-generate Pokemon data
// const {team} = this.props;

// listOfPokemon.slice(906).forEach((value) => {
// listOfPokemon.slice(1008).forEach((value) => {
// this.props.addPokemon(
// generateEmptyPokemon(team, {
// species: value,
Expand Down
3 changes: 3 additions & 0 deletions src/components/Shared/ReleaseDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,12 @@ 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');
const koraidon = require('assets/icons/pokemon/regular/koraidon.png');
const terapagos = require('assets/icons/pokemon/regular/terapagos.png');

export const getMascot = v => {
switch (v) {
case '1.16':
return terapagos.default;
case '1.15':
return koraidon.default;
case '1.14':
Expand Down
Binary file added src/img/archaludon.jpg
Binary file added src/img/dipplin.jpg
Binary file added src/img/gouging-fire.jpg
Binary file added src/img/hydrapple.jpg
Binary file added src/img/iron-leaves.jpg
Binary file added src/img/ogerpon-cornerstone.jpg
Binary file added src/img/ogerpon-heartflame.jpg
Binary file added src/img/ogerpon-wellspring.jpg
Binary file added src/img/ogerpon.jpg
Binary file added src/img/pecharunt.jpg
Binary file added src/img/raging-bolt.jpg
Binary file added src/img/terapagos-terastal.jpeg
Binary file added src/img/terapagos.jpg
Binary file added src/img/walking-wake.jpg
4 changes: 4 additions & 0 deletions src/utils/Forme.ts
Original file line number Diff line number Diff line change
Expand Up @@ -109,4 +109,8 @@ export enum Forme {

Therian = 'therian',

Wellspring = 'wellspring',
Heartflame = 'heartflame',
Cornerstone = 'cornerstone',

}
6 changes: 5 additions & 1 deletion src/utils/addForme.ts
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,11 @@ export const addForme = (species: string | undefined, forme?: keyof typeof Forme
'School',
'Pirouette',

'Therian'
'Therian',

'Wellspring',
'Heartflame',
'Cornerstone',
].includes(forme)
) {
return `${species}-${forme.replace(/\s/g, '-').replace(/\'/g, '-').toLowerCase()}`;
Expand Down
4 changes: 3 additions & 1 deletion src/utils/data/listOfEvolutions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,9 @@ export const EvolutionTree: EvolutionTree = {
Yamper: ['Boltund'],
Rolycoly: ['Carkol'],
Carkol: ['Coalossal'],
Applin: ['Flapple', 'Appletun'],
Applin: ['Flapple', 'Appletun', 'Dipplin'],
Dipplin: ['Hydrapple'],
Duraludon: ['Archaludon'],
Silicobra: ['Sandaconda'],
Arrokuda: ['Barraskewda'],
Toxel: ['Toxtricity'],
Expand Down
4 changes: 3 additions & 1 deletion src/utils/data/listOfGames.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ export type Game =
| 'Shining Pearl'
| 'Legends: Arceus'
| 'Scarlet'
| 'Violet';
| 'Violet'
| 'Legends: Z-A';


export const listOfGames: Game[] = [
Expand Down Expand Up @@ -84,5 +85,6 @@ export const listOfGames: Game[] = [
'Legends: Arceus',
'Scarlet',
'Violet',
'Legends: Z-A'
//'Custom...',
];
30 changes: 30 additions & 0 deletions src/utils/data/listOfLocations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -671,6 +671,36 @@ export const locations = {
'North Province Area Three',
'North Paldean Sea',
'Area Zero',

'Kitakami Road',
'Mossui Town',
'Apple Hills',
'Reveler\'s Road',
'Mossfell Confluence',
'Fellhorn Gorge',
'Loyalty Plaza',
'Infernal Pass',
'Oni Mountain',
'Dreaded Den',
'Oni\'s Maw',
'Chilling Waterhead',
'Crystal Pool',
'Wistful Fields',
'Paradise Barrens',
'Kitakami Wilds',
'Timeless Woods',

'Canyon Biome',
'Canyon Plaza',
'Central Plaza',
'Chargestone Cavern',
'Coastal Biome',
'Coastal Plaza',
'Polar Biome',
'Polar Plaza',
'Savanna Biome',
'Savanna Plaza',
'Torchlit Labyrinth',
],
Misc: [
'Mystery Gift',
Expand Down
17 changes: 17 additions & 0 deletions src/utils/data/listOfPokemon.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1007,6 +1007,23 @@ export const listOfPokemon = [
'Iron Valiant',
'Koraidon',
'Miraidon',
'Walking Wake',
'Iron Leaves',
'Dipplin',
'Poltchageist',
'Sinistcha',
'Okidogi',
'Munkidori',
'Fezandipiti',
'Ogerpon',
'Archaludon',
'Hydrapple',
'Gouging Fire',
'Raging Bolt',
'Iron Boulder',
'Iron Crown',
'Terapagos',
'Pecharunt',
] as const;

const listOfTemtem = [
Expand Down
1 change: 1 addition & 0 deletions src/utils/formatters/gameOfOriginToColor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ export const gameOfOriginToColor = (game: Game) => {
'Legends: Arceus': '#87c196',
'Scarlet': '#e54310',
'Violet': '#491a6a',
'Legends: Z-A': '#68a090',
};

return gameToColor[game] || '';
Expand Down
35 changes: 35 additions & 0 deletions src/utils/formatters/matchSpeciesToTypes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -560,6 +560,17 @@ export const handleSpeciesTypeEdgeCases = ({
return [Types.Fighting, Types.Water];
}

if (match({ ...data, species: ['Ogerpon'], forme: ['Wellspring']})) {
return [Types.Grass, Types.Water];
}

if (match({ ...data, species: ['Ogerpon'], forme: ['Heartflame']})) {
return [Types.Grass, Types.Water];
}

if (match({ ...data, species: ['Ogerpon'], forme: ['Cornerstone']})) {
return [Types.Grass, Types.Water];
}

return null;
};
Expand Down Expand Up @@ -627,6 +638,7 @@ export const matchSpeciesToTypes = (
case 'Quilladin':
case 'Skiddo':
case 'Gogoat':
case 'Ogerpon':
return [Types.Grass, Types.Grass];
case 'Torterra':
return [Types.Grass, Types.Ground];
Expand All @@ -637,6 +649,8 @@ export const matchSpeciesToTypes = (
case 'Dartrix':
return [Types.Grass, Types.Flying];
case 'Decidueye':
case 'Poltchageist':
case 'Sinistcha':
return [Types.Grass, Types.Ghost];
/**
* @type Fire Types
Expand Down Expand Up @@ -1102,6 +1116,7 @@ export const matchSpeciesToTypes = (
return [Types.Water, Types.Fighting];
case 'Croagunk':
case 'Toxicroak':
case 'Okidogi':
return [Types.Poison, Types.Fighting];
case 'Marshadow':
return [Types.Ghost, Types.Fighting];
Expand Down Expand Up @@ -1436,6 +1451,7 @@ export const matchSpeciesToTypes = (
case 'Exeggcute':
case 'Exeggutor':
case 'Celebi':
case 'Iron Leaves':
return [Types.Grass, Types.Psychic];
case 'Tentacool':
case 'Tentacruel':
Expand Down Expand Up @@ -1575,6 +1591,7 @@ export const matchSpeciesToTypes = (
case 'Skwovet':
case 'Greedent':
case 'Dubwool':
case 'Terapagos':
return [Types.Normal, Types.Normal];
case 'Drampa':
return [Types.Normal, Types.Dragon];
Expand Down Expand Up @@ -1753,6 +1770,8 @@ export const matchSpeciesToTypes = (
case 'Applin':
case 'Flapple':
case 'Appletun':
case 'Dipplin':
case 'Hydrapple':
return [Types.Grass, Types.Dragon];
case 'Silicobra':
case 'Sandaconda':
Expand Down Expand Up @@ -1807,10 +1826,12 @@ export const matchSpeciesToTypes = (
case 'Arctozolt':
return [Types.Electric, Types.Ice];
case 'Dracovish':
case 'Walking Wake':
return [Types.Water, Types.Dragon];
case 'Arctovish':
return [Types.Water, Types.Ice];
case 'Duraludon':
case 'Archaludon':
return [Types.Steel, Types.Dragon];
case 'Dreepy':
case 'Drakloak':
Expand Down Expand Up @@ -1914,6 +1935,20 @@ export const matchSpeciesToTypes = (
case 'Ferroseed':
case 'Ferrothorn':
return [Types.Grass, Types.Steel];
case 'Fezandipiti':
return [Types.Poison, Types.Fairy];
case 'Munkidori':
return [Types.Poison, Types.Psychic];
case 'Gouging Fire':
return [Types.Fire, Types.Dragon];
case 'Raging Bolt':
return [Types.Electric, Types.Dragon];
case 'Iron Boulder':
return [Types.Rock, Types.Psychic];
case 'Iron Crown':
return [Types.Steel, Types.Psychic];
case 'Pecharunt':
return [Types.Poison, Types.Ghost];
case 'Taillow':
case 'Pidgey':
case 'Pidgeotto':
Expand Down
8 changes: 8 additions & 0 deletions src/utils/getters/getAdditionalFormes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -328,5 +328,13 @@ export const getAdditionalFormes = (species: string | undefined): string[] => {
return ['Roaming'];
}

if (s === 'ogerpon') {
return ['Teal Mask', 'Wellspring', 'Heartflame', 'Cornerstone'];
}

if (s === 'terapagos') {
return ['Terastal'];
}

return [];
};
3 changes: 3 additions & 0 deletions src/utils/getters/getGameGeneration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export enum Generation {
Gen6,
Gen7,
Gen8,
Gen9,
}

export const getGameGeneration = (game: Game): Generation => {
Expand Down Expand Up @@ -37,6 +38,7 @@ export const getGameGeneration = (game: Game): Generation => {
'Let\'s Go Pikachu',
];
const Gen8: Game[] = ['Sword', 'Shield', 'Brilliant Diamond', 'Shining Pearl', 'Legends: Arceus'];
const Gen9: Game[] = ['Scarlet', 'Violet', 'Legends: Z-A'];

if (Gen1.includes(game)) return Generation.Gen1;
if (Gen2.includes(game)) return Generation.Gen2;
Expand All @@ -46,6 +48,7 @@ export const getGameGeneration = (game: Game): Generation => {
if (Gen6.includes(game)) return Generation.Gen6;
if (Gen7.includes(game)) return Generation.Gen7;
if (Gen8.includes(game)) return Generation.Gen8;
if (Gen9.includes(game)) return Generation.Gen9;

return Generation.Gen8;
};

0 comments on commit 2f0937e

Please sign in to comment.