@@ -1,6 +1,6 @@ | |||||
define([ | define([ | ||||
'js/system/events' | 'js/system/events' | ||||
], function( | |||||
], function ( | |||||
events | events | ||||
) { | ) { | ||||
var resources = { | var resources = { | ||||
@@ -19,7 +19,7 @@ define([ | |||||
'abilityIcons', | 'abilityIcons', | ||||
'uiIcons', | 'uiIcons', | ||||
'items', | 'items', | ||||
'materials', | |||||
'materials', | |||||
'questItems', | 'questItems', | ||||
'auras', | 'auras', | ||||
'sprites', | 'sprites', | ||||
@@ -27,16 +27,17 @@ define([ | |||||
'animMob', | 'animMob', | ||||
'animBoss', | 'animBoss', | ||||
'white', | 'white', | ||||
'ray' | |||||
'ray', | |||||
'images/skins/0001.png' | |||||
], | ], | ||||
sprites: {}, | sprites: {}, | ||||
ready: false, | ready: false, | ||||
init: function(list) { | |||||
list.forEach(function(l) { | |||||
init: function (list) { | |||||
list.forEach(function (l) { | |||||
this.spriteNames.push(l); | this.spriteNames.push(l); | ||||
}, this); | }, this); | ||||
this.spriteNames.forEach(function(s) { | |||||
this.spriteNames.forEach(function (s) { | |||||
var sprite = { | var sprite = { | ||||
image: (new Image()), | image: (new Image()), | ||||
ready: false | ready: false | ||||
@@ -47,7 +48,7 @@ define([ | |||||
this.sprites[s] = sprite; | this.sprites[s] = sprite; | ||||
}, this); | }, this); | ||||
}, | }, | ||||
onSprite: function(sprite) { | |||||
onSprite: function (sprite) { | |||||
sprite.ready = true; | sprite.ready = true; | ||||
var readyCount = 0; | var readyCount = 0; | ||||
@@ -59,12 +60,12 @@ define([ | |||||
if (readyCount == this.spriteNames.length) | if (readyCount == this.spriteNames.length) | ||||
this.onReady(); | this.onReady(); | ||||
}, | }, | ||||
onReady: function() { | |||||
onReady: function () { | |||||
this.ready = true; | this.ready = true; | ||||
events.emit('onResourcesLoaded'); | events.emit('onResourcesLoaded'); | ||||
} | } | ||||
}; | }; | ||||
return resources; | return resources; | ||||
}); | |||||
}); |
@@ -226,10 +226,10 @@ define([ | |||||
var textbox = this.find('input'); | var textbox = this.find('input'); | ||||
var val = textbox.val() | var val = textbox.val() | ||||
.split('<') | |||||
.join('') | |||||
.split('>') | |||||
.join(''); | |||||
/*.split('<') | |||||
.join('') | |||||
.split('>') | |||||
.join('');*/ | |||||
textbox.blur(); | textbox.blur(); | ||||
@@ -5,6 +5,7 @@ define([ | |||||
'security/connections', | 'security/connections', | ||||
'leaderboard/leaderboard', | 'leaderboard/leaderboard', | ||||
'config/skins', | 'config/skins', | ||||
'config/roles', | |||||
'misc/profanities' | 'misc/profanities' | ||||
], function ( | ], function ( | ||||
bcrypt, | bcrypt, | ||||
@@ -13,6 +14,7 @@ define([ | |||||
connections, | connections, | ||||
leaderboard, | leaderboard, | ||||
skins, | skins, | ||||
roles, | |||||
profanities | profanities | ||||
) { | ) { | ||||
return { | return { | ||||
@@ -209,7 +211,8 @@ define([ | |||||
onGetSkins: function (msg, result) { | onGetSkins: function (msg, result) { | ||||
this.skins = JSON.parse(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); | msg.callback(skinList); | ||||
}, | }, | ||||
@@ -1,6 +1,6 @@ | |||||
define([ | define([ | ||||
], function( | |||||
], function ( | |||||
) { | ) { | ||||
return { | return { | ||||
@@ -14,11 +14,14 @@ define([ | |||||
name: 'Key to the world', | name: 'Key to the world', | ||||
sprite: [12, 0], | sprite: [12, 0], | ||||
keyId: 'world' | 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 account = obj.account; | ||||
var config = this.accounts[account] || {}; | var config = this.accounts[account] || {}; | ||||
if (config.items) { | if (config.items) { | ||||
@@ -30,12 +33,11 @@ define([ | |||||
}); | }); | ||||
return; | return; | ||||
} | |||||
else if (!blueprintInventory.items) | |||||
} else if (!blueprintInventory.items) | |||||
blueprintInventory.items = []; | blueprintInventory.items = []; | ||||
var 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)); | var hasItem = items.find(i => (i.name == item.name)); | ||||
if (hasItem) | if (hasItem) | ||||
return; | return; | ||||
@@ -45,14 +47,14 @@ define([ | |||||
} | } | ||||
}, | }, | ||||
getRoleLevel: function(player) { | |||||
getRoleLevel: function (player) { | |||||
var account = player.account; | var account = player.account; | ||||
var level = this.accounts[account] ? this.accounts[account].level : 0; | var level = this.accounts[account] ? this.accounts[account].level : 0; | ||||
return level; | return level; | ||||
}, | }, | ||||
isRoleLevel: function(player, requireLevel, message) { | |||||
isRoleLevel: function (player, requireLevel, message) { | |||||
var account = player.account; | var account = player.account; | ||||
var level = this.accounts[account] ? this.accounts[account].level : 0; | var level = this.accounts[account] ? this.accounts[account].level : 0; | ||||
@@ -64,17 +66,21 @@ define([ | |||||
return success; | return success; | ||||
}, | }, | ||||
getRoleMessageStyle: function(player) { | |||||
getRoleMessageStyle: function (player) { | |||||
var account = player.account; | var account = player.account; | ||||
return this.accounts[account] ? this.accounts[account].messageStyle : null; | return this.accounts[account] ? this.accounts[account].messageStyle : null; | ||||
}, | }, | ||||
getRoleMessagePrefix: function(player) { | |||||
getRoleMessagePrefix: function (player) { | |||||
var account = player.account; | var account = player.account; | ||||
return this.accounts[account] ? this.accounts[account].messagePrefix : null; | 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'; | msg = 'Only certain roles can ' + msg + ' at the moment'; | ||||
player.instance.syncer.queue('onGetMessages', { | player.instance.syncer.queue('onGetMessages', { | ||||
@@ -86,4 +92,4 @@ define([ | |||||
}, [player.serverId]); | }, [player.serverId]); | ||||
} | } | ||||
}; | }; | ||||
}); | |||||
}); |
@@ -57,6 +57,42 @@ define([ | |||||
name: 'Skin: Gaekatlan Druid', | name: 'Skin: Gaekatlan Druid', | ||||
sprite: [0, 4], | sprite: [0, 4], | ||||
class: 'cleric' | 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 | |||||
} | } | ||||
}; | }; | ||||