From 9b4c5d30ddaa2e767152344ed3a30551a43f05dc Mon Sep 17 00:00:00 2001 From: Nick Shvelidze Date: Tue, 6 Oct 2015 14:11:49 +0400 Subject: [PATCH] Reformat code --- client/js/gameclient.js | 525 ++++++++++++++++++++-------------------- 1 file changed, 262 insertions(+), 263 deletions(-) diff --git a/client/js/gameclient.js b/client/js/gameclient.js index caf5a2f5..9a9b34e4 100644 --- a/client/js/gameclient.js +++ b/client/js/gameclient.js @@ -1,8 +1,7 @@ - -define(['player', 'entityfactory', 'lib/bison'], function(Player, EntityFactory, BISON) { +define(['player', 'entityfactory', 'lib/bison'], function (Player, EntityFactory, BISON) { var GameClient = Class.extend({ - init: function(host, port) { + init: function (host, port) { this.connection = null; this.host = host; this.port = port; @@ -42,75 +41,75 @@ define(['player', 'entityfactory', 'lib/bison'], function(Player, EntityFactory, this.enable(); }, - enable: function() { + enable: function () { this.isListening = true; }, - disable: function() { + disable: function () { this.isListening = false; }, - connect: function(dispatcherMode) { + connect: function (dispatcherMode) { var url, self = this; - if(location.protocol === "https:") - url = "wss://"+ this.host +":"+ this.port +"/"; + if (location.protocol === "https:") + url = "wss://" + this.host + ":" + this.port + "/"; else - url = "ws://"+ this.host +":"+ this.port +"/"; + url = "ws://" + this.host + ":" + this.port + "/"; - log.info("Trying to connect to server : "+url); + log.info("Trying to connect to server : " + url); - this.connection = io(url, {forceNew: true, reconnection: false});// This sets the connection as a socket.io Socket. + this.connection = io(url, { forceNew: true, reconnection: false });// This sets the connection as a socket.io Socket. - if(dispatcherMode) { - this.connection.on('message', function(e) { + if (dispatcherMode) { + this.connection.on('message', function (e) { var reply = JSON.parse(e.data); - if(reply.status === 'OK') { + if (reply.status === 'OK') { self.dispatched_callback(reply.host, reply.port); - } else if(reply.status === 'FULL') { + } else if (reply.status === 'FULL') { alert("BrowserQuest is currently at maximum player population. Please retry later."); } else { alert("Unknown error while connecting to BrowserQuest."); } }); } else { - this.connection.on('connection', function() { - log.info("Connected to server "+self.host+":"+self.port); + this.connection.on('connection', function () { + log.info("Connected to server " + self.host + ":" + self.port); }); - this.connection.on('message', function(e) { - if(e === 'go') { - if(self.connected_callback) { + this.connection.on('message', function (e) { + if (e === 'go') { + if (self.connected_callback) { self.connected_callback(); } return; } - if(e === 'timeout') { + if (e === 'timeout') { self.isTimeout = true; return; } - if(e === 'invalidlogin' || e === 'userexists' || e === 'loggedin' || e === 'invalidusername'){ - if(self.fail_callback){ + if (e === 'invalidlogin' || e === 'userexists' || e === 'loggedin' || e === 'invalidusername') { + if (self.fail_callback) { self.fail_callback(e); } return; } - self.receiveMessage(e); + self.receiveMessage(e); }); - this.connection.on('error', function(e) { + this.connection.on('error', function (e) { log.error(e, true); }); - this.connection.on('disconnect', function() { + this.connection.on('disconnect', function () { log.debug("Connection closed"); $('#container').addClass('error'); - if(self.disconnected_callback) { - if(self.isTimeout) { + if (self.disconnected_callback) { + if (self.isTimeout) { self.disconnected_callback("You have been disconnected for being inactive for too long"); } else { self.disconnected_callback("The connection to BrowserQuest has been lost"); @@ -120,10 +119,10 @@ define(['player', 'entityfactory', 'lib/bison'], function(Player, EntityFactory, } }, - sendMessage: function(json) { + sendMessage: function (json) { var data; - if(this.connection.connected === true) { - if(this.useBison) { + if (this.connection.connected === true) { + if (this.useBison) { data = BISON.encode(json); } else { data = JSON.stringify(json); @@ -132,11 +131,11 @@ define(['player', 'entityfactory', 'lib/bison'], function(Player, EntityFactory, } }, - receiveMessage: function(message) { + receiveMessage: function (message) { var data, action; - if(this.isListening) { - if(this.useBison) { + if (this.isListening) { + if (this.useBison) { data = BISON.decode(message); } else { data = JSON.parse(message); @@ -144,8 +143,8 @@ define(['player', 'entityfactory', 'lib/bison'], function(Player, EntityFactory, log.debug("data: " + message); - if(data instanceof Array) { - if(data[0] instanceof Array) { + if (data instanceof Array) { + if (data[0] instanceof Array) { // Multiple actions received this.receiveActionBatch(data); } else { @@ -156,9 +155,9 @@ define(['player', 'entityfactory', 'lib/bison'], function(Player, EntityFactory, } }, - receiveAction: function(data) { + receiveAction: function (data) { var action = data[0]; - if(this.handlers[action] && _.isFunction(this.handlers[action])) { + if (this.handlers[action] && _.isFunction(this.handlers[action])) { this.handlers[action].call(this, data); } else { @@ -166,15 +165,15 @@ define(['player', 'entityfactory', 'lib/bison'], function(Player, EntityFactory, } }, - receiveActionBatch: function(actions) { + receiveActionBatch: function (actions) { var self = this; - _.each(actions, function(action) { + _.each(actions, function (action) { self.receiveAction(action); }); }, - receiveWelcome: function(data) { + receiveWelcome: function (data) { var id = data[1], name = data[2], x = data[3], @@ -186,129 +185,129 @@ define(['player', 'entityfactory', 'lib/bison'], function(Player, EntityFactory, weaponAvatar = data[9], experience = data[10]; - if(this.welcome_callback) { + if (this.welcome_callback) { this.welcome_callback(id, name, x, y, hp, armor, weapon, avatar, weaponAvatar, experience); } }, - receiveMove: function(data) { + receiveMove: function (data) { var id = data[1], x = data[2], y = data[3]; - if(this.move_callback) { + if (this.move_callback) { this.move_callback(id, x, y); } }, - receiveLootMove: function(data) { + receiveLootMove: function (data) { var id = data[1], item = data[2]; - if(this.lootmove_callback) { + if (this.lootmove_callback) { this.lootmove_callback(id, item); } }, - receiveAttack: function(data) { + receiveAttack: function (data) { var attacker = data[1], target = data[2]; - if(this.attack_callback) { + if (this.attack_callback) { this.attack_callback(attacker, target); } }, - receiveSpawn: function(data) { + receiveSpawn: function (data) { var id = data[1], kind = data[2], x = data[3], y = data[4]; - if(Types.isItem(kind)) { + if (Types.isItem(kind)) { var item = EntityFactory.createEntity(kind, id); - if(this.spawn_item_callback) { + if (this.spawn_item_callback) { this.spawn_item_callback(item, x, y); } - } else if(Types.isChest(kind)) { + } else if (Types.isChest(kind)) { var item = EntityFactory.createEntity(kind, id); - if(this.spawn_chest_callback) { + if (this.spawn_chest_callback) { this.spawn_chest_callback(item, x, y); } } else { var name, orientation, target, weapon, armor, level; - if(Types.isPlayer(kind)) { + if (Types.isPlayer(kind)) { name = data[5]; orientation = data[6]; armor = data[7]; weapon = data[8]; - if(data.length > 9) { + if (data.length > 9) { target = data[9]; } } - else if(Types.isMob(kind)) { + else if (Types.isMob(kind)) { orientation = data[5]; - if(data.length > 6) { + if (data.length > 6) { target = data[6]; } } var character = EntityFactory.createEntity(kind, id, name); - if(character instanceof Player) { + if (character instanceof Player) { character.weaponName = Types.getKindAsString(weapon); character.spriteName = Types.getKindAsString(armor); } - if(this.spawn_character_callback) { + if (this.spawn_character_callback) { this.spawn_character_callback(character, x, y, orientation, target); } } }, - receiveDespawn: function(data) { + receiveDespawn: function (data) { var id = data[1]; - if(this.despawn_callback) { + if (this.despawn_callback) { this.despawn_callback(id); } }, - receiveHealth: function(data) { + receiveHealth: function (data) { var points = data[1], isRegen = false; - if(data[2]) { + if (data[2]) { isRegen = true; } - if(this.health_callback) { + if (this.health_callback) { this.health_callback(points, isRegen); } }, - receiveChat: function(data) { + receiveChat: function (data) { var id = data[1], text = data[2]; - if(this.chat_callback) { + if (this.chat_callback) { this.chat_callback(id, text); } }, - receiveEquipItem: function(data) { + receiveEquipItem: function (data) { var id = data[1], itemKind = data[2]; - if(this.equip_callback) { + if (this.equip_callback) { this.equip_callback(id, itemKind); } }, - receiveDrop: function(data) { + receiveDrop: function (data) { var mobId = data[1], id = data[2], kind = data[3], @@ -317,391 +316,391 @@ define(['player', 'entityfactory', 'lib/bison'], function(Player, EntityFactory, item.wasDropped = true; item.playersInvolved = data[4]; - if(this.drop_callback) { + if (this.drop_callback) { this.drop_callback(item, mobId); } }, - receiveTeleport: function(data) { + receiveTeleport: function (data) { var id = data[1], x = data[2], y = data[3]; - if(this.teleport_callback) { + if (this.teleport_callback) { this.teleport_callback(id, x, y); } }, - receiveDamage: function(data) { + receiveDamage: function (data) { var id = data[1], dmg = data[2]; - hp = parseInt(data[3]), + hp = parseInt(data[3]), maxHp = parseInt(data[4]); - if(this.dmg_callback) { + if (this.dmg_callback) { this.dmg_callback(id, dmg, hp, maxHp); } }, - receivePopulation: function(data) { + receivePopulation: function (data) { var worldPlayers = data[1], totalPlayers = data[2]; - if(this.population_callback) { + if (this.population_callback) { this.population_callback(worldPlayers, totalPlayers); } }, - receiveKill: function(data) { + receiveKill: function (data) { var mobKind = data[1]; var level = data[2]; var exp = data[3]; - if(this.kill_callback) { + if (this.kill_callback) { this.kill_callback(mobKind, level, exp); } }, - receiveList: function(data) { + receiveList: function (data) { data.shift(); - if(this.list_callback) { + if (this.list_callback) { this.list_callback(data); } }, - receiveDestroy: function(data) { + receiveDestroy: function (data) { var id = data[1]; - if(this.destroy_callback) { + if (this.destroy_callback) { this.destroy_callback(id); } }, - receiveHitPoints: function(data) { + receiveHitPoints: function (data) { var maxHp = data[1]; - if(this.hp_callback) { + if (this.hp_callback) { this.hp_callback(maxHp); } }, - receiveBlink: function(data) { + receiveBlink: function (data) { var id = data[1]; - if(this.blink_callback) { + if (this.blink_callback) { this.blink_callback(id); } }, - receivePVP: function(data){ + receivePVP: function (data) { var pvp = data[1]; - if(this.pvp_callback){ + if (this.pvp_callback) { this.pvp_callback(pvp); } }, - receiveGuildError: function(data) { - var errorType = data[1]; - var guildName = data[2]; - if(this.guilderror_callback) { - this.guilderror_callback(errorType, guildName); - } - }, - - receiveGuild: function(data) { - if( (data[1] === Types.Messages.GUILDACTION.CONNECT) && - this.guildmemberconnect_callback ){ - this.guildmemberconnect_callback(data[2]); //member name - } - else if( (data[1] === Types.Messages.GUILDACTION.DISCONNECT) && - this.guildmemberdisconnect_callback ){ - this.guildmemberdisconnect_callback(data[2]); //member name - } - else if( (data[1] === Types.Messages.GUILDACTION.ONLINE) && - this.guildonlinemembers_callback ){ - data.splice(0,2); - this.guildonlinemembers_callback(data); //member names - } - else if( (data[1] === Types.Messages.GUILDACTION.CREATE) && - this.guildcreate_callback){ - this.guildcreate_callback(data[2], data[3]);//id, name - } - else if( (data[1] === Types.Messages.GUILDACTION.INVITE) && - this.guildinvite_callback){ - this.guildinvite_callback(data[2], data[3], data[4]);//id, name, invitor name - } - else if( (data[1] === Types.Messages.GUILDACTION.POPULATION) && - this.guildpopulation_callback){ - this.guildpopulation_callback(data[2], data[3]);//name, count - } - else if( (data[1] === Types.Messages.GUILDACTION.JOIN) && - this.guildjoin_callback){ - this.guildjoin_callback(data[2], data[3], data[4], data[5]);//name, (id, (guildId, guildName)) - } - else if( (data[1] === Types.Messages.GUILDACTION.LEAVE) && - this.guildleave_callback){ - this.guildleave_callback(data[2], data[3], data[4]);//name, id, guildname - } - else if( (data[1] === Types.Messages.GUILDACTION.TALK) && - this.guildtalk_callback){ - this.guildtalk_callback(data[2], data[3], data[4]);//name, id, message - } - }, - - onDispatched: function(callback) { + receiveGuildError: function (data) { + var errorType = data[1]; + var guildName = data[2]; + if (this.guilderror_callback) { + this.guilderror_callback(errorType, guildName); + } + }, + + receiveGuild: function (data) { + if ((data[1] === Types.Messages.GUILDACTION.CONNECT) && + this.guildmemberconnect_callback) { + this.guildmemberconnect_callback(data[2]); //member name + } + else if ((data[1] === Types.Messages.GUILDACTION.DISCONNECT) && + this.guildmemberdisconnect_callback) { + this.guildmemberdisconnect_callback(data[2]); //member name + } + else if ((data[1] === Types.Messages.GUILDACTION.ONLINE) && + this.guildonlinemembers_callback) { + data.splice(0, 2); + this.guildonlinemembers_callback(data); //member names + } + else if ((data[1] === Types.Messages.GUILDACTION.CREATE) && + this.guildcreate_callback) { + this.guildcreate_callback(data[2], data[3]);//id, name + } + else if ((data[1] === Types.Messages.GUILDACTION.INVITE) && + this.guildinvite_callback) { + this.guildinvite_callback(data[2], data[3], data[4]);//id, name, invitor name + } + else if ((data[1] === Types.Messages.GUILDACTION.POPULATION) && + this.guildpopulation_callback) { + this.guildpopulation_callback(data[2], data[3]);//name, count + } + else if ((data[1] === Types.Messages.GUILDACTION.JOIN) && + this.guildjoin_callback) { + this.guildjoin_callback(data[2], data[3], data[4], data[5]);//name, (id, (guildId, guildName)) + } + else if ((data[1] === Types.Messages.GUILDACTION.LEAVE) && + this.guildleave_callback) { + this.guildleave_callback(data[2], data[3], data[4]);//name, id, guildname + } + else if ((data[1] === Types.Messages.GUILDACTION.TALK) && + this.guildtalk_callback) { + this.guildtalk_callback(data[2], data[3], data[4]);//name, id, message + } + }, + + onDispatched: function (callback) { this.dispatched_callback = callback; }, - onConnected: function(callback) { + onConnected: function (callback) { this.connected_callback = callback; }, - onDisconnected: function(callback) { + onDisconnected: function (callback) { this.disconnected_callback = callback; }, - onWelcome: function(callback) { + onWelcome: function (callback) { this.welcome_callback = callback; }, - onSpawnCharacter: function(callback) { + onSpawnCharacter: function (callback) { this.spawn_character_callback = callback; }, - onSpawnItem: function(callback) { + onSpawnItem: function (callback) { this.spawn_item_callback = callback; }, - onSpawnChest: function(callback) { + onSpawnChest: function (callback) { this.spawn_chest_callback = callback; }, - onDespawnEntity: function(callback) { + onDespawnEntity: function (callback) { this.despawn_callback = callback; }, - onEntityMove: function(callback) { + onEntityMove: function (callback) { this.move_callback = callback; }, - onEntityAttack: function(callback) { + onEntityAttack: function (callback) { this.attack_callback = callback; }, - onPlayerChangeHealth: function(callback) { + onPlayerChangeHealth: function (callback) { this.health_callback = callback; }, - onPlayerEquipItem: function(callback) { + onPlayerEquipItem: function (callback) { this.equip_callback = callback; }, - onPlayerMoveToItem: function(callback) { + onPlayerMoveToItem: function (callback) { this.lootmove_callback = callback; }, - onPlayerTeleport: function(callback) { + onPlayerTeleport: function (callback) { this.teleport_callback = callback; }, - onChatMessage: function(callback) { + onChatMessage: function (callback) { this.chat_callback = callback; }, - onDropItem: function(callback) { + onDropItem: function (callback) { this.drop_callback = callback; }, - onPlayerDamageMob: function(callback) { + onPlayerDamageMob: function (callback) { this.dmg_callback = callback; }, - onPlayerKillMob: function(callback) { + onPlayerKillMob: function (callback) { this.kill_callback = callback; }, - onPopulationChange: function(callback) { + onPopulationChange: function (callback) { this.population_callback = callback; }, - onEntityList: function(callback) { + onEntityList: function (callback) { this.list_callback = callback; }, - onEntityDestroy: function(callback) { + onEntityDestroy: function (callback) { this.destroy_callback = callback; }, - onPlayerChangeMaxHitPoints: function(callback) { + onPlayerChangeMaxHitPoints: function (callback) { this.hp_callback = callback; }, - onItemBlink: function(callback) { + onItemBlink: function (callback) { this.blink_callback = callback; }, - onPVPChange: function(callback){ + onPVPChange: function (callback) { this.pvp_callback = callback; }, - onGuildError: function(callback) { - this.guilderror_callback = callback; - }, + onGuildError: function (callback) { + this.guilderror_callback = callback; + }, - onGuildCreate: function(callback) { - this.guildcreate_callback = callback; - }, + onGuildCreate: function (callback) { + this.guildcreate_callback = callback; + }, - onGuildInvite: function(callback) { - this.guildinvite_callback = callback; - }, + onGuildInvite: function (callback) { + this.guildinvite_callback = callback; + }, - onGuildJoin: function(callback) { - this.guildjoin_callback = callback; - }, + onGuildJoin: function (callback) { + this.guildjoin_callback = callback; + }, - onGuildLeave: function(callback) { - this.guildleave_callback = callback; - }, + onGuildLeave: function (callback) { + this.guildleave_callback = callback; + }, - onGuildTalk: function(callback) { - this.guildtalk_callback = callback; - }, + onGuildTalk: function (callback) { + this.guildtalk_callback = callback; + }, - onMemberConnect: function(callback) { - this.guildmemberconnect_callback = callback; - }, + onMemberConnect: function (callback) { + this.guildmemberconnect_callback = callback; + }, - onMemberDisconnect: function(callback) { - this.guildmemberdisconnect_callback = callback; - }, + onMemberDisconnect: function (callback) { + this.guildmemberdisconnect_callback = callback; + }, - onReceiveGuildMembers: function(callback) { - this.guildonlinemembers_callback = callback; - }, + onReceiveGuildMembers: function (callback) { + this.guildonlinemembers_callback = callback; + }, - onGuildPopulation: function(callback) { - this.guildpopulation_callback = callback; - }, + onGuildPopulation: function (callback) { + this.guildpopulation_callback = callback; + }, - sendCreate: function(player) { + sendCreate: function (player) { this.sendMessage([Types.Messages.CREATE, - player.name, - player.pw, - player.email]); + player.name, + player.pw, + player.email]); }, - sendLogin: function(player) { + sendLogin: function (player) { this.sendMessage([Types.Messages.LOGIN, - player.name, - player.pw]); - }, - - // sendHello: function(player) { - //if(player.hasGuild()){ - // this.sendMessage([Types.Messages.HELLO, - // player.name, - // player.pw, - // player.email, - // Types.getKindFromString(player.getSpriteName()), - // Types.getKindFromString(player.getWeaponName()), - // player.guild.id, player.guild.name]); - //} - //else{ - //this.sendMessage([Types.Messages.HELLO, - //player.name, - //player.pw, - //player.email, - //Types.getKindFromString(player.getSpriteName()), - //Types.getKindFromString(player.getWeaponName())]); - //} - // }, - - sendMove: function(x, y) { + player.name, + player.pw]); + }, + + // sendHello: function(player) { + //if(player.hasGuild()){ + // this.sendMessage([Types.Messages.HELLO, + // player.name, + // player.pw, + // player.email, + // Types.getKindFromString(player.getSpriteName()), + // Types.getKindFromString(player.getWeaponName()), + // player.guild.id, player.guild.name]); + //} + //else{ + //this.sendMessage([Types.Messages.HELLO, + //player.name, + //player.pw, + //player.email, + //Types.getKindFromString(player.getSpriteName()), + //Types.getKindFromString(player.getWeaponName())]); + //} + // }, + + sendMove: function (x, y) { this.sendMessage([Types.Messages.MOVE, - x, - y]); + x, + y]); }, - sendLootMove: function(item, x, y) { + sendLootMove: function (item, x, y) { this.sendMessage([Types.Messages.LOOTMOVE, - x, - y, - item.id]); + x, + y, + item.id]); }, - sendAggro: function(mob) { + sendAggro: function (mob) { this.sendMessage([Types.Messages.AGGRO, - mob.id]); + mob.id]); }, - sendAttack: function(mob) { + sendAttack: function (mob) { this.sendMessage([Types.Messages.ATTACK, - mob.id]); + mob.id]); }, - sendHit: function(mob) { + sendHit: function (mob) { this.sendMessage([Types.Messages.HIT, - mob.id]); + mob.id]); }, - sendHurt: function(mob) { + sendHurt: function (mob) { this.sendMessage([Types.Messages.HURT, - mob.id]); + mob.id]); }, - sendChat: function(text) { + sendChat: function (text) { this.sendMessage([Types.Messages.CHAT, - text]); + text]); }, - sendLoot: function(item) { + sendLoot: function (item) { this.sendMessage([Types.Messages.LOOT, - item.id]); + item.id]); }, - sendTeleport: function(x, y) { + sendTeleport: function (x, y) { this.sendMessage([Types.Messages.TELEPORT, - x, - y]); + x, + y]); }, - sendZone: function() { + sendZone: function () { this.sendMessage([Types.Messages.ZONE]); }, - sendOpen: function(chest) { + sendOpen: function (chest) { this.sendMessage([Types.Messages.OPEN, - chest.id]); + chest.id]); }, - sendCheck: function(id) { + sendCheck: function (id) { this.sendMessage([Types.Messages.CHECK, - id]); + id]); }, - sendWho: function(ids) { + sendWho: function (ids) { ids.unshift(Types.Messages.WHO); this.sendMessage(ids); }, - sendNewGuild: function(name) { - this.sendMessage([Types.Messages.GUILD, Types.Messages.GUILDACTION.CREATE, name]); - }, + sendNewGuild: function (name) { + this.sendMessage([Types.Messages.GUILD, Types.Messages.GUILDACTION.CREATE, name]); + }, - sendGuildInvite: function(invitee) { - this.sendMessage([Types.Messages.GUILD, Types.Messages.GUILDACTION.INVITE, invitee]); - }, + sendGuildInvite: function (invitee) { + this.sendMessage([Types.Messages.GUILD, Types.Messages.GUILDACTION.INVITE, invitee]); + }, - sendGuildInviteReply: function(guild, answer) { - this.sendMessage([Types.Messages.GUILD, Types.Messages.GUILDACTION.JOIN, guild, answer]); - }, + sendGuildInviteReply: function (guild, answer) { + this.sendMessage([Types.Messages.GUILD, Types.Messages.GUILDACTION.JOIN, guild, answer]); + }, - talkToGuild: function(message){ - this.sendMessage([Types.Messages.GUILD, Types.Messages.GUILDACTION.TALK, message]); - }, + talkToGuild: function (message) { + this.sendMessage([Types.Messages.GUILD, Types.Messages.GUILDACTION.TALK, message]); + }, - sendLeaveGuild: function(){ - this.sendMessage([Types.Messages.GUILD, Types.Messages.GUILDACTION.LEAVE]); - } + sendLeaveGuild: function () { + this.sendMessage([Types.Messages.GUILD, Types.Messages.GUILDACTION.LEAVE]); + } }); return GameClient;