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

Seasonal: Fix custom movesets

Browse Source 
Merge conflicts were being resolved in the wrong direction, giving all Pokemon their normal Random Battle movepools.
This commit is contained in:
Marty-D 2015-11-22 21:46:14 -05:00
parent eeb232bc04
commit 0d37b7946d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/scripts.js
View File

@ -3234,7 +3234,7 @@ exports.BattleScripts = {
let template = {};
if (heroTemplate.moves) template.randomBattleMoves = heroTemplate.moves;
if (heroTemplate.required) template.requiredMove = heroTemplate.required;
Object.merge(template, this.getTemplate(heroTemplate.species), false);
Object.merge(template, this.getTemplate(heroTemplate.species), false, false);
let pokemon = this.randomSet(template, i, teamDetails);