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 updates

Browse Source 
- Give Regigigas Knock Off instead of Earthquake
- Reject Hidden Power with RestTalk
- Reject Toxic with Flame Charge
This commit is contained in:
The Immortal 2015-08-27 21:26:18 +04:00
parent f51447e74f
commit 6fc79a1e39
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/formats-data.js
View File

@ -3781,7 +3781,7 @@ exports.BattleFormatsData = {
tier: "OU"
},
regigigas: {
randomBattleMoves: ["thunderwave","substitute","return","drainpunch","earthquake","confuseray"],
randomBattleMoves: ["thunderwave","confuseray","substitute","return","knockoff","drainpunch"],
randomDoubleBattleMoves: ["thunderwave","substitute","return","icywind","rockslide","earthquake","knockoff","wideguard"],
eventPokemon: [
{"generation":4,"level":100,"moves":["ironhead","rockslide","icywind","crushgrip"],"pokeball":"cherishball"}

4
data/scripts.js
View File

@ -1357,6 +1357,9 @@ exports.BattleScripts = {
case 'explosion':
if (counter.setupType || hasMove['wish']) rejected = true;
break;
case 'hiddenpower':
if (hasMove['rest'] && hasMove['sleeptalk']) rejected = true;
break;
case 'hypervoice':
if (hasMove['naturepower'] || hasMove['return']) rejected = true;
break;
@ -1411,6 +1414,7 @@ exports.BattleScripts = {
if (hasMove['rest'] && hasMove['sleeptalk']) rejected = true;
break;
case 'toxic':
if (hasMove['flamecharge']) rejected = true;
if (hasMove['hypnosis'] || hasMove['sleeppowder'] || hasMove['stunspore'] || hasMove['thunderwave'] || hasMove['willowisp'] || hasMove['yawn']) rejected = true;
if (hasMove['rest'] && hasMove['sleeptalk']) rejected = true;
break;