diff --git a/src/client/images/halloween/bigMobs.pyxel b/src/client/images/halloween/bigMobs.pyxel deleted file mode 100644 index 9d8ca0f5..00000000 Binary files a/src/client/images/halloween/bigMobs.pyxel and /dev/null differ diff --git a/src/client/images/halloween/mobs.png b/src/client/images/halloween/mobs.png deleted file mode 100644 index 0f385a07..00000000 Binary files a/src/client/images/halloween/mobs.png and /dev/null differ diff --git a/src/client/images/halloween/mobs.pyxel b/src/client/images/halloween/mobs.pyxel deleted file mode 100644 index 661a9a87..00000000 Binary files a/src/client/images/halloween/mobs.pyxel and /dev/null differ diff --git a/src/client/js/resources.js b/src/client/js/resources.js index f76c9631..9ad57240 100644 --- a/src/client/js/resources.js +++ b/src/client/js/resources.js @@ -1,6 +1,6 @@ define([ 'js/system/events' -], function( +], function ( events ) { var resources = { @@ -19,7 +19,7 @@ define([ 'abilityIcons', 'uiIcons', 'items', - 'materials', + 'materials', 'questItems', 'auras', 'sprites', @@ -27,16 +27,17 @@ define([ 'animMob', 'animBoss', 'white', - 'ray' + 'ray', + 'images/skins/0001.png' ], sprites: {}, ready: false, - init: function(list) { - list.forEach(function(l) { + init: function (list) { + list.forEach(function (l) { this.spriteNames.push(l); }, this); - this.spriteNames.forEach(function(s) { + this.spriteNames.forEach(function (s) { var sprite = { image: (new Image()), ready: false @@ -47,7 +48,7 @@ define([ this.sprites[s] = sprite; }, this); }, - onSprite: function(sprite) { + onSprite: function (sprite) { sprite.ready = true; var readyCount = 0; @@ -59,12 +60,12 @@ define([ if (readyCount == this.spriteNames.length) this.onReady(); }, - onReady: function() { + onReady: function () { this.ready = true; - + events.emit('onResourcesLoaded'); } }; return resources; -}); \ No newline at end of file +}); diff --git a/src/client/ui/templates/messages/messages.js b/src/client/ui/templates/messages/messages.js index d3c441a8..8ff4b0c9 100644 --- a/src/client/ui/templates/messages/messages.js +++ b/src/client/ui/templates/messages/messages.js @@ -226,10 +226,10 @@ define([ var textbox = this.find('input'); var val = textbox.val() - .split('<') - .join('') - .split('>') - .join(''); + /*.split('<') + .join('') + .split('>') + .join('');*/ textbox.blur(); diff --git a/src/mtx/skins/0001.png b/src/mtx/skins/0001.png deleted file mode 100644 index 6b0c02ae..00000000 Binary files a/src/mtx/skins/0001.png and /dev/null differ diff --git a/src/server/components/auth.js b/src/server/components/auth.js index 9ae29f21..b569279f 100644 --- a/src/server/components/auth.js +++ b/src/server/components/auth.js @@ -5,6 +5,7 @@ define([ 'security/connections', 'leaderboard/leaderboard', 'config/skins', + 'config/roles', 'misc/profanities' ], function ( bcrypt, @@ -13,6 +14,7 @@ define([ connections, leaderboard, skins, + roles, profanities ) { return { @@ -209,7 +211,8 @@ define([ onGetSkins: function (msg, result) { this.skins = JSON.parse(result || '[]'); - var skinList = skins.getSkinList(this.skins); + var list = [...this.skins, ...roles.getSkins(this.username)]; + var skinList = skins.getSkinList(list); msg.callback(skinList); }, diff --git a/src/server/config/roles.js b/src/server/config/roles.js index 21c6214e..063af692 100644 --- a/src/server/config/roles.js +++ b/src/server/config/roles.js @@ -1,6 +1,6 @@ define([ -], function( +], function ( ) { return { @@ -14,11 +14,14 @@ define([ name: 'Key to the world', sprite: [12, 0], keyId: 'world' - }] + }], + skins: [ + '1.1', '1.2', '1.3', '1.4', '1.5' + ] } }, - onBeforePlayerEnterGame: function(obj, blueprint) { + onBeforePlayerEnterGame: function (obj, blueprint) { var account = obj.account; var config = this.accounts[account] || {}; if (config.items) { @@ -30,12 +33,11 @@ define([ }); return; - } - else if (!blueprintInventory.items) + } else if (!blueprintInventory.items) blueprintInventory.items = []; var items = blueprintInventory.items; - config.items.forEach(function(item) { + config.items.forEach(function (item) { var hasItem = items.find(i => (i.name == item.name)); if (hasItem) return; @@ -45,14 +47,14 @@ define([ } }, - getRoleLevel: function(player) { + getRoleLevel: function (player) { var account = player.account; var level = this.accounts[account] ? this.accounts[account].level : 0; return level; }, - isRoleLevel: function(player, requireLevel, message) { + isRoleLevel: function (player, requireLevel, message) { var account = player.account; var level = this.accounts[account] ? this.accounts[account].level : 0; @@ -64,17 +66,21 @@ define([ return success; }, - getRoleMessageStyle: function(player) { + getRoleMessageStyle: function (player) { var account = player.account; return this.accounts[account] ? this.accounts[account].messageStyle : null; }, - getRoleMessagePrefix: function(player) { + getRoleMessagePrefix: function (player) { var account = player.account; return this.accounts[account] ? this.accounts[account].messagePrefix : null; }, - sendMessage: function(player, msg) { + getSkins: function (account) { + return this.accounts[account] ? this.accounts[account].skins : []; + }, + + sendMessage: function (player, msg) { msg = 'Only certain roles can ' + msg + ' at the moment'; player.instance.syncer.queue('onGetMessages', { @@ -86,4 +92,4 @@ define([ }, [player.serverId]); } }; -}); \ No newline at end of file +}); diff --git a/src/server/config/skins.js b/src/server/config/skins.js index 746d6ce6..bd91e59d 100644 --- a/src/server/config/skins.js +++ b/src/server/config/skins.js @@ -57,6 +57,42 @@ define([ name: 'Skin: Gaekatlan Druid', sprite: [0, 4], class: 'cleric' + }, + + '1.1': { + name: 'blebby', + spritesheet: 'images/skins/0001.png', + sprite: [0, 0], + class: 'wizard', + default: true + }, + '1.2': { + name: 'blebby', + spritesheet: 'images/skins/0001.png', + sprite: [1, 0], + class: 'cleric', + default: true + }, + '1.3': { + name: 'blebby', + spritesheet: 'images/skins/0001.png', + sprite: [2, 0], + class: 'thief', + default: true + }, + '1.4': { + name: 'blebby', + spritesheet: 'images/skins/0001.png', + sprite: [3, 0], + class: 'warrior', + default: true + }, + '1.5': { + name: 'blebby', + spritesheet: 'images/skins/0001.png', + sprite: [4, 0], + class: 'necromancer', + default: true } };