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

Merge pull request #234 from Quinella/bwgfx

Browse Source 
BW animated sprites option
This commit is contained in:
Guangcong Luo 2014-08-10 00:06:04 -05:00
commit 09b0ae1862
3 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
data/pokedex-mini-g5.js → data/pokedex-mini-bw.js
View File

12
js/battledata.js
View File

@ -775,6 +775,15 @@ var Tools = {
return type; return type;
}, },
loadSpriteData: function(gen) {
var path = $('script[src*="pokedex-mini.js"]').attr('src');
var qs = path.split('?')[1] || '';
path = (path.match(/.+?(?=data\/pokedex-mini\.js)/) || [])[0] || '';
var el = document.createElement('script');
el.src = path + 'data/pokedex-mini' + (gen !== 'xy' ? '-' + gen : '') + '.js' + (qs ? '?' + qs : '');
document.getElementsByTagName('body')[0].appendChild(el);
},
getSpriteData: function(pokemon, siden, options) { getSpriteData: function(pokemon, siden, options) {
pokemon = Tools.getTemplate(pokemon); pokemon = Tools.getTemplate(pokemon);
var spriteData = { var spriteData = {
@ -814,6 +823,9 @@ var Tools = {
} }
var gen = 'xy'; var gen = 'xy';
if (Tools.prefs('bwgfx')) {
gen = 'bw';
}
if (animationData && animationData[facing]) { if (animationData && animationData[facing]) {
var spriteType = ''; var spriteType = '';

13
js/client.js
View File

@ -276,6 +276,12 @@
debugStyle.innerHTML = onCSS; debugStyle.innerHTML = onCSS;
} }
} }
if (Tools.prefs('bwgfx')) {
// since xy data is loaded by default, only call
// loadSpriteData if we want bw sprites
Tools.loadSpriteData('bw');
}
}); });
this.on('init:unsupported', function() { this.on('init:unsupported', function() {
@ -2272,6 +2278,7 @@
}, },
events: { events: {
'change input[name=noanim]': 'setNoanim', 'change input[name=noanim]': 'setNoanim',
'change input[name=bwgfx]': 'setBwgfx',
'change input[name=notournaments]': 'setNotournaments', 'change input[name=notournaments]': 'setNotournaments',
'change input[name=nolobbypm]': 'setNolobbypm', 'change input[name=nolobbypm]': 'setNolobbypm',
'change input[name=temporarynotifications]': 'setTemporaryNotifications', 'change input[name=temporarynotifications]': 'setTemporaryNotifications',
@ -2294,6 +2301,7 @@
buf += '<hr />'; buf += '<hr />';
buf += '<p><label class="optlabel">Background: <select name="bg"><option value="">Charizards</option><option value="#344b6c url(/fx/client-bg-horizon.jpg) no-repeat left center fixed">Horizon</option><option value="#546bac url(/fx/client-bg-3.jpg) no-repeat left center fixed">Waterfall</option><option value="#546bac url(/fx/client-bg-ocean.jpg) no-repeat left center fixed">Ocean</option><option value="#344b6c">Solid blue</option>'+(Tools.prefs('bg')?'<option value="" selected></option>':'')+'</select></label></p>'; buf += '<p><label class="optlabel">Background: <select name="bg"><option value="">Charizards</option><option value="#344b6c url(/fx/client-bg-horizon.jpg) no-repeat left center fixed">Horizon</option><option value="#546bac url(/fx/client-bg-3.jpg) no-repeat left center fixed">Waterfall</option><option value="#546bac url(/fx/client-bg-ocean.jpg) no-repeat left center fixed">Ocean</option><option value="#344b6c">Solid blue</option>'+(Tools.prefs('bg')?'<option value="" selected></option>':'')+'</select></label></p>';
buf += '<p><label class="optlabel"><input type="checkbox" name="noanim"'+(Tools.prefs('noanim')?' checked':'')+' /> Disable animations</label></p>'; buf += '<p><label class="optlabel"><input type="checkbox" name="noanim"'+(Tools.prefs('noanim')?' checked':'')+' /> Disable animations</label></p>';
buf += '<p><label class="optlabel"><input type="checkbox" name="bwgfx"'+(Tools.prefs('bwgfx')?' checked':'')+' /> Enable BW sprites</label></p>';
buf += '<p><label class="optlabel"><input type="checkbox" name="notournaments"'+(Tools.prefs('notournaments')?' checked':'')+' /> Ignore tournaments</label></p>'; buf += '<p><label class="optlabel"><input type="checkbox" name="notournaments"'+(Tools.prefs('notournaments')?' checked':'')+' /> Ignore tournaments</label></p>';
buf += '<p><label class="optlabel"><input type="checkbox" name="nolobbypm"'+(Tools.prefs('nolobbypm')?' checked':'')+' /> Don\'t show PMs in lobby chat</label></p>'; buf += '<p><label class="optlabel"><input type="checkbox" name="nolobbypm"'+(Tools.prefs('nolobbypm')?' checked':'')+' /> Don\'t show PMs in lobby chat</label></p>';
buf += '<p><label class="optlabel"><input type="checkbox" name="selfhighlight"'+(!Tools.prefs('noselfhighlight')?' checked':'')+'> Highlight when your name is said in chat</label></p>'; buf += '<p><label class="optlabel"><input type="checkbox" name="selfhighlight"'+(!Tools.prefs('noselfhighlight')?' checked':'')+'> Highlight when your name is said in chat</label></p>';
@ -2353,6 +2361,11 @@
var noanim = !!e.currentTarget.checked; var noanim = !!e.currentTarget.checked;
Tools.prefs('noanim', noanim); Tools.prefs('noanim', noanim);
}, },
setBwgfx: function(e) {
var bwgfx = !!e.currentTarget.checked;
Tools.prefs('bwgfx', bwgfx);
Tools.loadSpriteData(bwgfx ? 'bw' : 'xy');
},
setNotournaments: function(e) { setNotournaments: function(e) {
var notournaments = !!e.currentTarget.checked; var notournaments = !!e.currentTarget.checked;
Tools.prefs('notournaments', notournaments); Tools.prefs('notournaments', notournaments);