diff --git a/css/game.css b/client/css/game.css similarity index 100% rename from css/game.css rename to client/css/game.css diff --git a/css/game.css.map b/client/css/game.css.map similarity index 100% rename from css/game.css.map rename to client/css/game.css.map diff --git a/css/game.scss b/client/css/game.scss similarity index 100% rename from css/game.scss rename to client/css/game.scss diff --git a/css/main.css b/client/css/main.css similarity index 100% rename from css/main.css rename to client/css/main.css diff --git a/css/main.css.map b/client/css/main.css.map similarity index 100% rename from css/main.css.map rename to client/css/main.css.map diff --git a/css/main.scss b/client/css/main.scss similarity index 100% rename from css/main.scss rename to client/css/main.scss diff --git a/index.html b/client/index.html similarity index 86% rename from index.html rename to client/index.html index ce4715f..4126e69 100644 --- a/index.html +++ b/client/index.html @@ -14,7 +14,7 @@
- \ No newline at end of file diff --git a/javascript/client-only-logic.js b/client/javascript/client.js similarity index 100% rename from javascript/client-only-logic.js rename to client/javascript/client.js diff --git a/javascript/game-logic.js b/client/javascript/game-logic.js similarity index 92% rename from javascript/game-logic.js rename to client/javascript/game-logic.js index 719e3c5..eaf13b8 100644 --- a/javascript/game-logic.js +++ b/client/javascript/game-logic.js @@ -1,10 +1,4 @@ -/* -W = Player one basic piece -V = Player one queen piece -B = Player two basic piece -P = Player two queen piece -*/ const pieceList = new Array(); currentPlayer = "white"; @@ -144,8 +138,19 @@ function getCasualties(oldX, oldY, newX, newY) { } return casualties; } + +function getLoser() { + if (!pieceList.find(pieceRecord => pieceRecord.player == "white")) { + return "white"; + } + if (!pieceList.find(pieceRecord => pieceRecord.player == "black")) { + return "black"; + } + return null; +} + function continuableInDirectionForQueen(directionX, directionY, pieceRecord) { - console.log("----------------------------------"); + const pieceX = pieceRecord.x; const pieceY = pieceRecord.y; const player = pieceRecord.player; @@ -155,7 +160,7 @@ function continuableInDirectionForQueen(directionX, directionY, pieceRecord) { const y = pieceY + (i*directionY); if(x > 7 || x < 0 || y > 7 || y < 0 || (x+directionX) > 7 || (x+directionX) < 0 || (y+directionY) > 7 || (y+directionY) < 0 ){ - console.log("!konec!"); + return false; } @@ -163,13 +168,13 @@ function continuableInDirectionForQueen(directionX, directionY, pieceRecord) { if (record) { if (record.player == player) { - console.log("!je to hráč!"); + return false; } const firstBlockRecord = getPieceRecord(x+directionX,y+directionY); const secondBlockRecord = getPieceRecord(x-directionX,y-directionY); - console.log("fb: " + firstBlockRecord + secondBlockRecord); + return ((!firstBlockRecord || firstBlockRecord.id == pieceRecord.id) && (!secondBlockRecord || secondBlockRecord.id == pieceRecord.id)); @@ -196,8 +201,8 @@ function continuable(pieceRecord){ } if(type == "queen"){ - console.log("Tady to začíná"); - return (continuableInDirectionForQueen(1,1,pieceRecord) || continuableInDirectionForQueen(-1,-1,pieceRecord) || continuableInDirectionForQueen(-1,1,pieceRecord) || continuableInDirectionForQueen(-1,-1,pieceRecord)); + + return (continuableInDirectionForQueen(1,1,pieceRecord) || continuableInDirectionForQueen(-1,-1,pieceRecord) || continuableInDirectionForQueen(-1,1,pieceRecord) || continuableInDirectionForQueen(1,-1,pieceRecord)); } return false; @@ -238,9 +243,9 @@ function makeMove(pieceRecord, x, y){ nukePieceRecord(casualty); }); - if (casualties.length == 0 && getOportunities(pieceRecord).length != 0) { + /*if (casualties.length == 0 && getOportunities(pieceRecord).length != 0) { //POTŘREBA DODĚLAT SBÍRÁNÍ DÍLKŮ ZA NESKÁKÁNÍ - } + }*/ if ((player == "white" && y == 7) || (player == "black" && y == 0) && pieceRecord.type == "basic") { diff --git a/client/new.html b/client/new.html new file mode 100644 index 0000000..f210f97 --- /dev/null +++ b/client/new.html @@ -0,0 +1,25 @@ + + + + + Socket.IO chat + + + + +
+ +
+ + \ No newline at end of file diff --git a/resources/pieces/black-basic.svg b/client/resources/pieces/black-basic.svg similarity index 100% rename from resources/pieces/black-basic.svg rename to client/resources/pieces/black-basic.svg diff --git a/resources/pieces/black-queen.svg b/client/resources/pieces/black-queen.svg similarity index 100% rename from resources/pieces/black-queen.svg rename to client/resources/pieces/black-queen.svg diff --git a/resources/pieces/white-basic.svg b/client/resources/pieces/white-basic.svg similarity index 100% rename from resources/pieces/white-basic.svg rename to client/resources/pieces/white-basic.svg diff --git a/resources/pieces/white-queen.svg b/client/resources/pieces/white-queen.svg similarity index 100% rename from resources/pieces/white-queen.svg rename to client/resources/pieces/white-queen.svg diff --git a/package.json b/package.json new file mode 100644 index 0000000..e69de29 diff --git a/server/communication.js b/server/communication.js new file mode 100644 index 0000000..324b525 --- /dev/null +++ b/server/communication.js @@ -0,0 +1 @@ +import { Server } from "socket.io"; \ No newline at end of file