kjao/archive
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed up last commit

Browse Source
This commit is contained in:
ksjdragon 2015-08-30 22:41:36 -04:00
parent d8b16984ef
commit fc47d8e011
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clashingcomrades/static/main.js
View File

@ -20,7 +20,6 @@ var claimedColors = {
} }
document.getElementsByClassName('play')[0].onclick = function startGame() { document.getElementsByClassName('play')[0].onclick = function startGame() {
uuid4 = function() { uuid4 = function() {
return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, _uuid4); return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, _uuid4);
}; };
@ -28,15 +27,13 @@ document.getElementsByClassName('play')[0].onclick = function startGame() {
_uuid4 = function(cc) { _uuid4 = function(cc) {
var rr = Math.random() * 16 | 0; return (cc === 'x' ? rr : (rr & 0x3 | 0x8)).toString(16); var rr = Math.random() * 16 | 0; return (cc === 'x' ? rr : (rr & 0x3 | 0x8)).toString(16);
}; };
username = uuid4(); username = uuid4();
spectatedUser = username; spectatedUser = username;
//********************* //*********************
// TODO Get from server // TODO Get from server
//********************* //*********************
setTimeout
getInitial() getInitial()
console.log(playerTeam);
console.log(playerCoordinate[0],playerCoordinate[1]);
// TODO IP Handling, most likely not necessary // TODO IP Handling, most likely not necessary
@ -60,13 +57,12 @@ function getInitial() {
// data: '', // data: '',
success: function(data) { success: function(data) {
//called when successful //called when successful
console.log(data["coordinate"], data["team"])
playerCoordinate = data["coordinate"]; playerCoordinate = data["coordinate"];
playerTeam = data["team"]; playerTeam = data["team"];
}, },
error: function(e) { error: function(e) {
//called when there is an error //called when there is an error
//console.log(e.message); //1(e.message);
} }
}); });
} }
@ -98,8 +94,6 @@ function serverTransfer(coordinate,team,turn,username) {
) { ) {
if ((data[user].length > data[spectatedUser].length) if ((data[user].length > data[spectatedUser].length)
&& data[spectatedUser][turn][2] === "spectator") { && data[spectatedUser][turn][2] === "spectator") {
console.log(data[user]);
console.log(data[spectatedUser]);
spectatedUser = user; spectatedUser = user;
} }
var theMove = data[user][turn]; var theMove = data[user][turn];