diff --git a/app/slippiserver.js b/app/slippiserver.js index fb311e1..b79b10b 100644 --- a/app/slippiserver.js +++ b/app/slippiserver.js @@ -50,12 +50,12 @@ async function getStats(games, slpLiveFolderPath) { function SlippiServer() { this.server = express(); this.expressWs = ExpressWs(this.server); - this.slippiIP = 'localhost'; + this.slippiIP = '127.0.0.1'; this.slippiPort = 0; this.slippiFolder = ""; this.connectionStatus = ConnectionStatus; this.realtime = new SlpRealTime; - this.slippiType = "dolphin"; + this.slippiType = "console"; this.stream = new SlpLiveStream(this.slippiType); this.app = this.expressWs.app; this.status = null; @@ -185,10 +185,10 @@ SlippiServer.prototype.sendUpdateOverlay = function sendUpdateOverlay(type, data }; SlippiServer.prototype.startSlippi = function startSlippi() { this.stream = new SlpLiveStream(this.slippiType); - this.realtime.setStream(this.stream); - // try { this.stream.start(this.slippiIP, (this.slippiType == "dolphin") ? Ports.DEFAULT : this.slippiPort) .catch(console.error()); + this.realtime.setStream(this.stream); + // try { watch(this.stream.parser, 'lastFinalizedFrame', () => { //fs.writeFileSync('json/realtime.combo.json', util.inspect(realtime.combo.comboComputer, {depth: Infinity})); var overlayData = { diff --git a/js/main.js b/js/main.js index 8972a67..cc54f55 100644 --- a/js/main.js +++ b/js/main.js @@ -161,9 +161,9 @@ async function applyClientSettings(settings) { client.fixedSmashggQueue = row.value; document.body.classList.toggle("fixedSmashggQueue", row.value); break; - case "connection-type": - ipcRenderer.send("connectionType", row.value); - break; + // case "connection-type": + // ipcRenderer.send("connectionType", row.value); + // break; case "relay-port": ipcRenderer.send("slippiPort", row.value); break; diff --git a/js2/main.js b/js2/main.js index 8972a67..cc54f55 100644 --- a/js2/main.js +++ b/js2/main.js @@ -161,9 +161,9 @@ async function applyClientSettings(settings) { client.fixedSmashggQueue = row.value; document.body.classList.toggle("fixedSmashggQueue", row.value); break; - case "connection-type": - ipcRenderer.send("connectionType", row.value); - break; + // case "connection-type": + // ipcRenderer.send("connectionType", row.value); + // break; case "relay-port": ipcRenderer.send("slippiPort", row.value); break; diff --git a/scoreboard.json b/scoreboard.json index 663fd75..8e55e3a 100644 --- a/scoreboard.json +++ b/scoreboard.json @@ -1 +1 @@ -{"id":"1YGtQJ2bpB77lv5i","teams":{"1":{"name":"test2","players":[{"_id":"","name":"test2","displayname":"","firstname":"","lastname":"","birthday":null,"pronoun":"","twitter":"","twitch":"","steam":"","slippicode":"","country":"","city":null,"team":[],"smashgg":3180370,"smashggIgnore":{},"lastActivity":null}],"characters":[],"state":0,"score":0,"selected":null,"out":[]},"2":{"name":"test1","players":[{"_id":"AGjMiqQb0S3JaLUe","name":"3rd","displayname":"","firstname":"Jan","lastname":"K.","birthday":null,"pronoun":"he/him","twitter":"","twitch":"pepethebiggiraffe","steam":"","slippicode":"","country":"wvKcVbVeCJRw7shL","city":"Berlin","team":["DKHmmBRM3H80kiek"],"smashgg":"859325","smashggIgnore":{"country":null},"lastActivity":"2023-05-21T15:56:04.226Z"}],"characters":[],"state":0,"score":0,"selected":null,"out":[]}},"caster":[{"_id":"07zHIqjsXuHPUqPS","name":"Blackoser","displayname":"","firstname":"Marvin","lastname":"M.","birthday":null,"pronoun":"","twitter":"","twitch":"therealblackoser","steam":"","slippicode":"","country":"wvKcVbVeCJRw7shL","city":"Hamburg","team":[],"smashgg":"959740","smashggIgnore":{"country":null},"lastActivity":"2022-12-18T15:35:11.278Z"},{"_id":"07zHIqjsXuHPUqPS","name":"Blackoser","displayname":"","firstname":"Marvin","lastname":"M.","birthday":null,"pronoun":"","twitter":"","twitch":"therealblackoser","steam":"","slippicode":"","country":"wvKcVbVeCJRw7shL","city":"Hamburg","team":[],"smashgg":"959740","smashggIgnore":{"country":null},"lastActivity":"2022-12-18T15:35:11.278Z"}],"seatorder":[[1,0],[2,0]],"ports":[],"fields":{"round":{"enabled":true,"value":"Winners Final"},"bo":{"value":"freeplay","enabled":true},"tournamentname":{"value":"Deleted","enabled":true},"location":{"value":"","enabled":true},"smashgg":{"value":"testslug","enabled":true},"countdown":{"value":"","enabled":false},"switchtostart":{"value":"","enabled":true},"switchtoend":{"value":"","enabled":true},"bottombar":{"value":"standing","enabled":true},"hashtag":{"value":"TestHashtag","enabled":true},"freetext":{"value":"","enabled":true}},"game":"SDQXva74lQfZPTes","startgg":{"set":55315656,"event":834071,"phaseGroup":1948508,"phase":1270965},"smashggtoken":"17975f78257ff3d9cbca6eab679d6777","streamlist":[{"id":55315656,"slots":[{"entrant":{"name":"test2"}},{"entrant":{"name":"test1"}}],"fullRoundText":"Winners Final","identifier":"A","round":1}],"type":null,"_D":"2023-05-21T18:18:28.313Z","showcaster":null,"smashgg":null,"all":null} \ No newline at end of file +{"id":"1YGtQJ2bpB77lv5i","teams":{"1":{"name":"test2","players":[{"_id":"","name":"test2","displayname":"","firstname":"","lastname":"","birthday":null,"pronoun":"","twitter":"","twitch":"","steam":"","slippicode":"","country":"","city":null,"team":[],"smashgg":3180370,"smashggIgnore":{},"lastActivity":null}],"characters":[],"state":0,"score":0,"selected":null,"out":[]},"2":{"name":"test1","players":[{"_id":"AGjMiqQb0S3JaLUe","name":"3rd","displayname":"","firstname":"Jan","lastname":"K.","birthday":null,"pronoun":"he/him","twitter":"","twitch":"pepethebiggiraffe","steam":"","slippicode":"","country":"wvKcVbVeCJRw7shL","city":"Berlin","team":["DKHmmBRM3H80kiek"],"smashgg":"859325","smashggIgnore":{"country":null},"lastActivity":"2023-05-21T15:56:04.226Z"}],"characters":[],"state":0,"score":0,"selected":null,"out":[]}},"caster":[{"_id":"07zHIqjsXuHPUqPS","name":"Blackoser","displayname":"","firstname":"Marvin","lastname":"M.","birthday":null,"pronoun":"","twitter":"","twitch":"therealblackoser","steam":"","slippicode":"","country":"wvKcVbVeCJRw7shL","city":"Hamburg","team":[],"smashgg":"959740","smashggIgnore":{"country":null},"lastActivity":"2022-12-18T15:35:11.278Z"},{"_id":"07zHIqjsXuHPUqPS","name":"Blackoser","displayname":"","firstname":"Marvin","lastname":"M.","birthday":null,"pronoun":"","twitter":"","twitch":"therealblackoser","steam":"","slippicode":"","country":"wvKcVbVeCJRw7shL","city":"Hamburg","team":[],"smashgg":"959740","smashggIgnore":{"country":null},"lastActivity":"2022-12-18T15:35:11.278Z"}],"seatorder":[[1,0],[2,0]],"ports":[],"fields":{"round":{"enabled":true,"value":"Winners Final"},"bo":{"value":"freeplay","enabled":true},"tournamentname":{"value":"Deleted","enabled":true},"location":{"value":"","enabled":true},"smashgg":{"value":"testslug","enabled":true},"countdown":{"value":"","enabled":false},"switchtostart":{"value":"","enabled":true},"switchtoend":{"value":"","enabled":true},"bottombar":{"value":"standing","enabled":true},"hashtag":{"value":"TestHashtag","enabled":true},"freetext":{"value":"","enabled":true}},"game":"SDQXva74lQfZPTes","startgg":{"set":55315656,"event":834071,"phaseGroup":1948508,"phase":1270965},"smashggtoken":"17975f78257ff3d9cbca6eab679d6777","streamlist":[{"id":55315656,"slots":[{"entrant":{"name":"test2"}},{"entrant":{"name":"test1"}}],"fullRoundText":"Winners Final","identifier":"A","round":1}],"type":null,"_D":"2023-05-21T21:35:40.798Z","showcaster":null,"smashgg":null,"all":null} \ No newline at end of file diff --git a/window/settings.html b/window/settings.html index 986222c..4a1d336 100644 --- a/window/settings.html +++ b/window/settings.html @@ -67,7 +67,7 @@
Slippi Settings -
+
Slippi Relay