diff --git a/src/client/ui/templates/createCharacter/createCharacter.js b/src/client/ui/templates/createCharacter/createCharacter.js index a289a6ba..f80a95ab 100644 --- a/src/client/ui/templates/createCharacter/createCharacter.js +++ b/src/client/ui/templates/createCharacter/createCharacter.js @@ -167,7 +167,7 @@ define([ this.costume = (this.costume + 1) % spriteList.length; this.skinId = spriteList[this.costume].id; - el.html((this.costume + 1) + '/' + spriteList.length); + el.html(spriteList[this.costume].name); this.setSprite(); }, diff --git a/src/client/ui/templates/createCharacter/styles.less b/src/client/ui/templates/createCharacter/styles.less index 1f5b4d6c..67b548fb 100644 --- a/src/client/ui/templates/createCharacter/styles.less +++ b/src/client/ui/templates/createCharacter/styles.less @@ -47,9 +47,7 @@ } .txtCostume { - &:before { - content: 'costume '; - } + } } diff --git a/src/server/config/animations.js b/src/server/config/animations.js index 5b61bbc4..da64e8fe 100644 --- a/src/server/config/animations.js +++ b/src/server/config/animations.js @@ -40,9 +40,7 @@ define([ frames: 5, frameDelay: 3 } - } - }, - cleric: { + }, '4': { hitStaff: { sheet: 'animChar', diff --git a/src/server/config/classes.js b/src/server/config/classes.js index e2faa472..7590fa97 100644 --- a/src/server/config/classes.js +++ b/src/server/config/classes.js @@ -9,10 +9,6 @@ define([ x: 0, y: 0 }, - cleric: { - x: 1, - y: 0 - }, wizard: { x: 2, y: 0 @@ -24,7 +20,6 @@ define([ }, spells: { wizard: ['magic missile', 'ice spear'], - cleric: ['smite', 'consecrate'], warrior: ['slash', 'charge'], thief: ['flurry', 'smokebomb'] }, @@ -38,15 +33,6 @@ define([ int: 1 } }, - cleric: { - values: { - hpMax: 60 - }, - vitScale: 10, - gainStats: { - int: 1 - } - }, warrior: { values: { hpMax: 80 @@ -68,9 +54,8 @@ define([ }, weapons: { wizard: 'Gnarled Staff', - cleric: 'Wand', thief: 'Dagger', - warrior: 'Axe' + warrior: 'Sword' }, getSpritesheet: function (className) { diff --git a/src/server/config/skins.js b/src/server/config/skins.js index 97b94c98..39e84824 100644 --- a/src/server/config/skins.js +++ b/src/server/config/skins.js @@ -31,13 +31,13 @@ define([ 'cleric 1': { name: 'Cleric 1', sprite: [4, 0], - class: 'cleric', + class: 'wizard', default: true }, 'cleric 2': { name: 'Cleric 2', sprite: [5, 0], - class: 'cleric', + class: 'wizard', default: true }, 'thief 1': { @@ -70,7 +70,7 @@ define([ name: 'Diviner', spritesheet: 'images/skins/0001.png', sprite: [1, 0], - class: 'cleric' + class: 'wizard' }, '1.3': { name: 'Cutthroat', @@ -88,7 +88,7 @@ define([ name: 'Occultist', spritesheet: 'images/skins/0001.png', sprite: [4, 0], - class: 'necromancer' + class: 'wizard' }, //Templar Skin Pack @@ -96,31 +96,31 @@ define([ name: 'Crusader 1', spritesheet: 'images/skins/0010.png', sprite: [0, 0], - class: ['cleric', 'warrior'] + class: ['wizard', 'warrior'] }, '2.2': { name: 'Crusader 2', spritesheet: 'images/skins/0010.png', sprite: [1, 0], - class: ['cleric', 'warrior'] + class: ['wizard', 'warrior'] }, '2.3': { name: 'Crusader 3', spritesheet: 'images/skins/0010.png', sprite: [2, 0], - class: ['cleric', 'warrior'] + class: ['wizard', 'warrior'] }, '2.4': { name: 'Crusader 4', spritesheet: 'images/skins/0010.png', sprite: [3, 0], - class: ['cleric', 'warrior'] + class: ['wizard', 'warrior'] }, '2.5': { name: 'Grand Crusader', spritesheet: 'images/skins/0010.png', sprite: [4, 0], - class: ['cleric', 'warrior'] + class: ['wizard', 'warrior'] } }; diff --git a/src/server/mods/class-necromancer/index.js b/src/server/mods/class-necromancer/index.js index e81c3297..82466d51 100644 --- a/src/server/mods/class-necromancer/index.js +++ b/src/server/mods/class-necromancer/index.js @@ -85,7 +85,7 @@ define([ }, beforeGetClasses: function (classes) { - classes.spells.necromancer = ['harvest life', 'summon skeleton']; + /*classes.spells.necromancer = ['harvest life', 'summon skeleton']; classes.stats.necromancer = { values: { hpMax: 65 @@ -102,7 +102,7 @@ define([ spritesheet: `${this.folderName}/images/avatar.png`, x: 0, y: 0 - }; + };*/ }, beforeGetSpellTemplate: function (spell) { @@ -118,7 +118,7 @@ define([ skins['necromancer 1'] = { name: 'Necromancer 1', sprite: [0, 0], - class: 'necromancer', + class: 'wizard', spritesheet: `${this.folderName}/images/inGameSprite.png`, default: true }; diff --git a/src/server/mods/event-halloween/index.js b/src/server/mods/event-halloween/index.js index 6d022ed1..cd521109 100644 --- a/src/server/mods/event-halloween/index.js +++ b/src/server/mods/event-halloween/index.js @@ -106,7 +106,7 @@ define([ skins['pumpkin-head necromancer'] = { name: 'Pumpkin-Head Necromancer', sprite: [0, 0], - class: 'necromancer', + class: 'wizard', spritesheet: `${this.folderName}/images/skins.png` }; },