Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-03-21 17:50:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Doom Desire & Future Sight Timers UI (#2574)

Browse Source
This commit is contained in:
mollup 2026-03-15 05:05:24 -04:00 committed by GitHub
parent 71341b1fba
commit 7df45ea835
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
play.pokemonshowdown.com/src/battle.ts
View File

@ -715,6 +715,12 @@ export class Side {
case 'luckychant': case 'luckychant':
this.sideConditions[condition] = [effect.name, 1, 5, 0]; this.sideConditions[condition] = [effect.name, 1, 5, 0];
break; break;
case 'futuresight':
this.sideConditions[condition] = ['Future Sight', 1, 3, 0];
break;
case 'doomdesire':
this.sideConditions[condition] = ['Doom Desire', 1, 3, 0];
break;
case 'stealthrock': case 'stealthrock':
case 'spikes': case 'spikes':
case 'toxicspikes': case 'toxicspikes':
@ -2738,8 +2744,17 @@ export class Battle {
case 'reflect': case 'reflect':
this.scene.resultAnim(poke, 'Reflect', 'good'); this.scene.resultAnim(poke, 'Reflect', 'good');
break; break;
case 'futuresight':
poke.side.addSideCondition(effect, false);
this.scene.updateWeather();
break;
case 'doomdesire':
poke.side.addSideCondition(effect, false);
this.scene.updateWeather();
break;
} }
if (!(effect.id === 'typechange' && poke.terastallized)) { if (!(effect.id === 'typechange' && poke.terastallized) &&
effect.id !== 'futuresight' && effect.id !== 'doomdesire') {
poke.addVolatile(effect.id); poke.addVolatile(effect.id);
} }
this.scene.updateStatbar(poke); this.scene.updateStatbar(poke);
@ -2838,9 +2853,13 @@ export class Battle {
if (effect.effectType === 'Move') { if (effect.effectType === 'Move') {
if (effect.name === 'Doom Desire') { if (effect.name === 'Doom Desire') {
this.scene.runOtherAnim('doomdesirehit' as ID, [poke]); this.scene.runOtherAnim('doomdesirehit' as ID, [poke]);
poke.side.foe.removeSideCondition('Doom Desire');
this.scene.updateWeather();
} }
if (effect.name === 'Future Sight') { if (effect.name === 'Future Sight') {
this.scene.runOtherAnim('futuresighthit' as ID, [poke]); this.scene.runOtherAnim('futuresighthit' as ID, [poke]);
poke.side.foe.removeSideCondition('Future Sight');
this.scene.updateWeather();
} }
} }
} }
@ -3068,6 +3087,8 @@ export class Battle {
case 'lightscreen': case 'lightscreen':
case 'safeguard': case 'safeguard':
case 'mist': case 'mist':
case 'futuresight':
case 'doomdesire':
case 'gmaxwildfire': case 'gmaxwildfire':
case 'gmaxvolcalith': case 'gmaxvolcalith':
case 'gmaxvinelash': case 'gmaxvinelash':