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

Option to disable animations

Browse Source
This commit is contained in:
Guangcong Luo
2013-04-13 15:01:05 -07:00
parent 2df43efbc8
commit 027c8163ad
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/battledata.js
View File

@@ -678,7 +678,7 @@ var Tools = {
}
if (pokemon.shiny) back += '-shiny';
if (window.BattlePokemonSprites && BattlePokemonSprites[pokemon.speciesid] && BattlePokemonSprites[pokemon.speciesid][facing]) {
if (!Tools.prefs.get('noanim') && window.BattlePokemonSprites && BattlePokemonSprites[pokemon.speciesid] && BattlePokemonSprites[pokemon.speciesid][facing]) {
var url = Tools.resourcePrefix + 'sprites/bwani'+back;
url += '/'+spriteid;
var spriteType = 'ani';

7
js/sim.js
View File

@@ -389,6 +389,7 @@ function BattleRoom(id, elem) {
if (update.updates[i].substr(0,10) === '|callback|') selfR.controlsElem.html('');
if (update.updates[i].substr(0,12) === '| callback | ') selfR.controlsElem.html('');
selfR.battle.add(update.updates[i]);
if (Tools.prefs.get('noanim')) selfR.battle.fastForwardTo(-1);
}
}
}
@@ -3168,8 +3169,9 @@ function overlay(overlayType, data) {
contents += '<p><label class="optlabel">Timestamps in lobby chat: <select id="pref_timestamps_lobby"><option value="off">Off</option><option value="minutes"'+(timestamps.lobby==='minutes'?' selected="selected"':'')+'>[HH:MM]</option><option value="seconds"'+(timestamps.lobby==='seconds'?' selected="selected"':'')+'>[HH:MM:SS]</option></select></label></p>';
contents += '<p><label class="optlabel">Timestamps in PM\'s: <select id="pref_timestamps_pms"><option value="off">Off</option><option value="minutes"'+(timestamps.pms==='minutes'?' selected="selected"':'')+'>[HH:MM]</option><option value="seconds"'+(timestamps.pms==='seconds'?' selected="selected"':'')+'>[HH:MM:SS]</option></select></label></p>';
contents += '<p><label class="optlabel"><input type="checkbox" id="pref_showjoins"'+(Tools.prefs.get('showjoins')?' checked="checked"':'')+'> Always show joins/leaves</label></p>';
contents += '<p><label class="optlabel"><input type="checkbox" id="pref_showbattles"'+(Tools.prefs.get('showbattles')?' checked="checked"':'')+'> Always show battle starts</label></p>';
contents += '<p><label class="optlabel"><input type="checkbox" id="pref_showjoins"'+(Tools.prefs.get('showjoins')?' checked="checked"':'')+'> Always show joins/leaves in lobby chat</label></p>';
contents += '<p><label class="optlabel"><input type="checkbox" id="pref_showbattles"'+(Tools.prefs.get('showbattles')?' checked="checked"':'')+'> Always show battle starts in lobby chat</label></p>';
contents += '<p><label class="optlabel"><input type="checkbox" id="pref_noanim"'+(Tools.prefs.get('noanim')?' checked="checked"':'')+'> Disable animations</label></p>';
contents += '<p><button type="submit"><strong>Save</strong></button> <button onclick="overlayClose();return false">Cancel</button></p>';
break;
case 'testclientgetassertion':
@@ -3304,6 +3306,7 @@ function overlaySubmit(e, overlayType) {
}, false);
Tools.prefs.set('showjoins', !!$('#pref_showjoins')[0].checked, false);
Tools.prefs.set('showbattles', !!$('#pref_showbattles')[0].checked, false);
Tools.prefs.set('noanim', !!$('#pref_noanim')[0].checked, false);
Tools.prefs.save();
overlayClose();
break;