aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstonedDiscord <stoned@derpymail.org>2018-03-11 12:51:27 +0100
committerstonedDiscord <stoned@derpymail.org>2018-03-11 12:51:27 +0100
commita3033d03c0f6790aa0d3f3886147443000778789 (patch)
tree0a4f12d53dfa86b6b9689a32de2769cc1bb2a7dd
parentbcaf6ec1580d973e47c5ddf4f30eeab280f4e4cf (diff)
sending sfx and zoom
-rw-r--r--client.css2
-rw-r--r--client.html11
-rw-r--r--client.js35
3 files changed, 39 insertions, 9 deletions
diff --git a/client.css b/client.css
index ccce58a..ea92cd2 100644
--- a/client.css
+++ b/client.css
@@ -195,7 +195,7 @@ img {
margin: 4px;
color: white;
}
-input {
+.long {
width: 97%;
background-color: #dddddd;
border: 1px solid #555555;
diff --git a/client.html b/client.html
index 86139b8..d2e9f8f 100644
--- a/client.html
+++ b/client.html
@@ -31,7 +31,7 @@
<p id="client_inner_chat"></p>
</div>
</div>
- <input id="client_inputbox" type="text" onKeyPress="onEnter(event)" />
+ <input id="client_inputbox" class="long" type="text" onKeyPress="onEnter(event)" />
<div id="client_emo">
</div>
<br>
@@ -39,12 +39,15 @@
<img src="misc/holdit.png" id="button_1" alt="Hold it!" class="client_button" onclick="toggleshout(1)">
<img src="misc/objection.png" id="button_2" alt="OBJECTION!" class="client_button" onclick="toggleshout(2)">
<img src="misc/takethat.png" id="button_3" alt="Take That!" class="client_button" onclick="toggleshout(3)">
+ <br>
+ <input type="checkbox" id="sendsfx" name="sendsfx" value="sendsfx">
+ <label for="sendsfx">SFX</label>
</div>
</div>
<div id="client_settings">
- Music <input id="client_mvolume" type="range" min="0" max="100" value="80" onChange="changeMusicVolume()"/>
- SFX <input id="client_svolume" type="range" min="0" max="100" value="70" onChange="changeSFXVolume()"/>
- Blip <input id="client_bvolume" type="range" min="0" max="100" value="60" onChange="changeBlipVolume()"/>
+ Music <input id="client_mvolume" class="long" type="range" min="0" max="100" value="80" onChange="changeMusicVolume()"/>
+ SFX <input id="client_svolume" class="long" type="range" min="0" max="100" value="70" onChange="changeSFXVolume()"/>
+ Blip <input id="client_bvolume" class="long" type="range" min="0" max="100" value="60" onChange="changeBlipVolume()"/>
<input id="change_character" type="button" onClick="changeCharacter()" value="Change character"/>
</div>
diff --git a/client.js b/client.js
index 4e4948c..fdb3b17 100644
--- a/client.js
+++ b/client.js
@@ -136,7 +136,14 @@ function onEnter(event) {
if (event.keyCode == 13) {
mychar = chars[me]
myemo = emotes[myemotion]
- ICmessage = "MS#chat#" + myemo.speaking + "#" + mychar.name + "#" + myemo.silent + "#" + escapeChat(document.getElementById("client_inputbox").value) + "#" + mychar.side + "#0#0#" + me + "#0#" + objection_state + "#0#0#0#0#%";
+ if(document.getElementById("sendsfx").checked){
+ ssfxname=myemo.sfx;
+ ssfxdelay=myemo.sfxdelay;
+ }else{
+ ssfxname="0";
+ ssfxdelay="0";
+ }
+ ICmessage = "MS#chat#" + myemo.speaking + "#" + mychar.name + "#" + myemo.silent + "#" + escapeChat(document.getElementById("client_inputbox").value) + "#" + mychar.side + "#" + ssfxname +"#" + myemo.zoom + "#" + me + "#" + ssfxdelay + "#" + objection_state + "#0#0#0#0#%";
serv.send(ICmessage);
document.getElementById("client_inputbox").value = '';
if (objection_state) {
@@ -190,36 +197,46 @@ function ImageExist(url) {
}
function changebg(position) {
+ var standname
bgfolder = AO_HOST + "background/" + bgname + "/";
document.getElementById("client_fg").style.display = "none";
document.getElementById("client_bench").style.display = "none";
- //document.getElementById("client_bench").style.display = "block"
switch (position) {
case "def":
document.getElementById("client_court").src = bgfolder + "defenseempty.png"
document.getElementById("client_bench").style.display = "block";
document.getElementById("client_bench").src = bgfolder + "defensedesk.png"
+ standname="defense";
break;
case "pro":
document.getElementById("client_court").src = bgfolder + "prosecutorempty.png"
document.getElementById("client_bench").style.display = "block"
document.getElementById("client_bench").src = bgfolder + "prosecutiondesk.png"
+ standname="prosecution";
break;
case "hld":
document.getElementById("client_court").src = bgfolder + "helperstand.png"
+ standname="defense";
break;
case "hlp":
document.getElementById("client_court").src = bgfolder + "prohelperstand.png"
+ standname="prosecution";
break;
case "wit":
document.getElementById("client_court").src = bgfolder + "witnessempty.png"
- document.getElementById("client_fg").style.display = "block"
- document.getElementById("client_fg").src = bgfolder + "estrado.png"
+ document.getElementById("client_bench").style.display = "block"
+ document.getElementById("client_bench").src = bgfolder + "estrado.png"
+ standname="prosecution";
break;
case "jud":
document.getElementById("client_court").src = bgfolder + "judgestand.png"
+ standname="prosecution";
break;
}
+ if(chatmsg.type==5){
+ document.getElementById("client_bench").style.display = "none";
+ document.getElementById("client_court").src = AO_HOST + "themes/default/"+standname+"_speedlines.gif";
+ }
}
function updateText() {
@@ -538,11 +555,21 @@ function onMessage(e) {
chars[me].side = pinifile.Options.side;
for (var i = 1; i < pinifile.Emotions.number; i++) {
var emoteinfo = pinifile.Emotions[i].split('#');
+ esfx="0";
+ esfxd="0";
+ if (typeof pinifile.SoundN !== 'undefined') {
+ esfx=pinifile.SoundN[i];
+ }
+ if (typeof pinifile.SoundT !== 'undefined') {
+ esfxd=pinifile.SoundT[i];
+ }
emotes[i] = {
desc: emoteinfo[0],
speaking: emoteinfo[1],
silent: emoteinfo[2],
zoom: emoteinfo[3],
+ sfx: esfx,
+ sfxdelay: esfxd,
button_off: AO_HOST + 'characters/' + chars[me].name + '/emotions/button' + i + '_off.png',
button_on: AO_HOST + 'characters/' + chars[me].name + '/emotions/button' + i + '_on.png'
};