Parcourir la source

fixes #525

tags/v0.1.10^2
big bad waffle il y a 6 ans
Parent
révision
387279ee93
7 fichiers modifiés avec 17 ajouts et 36 suppressions
  1. +1
    -1
      src/client/ui/templates/createCharacter/createCharacter.js
  2. +1
    -3
      src/client/ui/templates/createCharacter/styles.less
  3. +1
    -3
      src/server/config/animations.js
  4. +1
    -16
      src/server/config/classes.js
  5. +9
    -9
      src/server/config/skins.js
  6. +3
    -3
      src/server/mods/class-necromancer/index.js
  7. +1
    -1
      src/server/mods/event-halloween/index.js

+ 1
- 1
src/client/ui/templates/createCharacter/createCharacter.js Voir le fichier

@@ -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();
},


+ 1
- 3
src/client/ui/templates/createCharacter/styles.less Voir le fichier

@@ -47,9 +47,7 @@
}

.txtCostume {
&:before {
content: 'costume ';
}
}
}



+ 1
- 3
src/server/config/animations.js Voir le fichier

@@ -40,9 +40,7 @@ define([
frames: 5,
frameDelay: 3
}
}
},
cleric: {
},
'4': {
hitStaff: {
sheet: 'animChar',


+ 1
- 16
src/server/config/classes.js Voir le fichier

@@ -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) {


+ 9
- 9
src/server/config/skins.js Voir le fichier

@@ -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']
}
};



+ 3
- 3
src/server/mods/class-necromancer/index.js Voir le fichier

@@ -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
};


+ 1
- 1
src/server/mods/event-halloween/index.js Voir le fichier

@@ -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`
};
},


Chargement…
Annuler
Enregistrer