Revert "commit"

This reverts commit c52e4b0.
sayan01 · May 4, 2019 · 2e5f76c · 2e5f76c
1 parent 105573e
commit 2e5f76c
Show file tree

Hide file tree

Showing 4 changed files with 127 additions and 127 deletions.
diff --git a/README.md b/README.md
@@ -1,2 +1,2 @@
-# Tic-Tac-Toe
-Tic-Tac-Toe game using java command line interface
+# Tic-Tac-Toe
+Tic-Tac-Toe game using java command line interface
diff --git a/java/bin/core/TTT.class b/java/bin/core/TTT.class
diff --git a/java/src/core/TTT.java b/java/src/core/TTT.java
diff --git a/javascript/sketch.js b/javascript/sketch.js
@@ -1,126 +1,126 @@
-/**
- * TicTacToe Game by Sayan Ghosh
- */
-
-var arr,sc,sz;
-var player1turn;
-var gameover;
-var count;
-var winner;
-var button;
-var playerinfo;
-function setup() {
-    console.log("Version 3.5");
-    sz = 600;
-    sc = sz/3;
-    createCanvas(sz,sz);
-    reset();
-
-    button = createButton('reset',5);
-    button.position(220, 620);
-    button.size(170,100);
-    button.style('font-size','300%');
-    button.mouseReleased(reset);
-
-    playerinfo = createP();
-    playerinfo.position(650,20);
-    playerinfo.style('font-size','200%');
-
-
-}
-function reset(){
-    arr = [1,2,3,4,5,6,7,8,9];
-    count = 0;
-    player1turn = true;
-    gameover = false;
-}
-
-function draw() {
-    background(51);
-    for(i = 0;i < 9; i++){
-        fill(51);
-        strokeWeight(3);
-        stroke(255);
-        push();
-        translate(((i%3)*sc),(floor((i/3))*sc));
-        rect(0,0,sc,sc);
-        if(arr[i] == 0){
-            ellipse(sc/2, sc/2, sc/2, sc/2);
-        }
-        else if(arr[i] == -1){
-            line(sc/4, sc/4, 3 * (sc/4),3 * (sc/4));
-            line(3 * (sc/4), (sc/4), (sc/4), 3 * (sc/4));
-        }
-        pop();
-
-        playerinfo.html("Player "+ ( (player1turn)?"1 (X) ":"2 (O) " )+ " turn");
-    }
-    if(gameover){
-        //Draw the line
-        if(count===9){
-            textAlign(CENTER, CENTER);
-            textSize(64);
-            fill(255);
-            stroke(51);
-            strokeWeight(3);
-            text("Draw!", width/2, height/2);
-            playerinfo.html("Draw");
-            return;
-        }
-        x1 = (winner[0]%3)*sc + sc/2;
-        y1 = (floor(winner[0]/3))*sc + sc/2;
-        x2 = (winner[1]%3)*sc + sc/2;
-        y2 = (floor(winner[1]/3))*sc + sc/2;
-        strokeWeight(20);
-        line(x1, y1, x2, y2);
-        playerinfo.html("Player "+((arr[winner[0]] === -1)?"1 (X) ":"2 (O) ") + "Won!");
-    }
-}
-
-function mouseReleased(){
-    if(gameover){   return; }
-    mx = mouseX;
-    my = mouseY;
-    if(mx>sz || my>sz ){   return; }
-    x = floor(mx/sc);
-    y = floor(my/sc);
-    ind = (y*3) + x;
-    if(arr[ind]<=0){return;}
-    arr[ind] = (player1turn)?-1:0;
-    player1turn = !player1turn;
-    count++;
-    checkwon();
-}
-
-function keyPressed(){
-    if(key === 'R'){
-		reset();
-	}
-}
-
-function checkwon(){
-    if(count === 9) {
-        gameover= true;
-    }
-	for( i = 0;i < 3;i++){
-		if(arr[i] === (arr[i+3]) && arr[i] === (arr[i+6])){
-            gameover = true;
-            winner = [i,i+6];
-		}
-	}
-
-
-	for( i =0;i<9;i+=3){
-		if(arr[i] === (arr[i+1]) && arr[i] === (arr[i+2])){
-            gameover = true;
-            winner = [i,i+2];
-		}
-	}
-
-	for( i = 0, b = 4; i < 3; i += 2, b -= 2){
-		if(arr[i] === (arr[i+b]) && arr[i] === (arr[i+b+b])){
-            gameover = true;
-            winner = [i,i+b+b];
-		}
-	}
+/**
+ * TicTacToe Game by Sayan Ghosh
+ */
+
+var arr,sc,sz;
+var player1turn;
+var gameover;
+var count;
+var winner;
+var button;
+var playerinfo;
+function setup() {
+    console.log("Version 3.5");
+    sz = 600;
+    sc = sz/3;
+    createCanvas(sz,sz);
+    reset();
+
+    button = createButton('reset',5);
+    button.position(220, 620);
+    button.size(170,100);
+    button.style('font-size','300%');
+    button.mouseReleased(reset);
+
+    playerinfo = createP();
+    playerinfo.position(650,20);
+    playerinfo.style('font-size','200%');
+
+
+}
+function reset(){
+    arr = [1,2,3,4,5,6,7,8,9];
+    count = 0;
+    player1turn = true;
+    gameover = false;
+}
+
+function draw() {
+    background(51);
+    for(i = 0;i < 9; i++){
+        fill(51);
+        strokeWeight(3);
+        stroke(255);
+        push();
+        translate(((i%3)*sc),(floor((i/3))*sc));
+        rect(0,0,sc,sc);
+        if(arr[i] == 0){
+            ellipse(sc/2, sc/2, sc/2, sc/2);
+        }
+        else if(arr[i] == -1){
+            line(sc/4, sc/4, 3 * (sc/4),3 * (sc/4));
+            line(3 * (sc/4), (sc/4), (sc/4), 3 * (sc/4));
+        }
+        pop();
+
+        playerinfo.html("Player "+ ( (player1turn)?"1 (X) ":"2 (O) " )+ " turn");
+    }
+    if(gameover){
+        //Draw the line
+        if(count===9){
+            textAlign(CENTER, CENTER);
+            textSize(64);
+            fill(255);
+            stroke(51);
+            strokeWeight(3);
+            text("Draw!", width/2, height/2);
+            playerinfo.html("Draw");
+            return;
+        }
+        x1 = (winner[0]%3)*sc + sc/2;
+        y1 = (floor(winner[0]/3))*sc + sc/2;
+        x2 = (winner[1]%3)*sc + sc/2;
+        y2 = (floor(winner[1]/3))*sc + sc/2;
+        strokeWeight(20);
+        line(x1, y1, x2, y2);
+        playerinfo.html("Player "+((arr[winner[0]] === -1)?"1 (X) ":"2 (O) ") + "Won!");
+    }
+}
+
+function mouseReleased(){
+    if(gameover){   return; }
+    mx = mouseX;
+    my = mouseY;
+    if(mx>sz || my>sz ){   return; }
+    x = floor(mx/sc);
+    y = floor(my/sc);
+    ind = (y*3) + x;
+    if(arr[ind]<=0){return;}
+    arr[ind] = (player1turn)?-1:0;
+    player1turn = !player1turn;
+    count++;
+    checkwon();
+}
+
+function keyPressed(){
+    if(key === 'R'){
+		reset();
+	}
+}
+
+function checkwon(){
+    if(count === 9) {
+        gameover= true;
+    }
+	for( i = 0;i < 3;i++){
+		if(arr[i] === (arr[i+3]) && arr[i] === (arr[i+6])){
+            gameover = true;
+            winner = [i,i+6];
+		}
+	}
+
+
+	for( i =0;i<9;i+=3){
+		if(arr[i] === (arr[i+1]) && arr[i] === (arr[i+2])){
+            gameover = true;
+            winner = [i,i+2];
+		}
+	}
+
+	for( i = 0, b = 4; i < 3; i += 2, b -= 2){
+		if(arr[i] === (arr[i+b]) && arr[i] === (arr[i+b+b])){
+            gameover = true;
+            winner = [i,i+b+b];
+		}
+	}
 }