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

Random Battle: Improve Pyroar and Rapidash

Browse Source 
- Reject Sunny Day if the Pokemon lacks an ability that benefits, and
lacks SolarBeam
- Add Dark Pulse to Pyroar to fix the issue raised in #2063
- Reordered the Status cases to weather/status/recovery/other instead
of just alphabetical
This commit is contained in:
The Immortal 2015-07-18 03:04:54 +04:00
parent 9c0de62062
commit 5ed4a13610
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/formats-data.js
View File

@ -4944,7 +4944,7 @@ exports.BattleFormatsData = {
tier: "LC"
},
pyroar: {
randomBattleMoves: ["sunnyday","fireblast","hypervoice","solarbeam","willowisp"],
randomBattleMoves: ["sunnyday","fireblast","hypervoice","solarbeam","willowisp","darkpulse"],
randomDoubleBattleMoves: ["hypervoice","fireblast","willowisp","protect","sunnyday","solarbeam"],
tier: "NU"
},

30
data/scripts.js
View File

@ -1358,21 +1358,12 @@ exports.BattleScripts = {
break;
// Status:
case 'raindance': case 'sunnyday':
case 'raindance':
if ((hasMove['rest'] && hasMove['sleeptalk']) || counter.Physical + counter.Special < 2) rejected = true;
break;
case 'rest':
if (!hasMove['sleeptalk'] && movePool.indexOf('sleeptalk') >= 0) rejected = true;
if (hasMove['moonlight'] || hasMove['painsplit'] || hasMove['recover'] || hasMove['synthesis']) rejected = true;
break;
case 'roar':
if (hasMove['dragontail']) rejected = true;
break;
case 'roost': case 'softboiled': case 'synthesis':
if (hasMove['wish']) rejected = true;
break;
case 'substitute':
if (hasMove['dracometeor'] || (hasMove['leafstorm'] && !hasAbility['Contrary']) || hasMove['pursuit'] || hasMove['taunt'] || hasMove['uturn'] || hasMove['voltswitch']) rejected = true;
case 'sunnyday':
if (!hasAbility['Chlorophyll'] && !hasAbility['Flower Gift'] && !hasAbility['Forecast'] && !hasMove['solarbeam']) rejected = true;
if ((hasMove['rest'] && hasMove['sleeptalk']) || counter.Physical + counter.Special < 2) rejected = true;
break;
case 'stunspore': case 'thunderwave':
if (counter.setupType || !!counter['speedsetup']) rejected = true;
@ -1386,6 +1377,19 @@ exports.BattleScripts = {
case 'willowisp':
if (hasMove['lavaplume'] || hasMove['sacredfire'] || hasMove['scald'] || hasMove['spore']) rejected = true;
break;
case 'rest':
if (!hasMove['sleeptalk'] && movePool.indexOf('sleeptalk') >= 0) rejected = true;
if (hasMove['moonlight'] || hasMove['painsplit'] || hasMove['recover'] || hasMove['synthesis']) rejected = true;
break;
case 'roost': case 'softboiled': case 'synthesis':
if (hasMove['wish']) rejected = true;
break;
case 'roar':
if (hasMove['dragontail']) rejected = true;
break;
case 'substitute':
if (hasMove['dracometeor'] || (hasMove['leafstorm'] && !hasAbility['Contrary']) || hasMove['pursuit'] || hasMove['taunt'] || hasMove['uturn'] || hasMove['voltswitch']) rejected = true;
break;
}
// Increased/decreased priority moves unneeded with moves that boost only speed