diff options
| -rw-r--r-- | about.html | 2 | ||||
| -rw-r--r-- | client.css | 4 | ||||
| -rw-r--r-- | client.html | 1 | ||||
| -rw-r--r-- | client.js | 30 | ||||
| -rw-r--r-- | index.html | 2 | ||||
| -rw-r--r-- | master.html | 12 | ||||
| -rw-r--r-- | master.js | 8 | ||||
| -rw-r--r-- | stylesheet.css | 10 |
8 files changed, 42 insertions, 27 deletions
@@ -13,7 +13,7 @@ <div id="header"> <p id="serverinfo">Masterserver version - 1.42</p> <p id="clientinfo">Client version - 1.7.5</p> -<a class="button" href="support.html" class="button" id="hotlinebtn"> +<a class="button" href="https://discord.gg/e8pTAFv" class="button" id="hotlinebtn"> Contact Hotline AO </a> </div> @@ -83,6 +83,10 @@ img { border: 1px solid black; } +.demothing .chosen { + border: 1px broken red; +} + #client_wrapper { position: absolute; top: 0; diff --git a/client.html b/client.html index eee9f23..75ce66b 100644 --- a/client.html +++ b/client.html @@ -38,6 +38,7 @@ 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()"/> + <input id="change_character" type="button" onClick="changeCharacter()" value="Change character"/> </div> <div id="client_chatlog"> @@ -147,6 +147,11 @@ function changeBlipVolume() { comboblip.volume = document.getElementById("client_bvolume").value / 100; } +function changeCharacter(event) { + serv.send("FC#%"); + document.getElementById("client_charselect").style.display = "block"; +} + function imgError(image) { image.onerror = ""; image.src = "/misc/placeholder.gif"; @@ -218,18 +223,18 @@ function changebg(position) { switch (position) { case "def": document.getElementById("client_bench").style.display = "block"; - if (ImageExist(bgfolder + "bancodefensa.gif")) { - document.getElementById("client_bench").src = bgfolder + "bancodefensa.gif" - } else if (ImageExist(bgfolder + "bancodefensa.png")) { - document.getElementById("client_bench").src = bgfolder + "bancodefensa.png" + if (ImageExist(bgfolder + "defensedesk.gif")) { + document.getElementById("client_bench").src = bgfolder + "defensedesk.gif" + } else if (ImageExist(bgfolder + "defensedesk.png")) { + document.getElementById("client_bench").src = bgfolder + "defensedesk.png" } break; case "pro": document.getElementById("client_bench").style.display = "block" - if (ImageExist(bgfolder + "bancoacusacion.gif")) { - document.getElementById("client_bench").src = bgfolder + "bancoacusacion.gif" - } else if (ImageExist(bgfolder + "bancoacusacion.png")) { - document.getElementById("client_bench").src = bgfolder + "bancoacusacion.png" + if (ImageExist(bgfolder + "prosecutiondesk.gif")) { + document.getElementById("client_bench").src = bgfolder + "prosecutiondesk.gif" + } else if (ImageExist(bgfolder + "prosecutiondesk.png")) { + document.getElementById("client_bench").src = bgfolder + "prosecutiondesk.png" } break; case "wit": @@ -409,8 +414,7 @@ function onMessage(e) { "name": charguments[0], "desc": charguments[1], "evidence": charguments[3], - "icon": AO_HOST + "misc/DemoThings/" + charguments[0] + "_char_icon.png", - "icon_chosen": AO_HOST + "misc/DemoThings/" + charguments[0] + "_char_icon_chosen.png" + "icon": AO_HOST + "characters/" + charguments[0] + "/char_icon.png" }; } } @@ -472,12 +476,14 @@ function onMessage(e) { var tr = document.createElement('TR'); } var td = document.createElement('TD'); + var icon_chosen; if (arguments[1+i]=="-1"){ - var thispick = chars[i].icon_chosen; + icon_chosen = " chosen"; } else { var thispick = chars[i].icon; + icon_chosen = ""; } - td.innerHTML = "<img class='demothing' id='demo_"+i+"' src='"+thispick + "' alt='"+chars[i].desc+"' onclick='pickchar(" + i + ")' onerror='demoError(this);'>"; + td.innerHTML = "<img class='demothing"+icon_chosen+"+' id='demo_"+i+"' src='"+thispick + "' alt='"+chars[i].desc+"' onclick='pickchar(" + i + ")' onerror='demoError(this);'>"; tr.appendChild(td); if (i % 5 == 0){ document.getElementById("client_chartable").appendChild(tr); @@ -13,7 +13,7 @@ <div id="header"> <p id="serverinfo">Masterserver version - 2.1.6</p> <p id="clientinfo">Client version - 1.7.5</p> -<a class="button" href="support.html" class="button" id="hotlinebtn"> +<a class="button" href="https://discord.gg/e8pTAFv" class="button" id="hotlinebtn"> Contact Hotline AO </a> </div> diff --git a/master.html b/master.html index e460281..15db393 100644 --- a/master.html +++ b/master.html @@ -14,7 +14,7 @@ <div id="header"> <p id="serverinfo">Masterserver version - ...</p> <p id="clientinfo">Client version - ...</p> -<a class="button" href="support.html" class="button" id="hotlinebtn"> +<a class="button" href="https://discord.gg/e8pTAFv" class="button" id="hotlinebtn"> Contact Hotline AO </a> </div> @@ -36,15 +36,7 @@ <div id="content"> <div id="serverthumb"> <div id="serverthumbC"> - <img id="client_court" src="background/gs4/defenseempty.png"/> - <img id="client_char" src="characters/Phoenix/(a)handsondesk.gif"/> - <img id="client_fg" src="background/gs4/bancodefensa.png"/> - <div id="client_name"><p>Phoenix</p></div> - <div id="client_chat"> - <p>Now this is a story all about how</p> - <p>My life got flipped-turned upside-down</p> - <p>And I'd rather take a minute</p> - </div> + </div> </div> @@ -47,7 +47,13 @@ function onMessage(e) { header = msg.split('#', 2)[0]; arguments = msg.split('#').slice(1) if (header == 'SN') { - document.getElementById('masterlist').innerHTML += '<li onmouseover="setServ(' + arguments[0] + ')"><p>' + arguments[4] + '</p> <a class=\"button\" href=\"client.html?mode=watch&ip=' + arguments[1] + ':' + arguments[3] + '\">Watch</a><a class=\"button\" href=\"client.html?mode=join&ip=' + arguments[1] + ':' + arguments[3] + '\">Join</a></li><br/>' + console.log(arguments[2].substring(0, 7)); + if (arguments[2].substring(0, 7) == 'serverD') { + unavv = 'class="available" ' + }else{ + unavv = '' + } + document.getElementById('masterlist').innerHTML += '<li ' + unavv + 'onmouseover="setServ(' + arguments[0] + ')"><p>' + arguments[4] + '</p> <a class=\"button\" href=\"client.html?mode=watch&ip=' + arguments[1] + ':' + arguments[3] + '\">Watch</a><a class=\"button\" href=\"client.html?mode=join&ip=' + arguments[1] + ':' + arguments[3] + '\">Join</a></li><br/>' serverpics[arguments[0]] = arguments[2]; descs[arguments[0]] = arguments[5]; } diff --git a/stylesheet.css b/stylesheet.css index bc598de..cd9b2bc 100644 --- a/stylesheet.css +++ b/stylesheet.css @@ -4,6 +4,7 @@ body { background-size: cover; background-attachment: fixed; font-family: "Ace Attorney","Tahoma",Sans; + transition: ease-in-out; } #content { @@ -189,7 +190,7 @@ body { .servs { display: block; margin: auto; - width: 300px; + width: 500px; } .servs li { @@ -201,7 +202,7 @@ body { padding: 0px; padding-left: 10px; display: block; - width: 400px; + width: 500px; height: 50px; margin: 10px; margin-left: auto; @@ -235,6 +236,11 @@ body { box-shadow: 0 0 0 2px #BBB; } +.servs .available { + background-color: #6BFF6B; + border-color: #21AD21; +} + .servs .button:hover { box-shadow: 0 0 0 1px #EFAD21; } |