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

Fix happiness reverting to 255 in teambuilder

Browse Source
This commit is contained in:
Guangcong Luo
2014-02-16 13:41:54 -06:00
parent 6aafb95ec5
commit de2d3fe15c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
js/client-teambuilder.js
View File

@@ -1011,7 +1011,8 @@
var happiness = parseInt(this.$chart.find('input[name=happiness]').val(),10);
if (happiness > 255) happiness = 255;
if (happiness < 0) happiness = 255;
if (happiness !== 255 || set.happiness || set.happiness === 0) set.happiness = happiness;
set.happiness = happiness;
if (set.happiness === 255) delete set.happiness;
// shiny
var shiny = (this.$chart.find('input[name=shiny]:checked').val() === 'yes');
@@ -1896,7 +1897,7 @@
if (curSet.shiny) {
text += 'Shiny: Yes\n';
}
if (curSet.happiness && curSet.happiness !== 255) {
if (typeof curSet.happiness === 'number' && curSet.happiness !== 255) {
text += 'Happiness: '+curSet.happiness+"\n";
}
var first = true;