g

9 months ago · ce84eeca1b
parent d59d1f5657
commit ce84eeca1b
16 changed files with 46 additions and 15 deletions
--- a/client/css/game.css
+++ b/client/css/game.css
--- a/client/css/game.css.map
+++ b/client/css/game.css.map
--- a/client/css/game.scss
+++ b/client/css/game.scss
--- a/client/css/main.css
+++ b/client/css/main.css
--- a/client/css/main.css.map
+++ b/client/css/main.css.map
--- a/client/css/main.scss
+++ b/client/css/main.scss
--- a/client/index.html
+++ b/client/index.html
@ -14,7 +14,7 @@
        <div id="playfield"></div>
    </section>
    <script src="./javascript/game-logic.js"></script>
-    <script src="./javascript/client-only-logic.js">
+    <script src="./javascript/client.js">
    </script>
 </body>
 </html>
--- a/javascript/client-only-logic.js
+++ b/javascript/client-only-logic.js
--- a/client/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") {
        
--- a/client/new.html
+++ b/client/new.html
@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <title>Socket.IO chat</title>
+    <style>
+      body { margin: 0; padding-bottom: 3rem; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif; }
+
+      #form { background: rgba(0, 0, 0, 0.15); padding: 0.25rem; position: fixed; bottom: 0; left: 0; right: 0; display: flex; height: 3rem; box-sizing: border-box; backdrop-filter: blur(10px); }
+      #input { border: none; padding: 0 1rem; flex-grow: 1; border-radius: 2rem; margin: 0.25rem; }
+      #input:focus { outline: none; }
+      #form > button { background: #333; border: none; padding: 0 1rem; margin: 0.25rem; border-radius: 3px; outline: none; color: #fff; }
+
+      #messages { list-style-type: none; margin: 0; padding: 0; }
+      #messages > li { padding: 0.5rem 1rem; }
+      #messages > li:nth-child(odd) { background: #efefef; }
+    </style>
+  </head>
+  <body>
+    <ul id="messages"></ul>
+    <form id="form" action="">
+      <input id="input" autocomplete="off" /><button>Send</button>
+    </form>
+  </body>
+</html>
--- a/client/resources/pieces/black-basic.svg
+++ b/client/resources/pieces/black-basic.svg
--- a/client/resources/pieces/black-queen.svg
+++ b/client/resources/pieces/black-queen.svg
--- a/client/resources/pieces/white-basic.svg
+++ b/client/resources/pieces/white-basic.svg
--- a/client/resources/pieces/white-queen.svg
+++ b/client/resources/pieces/white-queen.svg
--- a/package.json
+++ b/package.json
--- a/server/communication.js
+++ b/server/communication.js
@ -0,0 +1 @@
+import { Server } from "socket.io";