From 91f9a9e5b22ab6c3f3cb1e63dfe8d6724e8bd84d Mon Sep 17 00:00:00 2001 From: oldmud0 Date: Sat, 19 May 2018 10:55:46 -0500 Subject: Fix volume sliders not working --- webAO/client.b.js | 2 +- webAO/client.js | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'webAO') diff --git a/webAO/client.b.js b/webAO/client.b.js index aef73cc..e89bbbf 100644 --- a/webAO/client.b.js +++ b/webAO/client.b.js @@ -1,2 +1,2 @@ -!function(e){var t={};function n(i){if(t[i])return t[i].exports;var s=t[i]={i:i,l:!1,exports:{}};return e[i].call(s.exports,s,s.exports,n),s.l=!0,s.exports}n.m=e,n.c=t,n.d=function(e,t,i){n.o(e,t)||Object.defineProperty(e,t,{configurable:!1,enumerable:!0,get:i})},n.r=function(e){Object.defineProperty(e,"__esModule",{value:!0})},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=0)}([function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var i=function(){function e(e,t){for(var n=0;n=0)?B(this.chars[e[2]].name+" changed music to "+e[1]):B("The music was changed to "+e[1])}},{key:"handleRMC",value:function(e){S.pause(),(S=new Audio(this.musicList[e[1]])).totime=e[1],S.offset=(new Date).getTime()/1e3,S.addEventListener("loadedmetadata",function(){S.currentTime+=parseFloat(S.totime+((new Date).getTime()/1e3-S.offset)).toFixed(3),S.play()},!1)}},{key:"handleCI",value:function(e){document.getElementById("client_loadingtext").innerHTML="Loading Character "+e[1],this.serv.send("AN#"+(e[1]/10+1)+"#%");for(var t=2;t",n.appendChild(i),t%8==0&&document.getElementById("client_chartable").appendChild(n)}_("def")}},{key:"handlePV",value:function(e){this.charID=e[3],document.getElementById("client_charselect").style.display="none";var t=this.me(),n=this.emotes,i=new XMLHttpRequest;i.open("GET",l+"characters/"+escape(this.me().name)+"/char.ini",!0),i.responseType="text",i.onload=function(e){if(200==this.status){var i=this.responseText,s=p.parse(i);t.side=s.Options.side;for(var c=1;c"}x(1)}},i.send()}}]),e}(),m=function(){function e(){s(this,e),this.textnow="",this.chatmsg={isnew:!1,content:"",objection:"0",sound:"",startspeaking:!1,side:null,color:"0",snddelay:0},this.blip=new Audio(l+"sounds/general/sfx-blipmale.wav"),this.blip.volume=.5,this.womboblip=new Audio(l+"sounds/general/sfx-blipmale.wav"),this.womboblip.volume=.5,this.comboblip=new Audio(l+"sounds/general/sfx-blipmale.wav"),this.comboblip.volume=.5,this.combo=!1,this.sfxaudio=new Audio(l+"sounds/general/sfx-blipmale.wav"),this.sfxplayed=0,this.updater=null,this.bgname="gs4",this.shoutTimer=0,this.textTimer=0}return i(e,[{key:"bgFolder",value:function(){return l+"background/"+this.bgname+"/"}},{key:"say",value:function(e){var t=this;this.chatmsg=e,B(e.nameplate+": "+e.content),_(e.side),this.textnow="",this.sfxplayed=0,this.textTimer=0,this.updater=setInterval(function(){return t.updateText()},80)}},{key:"updateText",value:function(){if(""==this.chatmsg.content.trim()?(document.getElementById("client_name").style.display="none",document.getElementById("client_chat").style.display="none"):(document.getElementById("client_name").style.display="block",document.getElementById("client_chat").style.display="block"),this.chatmsg.isnew){var e={1:"holdit",2:"takethat",3:"objection"}[this.chatmsg.objection];void 0!==e?(document.getElementById("client_char").src=l+"misc/"+e+".gif",this.chatmsg.sound="sfx-"+e,this.shoutTimer=800):this.shoutTimer=0,this.chatmsg.isnew=!1,this.chatmsg.startspeaking=!0}if(this.textTimer>=this.shoutTimer)if(this.chatmsg.startspeaking){_(this.chatmsg.side),document.getElementById("client_char").src=l+"characters/"+escape(this.chatmsg.name)+"/"+this.chatmsg.speaking+".gif",document.getElementById("client_name").style.fontSize=.7*document.getElementById("client_name").offsetHeight+"px",document.getElementById("client_chat").style.fontSize=.25*document.getElementById("client_chat").offsetHeight+"px",document.getElementById("client_name").innerHTML="

"+this.chatmsg.nameplate.replace(/&/g,"&").replace(//g,">").replace(/"/g,""").replace(/'/g,"'")+"

";var t="color: "+({0:"#ffffff",1:"#00ff00",2:"#ff0000",3:"#ffaa00",4:"#0000ff",5:"#ffff00",6:"#aa00aa"}[this.chatmsg.color]||"#ffffff");document.getElementById("client_inner_chat").style=t,this.chatmsg.startspeaking=!1}else if(this.textnow!=this.chatmsg.content){if(" "!=this.chatmsg.content.charAt(this.textnow.length))switch(this.combo=(this.combo+1)%2,this.combo){case 0:this.blip.play()}this.textnow=this.chatmsg.content.substring(0,this.textnow.length+1),document.getElementById("client_inner_chat").innerHTML=this.textnow,this.textnow==this.chatmsg.content&&(this.textTimer=0,clearInterval(this.updater),document.getElementById("client_char").src=l+"characters/"+escape(this.chatmsg.name)+"/"+this.chatmsg.silent+".gif")}!this.sfxplayed&&this.chatmsg.snddelay+this.shoutTimer>=this.textTimer&&(this.sfxaudio.pause(),this.sfxplayed=1,"0"!=this.chatmsg.sound&&"1"!=this.chatmsg.sound&&(this.sfxaudio.src=l+"sounds/general/"+escape(this.chatmsg.sound)+".wav",this.sfxaudio.play())),this.textTimer=this.textTimer+80}}]),e}(),p=function(){function e(){s(this,e)}return i(e,null,[{key:"parse",value:function(e){var t={section:/^\s*\[\s*([^\]]*)\s*\]\s*$/,param:/^\s*([\w\.\-\_]+)\s*=\s*(.*?)\s*$/,comment:/^\s*;.*$/},n={},i=null;return e.split(/\r\n|\r|\n/).forEach(function(e){if(!t.comment.test(e)&&0!=e.length)if(t.param.test(e)){var s=e.match(t.param);i?n[i][s[1]]=s[2]:n[s[1]]=s[2]}else if(t.section.test(e)){var c=e.match(t.section);n[c[1]]={},i=c[1]}}),n}}]),e}();function f(e){13==e.keyCode&&(T.sendOOC(document.getElementById("client_oocinputbox").value),document.getElementById("client_oocinputbox").value="")}function g(e){if(13==e.keyCode){var t=T.me(),n=T.myEmote(),i="0",s="0";document.getElementById("sendsfx").checked&&(i=n.sfx,s=n.sfxdelay),T.sendIC(n.speaking,t.name,n.silent,document.getElementById("client_inputbox").value,t.side,i,n.zoom,s,u),document.getElementById("client_inputbox").value="",u&&(document.getElementById("button_"+u).className="client_button",u=0)}}function y(e){var t=document.getElementById("client_musiclist").value;T.sendMusicChange(t)}function v(e){T.sendLeaveRoom(),document.getElementById("client_charselect").style.display="block",document.getElementById("client_emo").innerHTML=""}function E(e){return e.onerror="",e.src="/misc/placeholder.gif",!0}function I(e){return e.onerror="",e.src="/misc/placeholder.png",!0}function _(e){var t,n=O.bgFolder();switch(document.getElementById("client_fg").style.display="none",document.getElementById("client_bench").style.display="none",e){case"def":document.getElementById("client_court").src=n+"defenseempty.png",document.getElementById("client_bench").style.display="block",document.getElementById("client_bench").src=n+"defensedesk.png",t="defense";break;case"pro":document.getElementById("client_court").src=n+"prosecutorempty.png",document.getElementById("client_bench").style.display="block",document.getElementById("client_bench").src=n+"prosecutiondesk.png",t="prosecution";break;case"hld":document.getElementById("client_court").src=n+"helperstand.png",t="defense";break;case"hlp":document.getElementById("client_court").src=n+"prohelperstand.png",t="prosecution";break;case"wit":document.getElementById("client_court").src=n+"witnessempty.png",document.getElementById("client_bench").style.display="block",document.getElementById("client_bench").src=n+"estrado.png",t="prosecution";break;case"jud":document.getElementById("client_court").src=n+"judgestand.png",t="prosecution"}5==O.chatmsg.type&&(document.getElementById("client_bench").style.display="none",document.getElementById("client_court").src=l+"themes/default/"+t+"_speedlines.gif")}function b(){(T=new h(o))&&(a="join",document.getElementById("client_error").style.display="none")}function k(){T.joinServer()}function B(e){document.getElementById("client_log").appendChild(document.createTextNode(e))}function w(e){e<1e3?T.sendCharacter(e):(document.getElementById("client_charselect").style.display="none",document.getElementById("client_inputbox").style.display="none",document.getElementById("client_emo").style.display="none")}function x(e){-1!=T.selectedEmote&&(document.getElementById("emo_"+T.selectedEmote).src=T.myEmote().button_off),T.selectedEmote=e,document.getElementById("emo_"+e).src=T.myEmote().button_on}function C(e){e==u?(document.getElementById("button_"+e).className="client_button",u=0):(document.getElementById("button_"+e).className="client_button dark",u&&(document.getElementById("button_"+u).className="client_button"),u=e)}function M(e){return e.replace(/#/g,"").replace(/&/g,"").replace(/%/g,"").replace(/\$/g,"")}window.onOOCEnter=f,window.onEnter=g,window.musiclist_click=y,window.changeCharacter=v,window.imgError=E,window.demoError=I,window.ReconnectButton=b,window.RetryButton=k,window.pickchar=w,window.pickemotion=x,window.toggleshout=C,void 0===String.prototype.trim&&(String.prototype.trim=function(){return String(this).replace(/^\s+|\s+$/g,"")});var T=new h(o),O=new m,S=new Audio;S.play()}]); +!function(e){var t={};function n(i){if(t[i])return t[i].exports;var c=t[i]={i:i,l:!1,exports:{}};return e[i].call(c.exports,c,c.exports,n),c.l=!0,c.exports}n.m=e,n.c=t,n.d=function(e,t,i){n.o(e,t)||Object.defineProperty(e,t,{configurable:!1,enumerable:!0,get:i})},n.r=function(e){Object.defineProperty(e,"__esModule",{value:!0})},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=0)}([function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var i=function(){function e(e,t){for(var n=0;n=0)?C(this.chars[e[2]].name+" changed music to "+e[1]):C("The music was changed to "+e[1])}},{key:"handleRMC",value:function(e){N.pause(),(N=new Audio(this.musicList[e[1]])).totime=e[1],N.offset=(new Date).getTime()/1e3,N.addEventListener("loadedmetadata",function(){N.currentTime+=parseFloat(N.totime+((new Date).getTime()/1e3-N.offset)).toFixed(3),N.play()},!1)}},{key:"handleCI",value:function(e){document.getElementById("client_loadingtext").innerHTML="Loading Character "+e[1],this.serv.send("AN#"+(e[1]/10+1)+"#%");for(var t=2;t",n.appendChild(i),t%8==0&&document.getElementById("client_chartable").appendChild(n)}B("def")}},{key:"handlePV",value:function(e){this.charID=e[3],document.getElementById("client_charselect").style.display="none";var t=this.me(),n=this.emotes,i=new XMLHttpRequest;i.open("GET",l+"characters/"+escape(this.me().name)+"/char.ini",!0),i.responseType="text",i.onload=function(e){if(200==this.status){var i=this.responseText,c=p.parse(i);t.side=c.Options.side;for(var o=1;o"}T(1)}},i.send()}}]),e}(),h=function(){function e(){c(this,e),this.textnow="",this.chatmsg={isnew:!1,content:"",objection:"0",sound:"",startspeaking:!1,side:null,color:"0",snddelay:0},this.blip=new Audio(l+"sounds/general/sfx-blipmale.wav"),this.blip.volume=.5,this.womboblip=new Audio(l+"sounds/general/sfx-blipmale.wav"),this.womboblip.volume=.5,this.comboblip=new Audio(l+"sounds/general/sfx-blipmale.wav"),this.comboblip.volume=.5,this.combo=!1,this.sfxaudio=new Audio(l+"sounds/general/sfx-blipmale.wav"),this.sfxplayed=0,this.updater=null,this.bgname="gs4",this.shoutTimer=0,this.textTimer=0}return i(e,[{key:"bgFolder",value:function(){return l+"background/"+this.bgname+"/"}},{key:"say",value:function(e){var t=this;this.chatmsg=e,C(e.nameplate+": "+e.content),B(e.side),this.textnow="",this.sfxplayed=0,this.textTimer=0,this.updater=setInterval(function(){return t.updateText()},80)}},{key:"updateText",value:function(){if(""==this.chatmsg.content.trim()?(document.getElementById("client_name").style.display="none",document.getElementById("client_chat").style.display="none"):(document.getElementById("client_name").style.display="block",document.getElementById("client_chat").style.display="block"),this.chatmsg.isnew){var e={1:"holdit",2:"takethat",3:"objection"}[this.chatmsg.objection];void 0!==e?(document.getElementById("client_char").src=l+"misc/"+e+".gif",this.chatmsg.sound="sfx-"+e,this.shoutTimer=800):this.shoutTimer=0,this.chatmsg.isnew=!1,this.chatmsg.startspeaking=!0}if(this.textTimer>=this.shoutTimer)if(this.chatmsg.startspeaking){B(this.chatmsg.side),document.getElementById("client_char").src=l+"characters/"+escape(this.chatmsg.name)+"/"+this.chatmsg.speaking+".gif",document.getElementById("client_name").style.fontSize=.7*document.getElementById("client_name").offsetHeight+"px",document.getElementById("client_chat").style.fontSize=.25*document.getElementById("client_chat").offsetHeight+"px",document.getElementById("client_name").innerHTML="

"+this.chatmsg.nameplate.replace(/&/g,"&").replace(//g,">").replace(/"/g,""").replace(/'/g,"'")+"

";var t="color: "+({0:"#ffffff",1:"#00ff00",2:"#ff0000",3:"#ffaa00",4:"#0000ff",5:"#ffff00",6:"#aa00aa"}[this.chatmsg.color]||"#ffffff");document.getElementById("client_inner_chat").style=t,this.chatmsg.startspeaking=!1}else if(this.textnow!=this.chatmsg.content){if(" "!=this.chatmsg.content.charAt(this.textnow.length))switch(this.combo=(this.combo+1)%2,this.combo){case 0:this.blip.play()}this.textnow=this.chatmsg.content.substring(0,this.textnow.length+1),document.getElementById("client_inner_chat").innerHTML=this.textnow,this.textnow==this.chatmsg.content&&(this.textTimer=0,clearInterval(this.updater),document.getElementById("client_char").src=l+"characters/"+escape(this.chatmsg.name)+"/"+this.chatmsg.silent+".gif")}!this.sfxplayed&&this.chatmsg.snddelay+this.shoutTimer>=this.textTimer&&(this.sfxaudio.pause(),this.sfxplayed=1,"0"!=this.chatmsg.sound&&"1"!=this.chatmsg.sound&&(this.sfxaudio.src=l+"sounds/general/"+escape(this.chatmsg.sound)+".wav",this.sfxaudio.play())),this.textTimer=this.textTimer+80}}]),e}(),p=function(){function e(){c(this,e)}return i(e,null,[{key:"parse",value:function(e){var t={section:/^\s*\[\s*([^\]]*)\s*\]\s*$/,param:/^\s*([\w\.\-\_]+)\s*=\s*(.*?)\s*$/,comment:/^\s*;.*$/},n={},i=null;return e.split(/\r\n|\r|\n/).forEach(function(e){if(!t.comment.test(e)&&0!=e.length)if(t.param.test(e)){var c=e.match(t.param);i?n[i][c[1]]=c[2]:n[c[1]]=c[2]}else if(t.section.test(e)){var o=e.match(t.section);n[o[1]]={},i=o[1]}}),n}}]),e}();function g(e){13==e.keyCode&&(L.sendOOC(document.getElementById("client_oocinputbox").value),document.getElementById("client_oocinputbox").value="")}function f(e){if(13==e.keyCode){var t=L.me(),n=L.myEmote(),i="0",c="0";document.getElementById("sendsfx").checked&&(i=n.sfx,c=n.sfxdelay),L.sendIC(n.speaking,t.name,n.silent,document.getElementById("client_inputbox").value,t.side,i,n.zoom,c,d),document.getElementById("client_inputbox").value="",d&&(document.getElementById("button_"+d).className="client_button",d=0)}}function y(e){var t=document.getElementById("client_musiclist").value;L.sendMusicChange(t)}function v(){H.music.volume=document.getElementById("client_mvolume").value/100}function E(){H.sfxaudio.volume=document.getElementById("client_svolume").value/100}function I(){H.blip.volume=document.getElementById("client_bvolume").value/100,H.womboblip.volume=document.getElementById("client_bvolume").value/100,H.comboblip.volume=document.getElementById("client_bvolume").value/100}function b(e){L.sendLeaveRoom(),document.getElementById("client_charselect").style.display="block",document.getElementById("client_emo").innerHTML=""}function _(e){return e.onerror="",e.src="/misc/placeholder.gif",!0}function k(e){return e.onerror="",e.src="/misc/placeholder.png",!0}function B(e){var t,n=H.bgFolder();switch(document.getElementById("client_fg").style.display="none",document.getElementById("client_bench").style.display="none",e){case"def":document.getElementById("client_court").src=n+"defenseempty.png",document.getElementById("client_bench").style.display="block",document.getElementById("client_bench").src=n+"defensedesk.png",t="defense";break;case"pro":document.getElementById("client_court").src=n+"prosecutorempty.png",document.getElementById("client_bench").style.display="block",document.getElementById("client_bench").src=n+"prosecutiondesk.png",t="prosecution";break;case"hld":document.getElementById("client_court").src=n+"helperstand.png",t="defense";break;case"hlp":document.getElementById("client_court").src=n+"prohelperstand.png",t="prosecution";break;case"wit":document.getElementById("client_court").src=n+"witnessempty.png",document.getElementById("client_bench").style.display="block",document.getElementById("client_bench").src=n+"estrado.png",t="prosecution";break;case"jud":document.getElementById("client_court").src=n+"judgestand.png",t="prosecution"}5==H.chatmsg.type&&(document.getElementById("client_bench").style.display="none",document.getElementById("client_court").src=l+"themes/default/"+t+"_speedlines.gif")}function w(){(L=new m(s))&&(a="join",document.getElementById("client_error").style.display="none")}function x(){L.joinServer()}function C(e){document.getElementById("client_log").appendChild(document.createTextNode(e))}function M(e){e<1e3?L.sendCharacter(e):(document.getElementById("client_charselect").style.display="none",document.getElementById("client_inputbox").style.display="none",document.getElementById("client_emo").style.display="none")}function T(e){-1!=L.selectedEmote&&(document.getElementById("emo_"+L.selectedEmote).src=L.myEmote().button_off),L.selectedEmote=e,document.getElementById("emo_"+e).src=L.myEmote().button_on}function S(e){e==d?(document.getElementById("button_"+e).className="client_button",d=0):(document.getElementById("button_"+e).className="client_button dark",d&&(document.getElementById("button_"+d).className="client_button"),d=e)}function O(e){return e.replace(/#/g,"").replace(/&/g,"").replace(/%/g,"").replace(/\$/g,"")}window.onOOCEnter=g,window.onEnter=f,window.musiclist_click=y,window.changeMusicVolume=v,window.changeSFXVolume=E,window.changeBlipVolume=I,window.changeCharacter=b,window.imgError=_,window.demoError=k,window.ReconnectButton=w,window.RetryButton=x,window.pickchar=M,window.pickemotion=T,window.toggleshout=S,void 0===String.prototype.trim&&(String.prototype.trim=function(){return String(this).replace(/^\s+|\s+$/g,"")});var L=new m(s),H=new h,N=new Audio;N.play()}]); //# sourceMappingURL=client.b.js.map \ No newline at end of file diff --git a/webAO/client.js b/webAO/client.js index 4871080..e177bd8 100644 --- a/webAO/client.js +++ b/webAO/client.js @@ -686,25 +686,28 @@ window.musiclist_click = musiclist_click; /** * Triggered by the music volume slider. */ -function changeMusicVolume() { +export function changeMusicVolume() { viewport.music.volume = document.getElementById("client_mvolume").value / 100; } +window.changeMusicVolume = changeMusicVolume; /** * Triggered by the sound effect volume slider. */ -function changeSFXVolume() { +export function changeSFXVolume() { viewport.sfxaudio.volume = document.getElementById("client_svolume").value / 100; } +window.changeSFXVolume = changeSFXVolume; /** * Triggered by the blip volume slider. */ -function changeBlipVolume() { +export function changeBlipVolume() { viewport.blip.volume = document.getElementById("client_bvolume").value / 100; viewport.womboblip.volume = document.getElementById("client_bvolume").value / 100; viewport.comboblip.volume = document.getElementById("client_bvolume").value / 100; } +window.changeBlipVolume = changeBlipVolume; /** * Triggered when a character icon is clicked in the character selection menu. -- cgit