diff --git a/UI/index.html b/UI/index.html
index f1e0b51..0e65776 100644
--- a/UI/index.html
+++ b/UI/index.html
@@ -28,12 +28,8 @@ function updateEvent() {
});
}
-function sendGameState() {
- gameSession.send('{"type":"update","state":'+JSON.stringify(window.gameState)+'}');
-}
-
function startGameSession() {
- window.gameSession = new WebSocket(server+gameID);
+ window.gameSession = new WebSocket(server);
gameSession.onmessage = function (event) {
var message = JSON.parse(event.data);
if (message.state) { gameState = message.state; updateEvent(); }
@@ -44,6 +40,13 @@ function startGameSession() {
sendGameState();
}
}
+ if (message.request) {
+ if ("session" == message.request) { mytest.send('{"session":'+window.gameState.session+'}'); }
+ if ("user" == message.request) { mytest.send('{"user":'+window.gameState.user+'}'); }
+ if ("join" == message.request) { mytest.send('{"action":"join"}'); }
+ if ("update" == message.request) { mytest.send('{"action":"update"}'); }
+ }
+ console.log(message);
};
gameSession.onconnect = function () {
gameSession.send('{"type":"update","command":"requestState"}');
@@ -53,34 +56,6 @@ function startGameSession() {
};
}
-function generateDeck(DDF) {
- var cards = [""];
- for (var attribute in DDF) {
- var tempcards = [];
- cards.forEach( function (current) {
- DDF[attribute].forEach( function (value) {
- tempcards.push(current+value);
- } );
- } );
- cards = tempcards.slice();
- }
- return cards;
-}
-
-function shuffleDeck(deck) {
- gameSession.send('{"type":"action","action":"shuffle"}');
-}
-
-function deckFromJSON(ourFile) {
- if ( Array.isArray(ourFile) ) {
- ourFile.forEach(function (deck) {
- window.gameState.deck = window.gameState.deck.concat(generateDeck(deck));
- });
- } else {
- window.gameState.deck = window.gameState.deck.concat(generateDeck(ourFile));
- }
-}
-
elementPlace("body","menu",null,"div");
buttonAdd("#menu","upload","Upload Deck", function () {
popupDialog("deckLoader","Select Deck definition File",true,inputDialog,{"inputType":"file"},function (f) {
@@ -127,26 +102,18 @@ elementPlace("body","display",null,"div");
window.UI = {};
window.UI.deck = elementPlace("#display","deck",null,"div");
window.UI.hand = elementPlace("#display","hand",null,"ol");
-
-popupDialog("gettingStarted","Welcome to Deckard and company", false, inputDialog,{"content":"Please enter a game ID or leave blank to start a new game","inputType":"number"},
- function (value) {
- if (Number.isInteger(Number.parseInt(value))) {
- window.gameID = Number.parseInt(value);
- } else {
- var tempses = new WebSocket(server);
- tempses.onmessage = function (event) {
- var message = JSON.parse(event.data);
- if (message.id) { window.gameID = message.id; }
- };
- }
- if (window.gameID) {
- startGameSession();
- } else {
- tempses.onclose = function () {
- startGameSession();
- };
- }
- });
-
+var parms = new URLSearchParams(window.location.search);
+if (parms.get("s")) {
+ window.gameState.session = parms.get("s");
+} else {
+ popupDialog("gettingStarted","Welcome to Deckard and company", false, inputDialog,{"content":"Please enter a game ID or leave blank to start a new game","inputType":"number"},
+ function (value) {
+ if (Number.isInteger(Number.parseInt(value))) {
+ window.gameState.session = Number.parseInt(value);
+ } else {
+ window.gameState.session = null;
+ }
+ });
+}