Fix Xonotic
This commit is contained in:
parent
efe8d35bc7
commit
a2a57e2624
|
@ -8,7 +8,10 @@ mkdir -p "${xonotic_directory}"
|
||||||
unzip -f -o -d ${xonotic_directory} ${TMPDIR:-/tmp}/xonotic.zip
|
unzip -f -o -d ${xonotic_directory} ${TMPDIR:-/tmp}/xonotic.zip
|
||||||
rm -f ${TMPDIR:-/tmp}/xonotic.zip
|
rm -f ${TMPDIR:-/tmp}/xonotic.zip
|
||||||
|
|
||||||
cat > /etc/xonotic.cfg <<EOF
|
mkdir -p ${systemuserhome}/xonotic/data
|
||||||
|
chown -R ${systemuser}: ${systemuserhome}/xonotic
|
||||||
|
|
||||||
|
cat > ${systemuserhome}/xonotic/data/server.cfg <<EOF
|
||||||
sv_public 0
|
sv_public 0
|
||||||
hostname "onFOSS"
|
hostname "onFOSS"
|
||||||
maxplayers 64
|
maxplayers 64
|
||||||
|
@ -36,8 +39,8 @@ Description=Unvanguished server
|
||||||
After=network.target
|
After=network.target
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
WorkingDirectory=${xonotic_directory}
|
WorkingDirectory=${xonotic_directory}/Xonotic
|
||||||
ExecStart=/usr/bin/console2web -p 62550 ${xonotic_directory}/daemonded -pakpath ${unvanquished_directory}/share/pkg/ -libpath ${unvanquished_directory}/bin/ -homepath \${HOME}/unvanguished_home/ +exec unvanguished.cfg
|
ExecStart=/usr/bin/console2web -p 62550 ${xonotic_directory}/Xonotic/xonotic-linux64-dedicated +serverconfig server.cfg -userdir ${systemuserhome}/xonotic
|
||||||
Restart=on-failure
|
Restart=on-failure
|
||||||
User=${systemuser}
|
User=${systemuser}
|
||||||
|
|
||||||
|
|
|
@ -7,24 +7,30 @@ function convertTerminalCodeToHtml(line) {
|
||||||
let code = line[++i]
|
let code = line[++i]
|
||||||
if(code == '[') {
|
if(code == '[') {
|
||||||
// This means it's a colour
|
// This means it's a colour
|
||||||
let colour_code = "";
|
while(i < line.length && line[i] != 'm') {
|
||||||
for(i++; i < line.length && line[i] != 'm'; i++) {
|
let colour_code = "";
|
||||||
colour_code += line[i];
|
for(i++; i < line.length && line[i] != 'm' && line[i] != ';'; i++) {
|
||||||
}
|
colour_code += line[i];
|
||||||
colour_code = parseInt(colour_code);
|
}
|
||||||
if(colour_code === 0) {
|
colour_code = parseInt(colour_code);
|
||||||
for(let i = 0; i < open_spans; i++) {
|
if(colour_code === 0) {
|
||||||
htmlline += "</span>";
|
for(let i = 0; i < open_spans; i++) {
|
||||||
|
htmlline += "</span>";
|
||||||
|
}
|
||||||
|
open_spans = 0;
|
||||||
|
}
|
||||||
|
if(colour_code === 1) {
|
||||||
|
htmlline += '<span class="TERM_FOREGROUND_BOLD">';
|
||||||
|
open_spans++;
|
||||||
|
}
|
||||||
|
else if(colour_code >= 30 && colour_code <= 37) {
|
||||||
|
htmlline += '<span class="TERM_FOREGROUND_'+(colour_code-30)+'">';
|
||||||
|
open_spans++;
|
||||||
|
}
|
||||||
|
else if(colour_code >= 90 && colour_code <= 97) {
|
||||||
|
htmlline += '<span class="TERM_FOREGROUND_'+(colour_code-90)+'_INTENSE">';
|
||||||
|
open_spans++;
|
||||||
}
|
}
|
||||||
open_spans = 0;
|
|
||||||
}
|
|
||||||
else if(colour_code >= 30 && colour_code <= 37) {
|
|
||||||
htmlline += '<span class="TERM_FOREGROUND_'+(colour_code-30)+'">';
|
|
||||||
open_spans++;
|
|
||||||
}
|
|
||||||
else if(colour_code >= 90 && colour_code <= 97) {
|
|
||||||
htmlline += '<span class="TERM_FOREGROUND_'+(colour_code-90)+'_INTENSE">';
|
|
||||||
open_spans++;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,7 +23,6 @@ function unvanguished_init() {
|
||||||
|
|
||||||
// Listen for messages
|
// Listen for messages
|
||||||
socket.addEventListener('message', function (event) {
|
socket.addEventListener('message', function (event) {
|
||||||
console.log(event);
|
|
||||||
const unvanguished_output = document.getElementById('unvanguished_output');
|
const unvanguished_output = document.getElementById('unvanguished_output');
|
||||||
let line = document.createElement('p')
|
let line = document.createElement('p')
|
||||||
line.innerHTML = convertDaemonedCodeToHtml(event.data);
|
line.innerHTML = convertDaemonedCodeToHtml(event.data);
|
||||||
|
|
|
@ -18,14 +18,14 @@ function xonotic_init() {
|
||||||
|
|
||||||
// Connection opened
|
// Connection opened
|
||||||
socket.addEventListener('open', function (event) {
|
socket.addEventListener('open', function (event) {
|
||||||
socket.send('/status');
|
socket.send('who');
|
||||||
});
|
});
|
||||||
|
|
||||||
// Listen for messages
|
// Listen for messages
|
||||||
socket.addEventListener('message', function (event) {
|
socket.addEventListener('message', function (event) {
|
||||||
const xonotic_output = document.getElementById('xonotic_output');
|
const xonotic_output = document.getElementById('xonotic_output');
|
||||||
let line = document.createElement('p')
|
let line = document.createElement('p')
|
||||||
line.innerHTML = convertDaemonedCodeToHtml(event.data);
|
line.innerHTML = convertTerminalCodeToHtml(event.data);
|
||||||
xonotic_output.prepend(line);
|
xonotic_output.prepend(line);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
Reference in New Issue