diff --git a/play.pokemonshowdown.com/src/battle-searchresults.tsx b/play.pokemonshowdown.com/src/battle-searchresults.tsx index 38179a678..4d5de8b82 100644 --- a/play.pokemonshowdown.com/src/battle-searchresults.tsx +++ b/play.pokemonshowdown.com/src/battle-searchresults.tsx @@ -243,7 +243,7 @@ export class PSSearchResults extends preact.Component<{ let pp = (move.pp === 1 || move.noPPBoosts ? move.pp : move.pp * 8 / 5); if (search.dex.gen < 3) pp = Math.min(61, pp); if (search.dex.modid === 'champions') { - pp = move.pp > 20 ? 20 : pp; + pp = move.pp > 20 ? 20 : move.pp; if (!move.noPPBoosts) pp = (pp / 5 + 1) * 4; } return
  • {set.shiny ? 'Yes' : '\u2014'} - {editor.gen === 9 ? ( + {editor.gen === 9 && !editor.isChampions ? ( @@ -2001,7 +2004,7 @@ class TeamWizard extends preact.Component<{ Shiny {} {set.shiny ? Yes : '\u2014'} } - {editor.gen === 9 && + {editor.gen === 9 && !editor.isChampions && Tera {} } @@ -2481,7 +2484,7 @@ class StatForm extends preact.Component<{ const autoSpread = set.ivs && editor.defaultIVs(set, false); const autoSpreadValue = autoSpread && Object.values(autoSpread).join('/'); if (!hpIVdata) { - return {autoSpreadValue && } @@ -2836,8 +2839,9 @@ class StatForm extends preact.Component<{ }; maxEVs() { const editor = this.props.editor; - const useEVs = !editor.isLetsGo && editor.gen >= 3; - return useEVs ? 510 : Infinity; + const usesStatPoints = editor.isChampions; + const useEVs = !editor.isLetsGo && editor.gen >= 3 && !usesStatPoints; + return usesStatPoints ? 66 : useEVs ? 510 : Infinity; } override render() { const { editor, set } = this.props; @@ -2847,9 +2851,10 @@ class StatForm extends preact.Component<{ const nature = BattleNatures[set.nature || 'Serious']; - const useEVs = !editor.isLetsGo; + const usesStatPoints = editor.isChampions; + const useEVs = !editor.isLetsGo && !usesStatPoints; // const useAVs = !useEVs && team.format.endsWith('norestrictions'); - const maxEV = useEVs ? 252 : 200; + const maxEV = usesStatPoints ? 32 : useEVs ? 252 : 200; const stepEV = useEVs ? 4 : 1; const defaultEV = useEVs && editor.gen <= 2 && !set.evs ? maxEV : 0; const useIVs = editor.gen > 2; @@ -2893,7 +2898,7 @@ class StatForm extends preact.Component<{ {/* Stat name */} Base {/* Stat bar */} - {useEVs ? 'EVs' : 'AVs'} + {useEVs ? 'EVs' : usesStatPoints ? 'Points' : 'AVs'} {/* EV slider */} {useIVs ? 'IVs' : 'DVs'} {/* Final stat */} @@ -2914,7 +2919,8 @@ class StatForm extends preact.Component<{ /> {stat} )} @@ -3075,7 +3081,7 @@ class DetailsForm extends preact.Component<{ name="level" value={set.level ?? ''} placeholder={`${editor.defaultLevel}`} type="number" inputMode="numeric" min="1" max="100" step="1" class="textbox inputform numform default-placeholder" style="width: 50px" - onInput={this.changeLevel} onChange={this.changeLevel} + onInput={this.changeLevel} onChange={this.changeLevel} disabled={editor.isChampions} />(You probably want to change the team's levels by changing the format, not here)

    {editor.gen > 1 && (<>

    Shiny:
    @@ -3151,7 +3157,7 @@ class DetailsForm extends preact.Component<{ ))}

    } - {editor.gen === 9 &&

    + {editor.gen === 9 && !editor.isChampions &&