Skip to content

Teambuilder: Removes Tera button in formats with Terastal clause #2712

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ry4242 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Teambuilder: Removes Tera button in formats with Terastal clause #2712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions play.pokemonshowdown.com/src/battle-dex-search.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,7 @@ abstract class BattleTypedSearch<T extends SearchType> {
'nfe' | 'ssdlc1' | 'ssdlc1doubles' | 'predlc' | 'predlcdoubles' | 'svdlc1' | 'svdlc1doubles' | 'stadium' | 'lc' |
'champions' | 'natdexchampions' | null = null;
isDoubles = false;
terastalClause = false;

/**
* Cached copy of what the results list would be with only base filters
Expand All @@ -605,6 +606,7 @@ abstract class BattleTypedSearch<T extends SearchType> {

this.baseResults = null;
this.baseIllegalResults = null;
this.terastalClause = !!BattleFormats[format]?.terastalClause;

if (format.startsWith('gen')) {
const gen = (Number(format.charAt(3)) || 6);
Expand Down Expand Up @@ -1720,6 +1722,8 @@ class BattleMoveSearch extends BattleTypedSearch<'move'> {
case 'temperflare':
return (!moves.includes('flareblitz') && !moves.includes('pyroball') && !moves.includes('sacredfire') &&
!moves.includes('bitterblade') && !moves.includes('firepunch')) || this.isDoubles;
case 'terablast':
return !this.terastalClause;
case 'terrainpulse': case 'waterpulse':
return ['megalauncher', 'technician'].includes(abilityid) && !moves.includes('originpulse');
case 'thief':
Expand Down
10 changes: 6 additions & 4 deletions play.pokemonshowdown.com/src/battle-team-editor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ export class TeamEditorState extends PSModel {
isNatDex = false;
isBDSP = false;
isChampions = false;
terastalClause = false;
formeLegality: 'normal' | 'hackmons' | 'custom' = 'normal';
abilityLegality: 'normal' | 'hackmons' = 'normal';
defaultLevel = 100;
Expand Down Expand Up @@ -100,6 +101,7 @@ export class TeamEditorState extends PSModel {
this.isNatDex = formatid.includes('nationaldex') || formatid.includes('natdex');
this.isBDSP = formatid.includes('bdsp');
this.isChampions = formatid.includes('champions');
this.terastalClause = !!BattleFormats[formatid]?.terastalClause;
if (formatid.includes('almostanyability') || formatid.includes('aaa')) {
this.abilityLegality = 'hackmons';
} else {
Expand Down Expand Up @@ -497,7 +499,7 @@ export class TeamEditorState extends PSModel {
};
hpTypeMatters(set: Dex.PokemonSet): boolean {
if (this.gen < 2) return false;
if (this.gen > 7) return false;
if (this.gen > 7 && !this.isNatDex) return false;
for (const move of set.moves) {
const moveid = toID(move);
if (moveid.startsWith('hiddenpower')) return true;
Expand Down Expand Up @@ -1681,7 +1683,7 @@ class TeamTextbox extends preact.Component<{
<span class="detailcell">
<label>Shiny</label>{set.shiny ? 'Yes' : '\u2014'}
</span>
{editor.gen === 9 && !editor.isChampions ? (
{editor.gen === 9 && !editor.terastalClause && !editor.isChampions ? (
<span class="detailcell">
<label>Tera</label><PSIcon type={set.teraType || species.requiredTeraType || species.types[0]} />
</span>
Expand Down Expand Up @@ -2011,7 +2013,7 @@ class TeamWizard extends preact.Component<{
<strong class="label">Shiny</strong> {}
{set.shiny ? <img src={`${Dex.resourcePrefix}sprites/misc/shiny.png`} width={22} height={22} alt="Yes" /> : '\u2014'}
</span>}
{editor.gen === 9 && !editor.isChampions && <span class="detailcell">
{editor.gen === 9 && !editor.terastalClause && !editor.isChampions && <span class="detailcell">
<strong class="label">Tera</strong> {}
<PSIcon type={set.teraType || species.requiredTeraType || species.types[0]} />
</span>}
Expand Down Expand Up @@ -3164,7 +3166,7 @@ class DetailsForm extends preact.Component<{
))}
</select></label>
</p>}
{editor.gen === 9 && !editor.isChampions && <p>
{editor.gen === 9 && !editor.terastalClause && !editor.isChampions && <p>
<label class="label" title="Tera Type">
Tera Type: {}
{species.requiredTeraType && editor.formeLegality === 'normal' ? (
Expand Down
3 changes: 3 additions & 0 deletions play.pokemonshowdown.com/src/panel-mainmenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@ export class MainMenuRoom extends PSRoom {
let bestOfDefault = false;
let teraPreviewDefault = false;
let itemClauseDefault = false;
let terastalClause = false;
let team: 'preset' | null = null;
let teambuilderLevel: number | null = null;
let lastCommaIndex = name.lastIndexOf(',');
Expand All @@ -279,6 +280,7 @@ export class MainMenuRoom extends PSRoom {
if (code & 64) bestOfDefault = true;
if (code & 128) teraPreviewDefault = true;
if (code & 256) itemClauseDefault = true;
if (code & 512) terastalClause = true;
} else {
// Backwards compatibility: late 0.9.0 -> 0.10.0
if (name.substr(name.length - 2) === ',#') { // preset teams
Expand Down Expand Up @@ -343,6 +345,7 @@ export class MainMenuRoom extends PSRoom {
bestOfDefault,
teraPreviewDefault,
itemClauseDefault,
terastalClause,
rated: searchShow && id.substr(4, 7) !== 'unrated',
teambuilderLevel,
partner,
Expand Down
1 change: 1 addition & 0 deletions play.pokemonshowdown.com/src/panel-teamdropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,7 @@ export interface FormatData {
bestOfDefault?: boolean;
teraPreviewDefault?: boolean;
itemClauseDefault?: boolean;
terastalClause?: boolean;
rated: boolean;
teambuilderLevel?: number | null;
partner?: boolean;
Expand Down