things

3 files changed, 70 insertions, 21 deletions

diff --git a/common.js b/common.js
index e77db07..7f5bd6a 100644
--- a/common.js
+++ b/common.js
@@ -1,7 +1,11 @@
-var W=8,H=9;
-
 if(typeof module=="undefined")module=false; //hack to support client-side importing
 
+var W=8,H=9;
+if(module){
+	module.exports.W=W;
+	module.exports.H=H;
+}
+
 if(module)module.exports["emptyboard"]=emptyboard;
 function emptyboard(){
 	return new Array(H).fill(0).map(function(){
diff --git a/index.html b/index.html
index dcf0b9b..6fbc6fc 100644
--- a/index.html
+++ b/index.html
@@ -24,7 +24,9 @@ socket.on("roomdestroy",roomdestroy);
 socket.on("roominvite",roominvite);
 socket.on("roomjoin",roomadduser);
 socket.on("roomchat",roomchat);
+socket.on("roomcreategame",roomcreategame)
 socket.on("roomgameturn",roomgameturn);
+socket.on("roomgameplace",roomgameplace);
 
 if(location.hostname=="localhost"&&Math.random()<.25)localStorage.setItem("nickname","aaa");
 
@@ -89,7 +91,7 @@ function Room(_roomid){
 	if(!(this instanceof Room))return new Room(_roomid)
 	this.id=_roomid;
 	this.userlist=[];
-	this.bd=emptyboard();
+	this.bd=null;
 	this.onturn=0;
 	this.cellsz=40;
 
@@ -144,8 +146,9 @@ function Room(_roomid){
 	e.appendChild(input);
 	this.uidiv.appendChild(e);
 
-	e=document.createElement("div");
-	e.classList.add("gamediv");
+	this.gamediv=document.createElement("div");
+	this.gamediv.classList.add("gamediv");
+	this.gamediv.classList.add("invisible"); //no game running yet
 	this.cvs=document.createElement("canvas");
 	this.ctx=this.cvs.getContext("2d");
 	this.cvs.classList.add("gamecvs");
@@ -153,13 +156,24 @@ function Room(_roomid){
 	this.cvs.height=this.cellsz*H+1;
 	this.cvs.addEventListener("click",function(ev){
 		if(ev.target!=this.cvs)return;
-		var x=ev.clientX/this.cellsz,y=ev.clientY/this.cellsz,idx=W*y+x;
+		var bbox=ev.target.getBoundingClientRect();
+		var x=~~((ev.clientX-bbox.left)/this.cellsz),
+		    y=~~((ev.clientY-bbox.top)/this.cellsz),
+		    idx=W*y+x;
 		if(x<0||y<0||x>=W||y>=H)return;
-		if(this.bd[idx]place(idx,this.onturn);
+		socket.emit("roomgameplace",this.id,idx);
 	}.bind(this));
-	drawboard(this.ctx,this.cellsz,this.bd,0);
-	e.appendChild(this.cvs);
-	this.uidiv.appendChild(e);
+	//drawboard(this.ctx,this.cellsz,this.bd,0);
+	this.gamediv.appendChild(this.cvs);
+	this.uidiv.appendChild(this.gamediv);
+
+	this.newgamebtn=document.createElement("input");
+	this.newgamebtn.type="button";
+	this.newgamebtn.value="Start new game!";
+	this.newgamebtn.addEventListener("click",function(){
+		socket.emit("roomcreategame",this.id); //just a request
+	}.bind(this));
+	this.uidiv.appendChild(this.newgamebtn);
 
 	this.statusdiv=document.createElement("div");
 	this.statusdiv.classList.add("gamestatusdiv");
@@ -191,19 +205,28 @@ Room.prototype.chat=function(by,msg){
 	this.uidiv.getElementsByClassName("chatlogtbody")[0].appendChild(tr);
 	tr.scrollIntoView();
 };
+Room.prototype.creategame=function(){
+	this.newgamebtn.classList.add("invisible");
+	this.gamediv.classList.remove("invisible");
+	this.bd=emptyboard();
+	drawboard(this.ctx,this.cellsz,this.bd,0);
+};
+Room.prototype.myturn=function(ot){
+	this.canplace=true;
+	this.onturn=ot;
+	this.statusdiv.innerHTML="Your turn!";
+};
 Room.prototype.place=function(pos,pidx){
+	console.log("place: onturn "+this.onturn+" -> "+pidx);
+	this.onturn=pidx;
 	queueapplymove(this.id,this.ctx,this.cellsz,pos,pidx);
 	queueapplymove(this.id,function(){
 		//WINCHECK?
+		console.log("place qam_func: onturn "+this.onturn+" -> "+(this.onturn+1)%this.userlist.length);
 		this.onturn=(this.onturn+1)%this.userlist.length;
 		drawboard(this.ctx,this.cellsz,this.bd,this.onturn);
 	}.bind(this));
 };
-Room.prototype.myturn=function(ot){
-	this.canplace=true;
-	this.onturn=ot;
-	this.statusdiv.innerHTML="Your turn!";
-};
 
 function roominvite(roomid,by){
 	if(!confirm("User '"+by[1]+"' sent you an invite to join their room. Accept?"))return;
@@ -219,10 +242,18 @@ function roomchat(roomid,by,msg){
 	rooms[roomid].chat(by,msg);
 }
 
+function roomcreategame(roomid){
+	rooms[roomid].creategame();
+}
+
 function roomgameturn(roomid,ot){
 	rooms[roomid].myturn(ot);
 }
 
+function roomgameplace(roomid,pos,pidx){
+	rooms[roomid].place(pos,pidx);
+}
+
 
 function changenick(){
 	var newnick=prompt("New nickname?");
@@ -328,10 +359,12 @@ function applymove(ctx,cellsz,idx,c,aqid){
 	bd[~~(idx/W)][idx%W].c=c;
 	drawboard(ctx,cellsz,bd,onturn);
 	var anims=stabiliseanims(bd);
+	console.log(anims);
 	anims.forEach(function(pair,i){
 		var stage=pair[0],newbd=pair[1];
 		var finalstage=i==anims.length-1;
 		setTimeout(function(){
+			console.log("anim stage",stage);
 			var time=0;
 			var interval=setInterval(function(){
 				var i,fx,fy,tx,ty;
diff --git a/index.js b/index.js
index d2432ac..a87d6f0 100755
--- a/index.js
+++ b/index.js
@@ -30,19 +30,27 @@ app.get("/",function(req,res){
 
 function Game(_np){
 	if(!(this instanceof Game))return new Game(_np);
-	this.bd=emptyboard();
-	this.np=np;
+	this.bd=C.emptyboard();
+	this.np=_np;
 	this.onturn=0;
 }
 Game.prototype.applymove=function(player,pos){
 	if(this.onturn!=player)return false;
 	var x=pos%C.W,y=~~(pos/C.W);
+	if(x<0||y<0||x>=C.W||y>=C.H){
+		console.log("applymove asked to apply on pos ("+x+","+y+")");
+		return false;
+	}
 	if(this.bd[y][x].n&&this.bd[y][x].c!=player)return false;
 	this.bd[y][x].c=player;
 	this.bd[y][x].n++;
 	this.bd=C.stabilise(this.bd);
-	do this.onturn=(this.onturn+1)%this.np;
-	while C.countballs(this.bd,this.onturn)==0;
+	this.onturn=(this.onturn+1)%this.np;
+	if(C.countballs(this.bd)>=this.np){
+		while(C.countballs(this.bd,this.onturn)==0){
+			this.onturn=(this.onturn+1)%this.np;
+		}
+	}
 	return true;
 };
 Game.prototype.checkwin=function(){
@@ -166,7 +174,7 @@ io.on("connection",function(conn){
 	});
 	function guardroomid(roomid){
 		if(obj.rooms.indexOf(roomid)==-1){
-			conn.emit("message","No member of that room!");
+			conn.emit("message","Not a member of that room!");
 			return false;
 		}
 		return true;
@@ -234,7 +242,11 @@ io.on("connection",function(conn){
 	conn.on("roomgameplace",function(roomid,pos){
 		if(!guardroomid(roomid)||!guardroomgame(roomid))return;
 		var playeridx=rooms[roomid].ids.indexOf(obj.id);
-		if(!rooms[roomid].game.applymove(pos,playeridx)){
+		if(playeridx!=rooms[roomid].game.onturn){
+			conn.emit("message","Not your turn! (You are player "+(playeridx+1)+", on turn: "+(rooms[roomid].game.onturn+1)+")");
+			return;
+		}
+		if(!rooms[roomid].game.applymove(playeridx,pos)){
 			conn.emit("message","Invalid move!");
 			return;
 		}