Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-05-09 04:23:01 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge 9ec4810e82 into 530765fc12

Browse Source
This commit is contained in:
shrianshChari 2026-04-26 15:17:40 -07:00 committed by GitHub
commit e2cd7cf6bc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 66 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
teams.pokemonshowdown.com/src/teams-view.tsx
View File

@ -173,8 +173,73 @@ function PokemonSet({ set }: { set: Dex.PokemonSet }) {
move = move.slice(0, 13);
move = `${move}[${hpType}]`;
}
let moveType = Dex.moves.get(move).type;
let item = Dex.items.get(set.item);
if (item) {
if (move === 'Judgment' && item.onPlate && !item.zMoveType) {
moveType = item.onPlate;
} else if (move === 'Multi-Attack' && item.onMemory) {
moveType = item.onMemory;
} else if (move === 'Techno Blast' && item.onDrive) {
moveType = item.onDrive;
} else if (move === 'Natural Gift' && item.naturalGift) {
moveType = item.naturalGift.type;
}
}
if (move === 'Raging Bull') {
switch (set.species) {
case 'Tauros-Paldea-Combat':
moveType = 'Fighting';
break;
case 'Tauros-Paldea-Blaze':
moveType = 'Fire';
break;
case 'Tauros-Paldea-Aqua':
moveType = 'Water';
break;
}
} else if (move === 'Ivy Cudgel') {
switch (set.species) {
case 'Ogerpon-Cornerstone':
moveType = 'Rock';
break;
case 'Ogerpon-Hearthflame':
moveType = 'Fire';
break;
case 'Ogerpon-Wellspring':
moveType = 'Water';
break;
}
} else if (move === 'Revelation Dance') {
moveType = Dex.species.get(set.species).types[0];
}
if (set.ability) {
const noTypeOverride = [
'Judgment', 'Multi Attack', 'Natural Gift', 'Revelation Dance', 'Techno Blast', 'Terrain Pulse', 'Weather Ball',
];
const allowTypeOverride = !noTypeOverride.includes(move);
if (set.ability === 'Normalize') {
moveType = 'Normal';
} else if (allowTypeOverride && moveType === 'Normal') {
if (set.ability === 'Aerilate') {
moveType = 'Flying';
} else if (set.ability === 'Galvanize') {
moveType = 'Electric';
} else if (set.ability === 'Pixilate') {
moveType = 'Fairy';
} else if (set.ability === 'Refrigerate') {
moveType = 'Ice';
}
} else if (set.ability === 'Liquid Voice' && Dex.moves.get(move).flags.sound) {
moveType = 'Water';
}
}
// hide the alt so it doesn't interfere w/ copy/pasting
return <>- {move} <PSIcon type={Dex.moves.get(move).type} hideAlt /><br /></>;
return <>- {move} <PSIcon type={moveType} hideAlt /><br /></>;
}) : <></>}
{typeof set.happiness === 'number' && set.happiness !== 255 && !isNaN(set.happiness) ?